summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/ansible/Manifest1
-rw-r--r--app-admin/ansible/ansible-1.9.3.ebuild2
-rw-r--r--app-admin/ansible/ansible-1.9.4.ebuild63
-rw-r--r--app-admin/glance/Manifest1
-rw-r--r--app-admin/glance/glance-2015.1.2.ebuild192
-rw-r--r--app-admin/glance/glance-2015.1.9999.ebuild10
-rw-r--r--app-admin/puppet-agent/Manifest2
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.2.6.ebuild77
-rw-r--r--app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch55
-rw-r--r--app-admin/sagan/metadata.xml5
-rw-r--r--app-admin/sagan/sagan-1.0.0_rc3.ebuild4
-rw-r--r--app-admin/sudo/sudo-1.8.12-r1.ebuild197
-rw-r--r--app-admin/webapp-config/webapp-config-1.54-r1.ebuild2
-rw-r--r--app-antivirus/clamav/clamav-0.98.7.ebuild2
-rw-r--r--app-arch/pbzip2/pbzip2-1.1.12.ebuild2
-rw-r--r--app-arch/snappy/metadata.xml5
-rw-r--r--app-arch/unrar/Manifest2
-rw-r--r--app-arch/unrar/unrar-5.3.6.ebuild (renamed from app-arch/unrar/unrar-5.3.2.ebuild)6
-rw-r--r--app-crypt/gnupg/Manifest3
-rw-r--r--app-crypt/gnupg/gnupg-2.0.28.ebuild2
-rw-r--r--app-crypt/gnupg/gnupg-2.1.6.ebuild170
-rw-r--r--app-crypt/gnupg/gnupg-2.1.7.ebuild169
-rw-r--r--app-crypt/gnupg/gnupg-2.1.8.ebuild2
-rw-r--r--app-crypt/gnupg/gnupg-2.1.9.ebuild (renamed from app-crypt/gnupg/gnupg-2.1.7-r1.ebuild)2
-rw-r--r--app-crypt/keybase/Manifest4
-rw-r--r--app-crypt/keybase/keybase-0.8.12.ebuild33
-rw-r--r--app-crypt/keybase/keybase-0.8.22.ebuild (renamed from app-crypt/keybase/keybase-0.8.10.ebuild)0
-rw-r--r--app-crypt/keybase/keybase-0.8.9.ebuild33
-rw-r--r--app-crypt/pinentry/pinentry-0.9.5.ebuild2
-rw-r--r--app-crypt/sign/metadata.xml5
-rw-r--r--app-crypt/xca/Manifest1
-rw-r--r--app-crypt/xca/xca-1.3.2.ebuild43
-rw-r--r--app-editors/retext/Manifest1
-rw-r--r--app-editors/retext/metadata.xml2
-rw-r--r--app-editors/retext/retext-5.2.1.ebuild53
-rw-r--r--app-emacs/ess/Manifest2
-rw-r--r--app-emacs/ess/ess-15.09.ebuild (renamed from app-emacs/ess/ess-13.09.ebuild)15
-rw-r--r--app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild1
-rw-r--r--app-emulation/libvirt/Manifest1
-rw-r--r--app-emulation/libvirt/libvirt-1.2.15-r1.ebuild464
-rw-r--r--app-emulation/libvirt/libvirt-1.2.19-r1.ebuild12
-rw-r--r--app-emulation/libvirt/libvirt-1.2.20.ebuild12
-rw-r--r--app-emulation/libvirt/libvirt-9999.ebuild12
-rw-r--r--app-emulation/lxd/Manifest1
-rw-r--r--app-emulation/lxd/files/lxd-0.18-dont-go-get.patch18
-rw-r--r--app-emulation/lxd/files/lxd-0.18-nc-binary-name.patch11
-rw-r--r--app-emulation/lxd/files/lxd-0.18.confd27
-rw-r--r--app-emulation/lxd/files/lxd-0.18.initd32
-rw-r--r--app-emulation/lxd/lxd-0.18.ebuild166
-rw-r--r--app-emulation/lxd/metadata.xml4
-rw-r--r--app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild2
-rw-r--r--app-misc/mc/mc-4.8.14.ebuild2
-rw-r--r--app-misc/screen/Manifest2
-rw-r--r--app-misc/screen/files/4.0.2-64bit-time.patch11
-rw-r--r--app-misc/screen/files/4.0.2-no-libelf.patch18
-rw-r--r--app-misc/screen/files/4.0.2-no-pty.patch14
-rw-r--r--app-misc/screen/files/4.0.2-no-utempter.patch14
-rw-r--r--app-misc/screen/files/4.0.2-nonblock.patch11
-rw-r--r--app-misc/screen/files/4.0.2-windowlist-multiuser-fix.patch12
-rw-r--r--app-misc/screen/files/4.0.3-extend-d_termname-ng2.patch203
-rw-r--r--app-misc/screen/files/screen-4.0.1-int-overflow-fix.patch31
-rw-r--r--app-misc/screen/files/screen-4.0.1-vsprintf.patch13
-rw-r--r--app-misc/screen/files/screen-4.0.3-config.h-autoconf-2.62.patch14
-rw-r--r--app-misc/screen/files/screen-4.0.3-cppflags.patch20
-rw-r--r--app-misc/screen/files/screen-4.0.3-crosscompile.patch598
-rw-r--r--app-misc/screen/files/screen-4.0.3-setenv_autoconf.patch79
-rw-r--r--app-misc/screen/screen-4.0.3-r6.ebuild163
-rw-r--r--app-misc/screen/screen-4.0.3-r7.ebuild163
-rw-r--r--app-misc/screen/screen-4.0.3-r8.ebuild173
-rw-r--r--app-misc/screen/screen-4.2.1-r2.ebuild146
-rw-r--r--app-misc/screen/screen-4.3.1-r1.ebuild2
-rw-r--r--app-misc/screen/screen-4.3.1.ebuild146
-rw-r--r--app-misc/tracker/tracker-1.2.6.ebuild1
-rw-r--r--app-misc/tracker/tracker-1.4.0.ebuild1
-rw-r--r--app-misc/tracker/tracker-1.4.1.ebuild1
-rw-r--r--app-office/impressive/impressive-0.10.5.ebuild1
-rw-r--r--app-office/impressive/impressive-0.11.0b-r1.ebuild (renamed from app-office/impressive/impressive-0.11.0b.ebuild)6
-rw-r--r--app-office/libreoffice/Manifest2
-rw-r--r--app-office/libreoffice/libreoffice-5.0.3.1.ebuild609
-rw-r--r--app-office/libreoffice/libreoffice-9999.ebuild2
-rw-r--r--app-officeext/languagetool/Manifest1
-rw-r--r--app-officeext/languagetool/languagetool-3.1.ebuild26
-rw-r--r--app-officeext/ooofbtools/Manifest3
-rw-r--r--app-officeext/ooofbtools/ooofbtools-2.34.ebuild40
-rw-r--r--app-officeext/ooofbtools/ooofbtools-2.38.ebuild (renamed from app-officeext/ooofbtools/ooofbtools-2.35.ebuild)6
-rw-r--r--app-portage/eix/eix-0.30.11.ebuild2
-rw-r--r--app-text/dos2unix/dos2unix-7.3-r1.ebuild2
-rw-r--r--app-text/libwps/Manifest1
-rw-r--r--app-text/libwps/libwps-0.4.2.ebuild40
-rw-r--r--app-text/xapian-omega/Manifest2
-rw-r--r--app-text/xapian-omega/xapian-omega-1.2.20.ebuild30
-rw-r--r--app-text/xapian-omega/xapian-omega-1.3.2.ebuild30
-rw-r--r--dev-db/couchdb/couchdb-1.6.1-r2.ebuild1
-rw-r--r--dev-db/mariadb/Manifest1
-rw-r--r--dev-db/mariadb/mariadb-5.5.46.ebuild123
-rw-r--r--dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild2
-rw-r--r--dev-db/mysql/Manifest1
-rw-r--r--dev-db/mysql/mysql-5.5.46.ebuild126
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-4.3.13.3.ebuild2
-rw-r--r--dev-db/phpmyadmin/phpmyadmin-4.4.14.1.ebuild2
-rw-r--r--dev-db/postgresql/Manifest5
-rw-r--r--dev-db/postgresql/postgresql-9.0.22-r1.ebuild374
-rw-r--r--dev-db/postgresql/postgresql-9.0.22.ebuild371
-rw-r--r--dev-db/postgresql/postgresql-9.0.23.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.1.18-r1.ebuild378
-rw-r--r--dev-db/postgresql/postgresql-9.1.18.ebuild375
-rw-r--r--dev-db/postgresql/postgresql-9.1.19.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.2.13-r1.ebuild390
-rw-r--r--dev-db/postgresql/postgresql-9.2.13.ebuild387
-rw-r--r--dev-db/postgresql/postgresql-9.2.14.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.3.10.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.3.9-r1.ebuild390
-rw-r--r--dev-db/postgresql/postgresql-9.3.9.ebuild387
-rw-r--r--dev-db/postgresql/postgresql-9.4.4-r1.ebuild422
-rw-r--r--dev-db/postgresql/postgresql-9.4.4-r2.ebuild425
-rw-r--r--dev-db/postgresql/postgresql-9.4.4.ebuild419
-rw-r--r--dev-db/postgresql/postgresql-9.4.5.ebuild2
-rw-r--r--dev-games/tiled/Manifest2
-rw-r--r--dev-games/tiled/tiled-0.14.2.ebuild (renamed from dev-games/tiled/tiled-0.11.0.ebuild)44
-rw-r--r--dev-java/asm/Manifest2
-rw-r--r--dev-java/asm/asm-1.4.3-r3.ebuild44
-rw-r--r--dev-java/asm/asm-1.4.3-r4.ebuild38
-rw-r--r--dev-java/asm/asm-1.5.3-r1.ebuild36
-rw-r--r--dev-java/asm/asm-1.5.3.ebuild37
-rw-r--r--dev-java/icedtea/files/TryXShmAttach.patch201
-rw-r--r--dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild (renamed from dev-java/icedtea/icedtea-7.2.6.1.ebuild)4
-rw-r--r--dev-java/invokebinder/Manifest1
-rw-r--r--dev-java/invokebinder/files/invokebinder-1.6-build.xml230
-rw-r--r--dev-java/invokebinder/invokebinder-1.6.ebuild45
-rw-r--r--dev-java/jama/jama-1.0.3-r1.ebuild25
-rw-r--r--dev-java/jama/jama-1.0.3.ebuild42
-rw-r--r--dev-java/javacsv/javacsv-2.1.ebuild2
-rw-r--r--dev-java/jsr101/Manifest1
-rw-r--r--dev-java/jsr101/jsr101-1.4-r3.ebuild32
-rw-r--r--dev-java/netty-buffer/Manifest2
-rw-r--r--dev-java/netty-buffer/files/netty-buffer-4.0.32-build.xml (renamed from dev-java/netty-buffer/files/netty-buffer-4.0.22-build.xml)0
-rw-r--r--dev-java/netty-buffer/netty-buffer-4.0.32.ebuild (renamed from dev-java/netty-buffer/netty-buffer-4.0.22.ebuild)0
-rw-r--r--dev-java/netty-codec/Manifest2
-rw-r--r--dev-java/netty-codec/files/netty-codec-4.0.32-build.xml (renamed from dev-java/netty-codec/files/netty-codec-4.0.22-build.xml)0
-rw-r--r--dev-java/netty-codec/netty-codec-4.0.32.ebuild (renamed from dev-java/netty-codec/netty-codec-4.0.22.ebuild)0
-rw-r--r--dev-java/netty-common/Manifest2
-rw-r--r--dev-java/netty-common/netty-common-4.0.32.ebuild (renamed from dev-java/netty-common/netty-common-4.0.22.ebuild)0
-rw-r--r--dev-java/netty-transport/Manifest2
-rw-r--r--dev-java/netty-transport/files/netty-transport-4.0.32-build.xml (renamed from dev-java/netty-transport/files/netty-transport-4.0.22-build.xml)0
-rw-r--r--dev-java/netty-transport/netty-transport-4.0.32.ebuild (renamed from dev-java/netty-transport/netty-transport-4.0.22.ebuild)0
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.1.33-r1.ebuild (renamed from dev-java/tomcat-native/tomcat-native-1.1.33.ebuild)25
-rw-r--r--dev-java/vldocking/Manifest1
-rw-r--r--dev-java/vldocking/metadata.xml12
-rw-r--r--dev-java/vldocking/vldocking-3.0.5.ebuild38
-rw-r--r--dev-lang/ekopath/Manifest1
-rw-r--r--dev-lang/ekopath/ekopath-6.0.477_p20150809.ebuild2
-rw-r--r--dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild2
-rw-r--r--dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild2
-rw-r--r--dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild2
-rw-r--r--dev-lang/ekopath/ekopath-6.0.551_p20151010.ebuild74
-rw-r--r--dev-lang/python/python-2.7.10.ebuild2
-rw-r--r--dev-lang/python/python-3.4.3.ebuild2
-rw-r--r--dev-lang/ruby/Manifest1
-rw-r--r--dev-lang/ruby/ruby-2.2.3-r1.ebuild241
-rw-r--r--dev-lang/swi-prolog/Manifest12
-rw-r--r--dev-lang/swi-prolog/metadata.xml1
-rw-r--r--dev-lang/swi-prolog/swi-prolog-7.2.0.ebuild128
-rw-r--r--dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild (renamed from dev-lang/swi-prolog/swi-prolog-7.2.1.ebuild)7
-rw-r--r--dev-lang/swi-prolog/swi-prolog-7.3.8.ebuild (renamed from dev-lang/swi-prolog/swi-prolog-7.3.6.ebuild)4
-rw-r--r--dev-lang/swi-prolog/swi-prolog-7.3.9.ebuild (renamed from dev-lang/swi-prolog/swi-prolog-7.3.5.ebuild)17
-rw-r--r--dev-libs/geoip/geoip-1.6.6.ebuild2
-rw-r--r--dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch15
-rw-r--r--dev-libs/glib/glib-2.44.1-r1.ebuild285
-rw-r--r--dev-libs/glib/metadata.xml3
-rw-r--r--dev-libs/gmp/gmp-6.0.0a.ebuild2
-rw-r--r--dev-libs/libevent/libevent-2.0.22-r2.ebuild70
-rw-r--r--dev-libs/libevent/libevent-2.1.5-r3.ebuild (renamed from dev-libs/libevent/libevent-2.1.5-r1.ebuild)6
-rw-r--r--dev-libs/libgit2/Manifest3
-rw-r--r--dev-libs/libgit2/libgit2-0.23.0.ebuild75
-rw-r--r--dev-libs/libgit2/libgit2-0.23.1.ebuild75
-rw-r--r--dev-libs/libgit2/libgit2-0.23.3.ebuild (renamed from dev-libs/libgit2/libgit2-0.23.2.ebuild)5
-rw-r--r--dev-libs/libiconv/libiconv-1.14-r2.ebuild55
-rw-r--r--dev-libs/libintl/Manifest1
-rw-r--r--dev-libs/libintl/files/libintl-0.19.5-langinfo.patch35
-rw-r--r--dev-libs/libintl/libintl-0.19.6.ebuild73
-rw-r--r--dev-libs/libintl/metadata.xml5
-rw-r--r--dev-libs/libwacom/Manifest1
-rw-r--r--dev-libs/libwacom/libwacom-0.15.ebuild46
-rw-r--r--dev-libs/npth/npth-1.1.ebuild2
-rw-r--r--dev-libs/npth/npth-1.2.ebuild2
-rw-r--r--dev-libs/ppl/ppl-1.1.ebuild2
-rw-r--r--dev-libs/serd/Manifest1
-rw-r--r--dev-libs/serd/serd-0.22.0.ebuild41
-rw-r--r--dev-libs/sord/Manifest1
-rw-r--r--dev-libs/sord/sord-0.14.0.ebuild42
-rw-r--r--dev-libs/uriparser/Manifest1
-rw-r--r--dev-libs/uriparser/uriparser-0.8.4.ebuild42
-rw-r--r--dev-libs/xapian-bindings/Manifest2
-rw-r--r--dev-libs/xapian-bindings/xapian-bindings-1.2.20.ebuild202
-rw-r--r--dev-libs/xapian-bindings/xapian-bindings-1.3.2.ebuild178
-rw-r--r--dev-libs/xapian-bindings/xapian-bindings-1.3.3-r2.ebuild (renamed from dev-libs/xapian-bindings/xapian-bindings-1.3.3-r1.ebuild)17
-rw-r--r--dev-libs/xapian-bindings/xapian-bindings-1.3.3.ebuild178
-rw-r--r--dev-libs/xapian/Manifest2
-rw-r--r--dev-libs/xapian/xapian-1.2.20.ebuild63
-rw-r--r--dev-libs/xapian/xapian-1.3.2.ebuild63
-rw-r--r--dev-lisp/sbcl/Manifest1
-rw-r--r--dev-lisp/sbcl/sbcl-1.2.16.ebuild2
-rw-r--r--dev-ml/cmdliner/Manifest1
-rw-r--r--dev-ml/cmdliner/cmdliner-0.9.8.ebuild37
-rw-r--r--dev-perl/Alien-SDL/Alien-SDL-1.440.0.ebuild39
-rw-r--r--dev-perl/Alien-SDL/Alien-SDL-1.444.0.ebuild40
-rw-r--r--dev-perl/Alien-SDL/Manifest2
-rw-r--r--dev-perl/Canary-Stability/Canary-Stability-2006.ebuild2
-rw-r--r--dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild2
-rw-r--r--dev-perl/Expect/Expect-1.320.0-r1.ebuild2
-rw-r--r--dev-perl/Expect/Expect-1.320.0.ebuild32
-rw-r--r--dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild2
-rw-r--r--dev-perl/Search-Xapian/Manifest1
-rw-r--r--dev-perl/Search-Xapian/Search-Xapian-1.2.20.0.ebuild36
-rw-r--r--dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.3.ebuild2
-rw-r--r--dev-python/Babel/Babel-2.1.1-r1.ebuild49
-rw-r--r--dev-python/CacheControl/CacheControl-0.11.5-r1.ebuild31
-rw-r--r--dev-python/CacheControl/CacheControl-0.11.5.ebuild2
-rw-r--r--dev-python/alabaster/alabaster-0.7.6-r1.ebuild19
-rw-r--r--dev-python/ansi2html/ansi2html-1.1.0.ebuild7
-rw-r--r--dev-python/bandit/Manifest1
-rw-r--r--dev-python/bandit/bandit-0.14.0.ebuild57
-rw-r--r--dev-python/bcolz/Manifest3
-rw-r--r--dev-python/bcolz/bcolz-0.10.0.ebuild7
-rw-r--r--dev-python/bcolz/bcolz-0.11.3.ebuild (renamed from dev-python/bcolz/bcolz-0.9.0.ebuild)12
-rw-r--r--dev-python/bcolz/bcolz-0.8.1.ebuild50
-rw-r--r--dev-python/botocore/Manifest2
-rw-r--r--dev-python/botocore/botocore-1.2.10.ebuild (renamed from dev-python/botocore/botocore-1.2.1.ebuild)5
-rw-r--r--dev-python/certifi/certifi-2015.9.6.2-r1.ebuild21
-rw-r--r--dev-python/certifi/certifi-2015.9.6.2.ebuild2
-rw-r--r--dev-python/cffi/cffi-1.2.1-r1.ebuild42
-rw-r--r--dev-python/characteristic/characteristic-14.3.0-r1.ebuild43
-rw-r--r--dev-python/chardet/chardet-2.3.0-r1.ebuild21
-rw-r--r--dev-python/chardet/chardet-2.3.0.ebuild1
-rw-r--r--dev-python/click/click-5.1-r1.ebuild43
-rw-r--r--dev-python/colorama/colorama-0.3.3-r1.ebuild23
-rw-r--r--dev-python/colorama/colorama-0.3.3.ebuild2
-rw-r--r--dev-python/coverage/coverage-4.0-r1.ebuild30
-rw-r--r--dev-python/cryptography-vectors/cryptography-vectors-1.0.2-r1.ebuild26
-rw-r--r--dev-python/cryptography/cryptography-1.0.2-r1.ebuild47
-rw-r--r--dev-python/cython/Manifest1
-rw-r--r--dev-python/cython/cython-0.23.3-r1.ebuild62
-rw-r--r--dev-python/cython/cython-0.23.4.ebuild62
-rw-r--r--dev-python/distlib/distlib-0.2.1-r1.ebuild25
-rw-r--r--dev-python/distlib/distlib-0.2.1.ebuild2
-rw-r--r--dev-python/django/Manifest1
-rw-r--r--dev-python/django/django-1.8.5.ebuild107
-rw-r--r--dev-python/docutils/docutils-0.12-r1.ebuild70
-rw-r--r--dev-python/enable/enable-4.5.1.ebuild5
-rw-r--r--dev-python/enable/files/enable-4.5.1-gcc-5.patch22
-rw-r--r--dev-python/enable/metadata.xml2
-rw-r--r--dev-python/expects/Manifest4
-rw-r--r--dev-python/expects/expects-0.2.1.ebuild44
-rw-r--r--dev-python/expects/expects-0.7.2.ebuild38
-rw-r--r--dev-python/expects/expects-0.8.0_rc3.ebuild (renamed from dev-python/expects/expects-0.8.0_rc1.ebuild)2
-rw-r--r--dev-python/extras/extras-0.0.3-r1.ebuild27
-rw-r--r--dev-python/fixtures/fixtures-1.3.1-r1.ebuild2
-rw-r--r--dev-python/fixtures/fixtures-1.3.1-r2.ebuild32
-rw-r--r--dev-python/funcsigs/funcsigs-0.4.ebuild4
-rw-r--r--dev-python/html5lib/html5lib-0.9999999-r1.ebuild28
-rw-r--r--dev-python/idna/idna-2.0-r1.ebuild24
-rw-r--r--dev-python/idna/idna-2.0.ebuild2
-rw-r--r--dev-python/ipaddress/ipaddress-1.0.14-r1.ebuild25
-rw-r--r--dev-python/ipaddress/ipaddress-1.0.14.ebuild2
-rw-r--r--dev-python/ipython/Manifest1
-rw-r--r--dev-python/ipython/files/2.1.0-disable-tests.patch32
-rw-r--r--dev-python/ipython/ipython-2.2.0-r1.ebuild137
-rw-r--r--dev-python/iso8601/iso8601-0.1.10-r1.ebuild25
-rw-r--r--dev-python/jinja/jinja-2.8-r1.ebuild73
-rw-r--r--dev-python/libvirt-python/Manifest1
-rw-r--r--dev-python/libvirt-python/libvirt-python-1.2.15.ebuild44
-rw-r--r--dev-python/linecache2/linecache2-1.0.0-r1.ebuild32
-rw-r--r--dev-python/linecache2/linecache2-1.0.0.ebuild2
-rw-r--r--dev-python/lockfile/lockfile-0.10.2-r1.ebuild43
-rw-r--r--dev-python/lockfile/lockfile-0.10.2.ebuild2
-rw-r--r--dev-python/lockfile/metadata.xml2
-rw-r--r--dev-python/lxml/lxml-3.4.4.ebuild2
-rw-r--r--dev-python/lz4/lz4-0.7.0.ebuild7
-rw-r--r--dev-python/markupsafe/markupsafe-0.23-r1.ebuild38
-rw-r--r--dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild45
-rw-r--r--dev-python/mock/mock-1.2.0.ebuild2
-rw-r--r--dev-python/mock/mock-1.3.0-r1.ebuild2
-rw-r--r--dev-python/mock/mock-1.3.0-r2.ebuild42
-rw-r--r--dev-python/monotonic/Manifest1
-rw-r--r--dev-python/monotonic/monotonic-0.4.ebuild20
-rw-r--r--dev-python/more-itertools/more-itertools-2.2.ebuild2
-rw-r--r--dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0-r1.ebuild28
-rw-r--r--dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild8
-rw-r--r--dev-python/nose/metadata.xml2
-rw-r--r--dev-python/nose/nose-1.3.7-r1.ebuild89
-rw-r--r--dev-python/nose/nose-9999.ebuild2
-rw-r--r--dev-python/numpy/Manifest1
-rw-r--r--dev-python/numpy/numpy-1.10.0_p2-r1.ebuild154
-rw-r--r--dev-python/numpy/numpy-1.10.0_p2.ebuild154
-rw-r--r--dev-python/openpyxl/Manifest1
-rw-r--r--dev-python/openpyxl/openpyxl-2.2.6.ebuild33
-rw-r--r--dev-python/packaging/packaging-15.3-r1.ebuild2
-rw-r--r--dev-python/packaging/packaging-15.3-r2.ebuild32
-rw-r--r--dev-python/pandas/Manifest1
-rw-r--r--dev-python/pandas/pandas-0.17.0.ebuild128
-rw-r--r--dev-python/paramiko/Manifest4
-rw-r--r--dev-python/paramiko/paramiko-1.10.1.ebuild33
-rw-r--r--dev-python/paramiko/paramiko-1.12.2.ebuild34
-rw-r--r--dev-python/paramiko/paramiko-1.15.3.ebuild (renamed from dev-python/paramiko/paramiko-1.13.0.ebuild)11
-rw-r--r--dev-python/pbr/pbr-1.6.0.ebuild2
-rw-r--r--dev-python/pbr/pbr-1.7.0.ebuild2
-rw-r--r--dev-python/pbr/pbr-1.8.0.ebuild2
-rw-r--r--dev-python/pbr/pbr-1.8.1-r1.ebuild68
-rw-r--r--dev-python/pbr/pbr-1.8.1.ebuild2
-rw-r--r--dev-python/pexpect/Manifest3
-rw-r--r--dev-python/pexpect/metadata.xml2
-rw-r--r--dev-python/pexpect/pexpect-2.4-r1.ebuild26
-rw-r--r--dev-python/pexpect/pexpect-2.4.ebuild35
-rw-r--r--dev-python/pexpect/pexpect-3.0.ebuild29
-rw-r--r--dev-python/pexpect/pexpect-4.0.1-r1.ebuild51
-rw-r--r--dev-python/pexpect/pexpect-4.0.1.ebuild51
-rw-r--r--dev-python/pillow/pillow-3.0.0.ebuild5
-rw-r--r--dev-python/pip/pip-7.1.2-r1.ebuild66
-rw-r--r--dev-python/pip/pip-7.1.2.ebuild2
-rw-r--r--dev-python/ply/Manifest1
-rw-r--r--dev-python/ply/metadata.xml8
-rw-r--r--dev-python/ply/ply-3.8-r1.ebuild44
-rw-r--r--dev-python/ply/ply-3.8.ebuild44
-rw-r--r--dev-python/pretend/pretend-1.0.8-r1.ebuild20
-rw-r--r--dev-python/progress/progress-1.2-r1.ebuild29
-rw-r--r--dev-python/progress/progress-1.2.ebuild2
-rw-r--r--dev-python/ptyprocess/ptyprocess-0.5-r1.ebuild24
-rw-r--r--dev-python/ptyprocess/ptyprocess-0.5.ebuild4
-rw-r--r--dev-python/py-bcrypt/py-bcrypt-0.4.ebuild2
-rw-r--r--dev-python/py/py-1.4.30-r1.ebuild45
-rw-r--r--dev-python/pyasn1-modules/metadata.xml2
-rw-r--r--dev-python/pyasn1-modules/pyasn1-modules-0.0.8-r1.ebuild38
-rw-r--r--dev-python/pyasn1/metadata.xml2
-rw-r--r--dev-python/pyasn1/pyasn1-0.1.9-r1.ebuild32
-rw-r--r--dev-python/pycparser/pycparser-2.14-r1.ebuild34
-rw-r--r--dev-python/pyftpdlib/Manifest2
-rw-r--r--dev-python/pyftpdlib/files/pyftpdlib-1-pypy-test.patch20
-rw-r--r--dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild41
-rw-r--r--dev-python/pyftpdlib/pyftpdlib-1.3.0.ebuild40
-rw-r--r--dev-python/pygments/pygments-2.0.2-r1.ebuild52
-rw-r--r--dev-python/pyopenssl/metadata.xml2
-rw-r--r--dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild57
-rw-r--r--dev-python/pyopenssl/pyopenssl-0.15.1.ebuild9
-rw-r--r--dev-python/pypy3/files/pypy3-2.4.0-libressl.patch187
-rw-r--r--dev-python/pypy3/pypy3-2.4.0.ebuild6
-rw-r--r--dev-python/pyspf/Manifest1
-rw-r--r--dev-python/pyspf/pyspf-2.0.10.ebuild35
-rw-r--r--dev-python/pytest/Manifest1
-rw-r--r--dev-python/pytest/pytest-2.7.3-r1.ebuild63
-rw-r--r--dev-python/pytest/pytest-2.8.2-r1.ebuild73
-rw-r--r--dev-python/pytest/pytest-2.8.2.ebuild73
-rw-r--r--dev-python/python-ldap/Manifest1
-rw-r--r--dev-python/python-ldap/python-ldap-2.4.20.ebuild74
-rw-r--r--dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild2
-rw-r--r--dev-python/pytz/pytz-2015.6-r1.ebuild34
-rw-r--r--dev-python/pyyaml/pyyaml-3.11-r1.ebuild42
-rw-r--r--dev-python/redis-py/redis-py-2.10.3-r1.ebuild62
-rw-r--r--dev-python/redis-py/redis-py-2.10.3.ebuild2
-rw-r--r--dev-python/regendoc/regendoc-0.5-r1.ebuild26
-rw-r--r--dev-python/requests/Manifest1
-rw-r--r--dev-python/requests/requests-2.8.0-r1.ebuild53
-rw-r--r--dev-python/requests/requests-2.8.0.ebuild53
-rw-r--r--dev-python/retrying/retrying-1.3.2.ebuild2
-rw-r--r--dev-python/retrying/retrying-1.3.3-r1.ebuild25
-rw-r--r--dev-python/retrying/retrying-1.3.3.ebuild4
-rw-r--r--dev-python/rootpy/Manifest1
-rw-r--r--dev-python/rootpy/rootpy-0.8.0.ebuild47
-rw-r--r--dev-python/rospkg/Manifest1
-rw-r--r--dev-python/rospkg/files/py3.patch21
-rw-r--r--dev-python/rospkg/rospkg-1.0.37-r1.ebuild57
-rw-r--r--dev-python/rply/Manifest1
-rw-r--r--dev-python/rply/rply-0.7.4.ebuild37
-rw-r--r--dev-python/service_identity/service_identity-14.0.0.ebuild21
-rw-r--r--dev-python/setuptools/Manifest1
-rw-r--r--dev-python/setuptools/setuptools-18.3.2-r1.ebuild54
-rw-r--r--dev-python/setuptools/setuptools-18.4.ebuild54
-rw-r--r--dev-python/setuptools_scm/setuptools_scm-1.8.0-r1.ebuild26
-rw-r--r--dev-python/simpleeval/Manifest3
-rw-r--r--dev-python/simpleeval/simpleeval-0.8.2.ebuild20
-rw-r--r--dev-python/simpleeval/simpleeval-0.8.6.ebuild (renamed from dev-python/simpleeval/simpleeval-0.8.5.ebuild)0
-rw-r--r--dev-python/six/Manifest1
-rw-r--r--dev-python/six/six-1.10.0-r1.ebuild40
-rw-r--r--dev-python/six/six-1.10.0.ebuild40
-rw-r--r--dev-python/six/six-9999.ebuild2
-rw-r--r--dev-python/snowballstemmer/snowballstemmer-1.2.0-r1.ebuild18
-rw-r--r--dev-python/soya/metadata.xml2
-rw-r--r--dev-python/soya/soya-0.14-r1.ebuild26
-rw-r--r--dev-python/sparql-wrapper/Manifest3
-rw-r--r--dev-python/sparql-wrapper/sparql-wrapper-1.5.2.ebuild24
-rw-r--r--dev-python/sparql-wrapper/sparql-wrapper-1.6.0.ebuild2
-rw-r--r--dev-python/sparql-wrapper/sparql-wrapper-1.6.1.ebuild25
-rw-r--r--dev-python/sparql-wrapper/sparql-wrapper-1.6.2.ebuild25
-rw-r--r--dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild2
-rw-r--r--dev-python/sphinx/sphinx-1.2.3-r1.ebuild125
-rw-r--r--dev-python/sphinx/sphinx-1.3.1-r1.ebuild133
-rw-r--r--dev-python/sphinx/sphinx-1.3.1.ebuild11
-rw-r--r--dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9-r1.ebuild23
-rw-r--r--dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild1
-rw-r--r--dev-python/subunit/subunit-1.1.0-r1.ebuild90
-rw-r--r--dev-python/subunit/subunit-1.1.0.ebuild2
-rw-r--r--dev-python/testrepository/testrepository-0.0.18-r1.ebuild2
-rw-r--r--dev-python/testrepository/testrepository-0.0.18-r2.ebuild42
-rw-r--r--dev-python/testresources/testresources-0.2.7-r2.ebuild2
-rw-r--r--dev-python/testresources/testresources-0.2.7-r3.ebuild31
-rw-r--r--dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild32
-rw-r--r--dev-python/testscenarios/testscenarios-0.5.0.ebuild2
-rw-r--r--dev-python/testtools/metadata.xml2
-rw-r--r--dev-python/testtools/testtools-1.7.1.ebuild2
-rw-r--r--dev-python/testtools/testtools-1.8.0-r1.ebuild46
-rw-r--r--dev-python/testtools/testtools-1.8.0.ebuild2
-rw-r--r--dev-python/torment/Manifest2
-rw-r--r--dev-python/torment/torment-3.0.0.ebuild (renamed from dev-python/torment/torment-2.0.3.ebuild)2
-rw-r--r--dev-python/traceback2/traceback2-1.4.0-r1.ebuild24
-rw-r--r--dev-python/traceback2/traceback2-1.4.0.ebuild2
-rw-r--r--dev-python/unittest2/unittest2-1.0.1-r1.ebuild2
-rw-r--r--dev-python/unittest2/unittest2-1.1.0-r1.ebuild33
-rw-r--r--dev-python/unittest2/unittest2-1.1.0.ebuild2
-rw-r--r--dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild53
-rw-r--r--dev-python/virtualenv/virtualenv-13.1.2.ebuild2
-rw-r--r--dev-ros/calibration_estimation/Manifest1
-rw-r--r--dev-ros/calibration_estimation/calibration_estimation-0.10.13.ebuild31
-rw-r--r--dev-ros/calibration_estimation/calibration_estimation-9999.ebuild31
-rw-r--r--dev-ros/calibration_estimation/metadata.xml5
-rw-r--r--dev-ros/calibration_launch/Manifest1
-rw-r--r--dev-ros/calibration_launch/calibration_launch-0.10.13.ebuild25
-rw-r--r--dev-ros/calibration_launch/calibration_launch-9999.ebuild25
-rw-r--r--dev-ros/calibration_launch/metadata.xml5
-rw-r--r--dev-ros/calibration_msgs/Manifest1
-rw-r--r--dev-ros/calibration_msgs/calibration_msgs-0.10.13.ebuild21
-rw-r--r--dev-ros/calibration_msgs/calibration_msgs-9999.ebuild21
-rw-r--r--dev-ros/calibration_msgs/metadata.xml5
-rw-r--r--dev-ros/calibration_setup_helper/Manifest1
-rw-r--r--dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.13.ebuild19
-rw-r--r--dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild19
-rw-r--r--dev-ros/calibration_setup_helper/metadata.xml5
-rw-r--r--dev-ros/image_cb_detector/Manifest1
-rw-r--r--dev-ros/image_cb_detector/image_cb_detector-0.10.13.ebuild30
-rw-r--r--dev-ros/image_cb_detector/image_cb_detector-9999.ebuild30
-rw-r--r--dev-ros/image_cb_detector/metadata.xml5
-rw-r--r--dev-ros/imu_processors/Manifest1
-rw-r--r--dev-ros/imu_processors/imu_processors-0.2.1.ebuild24
-rw-r--r--dev-ros/imu_processors/imu_processors-9999.ebuild24
-rw-r--r--dev-ros/imu_processors/metadata.xml5
-rw-r--r--dev-ros/imu_transformer/Manifest1
-rw-r--r--dev-ros/imu_transformer/imu_transformer-0.2.1.ebuild29
-rw-r--r--dev-ros/imu_transformer/imu_transformer-9999.ebuild29
-rw-r--r--dev-ros/imu_transformer/metadata.xml5
-rw-r--r--dev-ros/interval_intersection/Manifest1
-rw-r--r--dev-ros/interval_intersection/interval_intersection-0.10.13.ebuild30
-rw-r--r--dev-ros/interval_intersection/interval_intersection-9999.ebuild30
-rw-r--r--dev-ros/interval_intersection/metadata.xml5
-rw-r--r--dev-ros/joint_states_settler/Manifest1
-rw-r--r--dev-ros/joint_states_settler/joint_states_settler-0.10.13.ebuild30
-rw-r--r--dev-ros/joint_states_settler/joint_states_settler-9999.ebuild30
-rw-r--r--dev-ros/joint_states_settler/metadata.xml5
-rw-r--r--dev-ros/laser_cb_detector/Manifest1
-rw-r--r--dev-ros/laser_cb_detector/laser_cb_detector-0.10.13.ebuild29
-rw-r--r--dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild29
-rw-r--r--dev-ros/laser_cb_detector/metadata.xml5
-rw-r--r--dev-ros/monocam_settler/Manifest1
-rw-r--r--dev-ros/monocam_settler/metadata.xml5
-rw-r--r--dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild28
-rw-r--r--dev-ros/monocam_settler/monocam_settler-9999.ebuild28
-rw-r--r--dev-ros/octomap_ros/Manifest1
-rw-r--r--dev-ros/octomap_ros/metadata.xml5
-rw-r--r--dev-ros/octomap_ros/octomap_ros-0.4.0.ebuild22
-rw-r--r--dev-ros/octomap_ros/octomap_ros-9999.ebuild22
-rw-r--r--dev-ros/rosapi/Manifest1
-rw-r--r--dev-ros/rosapi/metadata.xml5
-rw-r--r--dev-ros/rosapi/rosapi-0.7.13.ebuild26
-rw-r--r--dev-ros/rosapi/rosapi-9999.ebuild26
-rw-r--r--dev-ros/rosauth/Manifest1
-rw-r--r--dev-ros/rosauth/metadata.xml5
-rw-r--r--dev-ros/rosauth/rosauth-0.1.7.ebuild23
-rw-r--r--dev-ros/rosauth/rosauth-9999.ebuild23
-rw-r--r--dev-ros/rosbridge_library/Manifest1
-rw-r--r--dev-ros/rosbridge_library/metadata.xml5
-rw-r--r--dev-ros/rosbridge_library/rosbridge_library-0.7.13.ebuild43
-rw-r--r--dev-ros/rosbridge_library/rosbridge_library-9999.ebuild43
-rw-r--r--dev-ros/rosbridge_server/Manifest1
-rw-r--r--dev-ros/rosbridge_server/metadata.xml5
-rw-r--r--dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild24
-rw-r--r--dev-ros/rosbridge_server/rosbridge_server-9999.ebuild24
-rw-r--r--dev-ros/rosserial_arduino/Manifest1
-rw-r--r--dev-ros/rosserial_arduino/metadata.xml5
-rw-r--r--dev-ros/rosserial_arduino/rosserial_arduino-0.7.1.ebuild24
-rw-r--r--dev-ros/rosserial_arduino/rosserial_arduino-9999.ebuild24
-rw-r--r--dev-ros/rosserial_client/Manifest1
-rw-r--r--dev-ros/rosserial_client/metadata.xml5
-rw-r--r--dev-ros/rosserial_client/rosserial_client-0.7.1.ebuild24
-rw-r--r--dev-ros/rosserial_client/rosserial_client-9999.ebuild24
-rw-r--r--dev-ros/rosserial_embeddedlinux/Manifest1
-rw-r--r--dev-ros/rosserial_embeddedlinux/metadata.xml5
-rw-r--r--dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.1.ebuild26
-rw-r--r--dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-9999.ebuild26
-rw-r--r--dev-ros/rosserial_msgs/Manifest1
-rw-r--r--dev-ros/rosserial_msgs/metadata.xml5
-rw-r--r--dev-ros/rosserial_msgs/rosserial_msgs-0.7.1.ebuild20
-rw-r--r--dev-ros/rosserial_msgs/rosserial_msgs-9999.ebuild20
-rw-r--r--dev-ros/rosserial_python/Manifest1
-rw-r--r--dev-ros/rosserial_python/metadata.xml5
-rw-r--r--dev-ros/rosserial_python/rosserial_python-0.7.1.ebuild24
-rw-r--r--dev-ros/rosserial_python/rosserial_python-9999.ebuild24
-rw-r--r--dev-ros/rosserial_server/Manifest1
-rw-r--r--dev-ros/rosserial_server/metadata.xml5
-rw-r--r--dev-ros/rosserial_server/rosserial_server-0.7.1.ebuild23
-rw-r--r--dev-ros/rosserial_server/rosserial_server-9999.ebuild23
-rw-r--r--dev-ros/rosserial_windows/Manifest1
-rw-r--r--dev-ros/rosserial_windows/metadata.xml5
-rw-r--r--dev-ros/rosserial_windows/rosserial_windows-0.7.1.ebuild27
-rw-r--r--dev-ros/rosserial_windows/rosserial_windows-9999.ebuild27
-rw-r--r--dev-ros/rosserial_xbee/Manifest1
-rw-r--r--dev-ros/rosserial_xbee/metadata.xml5
-rw-r--r--dev-ros/rosserial_xbee/rosserial_xbee-0.7.1.ebuild25
-rw-r--r--dev-ros/rosserial_xbee/rosserial_xbee-9999.ebuild25
-rw-r--r--dev-ros/settlerlib/Manifest1
-rw-r--r--dev-ros/settlerlib/metadata.xml5
-rw-r--r--dev-ros/settlerlib/settlerlib-0.10.13.ebuild24
-rw-r--r--dev-ros/settlerlib/settlerlib-9999.ebuild24
-rw-r--r--dev-ros/turtle_tf/Manifest1
-rw-r--r--dev-ros/turtle_tf/metadata.xml5
-rw-r--r--dev-ros/turtle_tf/turtle_tf-0.2.2.ebuild26
-rw-r--r--dev-ros/turtle_tf/turtle_tf-9999.ebuild26
-rw-r--r--dev-ros/turtle_tf2/Manifest1
-rw-r--r--dev-ros/turtle_tf2/metadata.xml5
-rw-r--r--dev-ros/turtle_tf2/turtle_tf2-0.2.2.ebuild27
-rw-r--r--dev-ros/turtle_tf2/turtle_tf2-9999.ebuild27
-rw-r--r--dev-ruby/bluecloth/bluecloth-2.2.0-r1.ebuild1
-rw-r--r--dev-ruby/gettext_i18n_rails/Manifest1
-rw-r--r--dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.0.ebuild37
-rw-r--r--dev-ruby/metasm/metasm-1.0.2-r2.ebuild57
-rw-r--r--dev-ruby/ruby-atk/Manifest1
-rw-r--r--dev-ruby/ruby-atk/ruby-atk-3.0.7.ebuild28
-rw-r--r--dev-ruby/ruby-cairo-gobject/Manifest1
-rw-r--r--dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.0.7.ebuild34
-rw-r--r--dev-ruby/ruby-clutter-gstreamer/Manifest1
-rw-r--r--dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.0.7.ebuild48
-rw-r--r--dev-ruby/ruby-clutter-gtk/Manifest1
-rw-r--r--dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.0.7.ebuild49
-rw-r--r--dev-ruby/ruby-clutter/Manifest1
-rw-r--r--dev-ruby/ruby-clutter/ruby-clutter-3.0.7.ebuild49
-rw-r--r--dev-ruby/ruby-gdk3/Manifest1
-rw-r--r--dev-ruby/ruby-gdk3/ruby-gdk3-3.0.7.ebuild47
-rw-r--r--dev-ruby/ruby-gdkpixbuf2/Manifest1
-rw-r--r--dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.0.7.ebuild20
-rw-r--r--dev-ruby/ruby-gio2/Manifest1
-rw-r--r--dev-ruby/ruby-gio2/ruby-gio2-3.0.7.ebuild31
-rw-r--r--dev-ruby/ruby-glib2/Manifest1
-rw-r--r--dev-ruby/ruby-glib2/ruby-glib2-3.0.7.ebuild29
-rw-r--r--dev-ruby/ruby-gnome2/ruby-gnome2-3.0.7.ebuild38
-rw-r--r--dev-ruby/ruby-gobject-introspection/Manifest1
-rw-r--r--dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.0.7.ebuild43
-rw-r--r--dev-ruby/ruby-gstreamer/Manifest1
-rw-r--r--dev-ruby/ruby-gstreamer/ruby-gstreamer-3.0.7.ebuild35
-rw-r--r--dev-ruby/ruby-gtk2/Manifest1
-rw-r--r--dev-ruby/ruby-gtk2/ruby-gtk2-3.0.7.ebuild32
-rw-r--r--dev-ruby/ruby-gtk3/Manifest1
-rw-r--r--dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7.ebuild35
-rw-r--r--dev-ruby/ruby-gtksourceview/Manifest1
-rw-r--r--dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.0.7.ebuild31
-rw-r--r--dev-ruby/ruby-gtksourceview3/Manifest1
-rw-r--r--dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.0.7.ebuild40
-rw-r--r--dev-ruby/ruby-pango/Manifest1
-rw-r--r--dev-ruby/ruby-pango/ruby-pango-3.0.7.ebuild30
-rw-r--r--dev-ruby/ruby-poppler/Manifest1
-rw-r--r--dev-ruby/ruby-poppler/ruby-poppler-3.0.7.ebuild31
-rw-r--r--dev-ruby/ruby-rsvg/Manifest1
-rw-r--r--dev-ruby/ruby-rsvg/ruby-rsvg-3.0.7.ebuild34
-rw-r--r--dev-ruby/ruby-shadow/Manifest1
-rw-r--r--dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild32
-rw-r--r--dev-ruby/ruby-vte/Manifest1
-rw-r--r--dev-ruby/ruby-vte/ruby-vte-3.0.7.ebuild17
-rw-r--r--dev-ruby/ruby-vte3/Manifest1
-rw-r--r--dev-ruby/ruby-vte3/ruby-vte3-3.0.7.ebuild42
-rw-r--r--dev-ruby/ruby-webkit-gtk/Manifest1
-rw-r--r--dev-ruby/ruby-webkit-gtk/ruby-webkit-gtk-3.0.7.ebuild45
-rw-r--r--dev-ruby/ruby-webkit-gtk2/Manifest1
-rw-r--r--dev-ruby/ruby-webkit-gtk2/ruby-webkit-gtk2-3.0.7.ebuild45
-rw-r--r--dev-ruby/sass/Manifest1
-rw-r--r--dev-ruby/sass/sass-3.4.19.ebuild40
-rw-r--r--dev-ruby/selenium-webdriver/Manifest1
-rw-r--r--dev-ruby/selenium-webdriver/selenium-webdriver-2.48.0.ebuild40
-rw-r--r--dev-ruby/sqlite3/Manifest1
-rw-r--r--dev-ruby/sqlite3/sqlite3-1.3.11.ebuild82
-rw-r--r--dev-ruby/syntax/syntax-1.2.0-r1.ebuild2
-rw-r--r--dev-ruby/test-unit/Manifest1
-rw-r--r--dev-ruby/test-unit/test-unit-3.1.5.ebuild60
-rw-r--r--dev-scheme/guile/files/guile-1.8.8-gcc5.patch15
-rw-r--r--dev-scheme/guile/files/guile-1.8.8-readline.patch34
-rw-r--r--dev-scheme/guile/files/guile-1.8.8-sandbox.patch15
-rw-r--r--dev-scheme/guile/files/guile-1.8.8-tinfo.patch15
-rw-r--r--dev-scheme/guile/guile-1.8.8-r2.ebuild130
-rw-r--r--dev-scheme/slib/slib-3.2.2.ebuild2
-rw-r--r--dev-util/catalyst/Manifest2
-rw-r--r--dev-util/catalyst/catalyst-2.0.16.ebuild111
-rw-r--r--dev-util/catalyst/catalyst-2.0.17.ebuild111
-rw-r--r--dev-util/catalyst/catalyst-2.0.18-r1.ebuild3
-rw-r--r--dev-util/catalyst/catalyst-2.0.18.ebuild111
-rw-r--r--dev-util/catalyst/catalyst-2.0.9999.ebuild3
-rw-r--r--dev-util/catalyst/catalyst-2.9999.ebuild3
-rw-r--r--dev-util/catalyst/catalyst-9999.ebuild3
-rw-r--r--dev-util/cmake/Manifest3
-rw-r--r--dev-util/cmake/cmake-2.8.12.2-r2.ebuild203
-rw-r--r--dev-util/cmake/cmake-2.8.12.2.ebuild200
-rw-r--r--dev-util/cmake/cmake-3.0.2.ebuild187
-rw-r--r--dev-util/cmake/cmake-3.1.0.ebuild186
-rw-r--r--dev-util/cmake/cmake-3.2.3-r1.ebuild196
-rw-r--r--dev-util/cmake/cmake-3.2.3.ebuild194
-rw-r--r--dev-util/cmake/cmake-3.3.1-r1.ebuild2
-rw-r--r--dev-util/cmake/cmake-3.3.2-r1.ebuild (renamed from dev-util/cmake/cmake-3.3.2.ebuild)3
-rw-r--r--dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch73
-rw-r--r--dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch38
-rw-r--r--dev-util/cmake/files/cmake-2.8.12.2-python34.patch34
-rw-r--r--dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch28
-rw-r--r--dev-util/cmake/files/cmake-3.3.2-FindQt4.patch45
-rw-r--r--dev-util/howdoi/Manifest1
-rw-r--r--dev-util/howdoi/howdoi-1.1.6.ebuild23
-rw-r--r--dev-util/nvidia-cuda-sdk/Manifest2
-rw-r--r--dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild2
-rw-r--r--dev-util/nvidia-cuda-toolkit/Manifest2
-rw-r--r--dev-util/pkgconf/pkgconf-0.9.11.ebuild2
-rw-r--r--dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch8
-rw-r--r--dev-vcs/git/git-2.3.9.ebuild2
-rw-r--r--dev-vcs/git/git-2.4.9.ebuild2
-rw-r--r--dev-vcs/git/git-2.6.1-r2.ebuild (renamed from dev-vcs/git/git-2.6.1-r1.ebuild)0
-rw-r--r--dev-vcs/hgsubversion/Manifest5
-rw-r--r--dev-vcs/hgsubversion/hgsubversion-1.6.3.ebuild32
-rw-r--r--dev-vcs/hgsubversion/hgsubversion-1.7.ebuild32
-rw-r--r--dev-vcs/hgsubversion/hgsubversion-1.8.3.ebuild (renamed from dev-vcs/hgsubversion/hgsubversion-1.6.1.ebuild)0
-rw-r--r--dev-vcs/hgsubversion/hgsubversion-1.8.ebuild32
-rw-r--r--eclass/games.eclass4
-rw-r--r--eclass/gnome2-utils.eclass4
-rw-r--r--eclass/office-ext-r1.eclass2
-rw-r--r--eclass/python-utils-r1.eclass3
-rw-r--r--eclass/ros-catkin.eclass2
-rw-r--r--eclass/toolchain-funcs.eclass1
-rw-r--r--games-arcade/openmortal/files/openmortal-0.7-freetype.patch10
-rw-r--r--games-arcade/openmortal/files/openmortal-0.7-gcc41.patch4
-rw-r--r--games-arcade/openmortal/openmortal-0.7-r1.ebuild8
-rw-r--r--kde-apps/kdebase-data/kdebase-data-4.14.3-r1.ebuild2
-rw-r--r--kde-apps/kopete/kopete-4.14.3-r1.ebuild2
-rw-r--r--kde-apps/kstars/kstars-4.14.3-r1.ebuild2
-rw-r--r--kde-apps/ktp-l10n/ktp-l10n-15.08.1.ebuild2
-rw-r--r--kde-apps/step/step-4.14.3.ebuild5
-rw-r--r--kde-base/akonadiconsole/Manifest1
-rw-r--r--kde-base/akonadiconsole/akonadiconsole-4.14.3.ebuild25
-rw-r--r--kde-base/akonadiconsole/akonadiconsole-4.14.8.ebuild2
-rw-r--r--kde-base/akregator/Manifest1
-rw-r--r--kde-base/akregator/akregator-4.14.3.ebuild22
-rw-r--r--kde-base/akregator/akregator-4.14.8.ebuild2
-rw-r--r--kde-base/blogilo/Manifest1
-rw-r--r--kde-base/blogilo/blogilo-4.14.3.ebuild26
-rw-r--r--kde-base/blogilo/blogilo-4.14.8.ebuild2
-rw-r--r--kde-base/calendarjanitor/Manifest1
-rw-r--r--kde-base/calendarjanitor/calendarjanitor-4.14.3.ebuild27
-rw-r--r--kde-base/calendarjanitor/calendarjanitor-4.14.8.ebuild2
-rw-r--r--kde-base/freespacenotifier/Manifest1
-rw-r--r--kde-base/freespacenotifier/freespacenotifier-4.11.14.ebuild12
-rw-r--r--kde-base/freespacenotifier/freespacenotifier-4.11.19.ebuild2
-rw-r--r--kde-base/kabcclient/Manifest1
-rw-r--r--kde-base/kabcclient/kabcclient-4.14.3.ebuild26
-rw-r--r--kde-base/kabcclient/kabcclient-4.14.8.ebuild2
-rw-r--r--kde-base/kaddressbook/Manifest1
-rw-r--r--kde-base/kaddressbook/kaddressbook-4.14.3.ebuild51
-rw-r--r--kde-base/kaddressbook/kaddressbook-4.14.8.ebuild2
-rw-r--r--kde-base/kalarm/Manifest1
-rw-r--r--kde-base/kalarm/kalarm-4.14.3.ebuild26
-rw-r--r--kde-base/kalarm/kalarm-4.14.8.ebuild2
-rw-r--r--kde-base/kcheckpass/Manifest1
-rw-r--r--kde-base/kcheckpass/kcheckpass-4.11.14.ebuild33
-rw-r--r--kde-base/kcheckpass/kcheckpass-4.11.19.ebuild2
-rw-r--r--kde-base/kcminit/Manifest1
-rw-r--r--kde-base/kcminit/kcminit-4.11.14.ebuild17
-rw-r--r--kde-base/kcminit/kcminit-4.11.19.ebuild2
-rw-r--r--kde-base/kdebase-cursors/Manifest1
-rw-r--r--kde-base/kdebase-cursors/kdebase-cursors-4.11.14.ebuild13
-rw-r--r--kde-base/kdebase-cursors/kdebase-cursors-4.11.19.ebuild2
-rw-r--r--kde-base/kdebase-startkde/Manifest1
-rw-r--r--kde-base/kdebase-startkde/kdebase-startkde-4.11.14.ebuild95
-rw-r--r--kde-base/kdebase-startkde/kdebase-startkde-4.11.19.ebuild2
-rw-r--r--kde-base/kdelibs/Manifest3
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.14.0-mimetypes.patch39
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.14.3-trim-crash.patch610
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.6.2-armlinking.patch14
-rw-r--r--kde-base/kdelibs/kdelibs-4.14.10.ebuild298
-rw-r--r--kde-base/kdelibs/kdelibs-4.14.11.ebuild299
-rw-r--r--kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild299
-rw-r--r--kde-base/kdelibs/kdelibs-4.14.8.ebuild2
-rw-r--r--kde-base/kdepim-common-libs/Manifest1
-rw-r--r--kde-base/kdepim-common-libs/kdepim-common-libs-4.14.3.ebuild81
-rw-r--r--kde-base/kdepim-common-libs/kdepim-common-libs-4.14.8.ebuild2
-rw-r--r--kde-base/kdepim-icons/Manifest1
-rw-r--r--kde-base/kdepim-icons/kdepim-icons-4.14.3.ebuild16
-rw-r--r--kde-base/kdepim-icons/kdepim-icons-4.14.8.ebuild2
-rw-r--r--kde-base/kdepim-kresources/Manifest1
-rw-r--r--kde-base/kdepim-kresources/kdepim-kresources-4.14.3.ebuild27
-rw-r--r--kde-base/kdepim-kresources/kdepim-kresources-4.14.8.ebuild2
-rw-r--r--kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild38
-rw-r--r--kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild2
-rw-r--r--kde-base/kdepim-runtime/Manifest1
-rw-r--r--kde-base/kdepim-runtime/kdepim-runtime-4.14.3.ebuild42
-rw-r--r--kde-base/kdepim-runtime/kdepim-runtime-4.14.8.ebuild2
-rw-r--r--kde-base/kdepimlibs/Manifest1
-rw-r--r--kde-base/kdepimlibs/kdepimlibs-4.14.3.ebuild56
-rw-r--r--kde-base/kdepimlibs/kdepimlibs-4.14.8.ebuild2
-rw-r--r--kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild4
-rw-r--r--kde-base/kdm/Manifest1
-rw-r--r--kde-base/kdm/kdm-4.11.14.ebuild165
-rw-r--r--kde-base/kdm/kdm-4.11.19.ebuild2
-rw-r--r--kde-base/kephal/Manifest1
-rw-r--r--kde-base/kephal/kephal-4.11.14.ebuild25
-rw-r--r--kde-base/kephal/kephal-4.11.19.ebuild2
-rw-r--r--kde-base/khotkeys/Manifest1
-rw-r--r--kde-base/khotkeys/khotkeys-4.11.14.ebuild23
-rw-r--r--kde-base/khotkeys/khotkeys-4.11.19.ebuild2
-rw-r--r--kde-base/kinfocenter/Manifest1
-rw-r--r--kde-base/kinfocenter/kinfocenter-4.11.14.ebuild37
-rw-r--r--kde-base/kinfocenter/kinfocenter-4.11.19.ebuild2
-rw-r--r--kde-base/kjots/Manifest1
-rw-r--r--kde-base/kjots/kjots-4.14.3.ebuild26
-rw-r--r--kde-base/kjots/kjots-4.14.8.ebuild2
-rw-r--r--kde-base/kleopatra/Manifest1
-rw-r--r--kde-base/kleopatra/kleopatra-4.14.3.ebuild40
-rw-r--r--kde-base/kleopatra/kleopatra-4.14.8.ebuild2
-rw-r--r--kde-base/klipper/Manifest1
-rw-r--r--kde-base/klipper/klipper-4.11.14.ebuild31
-rw-r--r--kde-base/klipper/klipper-4.11.19.ebuild2
-rw-r--r--kde-base/kmail/Manifest1
-rw-r--r--kde-base/kmail/kmail-4.14.3.ebuild113
-rw-r--r--kde-base/kmail/kmail-4.14.8.ebuild2
-rw-r--r--kde-base/kmenuedit/Manifest1
-rw-r--r--kde-base/kmenuedit/kmenuedit-4.11.14.ebuild31
-rw-r--r--kde-base/kmenuedit/kmenuedit-4.11.19.ebuild2
-rw-r--r--kde-base/knode/Manifest1
-rw-r--r--kde-base/knode/knode-4.14.3.ebuild48
-rw-r--r--kde-base/knode/knode-4.14.8.ebuild2
-rw-r--r--kde-base/knotes/Manifest1
-rw-r--r--kde-base/knotes/knotes-4.14.3.ebuild31
-rw-r--r--kde-base/knotes/knotes-4.14.8.ebuild2
-rw-r--r--kde-base/konsolekalendar/Manifest1
-rw-r--r--kde-base/konsolekalendar/konsolekalendar-4.14.3.ebuild31
-rw-r--r--kde-base/konsolekalendar/konsolekalendar-4.14.8.ebuild2
-rw-r--r--kde-base/kontact/Manifest1
-rw-r--r--kde-base/kontact/kontact-4.14.3.ebuild51
-rw-r--r--kde-base/kontact/kontact-4.14.8.ebuild2
-rw-r--r--kde-base/korganizer/Manifest1
-rw-r--r--kde-base/korganizer/korganizer-4.14.3.ebuild76
-rw-r--r--kde-base/korganizer/korganizer-4.14.8.ebuild2
-rw-r--r--kde-base/krunner/Manifest1
-rw-r--r--kde-base/krunner/krunner-4.11.14.ebuild51
-rw-r--r--kde-base/krunner/krunner-4.11.19.ebuild2
-rw-r--r--kde-base/kscreensaver/Manifest1
-rw-r--r--kde-base/kscreensaver/kscreensaver-4.11.14.ebuild22
-rw-r--r--kde-base/kscreensaver/kscreensaver-4.11.19.ebuild2
-rw-r--r--kde-base/ksmserver/Manifest1
-rw-r--r--kde-base/ksmserver/ksmserver-4.11.14.ebuild43
-rw-r--r--kde-base/ksmserver/ksmserver-4.11.19.ebuild2
-rw-r--r--kde-base/ksplash/Manifest1
-rw-r--r--kde-base/ksplash/ksplash-4.11.14.ebuild39
-rw-r--r--kde-base/ksplash/ksplash-4.11.19.ebuild2
-rw-r--r--kde-base/kstartupconfig/Manifest1
-rw-r--r--kde-base/kstartupconfig/kstartupconfig-4.11.14.ebuild12
-rw-r--r--kde-base/kstartupconfig/kstartupconfig-4.11.19.ebuild2
-rw-r--r--kde-base/kstyles/Manifest1
-rw-r--r--kde-base/kstyles/kstyles-4.11.14.ebuild22
-rw-r--r--kde-base/kstyles/kstyles-4.11.19.ebuild2
-rw-r--r--kde-base/ksysguard/Manifest1
-rw-r--r--kde-base/ksysguard/ksysguard-4.11.14.ebuild46
-rw-r--r--kde-base/ksysguard/ksysguard-4.11.19.ebuild2
-rw-r--r--kde-base/ksystraycmd/Manifest1
-rw-r--r--kde-base/ksystraycmd/ksystraycmd-4.11.14.ebuild15
-rw-r--r--kde-base/ksystraycmd/ksystraycmd-4.11.19.ebuild2
-rw-r--r--kde-base/ktimetracker/Manifest1
-rw-r--r--kde-base/ktimetracker/ktimetracker-4.14.3.ebuild38
-rw-r--r--kde-base/ktimetracker/ktimetracker-4.14.8.ebuild2
-rw-r--r--kde-base/ktnef/Manifest1
-rw-r--r--kde-base/ktnef/ktnef-4.14.3.ebuild24
-rw-r--r--kde-base/ktnef/ktnef-4.14.8.ebuild2
-rw-r--r--kde-base/kwin/Manifest1
-rw-r--r--kde-base/kwin/kwin-4.11.14.ebuild80
-rw-r--r--kde-base/kwin/kwin-4.11.19.ebuild2
-rw-r--r--kde-base/kwrited/Manifest1
-rw-r--r--kde-base/kwrited/kwrited-4.11.14.ebuild16
-rw-r--r--kde-base/kwrited/kwrited-4.11.19.ebuild2
-rw-r--r--kde-base/libkgreeter/libkgreeter-4.11.19.ebuild2
-rw-r--r--kde-base/libkworkspace/Manifest1
-rw-r--r--kde-base/libkworkspace/libkworkspace-4.11.14.ebuild34
-rw-r--r--kde-base/libkworkspace/libkworkspace-4.11.19.ebuild2
-rw-r--r--kde-base/liboxygenstyle/Manifest1
-rw-r--r--kde-base/liboxygenstyle/liboxygenstyle-4.11.14.ebuild17
-rw-r--r--kde-base/liboxygenstyle/liboxygenstyle-4.11.19.ebuild2
-rw-r--r--kde-base/libplasmaclock/Manifest1
-rw-r--r--kde-base/libplasmaclock/libplasmaclock-4.11.14.ebuild33
-rw-r--r--kde-base/libplasmaclock/libplasmaclock-4.11.19.ebuild2
-rw-r--r--kde-base/libplasmagenericshell/Manifest1
-rw-r--r--kde-base/libplasmagenericshell/libplasmagenericshell-4.11.14.ebuild28
-rw-r--r--kde-base/libplasmagenericshell/libplasmagenericshell-4.11.19.ebuild2
-rw-r--r--kde-base/libtaskmanager/Manifest1
-rw-r--r--kde-base/libtaskmanager/libtaskmanager-4.11.14.ebuild35
-rw-r--r--kde-base/libtaskmanager/libtaskmanager-4.11.19.ebuild2
-rw-r--r--kde-base/plasma-workspace/Manifest1
-rw-r--r--kde-base/plasma-workspace/plasma-workspace-4.11.14.ebuild118
-rw-r--r--kde-base/plasma-workspace/plasma-workspace-4.11.19.ebuild2
-rw-r--r--kde-base/powerdevil/Manifest1
-rw-r--r--kde-base/powerdevil/powerdevil-4.11.14.ebuild32
-rw-r--r--kde-base/powerdevil/powerdevil-4.11.19.ebuild2
-rw-r--r--kde-base/qguiplatformplugin_kde/Manifest1
-rw-r--r--kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.14.ebuild12
-rw-r--r--kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.19.ebuild2
-rw-r--r--kde-base/solid-actions-kcm/Manifest1
-rw-r--r--kde-base/solid-actions-kcm/solid-actions-kcm-4.11.14.ebuild19
-rw-r--r--kde-base/solid-actions-kcm/solid-actions-kcm-4.11.19.ebuild2
-rw-r--r--kde-base/systemsettings/Manifest1
-rw-r--r--kde-base/systemsettings/systemsettings-4.11.14.ebuild99
-rw-r--r--kde-base/systemsettings/systemsettings-4.11.19.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.ebuild48
-rw-r--r--kde-frameworks/kactivities/Manifest1
-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.ebuild24
-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.ebuild32
-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.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--mail-client/alpine/alpine-2.00-r6.ebuild115
-rw-r--r--mail-client/balsa/balsa-2.5.2-r1.ebuild105
-rw-r--r--mail-client/claws-mail/Manifest1
-rw-r--r--mail-client/claws-mail/claws-mail-3.13.0.ebuild205
-rw-r--r--mail-client/mail-notification/mail-notification-5.4-r9.ebuild115
-rw-r--r--mail-client/nail/nail-12.4-r3.ebuild110
-rw-r--r--mail-client/sylpheed/sylpheed-3.4.3-r1.ebuild63
-rw-r--r--mail-client/sylpheed/sylpheed-3.4.3.ebuild2
-rw-r--r--mail-filter/gld/gld-1.7-r3.ebuild78
-rw-r--r--mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild43
-rw-r--r--mail-filter/imapfilter/imapfilter-2.5.7.ebuild4
-rw-r--r--mail-filter/libdkim/libdkim-1.0.21-r3.ebuild54
-rw-r--r--mail-filter/opensmtpd-extras/opensmtpd-extras-5.7.1-r1.ebuild92
-rw-r--r--mail-filter/policyd/policyd-1.82-r2.ebuild76
-rw-r--r--mail-filter/popfile/popfile-1.1.3-r1.ebuild56
-rw-r--r--mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild67
-rw-r--r--mail-filter/spamdyke/metadata.xml2
-rw-r--r--mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild82
-rw-r--r--mail-filter/spamdyke/spamdyke-4.3.0.ebuild13
-rw-r--r--mail-mta/netqmail/netqmail-1.06-r3.ebuild173
-rw-r--r--mail-mta/opensmtpd/opensmtpd-5.7.3_p1-r1.ebuild94
-rw-r--r--mail-mta/postfix/Manifest9
-rw-r--r--mail-mta/postfix/postfix-2.10.9.ebuild (renamed from mail-mta/postfix/postfix-2.10.8.ebuild)2
-rw-r--r--mail-mta/postfix/postfix-2.11.7.ebuild (renamed from mail-mta/postfix/postfix-2.11.6.ebuild)2
-rw-r--r--mail-mta/postfix/postfix-3.0.0.ebuild313
-rw-r--r--mail-mta/postfix/postfix-3.0.1-r1.ebuild313
-rw-r--r--mail-mta/postfix/postfix-3.0.3.ebuild (renamed from mail-mta/postfix/postfix-3.1_pre20150924.ebuild)11
-rw-r--r--mail-mta/postfix/postfix-3.1_pre20151011.ebuild (renamed from mail-mta/postfix/postfix-3.1_pre20150924-r1.ebuild)2
-rw-r--r--media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild6
-rw-r--r--media-fonts/nanum/Manifest1
-rw-r--r--media-fonts/nanum/metadata.xml5
-rw-r--r--media-fonts/nanum/nanum-3.0.ebuild22
-rw-r--r--media-fonts/symbola/Manifest1
-rw-r--r--media-fonts/symbola/symbola-8.00.ebuild31
-rw-r--r--media-gfx/optipng/files/optipng-0.7.5-gifread.patch12
-rw-r--r--media-gfx/optipng/optipng-0.7.5-r1.ebuild57
-rw-r--r--media-gfx/photoqt/Manifest4
-rw-r--r--media-gfx/photoqt/files/photo-0.7.1.1-install-desktop.patch22
-rw-r--r--media-gfx/photoqt/photoqt-0.8-r1.ebuild27
-rw-r--r--media-gfx/photoqt/photoqt-1.0.ebuild37
-rw-r--r--media-gfx/photoqt/photoqt-1.1.0.1.ebuild38
-rw-r--r--media-gfx/photoqt/photoqt-1.2.ebuild40
-rw-r--r--media-gfx/shotwell/shotwell-0.22.0-r1.ebuild117
-rw-r--r--media-gfx/svg2rlg/svg2rlg-0.3.ebuild16
-rw-r--r--media-libs/jasper/jasper-1.900.1-r9.ebuild5
-rw-r--r--media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch26
-rw-r--r--media-libs/libass/libass-0.13.0.ebuild5
-rw-r--r--media-libs/libdvdnav/libdvdnav-5.0.3.ebuild4
-rw-r--r--media-libs/libhdhomerun/libhdhomerun-20150826.ebuild2
-rw-r--r--media-libs/libpng/libpng-1.6.18.ebuild2
-rw-r--r--media-libs/libraw/libraw-0.16.2.ebuild2
-rw-r--r--media-libs/libvisio/files/libvisio-0.1.3-boost-1.59.patch22
-rw-r--r--media-libs/libvisio/files/libvisio-0.1.3-fix-tests.patch49
-rw-r--r--media-libs/libvisio/libvisio-0.1.3-r1.ebuild57
-rw-r--r--media-libs/lilv/Manifest1
-rw-r--r--media-libs/lilv/lilv-0.22.0.ebuild53
-rw-r--r--media-libs/mesa/Manifest5
-rw-r--r--media-libs/mesa/mesa-10.6.6.ebuild463
-rw-r--r--media-libs/mesa/mesa-10.6.8.ebuild463
-rw-r--r--media-libs/mesa/mesa-11.0.0.ebuild466
-rw-r--r--media-libs/mesa/mesa-11.0.3.ebuild (renamed from media-libs/mesa/mesa-11.0.2.ebuild)0
-rw-r--r--media-libs/x264/Manifest7
-rw-r--r--media-libs/x264/files/x264-0.0.20120707-gcc48.patch138
-rw-r--r--media-libs/x264/files/x264-0.0.20130731-cflags.patch62
-rw-r--r--media-libs/x264/files/x264-0.0.20151011-cflags.patch51
-rw-r--r--media-libs/x264/files/x264-nostrip.patch16
-rw-r--r--media-libs/x264/files/x264-onlylib-20110425.patch30
-rw-r--r--media-libs/x264/files/x264-x32.patch34
-rw-r--r--media-libs/x264/x264-0.0.20111220.ebuild88
-rw-r--r--media-libs/x264/x264-0.0.20120327.ebuild88
-rw-r--r--media-libs/x264/x264-0.0.20120707.ebuild104
-rw-r--r--media-libs/x264/x264-0.0.20130506.ebuild82
-rw-r--r--media-libs/x264/x264-0.0.20130731.ebuild71
-rw-r--r--media-libs/x264/x264-0.0.20151011.ebuild (renamed from media-libs/x264/x264-0.0.20130912.ebuild)15
-rw-r--r--media-libs/x264/x264-9999.ebuild2
-rw-r--r--media-libs/x265/Manifest1
-rw-r--r--media-libs/x265/x265-1.8.ebuild82
-rw-r--r--media-libs/x265/x265-9999.ebuild4
-rw-r--r--media-plugins/vdr-remote/vdr-remote-0.6.0-r1.ebuild29
-rw-r--r--media-sound/mp3diags/metadata.xml4
-rw-r--r--media-sound/qmmp/Manifest2
-rw-r--r--media-sound/qmmp/qmmp-0.9.2.ebuild128
-rw-r--r--media-sound/qmmp/qmmp-1.0.0.ebuild132
-rw-r--r--media-sound/qtractor/Manifest1
-rw-r--r--media-sound/qtractor/qtractor-0.7.1.ebuild76
-rw-r--r--media-tv/tvheadend/Manifest4
-rw-r--r--media-tv/tvheadend/files/glibc_iconv.patch40
-rw-r--r--media-tv/tvheadend/metadata.xml33
-rw-r--r--media-tv/tvheadend/tvheadend-2.12.ebuild73
-rw-r--r--media-tv/tvheadend/tvheadend-3.2.ebuild71
-rw-r--r--media-tv/tvheadend/tvheadend-3.4.27.ebuild4
-rw-r--r--media-tv/tvheadend/tvheadend-4.0.6.ebuild118
-rw-r--r--media-tv/tvheadend/tvheadend-9999.ebuild4
-rw-r--r--media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch34
-rw-r--r--media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild50
-rw-r--r--media-video/handbrake/handbrake-0.10.2-r1.ebuild (renamed from media-video/handbrake/handbrake-0.10.2.ebuild)2
-rw-r--r--media-video/handbrake/handbrake-9999.ebuild2
-rw-r--r--media-video/x264-encoder/Manifest2
-rw-r--r--media-video/x264-encoder/files/ffmpeg29.patch13
-rw-r--r--media-video/x264-encoder/x264-encoder-0.0.20150820.ebuild71
-rw-r--r--media-video/x264-encoder/x264-encoder-0.0.20151011.ebuild (renamed from media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild)2
-rw-r--r--net-analyzer/speedtest-cli/Manifest3
-rw-r--r--net-analyzer/speedtest-cli/speedtest-cli-0.2.4.ebuild19
-rw-r--r--net-analyzer/speedtest-cli/speedtest-cli-0.3.4.ebuild (renamed from net-analyzer/speedtest-cli/speedtest-cli-0.2.5.ebuild)2
-rw-r--r--net-dialup/freeradius-client/Manifest2
-rw-r--r--net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild (renamed from net-dialup/freeradius-client/freeradius-client-1.1.6.ebuild)28
-rw-r--r--net-dns/pdns/Manifest1
-rw-r--r--net-dns/pdns/pdns-3.4.6.ebuild177
-rw-r--r--net-firewall/firehol/firehol-2.0.3.ebuild3
-rw-r--r--net-firewall/nftables/nftables-0.5.ebuild4
-rw-r--r--net-ftp/tnftp/Manifest1
-rw-r--r--net-ftp/tnftp/tnftp-20141104.ebuild2
-rw-r--r--net-ftp/tnftp/tnftp-20151004.ebuild32
-rw-r--r--net-im/corebird/Manifest1
-rw-r--r--net-im/corebird/corebird-1.1.ebuild50
-rw-r--r--net-im/gajim/gajim-0.16.4.ebuild2
-rw-r--r--net-libs/czmq/czmq-3.0.2.ebuild1
-rw-r--r--net-libs/libbtbb/Manifest1
-rw-r--r--net-libs/libbtbb/libbtbb-2015.10.1.ebuild133
-rw-r--r--net-libs/libnftnl/libnftnl-1.0.5.ebuild4
-rw-r--r--net-mail/dovecot/Manifest2
-rw-r--r--net-mail/dovecot/dovecot-2.2.19.ebuild306
-rw-r--r--net-misc/chrony/Manifest1
-rw-r--r--net-misc/chrony/chrony-2.2_pre1-r1.ebuild (renamed from net-misc/chrony/chrony-2.2_pre1.ebuild)2
-rw-r--r--net-misc/chrony/chrony-2.2_pre2.ebuild114
-rw-r--r--net-misc/chrony/files/chrony-2.2.logrotate7
-rw-r--r--net-misc/dibbler/Manifest1
-rw-r--r--net-misc/dibbler/dibbler-1.0.1.ebuild52
-rw-r--r--net-misc/openvpn/openvpn-2.3.8.ebuild2
-rw-r--r--net-misc/putty/Manifest1
-rw-r--r--net-misc/putty/putty-0.64.ebuild88
-rw-r--r--net-misc/spiped/spiped-1.5.0-r1.ebuild2
-rw-r--r--net-misc/stunnel/Manifest1
-rw-r--r--net-misc/stunnel/stunnel-5.23.ebuild2
-rw-r--r--net-misc/stunnel/stunnel-5.24-r1.ebuild (renamed from net-misc/stunnel/stunnel-5.17.ebuild)13
-rw-r--r--net-misc/stunnel/stunnel-5.24.ebuild2
-rw-r--r--net-misc/wget/wget-1.16.3-r1.ebuild2
-rw-r--r--net-misc/youtube-dl/Manifest4
-rw-r--r--net-misc/youtube-dl/youtube-dl-2015.10.12.ebuild (renamed from net-misc/youtube-dl/youtube-dl-2015.10.06.2.ebuild)0
-rw-r--r--net-misc/youtube-dl/youtube-dl-2015.10.13.ebuild (renamed from net-misc/youtube-dl/youtube-dl-2015.10.09.ebuild)0
-rw-r--r--net-p2p/classified-ads/Manifest2
-rw-r--r--net-p2p/classified-ads/classified-ads-0.09.ebuild85
-rw-r--r--net-proxy/squidguard/metadata.xml7
-rw-r--r--net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild2
-rw-r--r--net-proxy/squidguard/squidguard-1.5_beta.ebuild74
-rw-r--r--net-wireless/kismet-ubertooth/Manifest1
-rw-r--r--net-wireless/kismet-ubertooth/kismet-ubertooth-2015.10.1.ebuild54
-rw-r--r--net-wireless/ubertooth/Manifest1
-rw-r--r--net-wireless/ubertooth/ubertooth-2015.10.1.ebuild103
-rw-r--r--net-wireless/ubertooth/ubertooth-9999.ebuild3
-rw-r--r--profiles/base/use.mask2
-rw-r--r--profiles/desc/elibc.desc1
-rw-r--r--profiles/package.mask6
-rw-r--r--profiles/prefix/darwin/macos/10.11/eapi1
-rw-r--r--profiles/prefix/darwin/macos/10.11/make.defaults9
-rw-r--r--profiles/prefix/darwin/macos/10.11/package.mask8
-rw-r--r--profiles/prefix/darwin/macos/10.11/package.provided5
-rw-r--r--profiles/prefix/darwin/macos/10.11/package.unmask8
-rw-r--r--profiles/prefix/darwin/macos/10.11/package.use.mask8
-rw-r--r--profiles/prefix/darwin/macos/10.11/parent1
-rw-r--r--profiles/prefix/darwin/macos/10.11/profile.bashrc5
-rw-r--r--profiles/prefix/darwin/macos/10.11/x64/eapi1
-rw-r--r--profiles/prefix/darwin/macos/10.11/x64/make.defaults13
-rw-r--r--profiles/prefix/darwin/macos/10.11/x64/package.mask3
-rw-r--r--profiles/prefix/darwin/macos/10.11/x64/package.use.force7
-rw-r--r--profiles/prefix/darwin/macos/10.11/x64/package.use.mask5
-rw-r--r--profiles/prefix/darwin/macos/10.11/x64/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.11/x64/use.mask59
-rw-r--r--profiles/prefix/darwin/macos/10.11/x86/eapi1
-rw-r--r--profiles/prefix/darwin/macos/10.11/x86/make.defaults13
-rw-r--r--profiles/prefix/darwin/macos/10.11/x86/package.mask10
-rw-r--r--profiles/prefix/darwin/macos/10.11/x86/package.use.force7
-rw-r--r--profiles/prefix/darwin/macos/10.11/x86/package.use.mask5
-rw-r--r--profiles/prefix/darwin/macos/10.11/x86/parent2
-rw-r--r--profiles/prefix/darwin/macos/10.11/x86/use.mask59
-rw-r--r--ros-meta/calibration/Manifest1
-rw-r--r--ros-meta/calibration/calibration-0.10.13.ebuild29
-rw-r--r--ros-meta/calibration/calibration-9999.ebuild29
-rw-r--r--ros-meta/calibration/metadata.xml5
-rw-r--r--ros-meta/geometry_tutorials/Manifest1
-rw-r--r--ros-meta/geometry_tutorials/geometry_tutorials-0.2.2.ebuild21
-rw-r--r--ros-meta/geometry_tutorials/geometry_tutorials-9999.ebuild21
-rw-r--r--ros-meta/geometry_tutorials/metadata.xml5
-rw-r--r--ros-meta/imu_pipeline/Manifest1
-rw-r--r--ros-meta/imu_pipeline/imu_pipeline-0.2.1.ebuild21
-rw-r--r--ros-meta/imu_pipeline/imu_pipeline-9999.ebuild21
-rw-r--r--ros-meta/imu_pipeline/metadata.xml5
-rw-r--r--ros-meta/rosbridge_suite/Manifest1
-rw-r--r--ros-meta/rosbridge_suite/metadata.xml5
-rw-r--r--ros-meta/rosbridge_suite/rosbridge_suite-0.7.13.ebuild22
-rw-r--r--ros-meta/rosbridge_suite/rosbridge_suite-9999.ebuild22
-rw-r--r--ros-meta/rosserial/Manifest1
-rw-r--r--ros-meta/rosserial/metadata.xml5
-rw-r--r--ros-meta/rosserial/rosserial-0.7.1.ebuild27
-rw-r--r--ros-meta/rosserial/rosserial-9999.ebuild27
-rw-r--r--sci-chemistry/platon/Manifest2
-rw-r--r--sci-chemistry/platon/platon-20151001.ebuild (renamed from sci-chemistry/platon/platon-20150921.ebuild)4
-rw-r--r--sci-chemistry/prody/Manifest1
-rw-r--r--sci-chemistry/prody/metadata.xml8
-rw-r--r--sci-chemistry/prody/prody-1.6.ebuild44
-rw-r--r--sci-chemistry/pymol-plugins-dynamics/Manifest1
-rw-r--r--sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.0.4.ebuild38
-rw-r--r--sci-chemistry/relax/Manifest5
-rw-r--r--sci-chemistry/relax/relax-3.3.4.ebuild69
-rw-r--r--sci-chemistry/relax/relax-3.3.5.ebuild69
-rw-r--r--sci-chemistry/relax/relax-3.3.7.ebuild73
-rw-r--r--sci-chemistry/relax/relax-3.3.9.ebuild (renamed from sci-chemistry/relax/relax-3.3.6.ebuild)4
-rw-r--r--sys-apps/openrc/Manifest2
-rw-r--r--sys-apps/openrc/openrc-0.18.1.ebuild (renamed from sys-apps/openrc/openrc-0.18.ebuild)0
-rw-r--r--sys-apps/paludis/metadata.xml5
-rw-r--r--sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild2
-rw-r--r--sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild2
-rw-r--r--sys-apps/portage/Manifest4
-rw-r--r--sys-apps/portage/portage-2.2.14.ebuild352
-rw-r--r--sys-apps/portage/portage-2.2.18.ebuild352
-rw-r--r--sys-apps/portage/portage-2.2.20.ebuild365
-rw-r--r--sys-apps/portage/portage-2.2.22.ebuild363
-rw-r--r--sys-apps/portage/portage-2.2.23.ebuild2
-rw-r--r--sys-apps/portage/portage-9999.ebuild2
-rw-r--r--sys-apps/util-linux/util-linux-2.26.2.ebuild2
-rw-r--r--sys-auth/keystone/Manifest1
-rw-r--r--sys-auth/keystone/keystone-2015.1.2.ebuild187
-rw-r--r--sys-auth/keystone/keystone-2015.1.9999.ebuild8
-rw-r--r--sys-cluster/cinder/Manifest1
-rw-r--r--sys-cluster/cinder/cinder-2015.1.2.ebuild206
-rw-r--r--sys-cluster/cinder/cinder-2015.1.9999.ebuild12
-rw-r--r--sys-cluster/libcircle/Manifest1
-rw-r--r--sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild44
-rw-r--r--sys-cluster/libquo/Manifest1
-rw-r--r--sys-cluster/libquo/libquo-1.2.4-r1.ebuild38
-rw-r--r--sys-cluster/neutron/Manifest1
-rw-r--r--sys-cluster/neutron/neutron-2015.1.2.ebuild253
-rw-r--r--sys-cluster/neutron/neutron-2015.1.9999.ebuild16
-rw-r--r--sys-cluster/nova/Manifest1
-rw-r--r--sys-cluster/nova/nova-2015.1.2.ebuild254
-rw-r--r--sys-cluster/nova/nova-2015.1.9999.ebuild17
-rw-r--r--sys-cluster/ploop/Manifest1
-rw-r--r--sys-cluster/ploop/files/disable_create_run_dir.patch21
-rw-r--r--sys-cluster/ploop/ploop-1.14.1.ebuild61
-rw-r--r--sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild3
-rw-r--r--sys-cluster/util-vserver/util-vserver-0.30.216_pre3062.ebuild3
-rw-r--r--sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild3
-rw-r--r--sys-cluster/vzctl/Manifest3
-rw-r--r--sys-cluster/vzctl/vzctl-4.9.2.ebuild86
-rw-r--r--sys-cluster/vzctl/vzctl-4.9.4.ebuild (renamed from sys-cluster/vzctl/vzctl-4.9.3.ebuild)0
-rw-r--r--sys-devel/gcc/Manifest2
-rw-r--r--sys-devel/gcc/gcc-4.9.3.ebuild2
-rw-r--r--sys-devel/gdb/gdb-7.10-r1.ebuild2
-rw-r--r--sys-devel/gdb/gdb-7.8.2.ebuild2
-rw-r--r--sys-devel/gdb/gdb-7.9.1.ebuild2
-rw-r--r--sys-devel/gdb/gdb-9999.ebuild2
-rw-r--r--sys-devel/gettext/gettext-0.19.4.ebuild20
-rw-r--r--sys-devel/gettext/gettext-0.19.5.1-r1.ebuild20
-rw-r--r--sys-devel/gettext/gettext-0.19.5.ebuild20
-rw-r--r--sys-devel/gettext/gettext-0.19.6-r1.ebuild133
-rw-r--r--sys-devel/gettext/gettext-0.19.6.ebuild20
-rw-r--r--sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch12
-rw-r--r--sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch12
-rw-r--r--sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch8
-rw-r--r--sys-devel/llvm/files/llvm-3.7-lldb_python.patch23
-rw-r--r--sys-devel/llvm/llvm-3.7.0-r2.ebuild511
-rw-r--r--sys-fs/aufs3/Manifest1
-rw-r--r--sys-fs/aufs3/aufs3-3_p20151012.ebuild172
-rw-r--r--sys-fs/aufs3/metadata.xml2
-rw-r--r--sys-fs/aufs4/Manifest3
-rw-r--r--sys-fs/aufs4/aufs4-0_pre20151012.ebuild164
-rw-r--r--sys-fs/aufs4/metadata.xml2
-rw-r--r--sys-fs/bcache-tools/Manifest3
-rw-r--r--sys-fs/bcache-tools/bcache-tools-0_pre20130627-r1.ebuild43
-rw-r--r--sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild (renamed from sys-fs/bcache-tools/bcache-tools-1.0.4.ebuild)2
-rw-r--r--sys-fs/duperemove/Manifest1
-rw-r--r--sys-fs/duperemove/duperemove-0.10.ebuild34
-rw-r--r--sys-fs/encfs/encfs-1.7.5.ebuild2
-rw-r--r--sys-fs/encfs/encfs-1.8.1.ebuild2
-rw-r--r--sys-fs/eudev/Manifest5
-rw-r--r--sys-fs/eudev/eudev-1.3.ebuild279
-rw-r--r--sys-fs/eudev/eudev-1.5.3-r1.ebuild286
-rw-r--r--sys-fs/eudev/eudev-2.1.1.ebuild296
-rw-r--r--sys-fs/eudev/eudev-3.1.5.ebuild (renamed from sys-fs/eudev/eudev-3.0.ebuild)67
-rw-r--r--sys-fs/eudev/eudev-9999.ebuild61
-rw-r--r--sys-fs/zfs/Manifest1
-rw-r--r--sys-kernel/aufs-sources/Manifest11
-rw-r--r--sys-kernel/aufs-sources/aufs-sources-4.1.9-r1.ebuild (renamed from sys-kernel/aufs-sources/aufs-sources-4.1.9.ebuild)4
-rw-r--r--sys-kernel/aufs-sources/aufs-sources-4.2.3.ebuild85
-rw-r--r--sys-kernel/aufs-sources/metadata.xml2
-rw-r--r--sys-kernel/git-sources/Manifest1
-rw-r--r--sys-kernel/git-sources/git-sources-4.3_rc5.ebuild39
-rw-r--r--sys-kernel/hardened-sources/Manifest3
-rw-r--r--sys-kernel/hardened-sources/hardened-sources-4.2.3-r1.ebuild (renamed from sys-kernel/hardened-sources/hardened-sources-4.2.3.ebuild)2
-rw-r--r--sys-kernel/hardened-sources/hardened-sources-4.2.3-r2.ebuild45
-rw-r--r--sys-kernel/vanilla-sources/Manifest2
-rw-r--r--sys-kernel/vanilla-sources/vanilla-sources-3.12.49.ebuild (renamed from sys-kernel/vanilla-sources/vanilla-sources-3.12.48.ebuild)2
-rw-r--r--sys-libs/glibc/glibc-2.20-r2.ebuild2
-rw-r--r--sys-libs/glibc/glibc-2.22.ebuild10
-rw-r--r--sys-libs/libselinux/libselinux-2.4.ebuild12
-rw-r--r--sys-libs/libselinux/libselinux-9999.ebuild12
-rw-r--r--sys-libs/libsemanage/libsemanage-2.4-r2.ebuild2
-rw-r--r--virtual/libintl/libintl-0-r2.ebuild18
-rw-r--r--www-apps/postfixadmin/Manifest2
-rw-r--r--www-apps/postfixadmin/postfixadmin-2.3.8.ebuild (renamed from www-apps/postfixadmin/postfixadmin-2.3.7.ebuild)6
-rw-r--r--www-client/epiphany/Manifest1
-rw-r--r--www-client/epiphany/epiphany-3.14.2.ebuild4
-rw-r--r--www-client/epiphany/epiphany-3.16.2.ebuild103
-rw-r--r--www-client/epiphany/epiphany-3.16.3.ebuild1
-rw-r--r--www-client/firefox/Manifest160
-rw-r--r--www-client/firefox/firefox-41.0.1.ebuild (renamed from www-client/firefox/firefox-41.0-r1.ebuild)0
-rw-r--r--www-client/vivaldi/Manifest2
-rw-r--r--www-client/vivaldi/files/vivaldi-1.0.275.3_p1-flash.patch4
-rw-r--r--www-client/vivaldi/vivaldi-1.0.288.3_p1.ebuild104
-rw-r--r--www-client/vivaldi/vivaldi-1.0.291.18_p1-r1.ebuild (renamed from www-client/vivaldi/vivaldi-1.0.291.18_p1.ebuild)3
-rw-r--r--www-misc/monitorix/monitorix-3.5.1.ebuild2
-rw-r--r--www-plugins/freshplayerplugin/freshplayerplugin-0.3.3-r1.ebuild82
-rw-r--r--www-servers/bozohttpd/bozohttpd-20140708-r1.ebuild38
-rw-r--r--www-servers/cherokee/Manifest2
-rw-r--r--www-servers/cherokee/cherokee-1.2.103-r2.ebuild194
-rw-r--r--www-servers/cherokee/cherokee-1.2.104.ebuild12
-rw-r--r--www-servers/cherokee/files/cherokee-1.2.103-linux3.patch36
-rw-r--r--www-servers/gatling/gatling-0.13-r1.ebuild64
-rw-r--r--www-servers/pound/pound-2.7f-r1.ebuild52
-rw-r--r--www-servers/pshs/pshs-0.3-r1.ebuild39
-rw-r--r--www-servers/pshs/pshs-9999.ebuild8
-rw-r--r--www-servers/uwsgi/uwsgi-2.0.11.2-r1.ebuild402
-rw-r--r--www-servers/webfs/webfs-1.21-r4.ebuild53
-rw-r--r--x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild246
-rw-r--r--x11-drivers/xf86-video-freedreno/Manifest1
-rw-r--r--x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.4.0.ebuild17
-rw-r--r--x11-drivers/xf86-video-omap/Manifest1
-rw-r--r--x11-drivers/xf86-video-omap/xf86-video-omap-0.4.4.ebuild15
-rw-r--r--x11-libs/gdk-pixbuf/Manifest1
-rw-r--r--x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch81
-rw-r--r--x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild117
-rw-r--r--x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild (renamed from x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r1.ebuild)9
-rw-r--r--x11-misc/sddm/sddm-0.12.0.ebuild2
-rw-r--r--x11-misc/slim/slim-1.3.6-r5.ebuild2
-rw-r--r--x11-wm/jwm/jwm-2.3.2.ebuild25
1286 files changed, 21899 insertions, 22213 deletions
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index 416c4cc12d27..d4b79fe8ad02 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,2 +1,3 @@
DIST ansible-1.9.2.tar.gz 927525 SHA256 c25ef4738b08fdfb3094247c012f3fd1b29972acbd37f988070b2a85f5fbee00 SHA512 6c0b3eaac11e11bf90f5b63c54da86df0cb33b0ee98c987c48a68fa643b39e9f0817884767f2bd9c0f6e8852d37fd1b197d5299abc574fccc181fbb22985d4ad WHIRLPOOL 19d50845b9920d85c5ce0380303144e7a4237e673dd4beb5ff020042d7bac59dc0706cff88f08155029ce1a3aa9decc3c54261f9f16524b6e5e3b42e599d3a6b
DIST ansible-1.9.3.tar.gz 936633 SHA256 2594f642fd800056a427c1026410dc6ed8dfa7c0033f5c3d187abdb2b0d4eeed SHA512 280d7506417affc11fe8c8715f82ffb011991e48e96db73aca915e1393d51073564c78a98b018c380b7fb8e697ce0fac6208822da44f2bac545f142707325d43 WHIRLPOOL 5738bcd263ca32279bbca30e3f1b5c53e5bd72a18025fdb82393a8d85e5a826b3be4ce78cbbc648133768d212fa49d1c3320af4b34f948c1b1cee40d73147f8a
+DIST ansible-1.9.4.tar.gz 937120 SHA256 972c2face49f1577bd0ff7989440bfe2820e66fb10d7579915cc536bccfa6fe3 SHA512 53ef5b3390be620cedc92687c7c9853c42f38547494f9b77056d5ea48ccd8f43d193648a7f4569fcba5afad343a9202b123296ab47c8cd02eecfe455d83b9586 WHIRLPOOL 0b88a27f690ff940eae1969ff163d8f8c26df038d2e9aa76694bdba1448ac9cbe8123795d0787e528c6d22cf66cc01d6b89add8e3e97bbb107a3f1a96860fd8e
diff --git a/app-admin/ansible/ansible-1.9.3.ebuild b/app-admin/ansible/ansible-1.9.3.ebuild
index 273d25a097d6..7c8406c0dc4c 100644
--- a/app-admin/ansible/ansible-1.9.3.ebuild
+++ b/app-admin/ansible/ansible-1.9.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~x86 ~x64-macos"
IUSE="test"
RDEPEND="
diff --git a/app-admin/ansible/ansible-1.9.4.ebuild b/app-admin/ansible/ansible-1.9.4.ebuild
new file mode 100644
index 000000000000..273d25a097d6
--- /dev/null
+++ b/app-admin/ansible/ansible-1.9.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils readme.gentoo
+
+DESCRIPTION="Radically simple deployment, model-driven configuration management, and command execution framework"
+HOMEPAGE="http://ansible.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test"
+
+RDEPEND="
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/keyczar[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+ EXAMPLES=( examples )
+ distutils-r1_python_install_all
+
+ doman docs/man/man1/*.1
+
+ newenvd "${FILESDIR}"/${PN}.env 95ansible
+}
+
+src_install() {
+ distutils-r1_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ optfeature "Alternative ssh transport" dev-python/paramiko
+}
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index ccfeedec0ea6..f208b7ed8f62 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1 +1,2 @@
DIST glance-2015.1.1.tar.gz 1102359 SHA256 5c5714264c4ad9c3d178b983899b54f69f138505ddd77e13141dc5f3d1598ebe SHA512 d9233b78174ec0f84b317abf7d26153a7e3ead25b4ebc31acbe5d0806b6877da5875de52ee0742dcbdd5fd3d23cb0240208f6fd57fa59cc403ad228ac85f2a0f WHIRLPOOL 69a4cd27b4ac57a47523ceb4b899bbbb3569e7af2bb8f3e64373d98b7c72450bd587c6da96d33903dcbf44e02f89ea563d116d9d2dc90d4a0f472eca89963a87
+DIST glance-2015.1.2.tar.gz 1108933 SHA256 e46bc6648a74a643cef3825dcd44c7e275ed3385b96cab83ef50c4c514932541 SHA512 0f8b8dbc3c507a47ad0873f35ec2212903d7e419b61c0298f77661f89a9718e3604786d52976860c78841fe0a94ad8fc1fe99514183d2b29ed414efe448e590a WHIRLPOOL df8ba6586b2f71c5d7ecb252b80e6c6de6f08df1029576fc8b2fb2a68633f5ce76de1334949af955e85c39e9f1df25b2f8763837ef8efa228b29559dc34be863
diff --git a/app-admin/glance/glance-2015.1.2.ebuild b/app-admin/glance/glance-2015.1.2.ebuild
new file mode 100644
index 000000000000..c024b2072b59
--- /dev/null
+++ b/app-admin/glance/glance-2015.1.2.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="Provides services for discovering, registering, and retrieving
+virtual machine images"
+HOMEPAGE="https://launchpad.net/glance"
+SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc mysql postgres +sqlite +swift test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
+ <dev-python/pbr-1.0[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+ <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+ <dev-python/mox3-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0[${PYTHON_USEDEP}]
+ <dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+ !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+ <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+ <dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+ dev-python/mysql-python[${PYTHON_USEDEP}]
+ dev-python/psycopg[${PYTHON_USEDEP}]
+ ~dev-python/pysendfile-2.0.1[${PYTHON_USEDEP}]
+ dev-python/qpid-python[${PYTHON_USEDEP}]
+ >=dev-python/pyxattr-0.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+ >=dev-python/elasticsearch-py-1.3.0[${PYTHON_USEDEP}]
+ )"
+
+#note to self, wsgiref is a python builtin, no need to package it
+#>=dev-python/wsgiref-0.1.2[${PYTHON_USEDEP}]
+
+RDEPEND="
+ >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+ sqlite? (
+ >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ dev-python/mysql-python
+ >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ dev-python/psycopg:2
+ >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+ )
+ >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+ >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+ !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.0[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+ >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+ dev-python/ordereddict[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+ <dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
+ <dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
+ <dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+ <dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
+ <dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+ <dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/WSME-0.6[${PYTHON_USEDEP}]
+ <dev-python/WSME-0.7[${PYTHON_USEDEP}]
+ dev-python/posix_ipc[${PYTHON_USEDEP}]
+ swift? (
+ >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+ <dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
+ )
+ >=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
+ <dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
+ dev-python/paste[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+ <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.11[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
+ <dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/glance_store-0.3.0[${PYTHON_USEDEP}]
+ <dev-python/glance_store-0.5.0[${PYTHON_USEDEP}]
+ >=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+)
+
+pkg_setup() {
+ enewgroup glance
+ enewuser glance -1 -1 /var/lib/glance glance
+}
+
+python_prepare_all() {
+ sed -i '/xattr/d' test-requirements.txt || die
+ sed -i '/pysendfile/d' test-requirements.txt || die
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+ # https://bugs.launchpad.net/glance/+bug/1251105
+ # https://bugs.launchpad.net/glance/+bug/1242501
+ testr init
+ testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ for svc in api registry scrubber; do
+ newinitd "${FILESDIR}/glance.initd" glance-${svc}
+ done
+
+ diropts -m 0750 -o glance -g glance
+ dodir /var/log/glance /var/lib/glance/images /var/lib/glance/scrubber
+ keepdir /etc/glance
+ keepdir /var/log/glance
+ keepdir /var/lib/glance/images
+ keepdir /var/lib/glance/scrubber
+
+ insinto /etc/glance
+ insopts -m 0640 -o glance -g glance
+ doins etc/*.ini
+ doins etc/*.conf
+ doins etc/*.sample
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/app-admin/glance/glance-2015.1.9999.ebuild b/app-admin/glance/glance-2015.1.9999.ebuild
index 9bc465ee34b2..7b62377e0012 100644
--- a/app-admin/glance/glance-2015.1.9999.ebuild
+++ b/app-admin/glance/glance-2015.1.9999.ebuild
@@ -25,12 +25,12 @@ DEPEND="
<dev-python/pbr-1.0[${PYTHON_USEDEP}]
test? (
${RDEPEND}
- >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
- <dev-python/hacking-0.11[${PYTHON_USEDEP}]
>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+ <dev-python/mox3-0.8.0[${PYTHON_USEDEP}]
>=dev-python/mock-1.0[${PYTHON_USEDEP}]
<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
@@ -82,6 +82,8 @@ RDEPEND="
!~dev-python/routes-2.0[${PYTHON_USEDEP}]
>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
>=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
@@ -89,11 +91,12 @@ RDEPEND="
dev-python/ordereddict[${PYTHON_USEDEP}]
>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
@@ -148,6 +151,7 @@ pkg_setup() {
python_prepare_all() {
sed -i '/xattr/d' test-requirements.txt || die
sed -i '/pysendfile/d' test-requirements.txt || die
+ sed -i '/^hacking/d' test-requirements.txt || die
distutils-r1_python_prepare_all
}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index ebf38f701dfc..7d29ce792b00 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -4,3 +4,5 @@ DIST puppet-agent_1.2.4-1wheezy_amd64.deb 15187770 SHA256 a711255c7b5aab5f1a653f
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
diff --git a/app-admin/puppet-agent/puppet-agent-1.2.6.ebuild b/app-admin/puppet-agent/puppet-agent-1.2.6.ebuild
new file mode 100644
index 000000000000..7de77c52fb14
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-1.2.6.ebuild
@@ -0,0 +1,77 @@
+# 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/sagan/files/sagan-1.0.0-liblognorm-json-c.patch b/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
new file mode 100644
index 000000000000..f9540652717a
--- /dev/null
+++ b/app-admin/sagan/files/sagan-1.0.0-liblognorm-json-c.patch
@@ -0,0 +1,55 @@
+diff -rupN old/sagan-1.0.0RC3/configure.ac new/sagan-1.0.0RC3/configure.ac
+--- old/sagan-1.0.0RC3/configure.ac 2014-06-16 22:23:22.000000000 +0200
++++ new/sagan-1.0.0RC3/configure.ac 2015-10-11 21:04:26.493632624 +0200
+@@ -192,29 +192,15 @@ If you're not interested in libesmtp sup
+ fi
+
+ if test "$LOGNORM" = "yes"; then
+- AC_MSG_RESULT([------- liblognorm support is enabled -------])
+- AC_CHECK_HEADER([liblognorm.h])
+- AC_CHECK_HEADERS([json/json.h json.h], [break], [AC_MSG_ERROR([json-c headers not found or not usable.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag.])])
+- AC_CHECK_LIB(estr, main,,AC_MSG_ERROR(The libestr library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag. ))
+- AC_CHECK_LIB(ee, main,,AC_MSG_ERROR(The libee library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag. ))
+- AC_CHECK_LIB(lognorm, main,,AC_MSG_ERROR(The liblognorm library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag. ))
+- AC_CHECK_LIB(json, json_object_put,, [ AC_CHECK_LIB(json-c, json_object_put,,AC_MSG_ERROR(The json library cannot be found.
+-This library is important for the correlation aspects of Sagan! Please see
+-https://wiki.quadrantsec.com/bin/view/Main/LibLogNorm. To disable this feature
+-use the --disable-lognorm flag.)) ],)
+- fi
++ AC_MSG_RESULT([------- liblognorm support is enabled -------])
++
++ PKG_CHECK_MODULES(LIBEE, libee >= 0.3.2)
++ PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9)
++ PKG_CHECK_MODULES([JSON_C], [json-c],, [
++ PKG_CHECK_MODULES([JSON_C], [json],,)
++ ])
++ PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 1.0.2)
++fi
+
+ if test "$LIBPCAP" = "yes"; then
+ AC_MSG_RESULT([------- libpcap support is enabled -------])
+diff -rupN old/sagan-1.0.0RC3/src/Makefile.am new/sagan-1.0.0RC3/src/Makefile.am
+--- old/sagan-1.0.0RC3/src/Makefile.am 2014-06-16 22:23:22.000000000 +0200
++++ new/sagan-1.0.0RC3/src/Makefile.am 2015-10-11 21:05:28.754492699 +0200
+@@ -2,6 +2,9 @@ AUTOMAKE_OPIONS=foreign no-dependencies
+
+ bin_PROGRAMS = sagan
+
++sagan_CFLAGS = $(JSON_C_CFLAGS) $(LIBESTR_CFLAGS) $(LIBLOGNORM_CFLAGS)
++sagan_LDFLAGS = $(JSON_C_LIBS) $(LIBESTR_LIBS) $(LIBLOGNORM_LIBS)
++
+ sagan_SOURCES = sagan.c \
+ sagan-classifications.c \
+ sagan-config.c \
diff --git a/app-admin/sagan/metadata.xml b/app-admin/sagan/metadata.xml
index 0d04c216b673..9463d2049b70 100644
--- a/app-admin/sagan/metadata.xml
+++ b/app-admin/sagan/metadata.xml
@@ -7,6 +7,11 @@
<name>Andreis Vinogradovs</name>
</maintainer>
<maintainer>
+ <email>whissi@whissi.de</email>
+ <name>Thomas D.</name>
+ <description>Proxy-comaintianer, to have bugs assigned</description>
+ </maintainer>
+ <maintainer>
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
diff --git a/app-admin/sagan/sagan-1.0.0_rc3.ebuild b/app-admin/sagan/sagan-1.0.0_rc3.ebuild
index 871c024e8f2e..ff7e5405b6ce 100644
--- a/app-admin/sagan/sagan-1.0.0_rc3.ebuild
+++ b/app-admin/sagan/sagan-1.0.0_rc3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -38,7 +38,7 @@ DEPEND="virtual/pkgconfig
${RDEPEND}"
DOCS=( AUTHORS ChangeLog FAQ INSTALL README NEWS TODO )
-PATCHES=( "${FILESDIR}"/json_header_location.patch )
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0-liblognorm-json-c.patch )
S="${WORKDIR}/sagan-1.0.0RC3/"
pkg_setup() {
diff --git a/app-admin/sudo/sudo-1.8.12-r1.ebuild b/app-admin/sudo/sudo-1.8.12-r1.ebuild
new file mode 100644
index 000000000000..237f5c892c78
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.12-r1.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils pam multilib libtool
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+*_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="http://www.sudo.ws/"
+SRC_URI="http://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+ ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~sparc-solaris"
+IUSE="ldap nls pam offensive selinux skey +sendmail"
+
+DEPEND="pam? ( virtual/pam )
+ skey? ( >=sys-auth/skey-1.1.5-r1 )
+ ldap? (
+ >=net-nds/openldap-2.1.30-r1
+ dev-libs/cyrus-sasl
+ )
+ sys-libs/zlib"
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-sudo )
+ ldap? ( dev-lang/perl )
+ pam? ( sys-auth/pambase )
+ >=app-misc/editor-wrapper-3
+ virtual/editor
+ sendmail? ( virtual/mta )"
+DEPEND="${DEPEND}
+ sys-devel/bison"
+
+S=${WORKDIR}/${MY_P}
+
+REQUIRED_USE="pam? ( !skey ) skey? ( !pam )"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-include-sys-types-h.patch
+ elibtoolize
+}
+
+set_rootpath() {
+ # FIXME: secure_path is a compile time setting. using ROOTPATH
+ # is not perfect, env-update may invalidate this, but until it
+ # is available as a sudoers setting this will have to do.
+ einfo "Setting secure_path ..."
+
+ # first extract the default ROOTPATH from build env
+ ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
+ if [[ -z ${ROOTPATH} ]] ; then
+ ewarn " Failed to find ROOTPATH, please report this"
+ fi
+
+ # then remove duplicate path entries
+ cleanpath() {
+ local newpath thisp IFS=:
+ for thisp in $1 ; do
+ if [[ :${newpath}: != *:${thisp}:* ]] ; then
+ newpath+=:$thisp
+ else
+ einfo " Duplicate entry ${thisp} removed..."
+ fi
+ done
+ ROOTPATH=${newpath#:}
+ }
+ cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
+
+ # finally, strip gcc paths #136027
+ rmpath() {
+ local e newpath thisp IFS=:
+ for thisp in ${ROOTPATH} ; do
+ for e ; do [[ $thisp == $e ]] && continue 2 ; done
+ newpath+=:$thisp
+ done
+ ROOTPATH=${newpath#:}
+ }
+ rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+ einfo "... done"
+}
+
+src_configure() {
+ local ROOTPATH
+ set_rootpath
+
+ # audit: somebody got to explain me how I can test this before I
+ # enable it.. - Diego
+ # plugindir: autoconf code is crappy and does not delay evaluation
+ # until `make` time, so we have to use a full path here rather than
+ # basing off other values.
+ econf \
+ --enable-zlib=system \
+ --with-secure-path="${ROOTPATH}" \
+ --with-editor="${EPREFIX}"/usr/libexec/editor \
+ --with-env-editor \
+ $(use_with offensive insults) \
+ $(use_with offensive all-insults) \
+ $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo) \
+ $(use_with ldap) \
+ $(use_enable nls) \
+ $(use_with pam) \
+ $(use_with skey) \
+ $(use_with selinux) \
+ $(use_with sendmail) \
+ --without-opie \
+ --without-linux-audit \
+ --with-rundir="${EPREFIX}"/var/run/sudo \
+ --with-vardir="${EPREFIX}"/var/db/sudo \
+ --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+ default
+
+ if use ldap ; then
+ dodoc README.LDAP doc/schema.OpenLDAP
+ dosbin plugins/sudoers/sudoers2ldif
+
+ cat <<-EOF > "${T}"/ldap.conf.sudo
+ # See ldap.conf(5) and README.LDAP for details
+ # This file should only be readable by root
+
+ # supported directives: host, port, ssl, ldap_version
+ # uri, binddn, bindpw, sudoers_base, sudoers_debug
+ # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key
+ EOF
+
+ insinto /etc
+ doins "${T}"/ldap.conf.sudo
+ fperms 0440 /etc/ldap.conf.sudo
+ fi
+
+ pamd_mimic system-auth sudo auth account session
+
+ keepdir /var/db/sudo
+ fperms 0700 /var/db/sudo
+
+ # Don't install into /var/run as that is a tmpfs most of the time
+ # (bug #504854)
+ rm -rf "${D}"/var/run
+}
+
+pkg_postinst() {
+ if use ldap ; then
+ ewarn
+ ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+ ewarn
+ if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+ ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+ ewarn "configured in /etc/nsswitch.conf."
+ ewarn
+ ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+ ewarn " sudoers: ldap files"
+ ewarn
+ fi
+ fi
+ if use prefix ; then
+ ewarn
+ ewarn "To use sudo, you need to change file ownership and permissions"
+ ewarn "with root privileges, as follows:"
+ ewarn
+ ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
+ ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
+ ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
+ ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+ ewarn
+ fi
+
+ elog "To use the -A (askpass) option, you need to install a compatible"
+ elog "password program from the following list. Starred packages will"
+ elog "automatically register for the use with sudo (but will not force"
+ elog "the -A option):"
+ elog ""
+ elog " [*] net-misc/ssh-askpass-fullscreen"
+ elog " net-misc/x11-ssh-askpass"
+ elog ""
+ elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+ elog "variable to the program you want to use."
+}
diff --git a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild
index 67a609a1cd31..b3e580220567 100644
--- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
inherit distutils-r1
SRC_URI="https://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
DESCRIPTION="Gentoo's installer for web-based applications"
HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
diff --git a/app-antivirus/clamav/clamav-0.98.7.ebuild b/app-antivirus/clamav/clamav-0.98.7.ebuild
index 24cf61ca4e64..59e614ed266d 100644
--- a/app-antivirus/clamav/clamav-0.98.7.ebuild
+++ b/app-antivirus/clamav/clamav-0.98.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="bzip2 clamdtop iconv ipv6 milter metadata-analysis-api selinux static-libs uclibc"
CDEPEND="bzip2? ( app-arch/bzip2 )
diff --git a/app-arch/pbzip2/pbzip2-1.1.12.ebuild b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
index 62dcbde5a2bd..ec2d4db30128 100644
--- a/app-arch/pbzip2/pbzip2-1.1.12.ebuild
+++ b/app-arch/pbzip2/pbzip2-1.1.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/pbzip2/${PV:0:3}/${PV}/+download/${P}.tar.gz"
LICENSE="BZIP2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="static symlink"
LIB_DEPEND="app-arch/bzip2[static-libs(+)]"
diff --git a/app-arch/snappy/metadata.xml b/app-arch/snappy/metadata.xml
index 6dd995abaad0..6418fc0074b7 100644
--- a/app-arch/snappy/metadata.xml
+++ b/app-arch/snappy/metadata.xml
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <herd>proxy-maintainers</herd>
<maintainer>
- <email>maintainer-needed@gentoo.org</email>
+ <email>brendan@horan.hk</email>
+ <name>Brendan Horan</name>
</maintainer>
<longdescription lang="en">Snappy is a compression/decompression library. It does not aim for
maximum compression, or compatibility with any other compression
library; instead, it aims for very high speeds and reasonable
compression.</longdescription>
<upstream>
- <remote-id type="google-code">snappy</remote-id>
<remote-id type="github">google/snappy</remote-id>
</upstream>
</pkgmetadata>
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 17e5795fb045..86315bfe9b58 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,4 +1,4 @@
DIST unrarsrc-5.1.6.tar.gz 215185 SHA256 3c38eaabc655527244fd0c3ba3beff567ea24aad37d448488643242fd4cf41a5 SHA512 a7a7800ac94850320ce3e2dd24c5005694dd59360b7f3fc7886ef241153e471459b0b9397d1dacbc3adcd19044cdcb8a8a847e16d7b224af149a1455f46fcaa0 WHIRLPOOL bcb9d1b60f42357cb236cbb5e86eb19dd4ed623244036fc1e8fc3759eef3d4002e6ffc90d3cf5b5200e81fe018a2215c0238ee2aac7148e51f130e43ad3e5ea0
DIST unrarsrc-5.2.7.tar.gz 218880 SHA256 ef14757e943787b439fedf2c564c1f38d0db315528a928e0de170860717e2fac SHA512 95e06451e2bec46a12e5b9b1423c3ea31ce86859f8086812d9c442aaa69627f72635a6a8c197b30dbc7e99bbf7c7caaa25d703caecbe03c697cc0e5b7644d638 WHIRLPOOL 49f5492a7441192d96616f892012ca2dac8a94063e806ece3c62bf13d29beb9d2d0368a186c0f0bff8814c9e6af542ba6b447a61683295f560f120ff75507379
-DIST unrarsrc-5.3.2.tar.gz 221786 SHA256 2d8712eed32367b1a404633f230f94f545c1f2ce0552f851266b00c261a786ea SHA512 ea3ee5dd3c15a52f577896bca0d5136c9a6e76a5552d6f56be519eb59c2cc137aba0dafe53dfb50c768e8e7f2e1c1c067a3e4d0c67383da3ae1da58ed68fe99b WHIRLPOOL 07454ef4e00ad8982cd4658aa35a120d8318b3bc7979360abdb7973855e1d6e78cd28473cf4127aa7673b26c27c7e379e483017f0f29b49b6c65d08271326d05
DIST unrarsrc-5.3.3.tar.gz 221930 SHA256 099c67a2fdb76e55386e4496d28cf6fd1ffd9ac394b95c46b73926c5f69bd107 SHA512 5dffa77043992b72dab10752c547c30d2ff884a18c8b19ddbbcd711e4a9f7f82020edfeb560bd10122c18296aaf08d27c7c1db4f6b62e3ec2a4cd0c449ec7d52 WHIRLPOOL 8be0c41a1ac81d9e9a16ce6b7cbc3479929ec65df8040a58a91c0c89d9b02a8ccde584e829e6ceea6ffa645939d68998f46627ba7df54942f76595cea8f26aaf
+DIST unrarsrc-5.3.6.tar.gz 223184 SHA256 b917f2c5258ff2012008f9aa46984ad22dce21702eb264623b256bb8c2577c1b SHA512 b596f69a7d1b5f6a1e3dc0f060018589dc415463c2a9f403a365e10f8e362c09de4d295df04939f2a33c8daf88de7fbe32395043b978636ea7eaa1c1d2ad80fc WHIRLPOOL 6016b9ead3c2ef573e28ff05809c56e8037c23c01ee05fca0ef46eccbcc7e673b5fa57a0a6839ac2670cce928234c290e82a21a83471818e9a56eeff7984fb3e
diff --git a/app-arch/unrar/unrar-5.3.2.ebuild b/app-arch/unrar/unrar-5.3.6.ebuild
index ba3f09cdf491..71373bb52655 100644
--- a/app-arch/unrar/unrar-5.3.2.ebuild
+++ b/app-arch/unrar/unrar-5.3.6.ebuild
@@ -30,7 +30,7 @@ src_prepare() {
else
sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
fi
- sed -i "${sed_args[@]}" makefile
+ sed -i "${sed_args[@]}" makefile || die
}
src_configure() {
@@ -45,8 +45,8 @@ src_compile() {
}
unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
- ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname)
- ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV})
+ ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
+ ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
unrar_make -C build-bin
}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 672fa82bd41d..cc2ac11ac8a7 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -3,6 +3,5 @@ DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea
DIST gnupg-2.0.27.tar.bz2 4424679 SHA256 57646d3e4b919fa1e5c8f1c0cf5fe1215333041c493a5ebc4b8f2978dbe930f2 SHA512 b05e75f5ef9881df9472818743c175cfe3254088086f36dc0fcf3d34e61f648f1775d90d404f6c622561df5066d972aadbf99ea8ec1290e5d7f7310f4ef2989e WHIRLPOOL abb353b20655002a0957e38d2b889fb5e6a47ba7b7546e1c70fc1f97cf42deeca8f2b061678983f3a160210f4eaf7529441246df1f9f1d875f5cc090456fdfb7
DIST gnupg-2.0.28.tar.bz2 4435779 SHA256 ce092ee4ab58fd19b9fb34a460c07b06c348f4360dd5dd4886d041eb521a534c SHA512 7e786fe0648d5ea453f9c7524fec4bd7d5eec26d28f723acf3cb2f7ec9c400c339f0926a179411876c3f8e08b06942dcec643dc930caf58239bbd4932f4bd3c1 WHIRLPOOL ccf7427e54a545914e89677618055a114b4c9dc4db48669a2fc726fced98475df4ed27c93bd180f1250d147111ee663c736cdf4e1d8afdc40ed967cdffd0eb66
DIST gnupg-2.0.29.tar.bz2 4416251 SHA256 68ed6b386ba78425b05a60e8ee22785ff0fef190bdc6f1c612f19a58819d4ac9 SHA512 23b452c740ab5c1e1e37337ae0583dd3b15df58a5bb5639c0c2aef1fb603e0a7d90a257ac99b0d9dfb68b81fa061c0c64e0bfd256c00d64e2f432192f5052f37 WHIRLPOOL f3d59a9453b4a65c726788c35b065ffc9cde0b746705080cd3491c73439786d791da29cf8f5bf1e5594a0e39cfaec214e346fe18ec3acf0b425dc396aa189f33
-DIST gnupg-2.1.6.tar.bz2 4917722 SHA256 5e599ad542199f3bd733eed2b88a539d1b4c3beda2dbab0ff69f1896f52e92fd SHA512 ae8aafe770336c83badf5610fe37f4ddc488786e3604780627893b636161d8407f3fd782538799e2b2a02e31c97468464372017fa52b5d9ed1bd31c85d9b3763 WHIRLPOOL 2136c526242a4e741c0cbc9aec102ba634234efd679d62db9aae3b2ab8fe9f8ad9b8fdb7d1f2d43982e6a072d5f5072d0744d8bb434d61f49ff24e868c902f80
-DIST gnupg-2.1.7.tar.bz2 4918583 SHA256 c18a3776d47fec98892d51d28b6574ef16bf0a25eabb0956231058aaf2e7846e SHA512 7c3efb9bd5d1509a9b2a6264293542b3d5db979bf443754f96d77322a96e18cba2ac6142665459d161eb7222fae44ce5b89eff88dca1c7abf47449fcafd3eb00 WHIRLPOOL da7ef3a02b186736c8d105ca627d2c889781465ecfdb4c4861f8af748a7d68a7c05a106c73bdfe44e7037807deb822c231d615cc1e1fcdd9b01e7632945ac094
DIST gnupg-2.1.8.tar.bz2 4900705 SHA256 a3b8d01e4690715d42e8f289493c85413766f3fa935e4fe7e5ff5b0f6e2781a3 SHA512 80176fda032c921d3716fba3d3a264f9951464fd578a9d8d60673585efef17e20eec4d026921ab7ab2d7bd4dbf0a2b94a33a58c07acb747eebcb758e42bafd57 WHIRLPOOL 32e2e959363529cfd9ca857f823970b6cdd6497a72515aa9e75c2a680c83acea55a38d8de19b16c7327f92c0ab326e76a37952014b317afe2689c211c0d1965b
+DIST gnupg-2.1.9.tar.bz2 4925167 SHA256 1cb7633a57190beb66f9249cb7446603229b273d4d89331b75c652fa4a29f7b6 SHA512 c19b8cac42b7060caada230b77f36a0b0ed0a05efd519818c5b4057ef0fcb16602f2f3ade2409de2ef353a9e2acc3e5fa106a4449c6929a36a599a82194c0ee0 WHIRLPOOL 105b83e82330a00084a0e9f3d96c8788ac2c9e7831beea0ea42786df4e378dc9e8f2c1a31f12af9c53d363aa71810cd231afdf8f20eab424fea5f59b103033a9
diff --git a/app-crypt/gnupg/gnupg-2.0.28.ebuild b/app-crypt/gnupg/gnupg-2.0.28.ebuild
index 54433c706191..fe1e94996ccc 100644
--- a/app-crypt/gnupg/gnupg-2.0.28.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.28.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
COMMON_DEPEND_LIBS="
diff --git a/app-crypt/gnupg/gnupg-2.1.6.ebuild b/app-crypt/gnupg/gnupg-2.1.6.ebuild
deleted file mode 100644
index 2f40259fd38b..000000000000
--- a/app-crypt/gnupg/gnupg-2.1.6.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"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-MY_P="${P/_/-}"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
-
-COMMON_DEPEND_LIBS="
- dev-libs/npth
- >=dev-libs/libassuan-2
- >=dev-libs/libgcrypt-1.6.2
- >=dev-libs/libgpg-error-1.17
- >=dev-libs/libksba-1.0.7
- >=net-misc/curl-7.10
- gnutls? ( >=net-libs/gnutls-3.0 )
- sys-libs/zlib
- ldap? ( net-nds/openldap )
- bzip2? ( app-arch/bzip2 )
- readline? ( sys-libs/readline:= )
- smartcard? ( usb? ( virtual/libusb:0 ) )
- "
-COMMON_DEPEND_BINS="app-crypt/pinentry
- !app-crypt/dirmngr"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
- ${COMMON_DEPEND_BINS}
- static? (
- >=dev-libs/libassuan-2[static-libs]
- >=dev-libs/libgcrypt-1.6.2[static-libs]
- >=dev-libs/libgpg-error-1.17[static-libs]
- >=dev-libs/libksba-1.0.7[static-libs]
- dev-libs/npth[static-libs]
- >=net-misc/curl-7.10[static-libs]
- sys-libs/zlib[static-libs]
- bzip2? ( app-arch/bzip2[static-libs] )
- )
- nls? ( sys-devel/gettext )
- doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
- ${COMMON_DEPEND_BINS}
- selinux? ( sec-policy/selinux-gpg )
- nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # 'USE=static' support was requested:
- # gnupg1: bug #29299
- # gnupg2: bug #159623
- use static && append-ldflags -static
-
- if use smartcard; then
- myconf+=(
- --enable-scdaemon
- $(use_enable usb ccid-driver)
- )
- else
- myconf+=( --disable-scdaemon )
- fi
-
- if use elibc_SunOS || use elibc_AIX; then
- myconf+=( --disable-symcryptrun )
- else
- myconf+=( --enable-symcryptrun )
- fi
-
- # glib fails and picks up clang's internal stdint.h causing weird errors
- [[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --enable-gpg \
- --enable-gpgsm \
- --enable-large-secmem \
- --without-adns \
- "${myconf[@]}" \
- $(use_enable bzip2) \
- $(use_enable gnutls) \
- $(use_with ldap) \
- $(use_enable nls) \
- $(use_with readline) \
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
- default
-
- if use doc; then
- cd doc
- emake html
- fi
-}
-
-src_install() {
- default
-
- use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
-
- emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
- rm "${ED}"/usr/share/gnupg/help* || die
-
- dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
- doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
- dosym gpg2 /usr/bin/gpg
- dosym gpgv2 /usr/bin/gpgv
- echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
- echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
- if use doc; then
- dohtml doc/gnupg.html/* doc/*.png
- fi
-}
-
-pkg_postinst() {
- elog "If you wish to view images emerge:"
- elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
- elog "Remember to use photo-viewer option in configuration file to activate"
- elog "the right viewer."
- elog
-
- if use smartcard; then
- elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
- use usb && elog " - a CCID-compatible reader, used directly through libusb;"
- elog " - sys-apps/pcsc-lite and a compatible reader device;"
- elog " - dev-libs/openct and a compatible reader device;"
- elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
- elog ""
- elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
- elog "app-crypt/ccid first."
- fi
-
- ewarn "Please remember to restart gpg-agent if a different version"
- ewarn "of the agent is currently used. If you are unsure of the gpg"
- ewarn "agent you are using please run 'killall gpg-agent',"
- ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- elog "If upgrading from a version prior than 2.1 you might have to re-import"
- elog "secret keys after restarting the gpg-agent as the new version is using"
- elog "a new storage mechanism."
- elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
- fi
-}
diff --git a/app-crypt/gnupg/gnupg-2.1.7.ebuild b/app-crypt/gnupg/gnupg-2.1.7.ebuild
deleted file mode 100644
index 3cb5b58147d6..000000000000
--- a/app-crypt/gnupg/gnupg-2.1.7.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="http://www.gnupg.org/"
-MY_P="${P/_/-}"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
-
-COMMON_DEPEND_LIBS="
- dev-libs/npth
- >=dev-libs/libassuan-2
- >=dev-libs/libgcrypt-1.6.2
- >=dev-libs/libgpg-error-1.17
- >=dev-libs/libksba-1.0.7
- >=net-misc/curl-7.10
- gnutls? ( >=net-libs/gnutls-3.0 )
- sys-libs/zlib
- ldap? ( net-nds/openldap )
- bzip2? ( app-arch/bzip2 )
- readline? ( sys-libs/readline:= )
- smartcard? ( usb? ( virtual/libusb:0 ) )
- "
-COMMON_DEPEND_BINS="app-crypt/pinentry
- !app-crypt/dirmngr"
-
-# Existence of executables is checked during configuration.
-DEPEND="${COMMON_DEPEND_LIBS}
- ${COMMON_DEPEND_BINS}
- static? (
- >=dev-libs/libassuan-2[static-libs]
- >=dev-libs/libgcrypt-1.6.2[static-libs]
- >=dev-libs/libgpg-error-1.17[static-libs]
- >=dev-libs/libksba-1.0.7[static-libs]
- dev-libs/npth[static-libs]
- >=net-misc/curl-7.10[static-libs]
- sys-libs/zlib[static-libs]
- bzip2? ( app-arch/bzip2[static-libs] )
- )
- nls? ( sys-devel/gettext )
- doc? ( sys-apps/texinfo )"
-
-RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
- ${COMMON_DEPEND_BINS}
- selinux? ( sec-policy/selinux-gpg )
- nls? ( virtual/libintl )"
-
-REQUIRED_USE="smartcard? ( !static )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch_user
-}
-
-src_configure() {
- local myconf=()
-
- # 'USE=static' support was requested:
- # gnupg1: bug #29299
- # gnupg2: bug #159623
- use static && append-ldflags -static
-
- if use smartcard; then
- myconf+=(
- --enable-scdaemon
- $(use_enable usb ccid-driver)
- )
- else
- myconf+=( --disable-scdaemon )
- fi
-
- if use elibc_SunOS || use elibc_AIX; then
- myconf+=( --disable-symcryptrun )
- else
- myconf+=( --enable-symcryptrun )
- fi
-
- # glib fails and picks up clang's internal stdint.h causing weird errors
- [[ ${CC} == clang ]] && export gl_cv_absolute_stdint_h=/usr/include/stdint.h
-
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --enable-gpg \
- --enable-gpgsm \
- --enable-large-secmem \
- --without-adns \
- "${myconf[@]}" \
- $(use_enable bzip2) \
- $(use_enable gnutls) \
- $(use_with ldap) \
- $(use_enable nls) \
- $(use_with readline) \
- CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-src_compile() {
- default
-
- if use doc; then
- cd doc
- emake html
- fi
-}
-
-src_install() {
- default
-
- use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
- tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
-
- emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
- rm "${ED}"/usr/share/gnupg/help* || die
-
- dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
- doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
-
- dosym gpg2 /usr/bin/gpg
- dosym gpgv2 /usr/bin/gpgv
- echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
- echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
-
- dodir /etc/env.d
- echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
-
- if use doc; then
- dohtml doc/gnupg.html/* doc/*.png
- fi
-}
-
-pkg_postinst() {
- elog "If you wish to view images emerge:"
- elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
- elog "Remember to use photo-viewer option in configuration file to activate"
- elog "the right viewer."
- elog
-
- if use smartcard; then
- elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
- use usb && elog " - a CCID-compatible reader, used directly through libusb;"
- elog " - sys-apps/pcsc-lite and a compatible reader device;"
- elog " - dev-libs/openct and a compatible reader device;"
- elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
- elog ""
- elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
- elog "app-crypt/ccid first."
- fi
-
- ewarn "Please remember to restart gpg-agent if a different version"
- ewarn "of the agent is currently used. If you are unsure of the gpg"
- ewarn "agent you are using please run 'killall gpg-agent',"
- ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
-
- if [[ -n ${REPLACING_VERSIONS} ]]; then
- elog "If upgrading from a version prior than 2.1 you might have to re-import"
- elog "secret keys after restarting the gpg-agent as the new version is using"
- elog "a new storage mechanism."
- elog "You can migrate the keys using gpg --import \$HOME/.gnupg/secring.gpg"
- fi
-}
diff --git a/app-crypt/gnupg/gnupg-2.1.8.ebuild b/app-crypt/gnupg/gnupg-2.1.8.ebuild
index a29666177992..4e192a18c3d2 100644
--- a/app-crypt/gnupg/gnupg-2.1.8.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
COMMON_DEPEND_LIBS="
diff --git a/app-crypt/gnupg/gnupg-2.1.7-r1.ebuild b/app-crypt/gnupg/gnupg-2.1.9.ebuild
index a29666177992..4e192a18c3d2 100644
--- a/app-crypt/gnupg/gnupg-2.1.7-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.1.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="bzip2 doc +gnutls ldap nls readline static selinux smartcard tools usb"
COMMON_DEPEND_LIBS="
diff --git a/app-crypt/keybase/Manifest b/app-crypt/keybase/Manifest
index 905946d6c85c..8c6b12707c49 100644
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@@ -1,5 +1,3 @@
-DIST keybase-0.8.10.tar.gz 7055453 SHA256 ce9a22427d40341059071737ace2dacbe0a81e29e783ec2c8324e2704c1f558f SHA512 4701a0c8d88ffc90fa68f24ef4695f7c7b63ec91a41ccc1bf9d25efb182befc0750e1f9f5ec185161d65bdcbaeb3a73ab8f54f7047ab9d1efdca55b5f56957f0 WHIRLPOOL dd6d53154164ac235b89947530f7af4ed9fdc1421c26b2cef92e1721e2dcdf63e43fff054718c58c6a519f24f1766969a0e740f97d9eb17472d1ef8174e1851f
-DIST keybase-0.8.12.tar.gz 7057638 SHA256 fa6a8eb6f857d98d4d0f5c97862ba99480b0dd2c85fccd631180c0ab8f3ca97f SHA512 e8c568e0154308d3f0172a5e9b22de31c8a9b07d3a4f324a4afec57972602a3bd957220a96427eefa5df563ce0152495f5c33668536e03f3d6af9344c2061397 WHIRLPOOL e4a2431c05add26645f4ec3f2062a81d38c39ad9f9d6357f62009292f60fe072d67547d6c0a39470c130165bb9491fc7cb17cfe91a3fc1be75ad7a6377da9dad
DIST keybase-0.8.13.tar.gz 7057750 SHA256 a485257b7302d848be41e9c0a79f7b1c0da4c8ceaee70c0cc011838cbd723fd8 SHA512 8a082ff9d61f960a0c4862fba04adf323005b3c70e6d208a38a001716bcc374e10cde315eced6730d90316466244e58a9de0f78a66ab2f9bd91326979f0ef28b WHIRLPOOL b651a48be0ced301991edd03d40182c0b900ea28e2b97630a3ad741b34266dbd95c3d370db636ca8088ce5e781a2cf609255a6b52a5b6bdbfa540b879cdcd778
DIST keybase-0.8.18.tar.gz 7062931 SHA256 c1ef27f959401164e72fbcd5c4054d13258a3f09dcdebb0ac3c447519780d59e SHA512 2d2c019cdf0e1fef496d709f7bf17c0d30d614e017a88b54d2a2198aafcd9ad436a636e1f1de27ac98df9e3ca90432b3cc3ff0b83fbb59d7e3a9acdef589d940 WHIRLPOOL 0d80b47fa8da500ee4886f95c9bfa55f392e4988db887fa8f2fd332c185a6e1be082ed7b2fce01f98ea4fd064f27b3159cf04e19d1ee2ec985d222606f48059a
-DIST keybase-0.8.9.tar.gz 7055307 SHA256 2feb54d26afc639f4d4998fbc35aafa2100a9926a6ec4f84343ca56d0284a3dd SHA512 431b3314cf939605a56f163b67226c9027a83159aae7f6b9226a4b5ccf63ecd3f79a873cbb9ab2756d83df2191823b70f884327f160187c00f6a6954b8ca144a WHIRLPOOL 4de64969a1e8898b19903cce391ca599af09b4f3dee6bf2b6bf10fcb39d8b6f939d5aa0320a5efe4b3aaf78217c6b6d7c16f09321af3ed115b6985194a0f0c0e
+DIST keybase-0.8.22.tar.gz 7101414 SHA256 4290251ddf7d1f124211731aa8d0dd47f43ba9e1eb9b0b0f326d7986a3f87cb7 SHA512 ed75fc7fa5f97701c6a9e5880a113bdf392f21b1bdfaa63b7070231e10608d755304300b6b5208b2bc363869ffb631e2261df89747ba9b654bc98a420a0511cb WHIRLPOOL e13a4451bdf5962122b54c95d8d35d4570e0475f6012bb5126ff5ec2f48767048600da4f89f9d0ec6b70523b54262c52f5e29d7b766a83c38723ee25ce5acaab
diff --git a/app-crypt/keybase/keybase-0.8.12.ebuild b/app-crypt/keybase/keybase-0.8.12.ebuild
deleted file mode 100644
index 644ff738ea67..000000000000
--- a/app-crypt/keybase/keybase-0.8.12.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- net-libs/nodejs
- app-crypt/gnupg"
-
-src_unpack() {
- unpack "${P}.tar.gz"
- mv "node-client-${PV}" "${P}"
-}
-
-src_install() {
- dodoc CHANGELOG.md README.md SIGNED.md
- insinto "/opt/${PN}"
- doins -r package.json bin certs json lib node_modules sql
- dosym "${D}/opt/${PN}/bin/main.js" "${ROOT}/usr/bin/keybase"
- chmod 0755 "${D}/opt/${PN}/bin/main.js" || die
-}
diff --git a/app-crypt/keybase/keybase-0.8.10.ebuild b/app-crypt/keybase/keybase-0.8.22.ebuild
index 644ff738ea67..644ff738ea67 100644
--- a/app-crypt/keybase/keybase-0.8.10.ebuild
+++ b/app-crypt/keybase/keybase-0.8.22.ebuild
diff --git a/app-crypt/keybase/keybase-0.8.9.ebuild b/app-crypt/keybase/keybase-0.8.9.ebuild
deleted file mode 100644
index 644ff738ea67..000000000000
--- a/app-crypt/keybase/keybase-0.8.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Client for keybase.io"
-HOMEPAGE="https://keybase.io/"
-SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- net-libs/nodejs
- app-crypt/gnupg"
-
-src_unpack() {
- unpack "${P}.tar.gz"
- mv "node-client-${PV}" "${P}"
-}
-
-src_install() {
- dodoc CHANGELOG.md README.md SIGNED.md
- insinto "/opt/${PN}"
- doins -r package.json bin certs json lib node_modules sql
- dosym "${D}/opt/${PN}/bin/main.js" "${ROOT}/usr/bin/keybase"
- chmod 0755 "${D}/opt/${PN}/bin/main.js" || die
-}
diff --git a/app-crypt/pinentry/pinentry-0.9.5.ebuild b/app-crypt/pinentry/pinentry-0.9.5.ebuild
index 9027df63b544..2dff58e25486 100644
--- a/app-crypt/pinentry/pinentry-0.9.5.ebuild
+++ b/app-crypt/pinentry/pinentry-0.9.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="clipboard emacs gtk ncurses qt4 caps gnome-keyring static"
RDEPEND="
diff --git a/app-crypt/sign/metadata.xml b/app-crypt/sign/metadata.xml
index 22b9e39501a4..d27c6c5ab2ee 100644
--- a/app-crypt/sign/metadata.xml
+++ b/app-crypt/sign/metadata.xml
@@ -6,11 +6,6 @@
<name>Alice Ferrazzi</name>
<description>Assign bugs to me.</description>
</maintainer>
-<maintainer>
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
- <description>CC him on bugs.</description>
-</maintainer>
<longdescription>
sign is a file signing and signature verification utility. It's main purpose is
to be a simple and convenient extension to a tar/gz/bzip2 line of tools to check
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 3eec8a943383..a692692ea60e 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,3 +1,4 @@
DIST xca-1.1.0.tar.gz 854925 SHA256 997b62b523f6581f0d96a5f5ba2fa31dcdd2b3cf1ffe924f5c69a931b0dd44df SHA512 c22a594c61f63c71e8bc7c38ccdfabe05903a33bf5116630ca4c5072b725e551a128b10f624d01a464695d739fb9d77a510b3ced99fedc5d5378cb5fd563d954 WHIRLPOOL 1b58ec3dce44e0eb101265f7b1e68695ea2121c795f7d5f6a5349c812469c50f618ce34a5985991432b49a910b2c34fd3eb8e88ac735078a6e063801f1731be0
DIST xca-1.3.0.tar.gz 883772 SHA256 ef5b6e4ed93abb02eb53925edd222bfeb5c26a3b0698af90a416d8e92869414c SHA512 af537154a26fbb8749034b8aa79d0379e5e2567ea2b4c82c8a2f77b0fec7017d01aa0974d013f0d84eb52f2dc18994b29890d9ab63939c91aa9e316f6ef93685 WHIRLPOOL 19ce637f6794b00f7fbc363263768a8b651a21d9dd564ec7ba05fc9c729240ae8edc9d323b899b3641f9bf757b325a77c11a84848606dfe5dec839678a2c0314
DIST xca-1.3.1.tar.gz 883797 SHA256 c2dd8d79b37440126d9fe7281e8c6802b95537c50ad464f6f7799ffa81aa3d83 SHA512 186056638177a01ca2ed1ad6e6e9e142de7d9e4a057c9a6ec691a488cfa094c97b90f1cae6e083c0a92f5492c67afb285946acbab7ec59d21b791e46cf54bc79 WHIRLPOOL c61c67311d3d64d772219a2bd544a720143a6636c8136174a748cd7f8037caa702d2fab6448b717def18de0e9353758bddffbee049fd427724828014a71dcb92
+DIST xca-1.3.2.tar.gz 897947 SHA256 04f11f2148c8369c1a1b4e109956ed8cc807ec266d0d936410624ba8ee4b5ce4 SHA512 f0a9c4d47f0c20632f44364cc55293a7d2152772a746a72bc4a46622da4e48ae612bafe918c098a71c29cdfca8e6c03c27cf85a862ca0f356eddf061414c89b2 WHIRLPOOL 11a19800447fe939d1684524c4c0da90dc8dde4dfce4ff8f606d384f976b0d6f067e8455e3a90facfbf99a1cc651affdffa9397a9a8191f1fc8d302944ea730a
diff --git a/app-crypt/xca/xca-1.3.2.ebuild b/app-crypt/xca/xca-1.3.2.ebuild
new file mode 100644
index 000000000000..8803f7495eb8
--- /dev/null
+++ b/app-crypt/xca/xca-1.3.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests and revokation lists"
+HOMEPAGE="http://xca.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="bindist"
+
+RDEPEND=">=dev-libs/openssl-0.9.8:*[bindist=]
+ dev-qt/qtgui:4"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.0.0-desktop.patch
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ STRIP=true
+}
+
+src_compile() {
+ # enforce all to avoid the automatic silent rules
+ emake all
+}
+
+src_install() {
+ # non standard destdir
+ emake install destdir="${ED}"
+
+ insinto /etc/xca
+ doins misc/*.txt
+}
diff --git a/app-editors/retext/Manifest b/app-editors/retext/Manifest
index eb028eb217d9..9091eb561cd8 100644
--- a/app-editors/retext/Manifest
+++ b/app-editors/retext/Manifest
@@ -2,3 +2,4 @@ DIST ReText-4.1.3.tar.gz 129283 SHA256 bb4409982d27ac62cab01b0748fe41d9c66608536
DIST ReText-5.0.2.tar.gz 140853 SHA256 7ef898abc8aed70502fd4d69ed7e8ab43cc978fcbe6864da5771379c1e315bdd SHA512 b28dd24aa5253106880bd6a5a3a16f96670c3145a2cb46da520407d6705f055ee52aaef9c0a8e27c2900b5fdde6a67c599cb8945f7daa6e3ef4456e1fd7c9b0f WHIRLPOOL 0ee1a7497ca3d6fef8356777d93e369d06de542b20974055ddf66cc8e12d33c7716d3b4b5f0360b40037c90d146fddbff4c3b48c96929efafd8f43e278240c0f
DIST ReText-5.1.0.tar.gz 151833 SHA256 09b12892a0520bb8b0692f5aec7aa88911d07a5048a3402a9e9d4ac57322b5ca SHA512 3dbfe4992195119513c571291c344338dccf55c52d000cc69da63d0e51e5f2d9c5a0a2fba6570e525c96f1f9243a7465391a59b840a1fb7dd4513a0b4909ca5c WHIRLPOOL 76826184a3e8ac3ea3f5c10c31a3630ad8bc37a1bce0d771fc250f1f53acb9dd2f888aa67adf946368a5baebcdab0306100ea0e632dcd36edd81cdcd1a247838
DIST ReText-5.2.0.tar.gz 156953 SHA256 463b524435d7b068d90304ae719f96a9c8b957323206549ae5a02ffe5fa82b17 SHA512 9a40fb0e39145ee9bc29945af488e74ea8aa5a78b220f28d1c3de5060daf6f3a6864b4e852165847bb4b5905ca4f0684d56b24864baa05f96468f5d4d0172c6b WHIRLPOOL be4b10f7158de253ac1a104e5053d80afcf5ecc6928ba8a009c8bbdac9166a735cb60d56c268c6f1651f3d7c6c4d9daac46caa4696795e68c1dbf870dc759afd
+DIST ReText-5.2.1.tar.gz 157119 SHA256 02164ae2bba6f47a2ec5e11aa06aefbcd96bea1b84a96c5673dbe18d8ccb2a69 SHA512 1d11f6824b64a082425ac2e8b67da15d4df5352539b66a8297dba0cd4f4236b7328966e97104c3fd7a641067a84023f65ba856f932d8489ff4e80722471835d8 WHIRLPOOL 24e7c756f61c210320b0ab9a67c99f43ccf5739310a01d9ee98d779e8b45b27dbc828b0c573973b2e4d2b8e07f2edd56660de685930a7a2ed8ceb50ab6fb6f91
diff --git a/app-editors/retext/metadata.xml b/app-editors/retext/metadata.xml
index ded9cf707854..bfcec7249a3d 100644
--- a/app-editors/retext/metadata.xml
+++ b/app-editors/retext/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
diff --git a/app-editors/retext/retext-5.2.1.ebuild b/app-editors/retext/retext-5.2.1.ebuild
new file mode 100644
index 000000000000..f147eaa705e8
--- /dev/null
+++ b/app-editors/retext/retext-5.2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{3,4} )
+
+PLOCALES="ca cs cy da de es et eu fr hu it ja pl pt pt_BR ru sk sr sr@latin uk zh_TW"
+
+inherit distutils-r1 l10n
+
+MY_PN="ReText"
+MY_P="${MY_PN}-${PV/_/~}"
+
+DESCRIPTION="Simple editor for Markdown and reStructuredText"
+HOMEPAGE="https://github.com/retext-project/retext https://github.com/retext-project/retext/wiki"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+spell"
+
+RDEPEND="
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/markdown[${PYTHON_USEDEP}]
+ dev-python/markups[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/PyQt5[gui,network,printsupport,webkit,widgets,${PYTHON_USEDEP}]
+ spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}"/${MY_P}
+
+remove_locale() {
+ find "${ED}" -name "retext_${1}.qm" -delete || die "Failed to remove locale ${1}."
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ newicon {icons/,}${PN}.png
+ newicon {icons/,}${PN}.svg
+
+ l10n_for_each_disabled_locale_do remove_locale
+
+ make_desktop_entry ${PN} "${MY_PN} Editor" ${PN} "Development;Utility;TextEditor"
+}
diff --git a/app-emacs/ess/Manifest b/app-emacs/ess/Manifest
index f35ea1520780..ee6ddc83b3be 100644
--- a/app-emacs/ess/Manifest
+++ b/app-emacs/ess/Manifest
@@ -1,3 +1,3 @@
-DIST ess-13.09.tgz 3356969 SHA256 d0625f8ac38831a05d419435d3a6ccf852878c8aea018c3f4a9c9d6bd61e71d2 SHA512 96a91a41c9b390c27646e4b95d7a41e6b22d592c82bf775f2e1b70905c7bc684c3d6645496275d245c9f882030da1b3bd5cd3ba5711acbec3a07cdb2d065a5dd WHIRLPOOL 3560d95bcb43a65ca86787274fa96106611a98041cf63905a4066223247d8557405b7557da2c468d836d4570d4e791aa36e84e76585fc9668729926ef0759598
DIST ess-14.09.tgz 3350987 SHA256 b6f1badd065e2e42f1d9d75a4e7a04290849d6f7a2bdb8413f73e0eae4014571 SHA512 91e275810f7a8c856f3392194ad3fb3d5f5b966e887568b22c133a362164e71ff5306d1d1a70e97f9d10261fe82eecb5f14e99a0dad4a4e239f5b810d7bba8ac WHIRLPOOL 5eabe6d65d7b5d420a7c6989b82d9901ac20d7b6376223f5aee39da7212ea395d15a98ce86c49fb2782706ba524532ceb38fd23dafaae5891a55958d1c676221
DIST ess-15.03-1.tgz 3177102 SHA256 ad2f1b48dd4671848709d226aab72427129ac2fd5f85c0c0b39b96be24eee66f SHA512 5260d8afa10e1382cac3c70a4b6f753dd77e9f24bb2f68247732605b0f5fbb1b06e090dbcb45d747a484333f0779959c9213a4792103839b11c9e239bf35534d WHIRLPOOL eb1e6917a05b7444f4c37949a51554b6b33a0841bad5dae6aa93f575a7914fb36299c7c63ec27ec24944104a39b5844ada12b1c74a64daa04a682d5e97001834
+DIST ess-15.09.tgz 3239642 SHA256 3438683af3232280d9281938ad101a1e0bb92aa7c97f330c07d8ef7d10489465 SHA512 95350c1d558ba2bc8582978441569f40ba4c59609c21cd473908cc152c8cc6e4e38b9236cc47dd73469dcf14c8a359652e54de5632a21700835350764f401d4f WHIRLPOOL 426659087f7ace498cf99bcc67502c0d83c140ae8e5576d80747ba9fe22db641e2ef48dbbb0771231d880dddfc9fcf3ca8c482578e77c15c2d1b6a114509da46
diff --git a/app-emacs/ess/ess-13.09.ebuild b/app-emacs/ess/ess-15.09.ebuild
index e80e2e1550fa..69531175fdab 100644
--- a/app-emacs/ess/ess-13.09.ebuild
+++ b/app-emacs/ess/ess-15.09.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-inherit elisp
+inherit readme.gentoo elisp
DESCRIPTION="Emacs Speaks Statistics"
HOMEPAGE="http://ess.r-project.org/"
@@ -12,7 +12,7 @@ SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
DEPEND="app-text/texi2html
virtual/latex-base"
@@ -35,11 +35,10 @@ src_install() {
# Most documentation is installed by the package's build system.
rm -f "${ED}${SITELISP}/${PN}/ChangeLog"
dodoc ChangeLog *NEWS doc/{TODO,ess-intro.pdf}
+ newdoc doc/ChangeLog ChangeLog-doc
newdoc lisp/ChangeLog ChangeLog-lisp
-}
-pkg_postinst() {
- elisp-site-regen
- elog "Please see /usr/share/doc/${PF} for the complete documentation."
- elog "Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
+ DOC_CONTENTS="Please see /usr/share/doc/${PF} for the complete
+ documentation. Usage hints are in ${SITELISP}/${PN}/ess-site.el ."
+ readme.gentoo_create_doc
}
diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
index 589eafa60b73..c6f28fb04743 100644
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
@@ -25,7 +25,6 @@ IUSE=""
DEPEND=""
RDEPEND="app-arch/dump
>=app-emulation/ganeti-2.0.3
- || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )
app-emulation/qemu
sys-apps/util-linux
sys-fs/multipath-tools
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 961bf34d1bd4..375998b70aee 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,4 +1,3 @@
-DIST libvirt-1.2.15.tar.gz 29094868 SHA256 5f88041b8c212f8f687c672fe583108833240d6175b512ce4de92ab6660194c6 SHA512 c5dd3af86e89e3804d6c3b527c6dbd98c79d87d2591725a13af33530e0e9a9a2e9aeb9491844469d44ec4f4d17adb036c76391f964158ada23ec042a75556fbc WHIRLPOOL a43aad4caeff707c8d7a6872ff3c46911c96fd90ece02a7f6ceabb4ccd00e467b5341ab9d922912cc2968a2bb8826e970b253b257c5a8981b37364550f9b3616
DIST libvirt-1.2.18.tar.gz 29412554 SHA256 d5a5ff18af4cced21fed986d28fa0a21b782d256920326bf0ff1c7731eeb6ade SHA512 e89d494066ebec4de4c9a53089f015635b7b5ccf4a10ab9749883cc81f6f9607b18ca91a1bd01a9cdacb3a46de86223f0432fae3954106cb92dd275e5b4138c5 WHIRLPOOL dbbbd627ccb9be154bc680407898cd32dfdbc218a67f54560e6b0f0200cbc157a9aa05834de5d9d23e3b6da0625fd5943b4c8e38f8bb9a6ff920bc5820287bfc
DIST libvirt-1.2.19.tar.gz 29644247 SHA256 282c141f03331d640020c15f81464b27400e0ee307ef4c5190393b021caedd6e SHA512 2f3f26b90120a39861683f1b5af93ac661ab561e23514c71c2ebfb1ab88da99d25acee9a5d11bec35478e38b9105f3779bffb4d4649f16a91aeccdcaa61e4aa4 WHIRLPOOL 4262beb2248495746d32bc7b16c3eec69d9cba7d4fb3870fcd560bd4d222827cf90eb9cc3df647f3fe10467d1562e72138cbf871adc5f63d4788069e1b9740ac
DIST libvirt-1.2.20.tar.gz 29725368 SHA256 df0b5d8a150863a86b98cf809a586c91b2d49af25b74a354049ea416b0b27d30 SHA512 2c7f7995d38d15453de99cc34e63db9c39c653fc24a4fd949207e62c0241f2a5ff3ab5505909ffae77f7a91d321396372188aa29124b8271f876d93546c44d07 WHIRLPOOL 553517c8eec3f601987d9a9205668a81ffcaf9081ee0d79de847ce1d2c9bcd9115471adf2022095143d440a07f7d48059cfd88094b7dda7046a784c93c449817
diff --git a/app-emulation/libvirt/libvirt-1.2.15-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.15-r1.ebuild
deleted file mode 100644
index ac4516f3d4c0..000000000000
--- a/app-emulation/libvirt/libvirt-1.2.15-r1.ebuild
+++ /dev/null
@@ -1,464 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-inherit eutils user autotools linux-info systemd readme.gentoo
-
-BACKPORTS=""
-
-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/${MY_P}.tar.gz"
- else
- SRC_URI="http://libvirt.org/sources/${MY_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
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="http://www.libvirt.org/"
-LICENSE="LGPL-2.1"
-# TODO: Reenable IUSE wireshark-plugins
-IUSE="audit avahi +caps firewalld fuse glusterfs iscsi +libvirtd lvm lxc \
- +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl \
- selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen \
- elibc_glibc systemd"
-REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) )
- lxc? ( caps libvirtd )
- openvz? ( libvirtd )
- qemu? ( libvirtd )
- uml? ( libvirtd )
- vepa? ( macvtap )
- virtualbox? ( libvirtd )
- xen? ( libvirtd )
- virt-network? ( libvirtd )
- firewalld? ( virt-network )"
-
-# 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="sys-libs/readline:=
- sys-libs/ncurses:0=
- >=net-misc/curl-7.18.0
- dev-libs/libgcrypt:0
- >=dev-libs/libxml2-2.7.6
- dev-libs/libnl:3
- >=net-libs/gnutls-1.0.25
- net-libs/libssh2
- sys-apps/dmidecode
- >=sys-apps/util-linux-2.17
- sys-devel/gettext
- >=net-analyzer/netcat6-1.0-r2
- app-misc/scrub
- audit? ( sys-process/audit )
- avahi? ( >=net-dns/avahi-0.6[dbus] )
- caps? ( sys-libs/libcap-ng )
- fuse? ( >=sys-fs/fuse-2.8.6 )
- glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
- iscsi? ( sys-block/open-iscsi )
- lxc? ( !systemd? ( sys-power/pm-utils ) )
- lvm? ( >=sys-fs/lvm2-2.02.48-r2 )
- 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 )
- virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
- wireshark-plugins? ( net-analyzer/wireshark:= )
- xen? ( app-emulation/xen-tools app-emulation/xen )
- udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
- virt-network? ( net-dns/dnsmasq[script]
- >=net-firewall/iptables-1.4.10[ipv6]
- net-misc/radvd
- net-firewall/ebtables
- sys-apps/iproute2[-minimal]
- firewalld? ( net-firewall/firewalld )
- )
- elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- app-text/xhtml1
- dev-lang/perl
- dev-perl/XML-XPath
- dev-libs/libxslt"
-
-DOC_CONTENTS="For the basic networking support (bridged and routed networks)
-you don't need any extra software. For more complex network modes
-including but not limited to NATed network, you can enable the
-'virt-network' USE flag.\n\n
-If you are using dnsmasq on your system, you will have
-to configure /etc/dnsmasq.conf to enable the following settings:\n\n
- bind-interfaces\n
- interface or except-interface\n\n
-Otherwise you might have issues with your existing DNS server."
-
-LXC_CONFIG_CHECK="
- ~CGROUPS
- ~CGROUP_FREEZER
- ~CGROUP_DEVICE
- ~CGROUP_CPUACCT
- ~CGROUP_SCHED
- ~CGROUP_PERF
- ~BLK_CGROUP
- ~NET_CLS_CGROUP
- ~CGROUP_NET_PRIO
- ~CPUSETS
- ~NAMESPACES
- ~UTS_NS
- ~IPC_NS
- ~PID_NS
- ~NET_NS
- ~USER_NS
- ~DEVPTS_MULTIPLE_INSTANCES
- ~VETH
- ~MACVLAN
- ~POSIX_MQUEUE
- ~SECURITYFS
- ~!GRKERNSEC_CHROOT_MOUNT
- ~!GRKERNSEC_CHROOT_DOUBLE
- ~!GRKERNSEC_CHROOT_PIVOT
- ~!GRKERNSEC_CHROOT_CHMOD
- ~!GRKERNSEC_CHROOT_CAPS
-"
-
-VIRTNET_CONFIG_CHECK="
- ~BRIDGE_NF_EBTABLES
- ~BRIDGE_EBT_MARK_T
- ~NETFILTER_ADVANCED
- ~NETFILTER_XT_TARGET_CHECKSUM
- ~NETFILTER_XT_CONNMARK
- ~NETFILTER_XT_MARK
-"
-
-BWLMT_CONFIG_CHECK="
- ~BRIDGE_EBT_T_NAT
- ~NET_SCH_HTB
- ~NET_SCH_SFQ
- ~NET_SCH_INGRESS
- ~NET_CLS_FW
- ~NET_CLS_U32
- ~NET_ACT_POLICE
-"
-
-MACVTAP_CONFIG_CHECK=" ~MACVTAP"
-
-LVM_CONFIG_CHECK=" ~BLK_DEV_DM ~DM_SNAPSHOT ~DM_MULTIPATH"
-
-ERROR_USER_NS="Optional depending on LXC configuration."
-
-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
-
- # Handle specific kernel versions for different features
- kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
- kernel_is ge 3 6 && LXC_CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP ~MEMCG_KMEM"
-
- CONFIG_CHECK=""
- use fuse && CONFIG_CHECK+=" ~FUSE_FS"
- use lvm && CONFIG_CHECK+="${LVM_CONFIG_CHECK}"
- use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}"
- use macvtap && CONFIG_CHECK+="${MACVTAP_CONFIG_CHECK}"
- use virt-network && CONFIG_CHECK+="${VIRTNET_CONFIG_CHECK}"
- # Bandwidth Limiting Support
- use virt-network && CONFIG_CHECK+="${BWLMT_CONFIG_CHECK}"
- 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}"/${PN}-1.2.9-do_not_use_sysconf.patch
-
- [[ -n ${BACKPORTS} ]] && \
- EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
- EPATCH_SOURCE="${WORKDIR}/patches" epatch
-
- epatch_user
-
- [[ -n ${AUTOTOOLIZE} ]] && eautoreconf
-
- # Tweak the init script
- local avahi_init=
- local iscsi_init=
- local rbd_init=
- local firewalld_init=
- cp "${FILESDIR}/libvirtd.init-r14" "${S}/libvirtd.init"
- use avahi && avahi_init='avahi-daemon'
- use iscsi && iscsi_init='iscsid'
- use rbd && rbd_init='ceph'
- use firewalld && firewalld_init='need firewalld'
-
- sed -e "s/USE_FLAG_FIREWALLD/${firewalld_init}/" -i "${S}/libvirtd.init"
- sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init"
- sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init"
- sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init"
-}
-
-src_configure() {
- local myconf=""
-
- ## enable/disable daemon, otherwise client only utils
- myconf+=" $(use_with libvirtd)"
-
- ## enable/disable the daemon using avahi to find VMs
- myconf+=" $(use_with avahi)"
-
- ## hypervisors on the local host
- myconf+=" $(use_with xen) $(use_with xen xen-inotify)"
- myconf+=" --without-xenapi"
- if use xen && has_version ">=app-emulation/xen-tools-4.2.0"; then
- myconf+=" --with-libxl"
- else
- myconf+=" --without-libxl"
- fi
- myconf+=" $(use_with openvz)"
- myconf+=" $(use_with lxc)"
- if use virtualbox && has_version app-emulation/virtualbox-ose; then
- myconf+=" --with-vbox=/usr/lib/virtualbox-ose/"
- else
- myconf+=" $(use_with virtualbox vbox)"
- fi
- myconf+=" $(use_with uml)"
- myconf+=" $(use_with qemu)"
- myconf+=" $(use_with qemu yajl)" # Use QMP over HMP
- myconf+=" $(use_with phyp)"
- myconf+=" --with-esx"
- myconf+=" --with-vmware"
-
- ## additional host drivers
- myconf+=" $(use_with virt-network network)"
- myconf+=" --with-storage-fs"
- myconf+=" $(use_with lvm storage-lvm)"
- myconf+=" $(use_with iscsi storage-iscsi)"
- myconf+=" $(use_with parted storage-disk)"
- myconf+=" $(use_with glusterfs)"
- myconf+=" $(use_with glusterfs storage-gluster)"
- myconf+=" $(use_with lvm storage-mpath)"
- myconf+=" $(use_with rbd storage-rbd)"
- myconf+=" $(use_with numa numactl)"
- myconf+=" $(use_with numa numad)"
- myconf+=" $(use_with selinux)"
- myconf+=" $(use_with fuse)"
-
- # udev for device support details
- myconf+=" $(use_with udev)"
- myconf+=" --without-hal"
-
- # linux capability support so we don't need privileged accounts
- myconf+=" $(use_with caps capng)"
-
- ## auth stuff
- myconf+=" $(use_with policykit polkit)"
- myconf+=" $(use_with sasl)"
-
- # network bits
- myconf+=" $(use_with macvtap)"
- myconf+=" $(use_with pcap libpcap)"
- myconf+=" $(use_with vepa virtualport)"
- myconf+=" $(use_with firewalld)"
-
- ## other
- myconf+=" $(use_enable nls)"
-
- # user privilege bits fir qemu/kvm
- if use caps; then
- myconf+=" --with-qemu-user=qemu"
- myconf+=" --with-qemu-group=qemu"
- else
- myconf+=" --with-qemu-user=root"
- myconf+=" --with-qemu-group=root"
- fi
-
- # audit support
- myconf+=" $(use_with audit)"
-
- # wireshark dissector
- myconf+=" $(use_with wireshark-plugins wireshark-dissector)"
-
- ## stuff we don't yet support
- myconf+=" --without-netcf"
-
- # locking support
- myconf+=" --without-sanlock"
-
- # systemd unit files
- myconf+=" $(use_with systemd systemd-daemon)"
- use systemd && myconf+=" --with-init-script=systemd"
-
- # this is a nasty trick to work around the problem in bug
- # #275073. The reason why we don't solve this properly is that
- # it'll require us to rebuild autotools (and we don't really want
- # to do that right now). The proper solution has been sent
- # upstream and should hopefully land in 0.7.7, in the mean time,
- # mime the same functionality with this.
- case ${CHOST} in
- *cygwin* | *mingw* )
- ;;
- *)
- ac_cv_prog_WINDRES=no
- ;;
- esac
-
- econf \
- ${myconf} \
- --disable-static \
- --disable-werror \
- --with-remote \
- --docdir=/usr/share/doc/${PF} \
- --localstatedir=/var
-
- if [[ ${PV} = *9999* ]]; then
- # Restore gnulib's config.sub and config.guess
- # bug #377279
- (cd .gnulib && git reset --hard > /dev/null)
- fi
-}
-
-src_test() {
- # Explicitly allow parallel build of tests
- export VIR_TEST_DEBUG=1
- HOME="${T}" emake check || die "tests failed"
-}
-
-src_install() {
- emake install \
- DESTDIR="${D}" \
- HTML_DIR=/usr/share/doc/${PF}/html \
- DOCS_DIR=/usr/share/doc/${PF} \
- EXAMPLE_DIR=/usr/share/doc/${PF}/examples \
- SYSTEMD_UNIT_DIR="$(systemd_get_unitdir)" \
- || die "emake install failed"
-
- 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/sysconf
- 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
- newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die
- newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
-
- 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
-
- # We really don't want to use or support old PolicyKit cause it
- # screws with the new polkit integration
- if has_version sys-auth/policykit; then
- rm -rf "${D}"/usr/share/PolicyKit/policy/org.libvirt.unix.policy
- fi
-
- # Only sysctl files ending in .conf work
- dodir /etc/sysctl.d
- mv "${D}"/usr/lib/sysctl.d/libvirtd.conf "${D}"/etc/sysctl.d/libvirtd.conf
-}
-
-pkg_postinst() {
- if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
- touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
- fi
-
- if ! use policykit; then
- elog "To allow normal users to connect to libvirtd you must change the"
- elog "unix sock group and/or perms in /etc/libvirt/libvirtd.conf"
- fi
-
- use libvirtd || return 0
- # From here, only libvirtd-related instructions, be warned!
-
- readme.gentoo_print_elog
-
- if use caps && use qemu; then
- elog "libvirt will now start qemu/kvm VMs with non-root privileges."
- elog "Ensure any resources your VMs use are accessible by qemu:qemu"
- fi
-
- if [[ -n "${REPLACING_VERSIONS}" ]]; then
- elog ""
- elog "The systemd service-file configuration under /etc/sysconfig has"
- elog "been removed. Please use"
- elog " /etc/systemd/system/libvirtd.service.d/00gentoo.conf"
- elog "to control the '--listen' parameter for libvirtd. The configuration"
- elog "for the libvirt-guests.service is now found under"
- elog " /etc/libvirt/libvirt-guests.conf"
- elog "The openrc configuration has not been changed. Thus no action is"
- elog "required for the openrc service manager."
- elog ""
- fi
-}
diff --git a/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild b/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild
index f345b0604547..cb757f002e64 100644
--- a/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.19-r1.ebuild
@@ -71,6 +71,7 @@ RDEPEND="
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 )
@@ -103,12 +104,17 @@ RDEPEND="
>=net-firewall/iptables-1.4.10[ipv6]
net-misc/radvd
sys-apps/iproute2[-minimal]
- firewalld? ( net-firewall/firewalld )
)
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
wireshark-plugins? ( net-analyzer/wireshark:= )
- xen? ( app-emulation/xen-tools app-emulation/xen )
- udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
+ xen? (
+ app-emulation/xen
+ app-emulation/xen-tools
+ )
+ udev? (
+ virtual/udev
+ >=x11-libs/libpciaccess-0.10.9
+ )
elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
DEPEND="${RDEPEND}
diff --git a/app-emulation/libvirt/libvirt-1.2.20.ebuild b/app-emulation/libvirt/libvirt-1.2.20.ebuild
index f345b0604547..cb757f002e64 100644
--- a/app-emulation/libvirt/libvirt-1.2.20.ebuild
+++ b/app-emulation/libvirt/libvirt-1.2.20.ebuild
@@ -71,6 +71,7 @@ RDEPEND="
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 )
@@ -103,12 +104,17 @@ RDEPEND="
>=net-firewall/iptables-1.4.10[ipv6]
net-misc/radvd
sys-apps/iproute2[-minimal]
- firewalld? ( net-firewall/firewalld )
)
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
wireshark-plugins? ( net-analyzer/wireshark:= )
- xen? ( app-emulation/xen-tools app-emulation/xen )
- udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
+ xen? (
+ app-emulation/xen
+ app-emulation/xen-tools
+ )
+ udev? (
+ virtual/udev
+ >=x11-libs/libpciaccess-0.10.9
+ )
elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
DEPEND="${RDEPEND}
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index f345b0604547..cb757f002e64 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -71,6 +71,7 @@ RDEPEND="
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 )
@@ -103,12 +104,17 @@ RDEPEND="
>=net-firewall/iptables-1.4.10[ipv6]
net-misc/radvd
sys-apps/iproute2[-minimal]
- firewalld? ( net-firewall/firewalld )
)
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
wireshark-plugins? ( net-analyzer/wireshark:= )
- xen? ( app-emulation/xen-tools app-emulation/xen )
- udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 )
+ xen? (
+ app-emulation/xen
+ app-emulation/xen-tools
+ )
+ udev? (
+ virtual/udev
+ >=x11-libs/libpciaccess-0.10.9
+ )
elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) )"
DEPEND="${RDEPEND}
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 625471421b09..88f53610f7a2 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,4 @@
DIST lxd-0.13.tar.bz2 3336161 SHA256 4228979ea9a856647f75f0230f58cc577c111a287f148787af766ab36c55f756 SHA512 12cd865ef63702674342df23ebb298b6ba39f0d44e9bfe91c643820be06ff30910145388a4daa2d63fbcb53c236e3cd4eb84e3e0bc617c85247322b0024c4920 WHIRLPOOL 82e788e9b35429df308d498955bd0cab06eb7d1a09c0a20bddad78490900b2cb78a44da9970db149ebfda546250a1d5aa2204e5f6f98b81a228310bfee3003a7
DIST lxd-0.14.tar.bz2 2526939 SHA256 c0c51ac5b3d30c7906323eba965011073b412a3c354ce095e46f14df4298c46c SHA512 d3f9eb38cdf71add270c895c1583dab85b0e0dba0d956900628b519881b41582113d6c25d37b9522493de069ad6a43b197ae895aefeb83391337273a4b60953e WHIRLPOOL 2b9c6931b81df7e60b13e35bfcd5272a46fb29377e11f6326616f55bf6c583db7be82d41273369518e9b9e434bee3b30f989b6816cd8dbdd40cc2cc1effac7b4
DIST lxd-0.16.tar.bz2 2660683 SHA256 bbe2b7542af34c93c7509e9638016a420bfc1daf1f1f45a33fa3d379ae10f14f SHA512 856e5ea1920ec3025cbd308a8e2ef656393a149111a38188f749e7d42a41032d762009d85316815c3f18ac0907fa9380758ca48666b13e900c9bbdf809d57f1c WHIRLPOOL f4bbea69073f2cc0dce65e39d88cdf1a0fadd4629b5b42bdee7ab385df459f78a2e36619c40ace687be124fb8d59c0da043cb1a8195630b2d0a051ab53297b89
+DIST lxd-0.18.tar.bz2 2674919 SHA256 cb9c4823fb19ccef4827ee4dc3a105b60d3549b5023f4517d1471487469ea395 SHA512 5bbaae6eef27a0b14f8fee41d113afeea61de5414e5f7ed5011819eb6823a11dff647ac3f9781357304f7c5b04c618d05e4a04197cae6c6e4845cad5476d22ff WHIRLPOOL ca73e587f19491d79b03af2d205ab9f234b5acb1ff1f2d68a05be053cbd1ec89f6b9bc0fc64113980d7f2d6e3c7ece01d7d0c431c08a87b2b0ec555c6ff97914
diff --git a/app-emulation/lxd/files/lxd-0.18-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.18-dont-go-get.patch
new file mode 100644
index 000000000000..1b229ea99cd5
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.18-dont-go-get.patch
@@ -0,0 +1,18 @@
+--- Makefile.orig 2015-09-17 20:37:16.481867339 -0500
++++ Makefile 2015-09-17 20:53:27.715800926 -0500
+@@ -12,15 +12,11 @@
+
+ .PHONY: default
+ default:
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./...
+ @echo "LXD built succesfuly"
+
+ .PHONY: client
+ client:
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./lxc
+ @echo "LXD client built succesfuly"
+
diff --git a/app-emulation/lxd/files/lxd-0.18-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.18-nc-binary-name.patch
new file mode 100644
index 000000000000..b88b7f7e5082
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.18-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/rsync.go.orig 2015-09-17 21:00:29.290772099 -0500
++++ lxd/rsync.go 2015-09-17 21:00:54.737770359 -0500
+@@ -73,7 +73,7 @@
+ * command (i.e. the command to run on --server). However, we're
+ * hardcoding that at the other end, so we can just ignore it.
+ */
+- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ cmd := exec.Command("rsync", "-arvP", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
+ if err := cmd.Start(); err != nil {
+ return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.18.confd b/app-emulation/lxd/files/lxd-0.18.confd
new file mode 100644
index 000000000000..3d553276a5e3
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.18.confd
@@ -0,0 +1,27 @@
+# Group which owns the shared socket
+LXD_OPTIONS+=" --group lxd"
+
+
+
+# Enable cpu profiling into the specified file
+#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
+
+# Enable memory profiling into the specified file
+#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-0.18.initd b/app-emulation/lxd/files/lxd-0.18.initd
new file mode 100644
index 000000000000..2b75e51c8a64
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.18.initd
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+depend() {
+ need cgmanager
+ need net
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxd server"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-0.18.ebuild b/app-emulation/lxd/lxd-0.18.ebuild
new file mode 100644
index 000000000000..fd53d9860e50
--- /dev/null
+++ b/app-emulation/lxd/lxd-0.18.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="http://961db08fe45d5f5dd062-b8a7a040508aea6d369676e49b80719d.r29.cf2.rackcdn.com/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="btrfs +criu +daemon lvm nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+DEPEND="
+ dev-go/go-crypto
+ >=dev-lang/go-1.4.2:=
+ dev-libs/protobuf
+ dev-vcs/git
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager,seccomp]
+ net-analyzer/openbsd-netcat
+ net-misc/bridge-utils
+ net-misc/rsync[xattr]
+ sys-apps/iproute2
+ virtual/acl
+ btrfs? (
+ sys-fs/btrfs-progs
+ )
+ criu? (
+ sys-process/criu
+ )
+ lvm? (
+ sys-fs/lvm2
+ )
+ )
+"
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
+# be preferable for that support to go into the golang-build eclass not
+# this package directly.
+# - Add apparmor USE. There are some exec calls to apparmor_parser
+# - Test build with Go 1.4 & 1.5
+# - integrate "lxd shutdown" into initscript as custom action (default "stop"
+# action should _not_ stop containers amirite?)
+# "Perform a clean shutdown of LXD and all running containers"
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}"
+
+ epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+ # Upstream requires the openbsd flavor of netcat (with -U), but
+ # Gentoo installs that with a renamed binary
+ epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}"
+
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:$(get_golibdir_gopath)" emake
+ else
+ # build client tool
+ GOPATH="${S}:$(get_golibdir_gopath)" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ if use daemon; then
+ dobin bin/fuidshift
+
+ dosbin bin/lxd
+ fi
+
+ cd "src/${EGO_PN}"
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxc.in lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md
+
+ docinto specs
+ dodoc specs/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "including a Quick Start."
+
+ # The messaging below only applies to daemon installs
+ use daemon || return 0
+
+ # The control socket will be owned by (and writeable by) this group.
+ enewgroup lxd
+
+ # Ubuntu also defines an lxd user but it appears unused (the daemon
+ # must run as root)
+
+ if test -n "${REPLACING_VERSIONS}"; then
+ einfo
+ einfo "If you are upgrading from version 0.14 or older, note that the --tcp"
+ einfo "is no longer available in /etc/conf.d/lxd. Instead, configure the"
+ einfo "listen address/port by setting the core.https_address server option."
+ fi
+}
diff --git a/app-emulation/lxd/metadata.xml b/app-emulation/lxd/metadata.xml
index c49dbec3e071..46d6c9001d6f 100644
--- a/app-emulation/lxd/metadata.xml
+++ b/app-emulation/lxd/metadata.xml
@@ -19,6 +19,10 @@
<remote-id type="github">lxc/lxd</remote-id>
</upstream>
<use>
+ <flag name="btrfs">
+ Add support for managing instance/snapshot
+ disk using btrfs subvolumes
+ </flag>
<flag name="criu">
Add support for live-migrateable containers
</flag>
diff --git a/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild b/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
index 851d93ef74f8..c996a1f507cf 100644
--- a/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
+++ b/app-eselect/eselect-pinentry/eselect-pinentry-0.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=app-eselect/eselect-lib-bin-symlink-0.1.1"
diff --git a/app-misc/mc/mc-4.8.14.ebuild b/app-misc/mc/mc-4.8.14.ebuild
index eee73d2838f3..5b989ad173d2 100644
--- a/app-misc/mc/mc-4.8.14.ebuild
+++ b/app-misc/mc/mc-4.8.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index fa65084d3b8a..9153fdb6aa84 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -1,3 +1 @@
-DIST screen-4.0.3.tar.gz 840602 SHA256 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77 SHA512 24c1f598972f3dc9ed49cd2c05852190a0190d22fa01401eee8484627c8dd2815f0a422d9b2697faa8aaa0b3efc6730a94e2d5aa787dbe5e9ec719143176c338 WHIRLPOOL 6774786126eb05749d432593bc2c1febdc57896959220a609feb138bdc16b8da278aea63af1ccfd5c7d38ccaa9e7d28980e9e14d0009d36a54cdbd9e4cb0fca7
-DIST screen-4.2.1.tar.gz 1062485 SHA256 5468545047e301d2b3579f9d9ce00466d14a7eec95ce806e3834a3d6b0b9b080 SHA512 30826b2a2fc436483276b90cc4c6679470f7ccb7098c9bb8457d0e534998cd12da02882cf80678465f6540cade170c3fdc6bdfa31b07359ff0d3ffe2d6063710 WHIRLPOOL 7d4209651a016a9ab91aec385532c6ebd7a6d96a60342721f3a53752924c3fb72aa3d648ad665b67fab0a78d6019396abe13e04f556c7e5e9f71bf3238e64cc5
DIST screen-4.3.1.tar.gz 845958 SHA256 fa4049f8aee283de62e283d427f2cfd35d6c369b40f7f45f947dbfd915699d63 SHA512 8e8a25b23330a7d8e00fc9e6cc430f0eb3937ccf4183efbd6fd24e4dc04cc09b3acae45bfc24892faee433b18fa79b1cfe0211fd75c0d74ecf908f916bf774aa WHIRLPOOL b47f7538351028cc3a2ec7f69a9373e152fa7655c6ae9feb75ba46db3cdc9b7d58ce78043993b7f134da3a04754c5e52d1a77da4c30a8decda21c79cf5c50f51
diff --git a/app-misc/screen/files/4.0.2-64bit-time.patch b/app-misc/screen/files/4.0.2-64bit-time.patch
deleted file mode 100644
index 645b37f9b098..000000000000
--- a/app-misc/screen/files/4.0.2-64bit-time.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- utmp.c.orig 2004-11-14 23:15:28.000000000 +0100
-+++ utmp.c 2004-11-14 23:15:39.000000000 +0100
-@@ -618,7 +618,7 @@
- #endif /* sgi */
- strncpy(u->ut_line, line, sizeof(u->ut_line));
- u->ut_pid = pid;
-- (void)time((time_t *)&u->ut_time);
-+ u->ut_time = time(NULL);
- }
-
- static slot_t
diff --git a/app-misc/screen/files/4.0.2-no-libelf.patch b/app-misc/screen/files/4.0.2-no-libelf.patch
deleted file mode 100644
index df06383c9d86..000000000000
--- a/app-misc/screen/files/4.0.2-no-libelf.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- screen-4.0.2/configure.in 2005-05-22 19:55:06.559874997 +0000
-+++ screen-4.0.2-no-libelf/configure.in 2005-05-22 19:56:05.895801017 +0000
-@@ -195,15 +195,6 @@
- #endif
- ], LIBS="$LIBS -lsocket -linet";seqptx=1)
-
--oldlibs="$LIBS"
--LIBS="$LIBS -lelf"
--AC_CHECKING(SVR4)
--AC_TRY_LINK([#include <utmpx.h>
--],,
--[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN),
--[AC_CHECK_HEADER(elf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN))])]
--,LIBS="$oldlibs")
--
- AC_CHECKING(for Solaris 2.x)
- AC_EGREP_CPP(yes,
- [#if defined(SVR4) && defined(sun)
diff --git a/app-misc/screen/files/4.0.2-no-pty.patch b/app-misc/screen/files/4.0.2-no-pty.patch
deleted file mode 100644
index 7b7b7984fff9..000000000000
--- a/app-misc/screen/files/4.0.2-no-pty.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- screen-4.0.2/pty.c.orig 2004-07-29 23:53:45.313533536 -0400
-+++ screen-4.0.2/pty.c 2004-07-29 23:53:59.011451136 -0400
-@@ -33,11 +33,6 @@
- # include <sys/ioctl.h>
- #endif
-
--/* for solaris 2.1, Unixware (SVR4.2) and possibly others */
--#ifdef HAVE_SVR4_PTYS
--# include <sys/stropts.h>
--#endif
--
- #if defined(sun) && defined(LOCKPTY) && !defined(TIOCEXCL)
- # include <sys/ttold.h>
- #endif
diff --git a/app-misc/screen/files/4.0.2-no-utempter.patch b/app-misc/screen/files/4.0.2-no-utempter.patch
deleted file mode 100644
index 2a06119bf4b5..000000000000
--- a/app-misc/screen/files/4.0.2-no-utempter.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- screen-4.0.2/configure.in.orig 2004-12-17 19:55:45.314670411 +0100
-+++ screen-4.0.2/configure.in 2004-12-17 19:55:50.575941541 +0100
-@@ -855,11 +855,6 @@
- #include <utmp.h>
- #endif
- ],[struct utmp u; u.ut_host[0] = 0;], AC_DEFINE(UTHOST))
--AC_CHECK_HEADER(utempter.h, have_utempter=yes, have_utempter=no)
--if test "$have_utempter" = yes; then
-- AC_DEFINE(HAVE_UTEMPTER)
-- LIBS="$LIBS -lutempter"
--fi
-
- dnl
- dnl **** loadav ****
diff --git a/app-misc/screen/files/4.0.2-nonblock.patch b/app-misc/screen/files/4.0.2-nonblock.patch
deleted file mode 100644
index f27c903a8dd9..000000000000
--- a/app-misc/screen/files/4.0.2-nonblock.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- screen.c.orig 2006-04-02 17:05:28.000000000 +0200
-+++ screen.c 2006-04-02 17:05:39.000000000 +0200
-@@ -1197,7 +1197,7 @@ char **av;
- if (!detached)
- {
- /* reopen tty. must do this, because fd 0 may be RDONLY */
-- if ((n = secopen(attach_tty, O_RDWR, 0)) < 0)
-+ if ((n = secopen(attach_tty, O_RDWR | O_NONBLOCK, 0)) < 0)
- Panic(0, "Cannot reopen '%s' - please check.", attach_tty);
- }
- else
diff --git a/app-misc/screen/files/4.0.2-windowlist-multiuser-fix.patch b/app-misc/screen/files/4.0.2-windowlist-multiuser-fix.patch
deleted file mode 100644
index 09848e93ef2e..000000000000
--- a/app-misc/screen/files/4.0.2-windowlist-multiuser-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur screen-4.0.2.orig/process.c screen-4.0.2/process.c
---- screen-4.0.2.orig/process.c 2003-09-18 14:53:54.000000000 +0200
-+++ screen-4.0.2/process.c 2005-07-06 19:55:08.370772955 +0200
-@@ -4841,7 +4841,7 @@
- s = buf;
- for (display = displays; display; display = display->d_next)
- {
-- if (D_user == olddisplay->d_user)
-+ if (olddisplay && D_user == olddisplay->d_user)
- continue;
- for (cv = D_cvlist; cv; cv = cv->c_next)
- if (Layer2Window(cv->c_layer) == p)
diff --git a/app-misc/screen/files/4.0.3-extend-d_termname-ng2.patch b/app-misc/screen/files/4.0.3-extend-d_termname-ng2.patch
deleted file mode 100644
index 21b11080dfa0..000000000000
--- a/app-misc/screen/files/4.0.3-extend-d_termname-ng2.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-diff --git a/acls.c b/acls.c
-index 0f98df2..5f26d70 100644
---- a/acls.c
-+++ b/acls.c
-@@ -178,7 +178,7 @@ struct acluser **up;
- #endif
- (*up)->u_Esc = DefaultEsc;
- (*up)->u_MetaEsc = DefaultMetaEsc;
-- strncpy((*up)->u_name, name, 20);
-+ strncpy((*up)->u_name, name, MAXSTR);
- (*up)->u_password = NULL;
- if (pass)
- (*up)->u_password = SaveStr(pass);
-@@ -314,8 +314,8 @@ struct acluser **up;
- return UserAdd(name, pass, up);
- if (!strcmp(name, "nobody")) /* he remains without password */
- return -1;
-- strncpy((*up)->u_password, pass ? pass : "", 20);
-- (*up)->u_password[20] = '\0';
-+ strncpy((*up)->u_password, pass ? pass : "", MAXSTR);
-+ (*up)->u_password[MAXSTR] = '\0';
- return 0;
- }
- #endif
-diff --git a/acls.h b/acls.h
-index c41b714..7f20f55 100644
---- a/acls.h
-+++ b/acls.h
-@@ -36,6 +36,16 @@
- #define ACLBYTE(data, w) ((data)[(w) >> 3])
- #define ACLBIT(w) (0x80 >> ((w) & 7))
-
-+#include <limits.h>
-+
-+#ifndef NAME_MAX
-+# ifndef MAXNAMELEN
-+# define NAME_MAX 255
-+# else
-+# define NAME_MAX MAXNAMELEN
-+# endif
-+#endif
-+
- typedef unsigned char * AclBits;
-
- /*
-@@ -73,7 +83,7 @@ struct plop
- typedef struct acluser
- {
- struct acluser *u_next; /* continue the main user list */
-- char u_name[20+1]; /* login name how he showed up */
-+ char u_name[NAME_MAX+1]; /* login name how he showed up */
- char *u_password; /* his password (may be NullStr). */
- int u_checkpassword; /* nonzero if this u_password is valid */
- int u_detachwin; /* the window where he last detached */
-diff --git a/display.h b/display.h
-index ef99954..563fcd0 100644
---- a/display.h
-+++ b/display.h
-@@ -22,6 +22,16 @@
- * $Id: display.h,v 1.9 1994/05/31 12:31:54 mlschroe Exp $ FAU
- */
-
-+#include <limits.h>
-+
-+#ifndef NAME_MAX
-+# ifndef MAXNAMELEN
-+# define NAME_MAX 255
-+# else
-+# define NAME_MAX MAXNAMELEN
-+# endif
-+#endif
-+
- #ifdef MAPKEYS
-
- #define KMAP_KEYS (T_OCAPS-T_CAPS)
-@@ -85,7 +95,7 @@ struct display
- struct win *d_other; /* pointer to other window */
- int d_nonblock; /* -1 don't block if obufmax reached */
- /* >0: block after nonblock secs */
-- char d_termname[20 + 1]; /* $TERM */
-+ char d_termname[NAME_MAX + 1]; /* $TERM */
- char *d_tentry; /* buffer for tgetstr */
- char d_tcinited; /* termcap inited flag */
- int d_width, d_height; /* width/height of the screen */
-diff --git a/screen.c b/screen.c
-index 70741df..6f45b60 100644
---- a/screen.c
-+++ b/screen.c
-@@ -106,6 +106,16 @@ FILE *dfp;
- #endif
-
-
-+#include <limits.h>
-+
-+#ifndef NAME_MAX
-+# ifndef MAXNAMELEN
-+# define NAME_MAX 255
-+# else
-+# define NAME_MAX MAXNAMELEN
-+# endif
-+#endif
-+
- extern char Term[], screenterm[], **environ, Termcap[];
- int force_vt = 1;
- int VBellWait, MsgWait, MsgMinWait, SilenceWait;
-@@ -877,13 +887,13 @@ char **av;
-
- if (home == 0 || *home == '\0')
- home = ppp->pw_dir;
-- if (strlen(LoginName) > 20)
-+ if (strlen(LoginName) > NAME_MAX)
- Panic(0, "LoginName too long - sorry.");
- #ifdef MULTIUSER
-- if (multi && strlen(multi) > 20)
-+ if (multi && strlen(multi) > NAME_MAX)
- Panic(0, "Screen owner name too long - sorry.");
- #endif
-- if (strlen(home) > MAXPATHLEN - 25)
-+ if (strlen(home) > MAXPATHLEN - NAME_MAX)
- Panic(0, "$HOME too long - sorry.");
-
- attach_tty = "";
-diff --git a/screen.h b/screen.h
-index 4f9f354..bcaaaf6 100644
---- a/screen.h
-+++ b/screen.h
-@@ -43,6 +43,15 @@
- #include "comm.h"
- #include "layer.h"
- #include "term.h"
-+#include <limits.h>
-+
-+#ifndef NAME_MAX
-+# ifndef MAXNAMELEN
-+# define NAME_MAX 255
-+# else
-+# define NAME_MAX MAXNAMELEN
-+# endif
-+#endif
-
-
- #ifdef DEBUG
-@@ -195,26 +204,26 @@ struct msg
- create;
- struct
- {
-- char auser[20 + 1]; /* username */
-+ char auser[NAME_MAX + 1]; /* username */
- int apid; /* pid of frontend */
- int adaptflag; /* adapt window size? */
- int lines, columns; /* display size */
- char preselect[20];
- int esc; /* his new escape character unless -1 */
- int meta_esc; /* his new meta esc character unless -1 */
-- char envterm[20 + 1]; /* terminal type */
-+ char envterm[NAME_MAX + 1]; /* terminal type */
- int encoding; /* encoding of display */
- }
- attach;
- struct
- {
-- char duser[20 + 1]; /* username */
-+ char duser[NAME_MAX + 1]; /* username */
- int dpid; /* pid of frontend */
- }
- detach;
- struct
- {
-- char auser[20 + 1]; /* username */
-+ char auser[NAME_MAX + 1]; /* username */
- int nargs;
- char cmd[MAXPATHLEN]; /* command */
- int apid; /* pid of frontend */
-diff --git a/socket.c b/socket.c
-index 62a73af..1cc9c27 100644
---- a/socket.c
-+++ b/socket.c
-@@ -45,6 +45,16 @@
-
- #include "extern.h"
-
-+#include <limits.h>
-+
-+#ifndef NAME_MAX
-+# ifndef MAXNAMELEN
-+# define NAME_MAX 255
-+# else
-+# define NAME_MAX MAXNAMELEN
-+# endif
-+#endif
-+
- static int CheckPid __P((int));
- static void ExecCreate __P((struct msg *));
- static void DoCommandMsg __P((struct msg *));
-@@ -1248,7 +1258,7 @@ static void PasswordProcessInput __P((char *, int));
-
- struct pwdata {
- int l;
-- char buf[20 + 1];
-+ char buf[NAME_MAX + 1];
- struct msg m;
- };
-
diff --git a/app-misc/screen/files/screen-4.0.1-int-overflow-fix.patch b/app-misc/screen/files/screen-4.0.1-int-overflow-fix.patch
deleted file mode 100644
index 4a40c8dd2c7c..000000000000
--- a/app-misc/screen/files/screen-4.0.1-int-overflow-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- ansi.c.orig 2003-09-08 10:24:44.000000000 -0400
-+++ ansi.c 2003-11-29 10:41:15.000000000 -0500
-@@ -559,7 +559,7 @@
- {
- case '0': case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8': case '9':
-- if (curr->w_NumArgs < MAXARGS)
-+ if (curr->w_NumArgs >= 0 && curr->w_NumArgs < MAXARGS)
- {
- if (curr->w_args[curr->w_NumArgs] < 100000000)
- curr->w_args[curr->w_NumArgs] =
---- resize.c.orig 2003-09-08 10:26:31.000000000 -0400
-+++ resize.c 2003-11-29 10:41:50.000000000 -0500
-@@ -682,6 +682,17 @@
- if (wi == 0)
- he = hi = 0;
-
-+ if (wi > 1000)
-+ {
-+ Msg(0, "Window width too large, truncated");
-+ wi = 1000;
-+ }
-+ if (he > 1000)
-+ {
-+ Msg(0, "Window height too large, truncated");
-+ he = 1000;
-+ }
-+
- if (p->w_width == wi && p->w_height == he && p->w_histheight == hi)
- {
- debug("ChangeWindowSize: No change.\n");
diff --git a/app-misc/screen/files/screen-4.0.1-vsprintf.patch b/app-misc/screen/files/screen-4.0.1-vsprintf.patch
deleted file mode 100644
index b2f7a20f9e92..000000000000
--- a/app-misc/screen/files/screen-4.0.1-vsprintf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- screen-4.0.1/configure.in 2003-06-03 07:58:24.000000000 -0400
-+++ screen-4.0.1/configure.in.agriffis 2004-01-13 12:07:37.000000000 -0500
-@@ -1206,7 +1206,9 @@
- rm -f /tmp/conftest*
-
- AC_MSG_CHECKING(for vsprintf)
--AC_TRY_LINK(,[vsprintf(0,0,0);], AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS), AC_MSG_RESULT(no))
-+AC_TRY_LINK([#include <stdarg.h>],[va_list valist; vsprintf(0,0,valist);],
-+ [AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS)],
-+ [AC_MSG_RESULT(no)])
-
- AC_HEADER_DIRENT
-
diff --git a/app-misc/screen/files/screen-4.0.3-config.h-autoconf-2.62.patch b/app-misc/screen/files/screen-4.0.3-config.h-autoconf-2.62.patch
deleted file mode 100644
index 5605fdac7414..000000000000
--- a/app-misc/screen/files/screen-4.0.3-config.h-autoconf-2.62.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-compability for sys-devel/autoconf-2.62
-
-https://bugs.gentoo.org/show_bug.cgi?id=217311
-
---- screen/config.h.in
-+++ screen/config.h.in
-@@ -563,7 +563,6 @@
- * If you are on a SYS V machine that restricts filename length to 14
- * characters, you may need to enforce that by setting NAME_MAX to 14
- */
--#undef NAME_MAX /* KEEP_UNDEF_HERE override system value */
- #undef NAME_MAX
-
- /*
diff --git a/app-misc/screen/files/screen-4.0.3-cppflags.patch b/app-misc/screen/files/screen-4.0.3-cppflags.patch
deleted file mode 100644
index ee3455ff92f6..000000000000
--- a/app-misc/screen/files/screen-4.0.3-cppflags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- screen-4.0.3/Makefile.in
-+++ screen-4.0.3/Makefile.in
-@@ -68,7 +68,7 @@
- $(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS)
-
- .c.o:
-- $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $<
-+ $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CPPFLAGS) $(CFLAGS) $<
-
- install_bin: .version screen
- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
-@@ -122,7 +122,7 @@
- sh $(srcdir)/tty.sh tty.c
-
- comm.h: comm.c comm.sh config.h
-- AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
-+ AWK=$(AWK) CC="$(CC) $(CFLAGS) $(CPPFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh
-
- osdef.h: osdef.sh config.h osdef.h.in
- CPP="$(CPP) $(CPPFLAGS)" srcdir=${srcdir} sh $(srcdir)/osdef.sh
diff --git a/app-misc/screen/files/screen-4.0.3-crosscompile.patch b/app-misc/screen/files/screen-4.0.3-crosscompile.patch
deleted file mode 100644
index 6e6bb948b919..000000000000
--- a/app-misc/screen/files/screen-4.0.3-crosscompile.patch
+++ /dev/null
@@ -1,598 +0,0 @@
---- configure.in~ 2008-11-23 17:43:48.000000000 +0000
-+++ configure.in 2008-11-23 17:43:48.000000000 +0000
-@@ -46,6 +46,7 @@
- AC_PROG_GCC_TRADITIONAL
- AC_ISC_POSIX
-
-+AC_MSG_CHECKING([for compiler sanity])
- AC_TRY_RUN(main(){exit(0);},,[
- if test $CC != cc ; then
- AC_NOTE(Your $CC failed - restarting with CC=cc)
-@@ -54,22 +55,17 @@
- export CC
- exec $0 $configure_args
- fi
--])
--
--AC_TRY_RUN(main(){exit(0);},,
--exec 5>&2
--eval $ac_link
--AC_NOTE(CC=$CC; CFLAGS=$CFLAGS; LIBS=$LIBS;)
--AC_NOTE($ac_compile)
--AC_MSG_ERROR(Can't run the compiler - sorry))
-+],AC_MSG_WARN([skipping test due to crosscompilation]))
-
-+AC_MSG_CHECKING([if compiler sets exit status])
- AC_TRY_RUN([
- main()
- {
- int __something_strange_();
- __something_strange_(0);
- }
--],AC_MSG_ERROR(Your compiler does not set the exit status - sorry))
-+],AC_MSG_ERROR(Your compiler does not set the exit status - sorry),,
-+AC_MSG_WARN(skipping test due to crosscompilation))
-
- AC_PROG_AWK
-
-@@ -103,6 +99,7 @@
- dnl
- dnl **** special unix variants ****
- dnl
-+AH_TEMPLATE(ISC,[])
- if test -n "$ISC"; then
- AC_DEFINE(ISC) LIBS="$LIBS -linet"
- fi
-@@ -114,11 +111,13 @@
- dnl fi
- dnl fi
-
-+AH_TEMPLATE([sysV68],[])
- if test -f /sysV68 ; then
- AC_DEFINE(sysV68)
- fi
-
- AC_CHECKING(for MIPS)
-+AH_TEMPLATE([MIPS],[])
- if test -f /lib/libmld.a || test -f /usr/lib/libmld.a || test -f /usr/lib/cmplrs/cc/libmld.a; then
- oldlibs="$LIBS"
- test -f /bin/mx || LIBS="$LIBS -lmld" # for nlist. But not on alpha.
-@@ -132,6 +131,8 @@
- AC_CHECKING(wait3)
- AC_TRY_LINK(,[wait3();], ,
- AC_CHECKING(wait2)
-+AH_TEMPLATE([USE_WAIT2],[On RISCOS we prefer wait2() over wait3(). rouilj@sni-usa.com])
-+dnl TODO(Hannes) shipped config.h.in wraps the define in #ifdef BSDWAIT
- AC_TRY_LINK(,[wait2();],
- dnl John Rouillard (rouilj@sni-usa.com):
- dnl need -I/usr/include/bsd in RISCOS otherwise sockets are broken, no
-@@ -154,9 +155,11 @@
- oldlibs="$LIBS"
- LIBS="$LIBS -lpyr"
- AC_CHECKING(Pyramid OSX)
-+AH_TEMPLATE([OSX], [Pyramid OSX])
- AC_TRY_LINK(,[open_controlling_pty("")], AC_DEFINE(OSX), LIBS="$oldlibs")
- fi
-
-+AH_TEMPLATE([POSIX],[Define POSIX if your system supports IEEE Std 1003.1-1988 (POSIX).])
- dnl ghazi@caip.rutgers.edu (Kaveh R. Ghazi):
- dnl BBN butterfly is not POSIX, but a MACH BSD system.
- dnl Do not define POSIX and TERMIO.
-@@ -183,6 +186,7 @@
- fi
-
- AC_CHECKING(for System V)
-+AH_TEMPLATE([SYSV], [Define SYSV if your machine is SYSV complient (Sys V, HPUX, A/UX)])
- AC_TRY_COMPILE(
- [#include <sys/types.h>
- #include <signal.h>
-@@ -226,6 +230,9 @@
- dnl
-
- AC_CHECKING(BSD job jontrol)
-+AH_TEMPLATE([BSDJOBS],
-+[Define BSDJOBS if you have BSD-style job control (both process
-+ groups and a tty that deals correctly with them)])
- AC_TRY_LINK(
- [#include <sys/types.h>
- #include <sys/ioctl.h>
-@@ -246,6 +253,10 @@
- dnl **** setreuid(), seteuid() ****
- dnl
- AC_CHECKING(setreuid)
-+AH_TEMPLATE([HAVE_SETREUID],
-+[If your system has the calls setreuid() and setregid(),
-+ define HAVE_SETREUID. Otherwise screen will use a forked process to
-+ safely create output files without retaining any special privileges.])
- AC_TRY_LINK(,[
- #ifdef __hpux
- setresuid(0, 0, 0);
-@@ -260,6 +271,9 @@
- dnl Solaris seteuid doesn't change the saved uid, bad for
- dnl multiuser screen sessions
- AC_CHECKING(seteuid)
-+AH_TEMPLATE([HAVE_SETEUID],
-+[If your system supports BSD4.4's seteuid() and setegid(), define
-+ HAVE_SETEUID.])
- AC_TRY_LINK(,[
- #if defined(linux) || defined(NeXT) || defined(_AUX_SOURCE) || defined(AUX) || defined(ultrix) || (defined(sun) && defined(SVR4)) || defined(ISC) || defined(sony_news)
- seteuid_is_broken(0);
-@@ -284,6 +298,8 @@
- dnl
-
- AC_CHECKING(fifos)
-+AC_CACHE_CHECK([usable fifos],
-+ [screen_cv_sys_fifo_usable],
- AC_TRY_RUN([
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -348,12 +364,15 @@
- exit(1);
- exit(0);
- }
--], AC_NOTE(- your fifos are usable) fifo=1,
--AC_NOTE(- your fifos are not usable))
-+], screen_cv_sys_fifo_usable=yes, screen_cv_sys_fifo_usable=no))
- rm -f /tmp/conftest*
-
--if test -n "$fifo"; then
--AC_CHECKING(for broken fifo implementation)
-+if test X"$screen_cv_sys_fifo_usable" = Xyes; then
-+AH_TEMPLATE([BROKEN_PIPE],
-+[Define this if your system exits select() immediatly if a pipe is
-+ opened read-only and no writer has opened it.])
-+AC_CACHE_CHECK([broken fifo implementation],
-+ [screen_cv_sys_fifo_broken_impl],
- AC_TRY_RUN([
- #include <sys/types.h>
- #include <fcntl.h>
-@@ -398,9 +416,12 @@
- exit(1);
- exit(0);
- }
--], AC_NOTE(- your implementation is ok),
--AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1)
-+], screen_cv_sys_fifo_broken_impl=no,
-+screen_cv_sys_fifo_broken_impl=yes))
-+if test X"$screen_cv_sys_fifo_broken_impl" = Xyes; then
-+ AC_DEFINE(BROKEN_PIPE)
-+fi
- rm -f /tmp/conftest*
- fi
-
- dnl
-@@ -410,6 +430,8 @@
- dnl
-
- AC_CHECKING(sockets)
-+AC_CACHE_CHECK([sockets are usable],
-+ [screen_cv_sys_sockets_usable],
- AC_TRY_RUN([
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -460,12 +482,16 @@
- exit(1);
- exit(0);
- }
--], AC_NOTE(- your sockets are usable) sock=1,
--AC_NOTE(- your sockets are not usable))
--rm -f /tmp/conftest*
-+], screen_cv_sys_sockets_usable=yes,
-+screen_cv_sys_sockets_usable=no))
-
--if test -n "$sock"; then
-+if test X"$screen_cv_sys_sockets_usable" = Xyes; then
- AC_CHECKING(socket implementation)
-+AH_TEMPLATE([SOCK_NOT_IN_FS],
-+[Define this if the unix-domain socket implementation doesn't
-+ create a socket in the filesystem.])
-+AC_CACHE_CHECK([if sockets are not stored in the filesystem],
-+ [screen_cv_sys_sockets_nofs],
- AC_TRY_RUN([
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -491,22 +517,25 @@
- close(s);
- exit(0);
- }
--],AC_NOTE(- you are normal),
--AC_NOTE(- unix domain sockets are not kept in the filesystem)
--AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1)
--rm -f /tmp/conftest*
-+], screen_cv_sys_sockets_nofs=no,
-+screen_cv_sys_sockets_nofs=yes))
-+
-+if test X"$screen_cv_sys_sockets_nofs" = Xyes; then
-+ AC_DEFINE(SOCK_NOT_IN_FS)
-+fi
- fi
-
-
- dnl
- dnl **** choose sockets or fifos ****
- dnl
--if test -n "$fifo"; then
-- if test -n "$sock"; then
-- if test -n "$nore"; then
-+AH_TEMPLATE([NAMEDPIPE], [Define this if your system supports named pipes.])
-+if test X"$screen_cv_sys_fifo_usable" = Xyes; then
-+ if test X"$screen_cv_sys_sockets_usable" = Xyes; then
-+ if test X"$screen_cv_sys_sockets_nofs" = Xyes; then
- AC_NOTE(- hmmm... better take the fifos)
- AC_DEFINE(NAMEDPIPE)
-- elif test -n "$fifobr"; then
-+ elif test X"$screen_cv_sys_fifo_broken_impl" = Xyes; then
- AC_NOTE(- as your fifos are broken lets use the sockets.)
- else
- AC_NOTE(- both sockets and fifos usable. let's take fifos.)
-@@ -516,7 +545,7 @@
- AC_NOTE(- using named pipes, of course)
- AC_DEFINE(NAMEDPIPE)
- fi
--elif test -n "$sock"; then
-+elif test X"$screen_cv_sys_sockets_usable" = Xyes; then
- AC_NOTE(- using unix-domain sockets, of course)
- else
- AC_MSG_ERROR(you have neither usable sockets nor usable pipes -> no screen)
-@@ -526,7 +555,11 @@
- dnl **** check the select implementation ****
- dnl
-
--AC_CHECKING(select return value)
-+AH_TEMPLATE([SELECT_BROKEN],
-+[If the select return value doesn't treat a descriptor that is
-+ usable for reading and writing as two hits, define SELECT_BROKEN.])
-+AC_CACHE_CHECK([for broken select return value],
-+ [screen_cv_sys_select_broken_retval],
- AC_TRY_RUN([
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -625,17 +658,26 @@
- exit(1);
- exit(0);
- }
--],AC_NOTE(- select is ok),
--AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN))
-+], screen_cv_sys_select_broken_retval=no,
-+screen_cv_sys_select_broken_retval=yes))
-+if test X"$screen_cv_sys_select_broken_retval" = Xyes; then
-+ AC_DEFINE(SELECT_BROKEN)
-+fi
-
- dnl
- dnl **** termcap or terminfo ****
- dnl
-+AH_TEMPLATE([TERMINFO],
-+[Define TERMINFO if your machine emulates the termcap routines
-+ with the terminfo database.
-+ Thus the .screenrc file is parsed for
-+ the command 'terminfo' and not 'termcap'])
-+
- AC_CHECKING(for tgetent)
- AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
- olibs="$LIBS"
--LIBS="-lcurses $olibs"
- AC_CHECKING(libcurses)
-+AC_CHECK_LIB(ncursesw,tgetent)
- AC_TRY_LINK(,[
- #ifdef __hpux
- __sorry_hpux_libcurses_is_totally_broken_in_10_10();
-@@ -654,24 +696,39 @@
- AC_TRY_LINK(,tgetent((char *)0, (char *)0);,,
- AC_MSG_ERROR(!!! no tgetent - no screen))))))
-
--AC_TRY_RUN([
-+AC_CACHE_CHECK([using terminfo database],[screen_cv_sys_terminfo_used],
-+ AC_TRY_RUN([
- main()
- {
- exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1);
--}], AC_NOTE(- you use the termcap database),
--AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO))
-+}
-+ ], screen_cv_sys_terminfo_used=no,
-+ screen_cv_sys_terminfo_used=yes)
-+)
-+
-+if test X"$screen_cv_sys_terminfo_used" = Xyes; then
-+ AC_DEFINE(TERMINFO)
-+fi
-+
- AC_CHECKING(ospeed)
-+AH_TEMPLATE([NEED_OSPEED],[If your library does not define ospeed, define this.])
- AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED))
-
- dnl
- dnl **** PTY specific things ****
- dnl
-+AH_TEMPLATE([HAVE_DEV_PTC],
-+[define HAVE_DEV_PTC if you have a /dev/ptc character special
-+ device.])
- AC_CHECKING(for /dev/ptc)
- if test -r /dev/ptc; then
- AC_DEFINE(HAVE_DEV_PTC)
- fi
-
- AC_CHECKING(for SVR4 ptys)
-+AH_TEMPLATE([HAVE_SVR4_PTYS],
-+[define HAVE_SVR4_PTYS if you have a /dev/ptmx character special
-+ device and support the ptsname(), grantpt(), unlockpt() functions.])
- sysvr4ptys=
- if test -c /dev/ptmx ; then
- AC_TRY_LINK([],[ptsname(0);grantpt(0);unlockpt(0);],[AC_DEFINE(HAVE_SVR4_PTYS)
-@@ -687,6 +744,13 @@
- fi
-
- AC_CHECKING(for ptyranges)
-+AH_TEMPLATE([PTYRANGE0],
-+[define PTYRANGE0 and or PTYRANGE1 if you want to adapt screen
-+ to unusual environments. E.g. For SunOs the defaults are "qpr" and
-+ "0123456789abcdef". For SunOs 4.1.2
-+ #define PTYRANGE0 "pqrstuvwxyzPQRST"
-+ is recommended by Dan Jacobson.])
-+AH_TEMPLATE([PTYRANGE1],[])
- if test -d /dev/ptym ; then
- pdir='/dev/ptym'
- else
-@@ -850,20 +914,39 @@
- dnl
- dnl **** loadav ****
- dnl
-+
-+AH_TEMPLATE([LOADAV],
-+[If you want the "time" command to display the current load average
-+ define LOADAV. Maybe you must install screen with the needed
-+ privileges to read /dev/kmem.
-+ Note that NLIST_ stuff is only checked, when getloadavg() is not available.
-+])
-+AH_TEMPLATE([LOADAV_NUM])
-+AH_TEMPLATE([LOADAV_TYPE])
-+AH_TEMPLATE([LOADAV_SCALE])
-+AH_TEMPLATE([LOADAV_GETLOADAVG])
-+AH_TEMPLATE([LOADAV_UNIX])
-+AH_TEMPLATE([LOADAV_AVENRUN])
-+AH_TEMPLATE([LOADAV_USE_NLIST64])
-+
-+AH_TEMPLATE([NLIST_DECLARED])
-+AH_TEMPLATE([NLIST_STRUCT])
-+AH_TEMPLATE([NLIST_NAME_UNION])
-+
- AC_CHECKING(for libutil(s))
--test -f /usr/lib/libutils.a && LIBS="$LIBS -lutils"
--test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil"
-+dnl I have no idea whether "login" is an appropriate symbol to check for here - Hannes
-+AC_CHECK_LIB(utils,login)
-+AC_CHECK_LIB(util,login)
-
- AC_CHECKING(getloadavg)
- AC_TRY_LINK(,[getloadavg((double *)0, 0);],
- AC_DEFINE(LOADAV_GETLOADAVG) load=1,
--if test -f /usr/lib/libkvm.a ; then
- olibs="$LIBS"
--LIBS="$LIBS -lkvm"
-+AC_CHECK_LIB(kvm,kvm_open,
- AC_CHECKING(getloadavg with -lkvm)
- AC_TRY_LINK(,[getloadavg((double *)0, 0);],
- AC_DEFINE(LOADAV_GETLOADAVG) load=1, LIBS="$olibs")
--fi
-+)
- )
-
- if test -z "$load" ; then
-@@ -1005,6 +1088,11 @@
- dnl
- dnl **** signal handling ****
- dnl
-+
-+AH_TEMPLATE([SIGVOID],
-+[Define SIGVOID if your signal handlers return void. On older
-+ systems, signal returns int, but on newer ones, it returns void.])
-+
- if test -n "$posix" ; then
-
- dnl POSIX has reliable signals with void return type.
-@@ -1014,6 +1102,7 @@
- else
-
- AC_CHECKING(return type of signal handlers)
-+AH_TEMPLATE([USESIGSET], [Define USESIGSET if you have sigset for BSD 4.1 reliable signals.])
- AC_TRY_COMPILE(
- [#include <sys/types.h>
- #include <signal.h>
-@@ -1033,6 +1122,9 @@
- #endif
- ], AC_DEFINE(USESIGSET))
- AC_CHECKING(signal implementation)
-+AH_TEMPLATE([SYSVSIGS],
-+[Define SYSVSIGS if signal handlers must be reinstalled after
-+ they have been called.])
- AC_TRY_RUN([
- #include <sys/types.h>
- #include <signal.h>
-@@ -1075,13 +1167,14 @@
- dnl
-
- AC_CHECKING(for crypt and sec libraries)
--test -f /lib/libcrypt_d.a || test -f /usr/lib/libcrypt_d.a && LIBS="$LIBS -lcrypt_d"
-+dnl I have no idea whether "crypt" is an appropriate symbol to check for here - Hannes
-+AC_CHECK_LIB(crypt_d,crypt)
- oldlibs="$LIBS"
--LIBS="$LIBS -lcrypt"
- AC_CHECKING(crypt)
- AC_TRY_LINK(,,,LIBS="$oldlibs")
--test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec"
--test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow"
-+AC_CHECK_LIB(crypt,crypt)
-+AC_CHECK_LIB(sec,crypt)
-+AC_CHECK_LIB(shadow,getspnam)
- oldlibs="$LIBS"
- LIBS="$LIBS -lsun"
- AC_CHECKING(IRIX sun library)
-@@ -1104,6 +1197,13 @@
- dnl **** misc things ****
- dnl
- AC_CHECKING(wait union)
-+AH_TEMPLATE([BSDWAIT],
-+[Define BSDWAIT if your system defines a 'union wait' in <sys/wait.h>
-+
-+ Only allow BSDWAIT i.e. wait3 on nonposix systems, since
-+ posix implies wait(3) and waitpid(3). vdlinden@fwi.uva.nl
-+ TODO(Hannes) shipped config.h.in does that with a #ifdef
-+])
- AC_TRY_COMPILE([#include <sys/types.h>
- #include <sys/wait.h>
- ],[
-@@ -1114,6 +1214,13 @@
- #endif
- ],AC_DEFINE(BSDWAIT))
-
-+AH_TEMPLATE([TERMIO],
-+[Define TERMIO if you have struct termio instead of struct sgttyb.
-+ This is usually the case for SVID systems, where BSD uses sgttyb.
-+ POSIX systems should define this anyway, even though they use
-+ struct termios.])
-+
-+
- if test -z "$butterfly"; then
- AC_CHECKING(for termio or termios)
- AC_TRY_CPP([#include <termio.h>], AC_DEFINE(TERMIO),
-@@ -1123,17 +1230,35 @@
- )
- fi
-
-+AH_TEMPLATE([CYTERMIO], [Define CYTERMIO if you have cyrillic termio modes.])
-+
- dnl AC_CHECK_HEADER(shadow.h, AC_DEFINE(SHADOWPW))
- AC_CHECKING(getspnam)
-+AH_TEMPLATE([SHADOWPW],
-+[If the passwords are stored in a shadow file and you want the
-+ builtin lock to work properly, define SHADOWPW.])
- AC_TRY_LINK([#include <shadow.h>], [getspnam("x");],AC_DEFINE(SHADOWPW))
-
- AC_CHECKING(getttyent)
-+AH_TEMPLATE([GETTTYENT],
-+[If your system has the new format /etc/ttys (like 4.3 BSD) and the
-+ getttyent(3) library functions, define GETTTYENT.])
- AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT))
-
- AC_CHECKING(fdwalk)
-+AH_TEMPLATE([HAVE_FDWALK],
-+[Newer versions of Solaris include fdwalk, which can greatly improve
-+ the startup time of screen; otherwise screen spends a lot of time
-+ closing file descriptors.])
- AC_TRY_LINK([#include <stdlib.h>], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK))
-
--AC_CHECKING(whether memcpy/memmove/bcopy handles overlapping arguments)
-+AH_TEMPLATE([USEBCOPY],
-+[Define USEBCOPY if the bcopy/memcpy from your system's C library
-+ supports the overlapping of source and destination blocks. When
-+ undefined, screen uses its own (probably slower) version of bcopy().])
-+
-+AC_CACHE_CHECK([if bcopy handles overlap],
-+ [screen_cv_sys_bcopy_overlap],
- AC_TRY_RUN([
- main() {
- char buf[10];
-@@ -1146,7 +1271,21 @@
- if (strncmp(buf, "cdedef", 6))
- exit(1);
- exit(0); /* libc version works properly. */
--}], AC_DEFINE(USEBCOPY))
-+}], screen_cv_sys_bcopy_overlap=yes,
-+screen_cv_sys_bcopy_overlap=no))
-+if test X"$screen_cv_sys_bcopy_overlap" = Xyes; then
-+ AC_DEFINE(USEBCOPY)
-+fi
-+
-+AH_TEMPLATE([USEMEMMOVE],
-+[SYSV machines may have a working memcpy() -- Oh, this is
-+ quite unlikely. Tell me if you see one.
-+ "But then, memmove() should work, if at all available" he thought...
-+ Boing, never say "works everywhere" unless you checked SCO UNIX.
-+ Their memove fails the test in the configure script. Sigh. (Juergen)
-+])
-+AC_CACHE_CHECK([if memmove handles overlap],
-+ [screen_cv_sys_memmove_overlap],
-
- AC_TRY_RUN([
- #define bcopy(s,d,l) memmove(d,s,l)
-@@ -1161,9 +1300,15 @@
- if (strncmp(buf, "cdedef", 6))
- exit(1);
- exit(0); /* libc version works properly. */
--}], AC_DEFINE(USEMEMMOVE))
--
-+}], screen_cv_sys_memmove_overlap=yes,
-+screen_cv_sys_memmove_overlap=no))
-+if test X"$screen_cv_sys_memmove_overlap" = Xyes; then
-+ AC_DEFINE(USEMEMMOVE)
-+fi
-
-+AH_TEMPLATE([USEMEMCPY],[])
-+AC_CACHE_CHECK([if memcpy handles overlap],
-+ [screen_cv_sys_memcpy_overlap],
- AC_TRY_RUN([
- #define bcopy(s,d,l) memcpy(d,s,l)
- main() {
-@@ -1177,9 +1322,19 @@
- if (strncmp(buf, "cdedef", 6))
- exit(1);
- exit(0); /* libc version works properly. */
--}], AC_DEFINE(USEMEMCPY))
-+}], screen_cv_sys_memcpy_overlap=yes,
-+screen_cv_sys_memcpy_overlap=no))
-+if test X"$screen_cv_sys_memcpy_overlap" = Xyes; then
-+ AC_DEFINE(USEMEMCPY)
-+fi
-
- AC_MSG_CHECKING(long file names)
-+AH_TEMPLATE([NAME_MAX],
-+[If you are on a SYS V machine that restricts filename length to 14
-+ characters, you may need to enforce that by setting NAME_MAX to 14])
-+dnl TODO(Hannes) shipped config.h.in has
-+dnl #undef NAME_MAX /* KEEP_UNDEF_HERE override system value */
-+dnl ahead of this
- (echo 1 > /tmp/conftest9012345) 2>/dev/null
- (echo 2 > /tmp/conftest9012346) 2>/dev/null
- val=`cat /tmp/conftest9012345 2>/dev/null`
-@@ -1192,6 +1347,10 @@
- rm -f /tmp/conftest*
-
- AC_MSG_CHECKING(for vsprintf)
-+AH_TEMPLATE([USEVARARGS],
-+[If your system has vsprintf() and requires the use of the macros in
-+ "varargs.h" to use functions with variable arguments,
-+ define USEVARARGS.])
- AC_TRY_LINK([#include <stdarg.h>],[va_list valist; vsprintf(0,0,valist);],
- [AC_MSG_RESULT(yes);AC_DEFINE(USEVARARGS)],
- [AC_MSG_RESULT(no)])
-@@ -1199,12 +1358,19 @@
- AC_HEADER_DIRENT
-
- AC_MSG_CHECKING(for setenv)
-+AH_TEMPLATE([USESETENV], [If your system has setenv() and unsetenv() define USESETENV])
- AC_TRY_LINK(,[setenv((char *)0,(char *)0);unsetenv((char *)0);], AC_MSG_RESULT(yes);AC_DEFINE(USESETENV),
- AC_MSG_RESULT(no)
- AC_MSG_CHECKING(for putenv)
-+AH_TEMPLATE([NEEDPUTENV],
-+[If your system does not come with a setenv()/putenv()/getenv()
-+ functions, you may bring in our own code by defining NEEDPUTENV.])
- AC_TRY_LINK(,[putenv((char *)0);unsetenv((char *)0);], AC_MSG_RESULT(yes) , AC_MSG_RESULT(no);AC_DEFINE(NEEDPUTENV)
- ))
- AC_MSG_CHECKING([for nl_langinfo(CODESET)])
-+AH_TEMPLATE([HAVE_NL_LANGINFO],
-+[define HAVE_NL_LANGINFO if your system has the nl_langinfo() call
-+ and <langinfo.h> defines CODESET.])
- AC_TRY_LINK([
- #include <langinfo.h>
- ],[nl_langinfo(CODESET);], AC_MSG_RESULT(yes);AC_DEFINE(HAVE_NL_LANGINFO), AC_MSG_RESULT(no))
-@@ -1254,7 +1420,8 @@
- dnl Ptx bug workaround -- insert -lc after -ltermcap
- test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq"
-
--AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.))
-+AC_MSG_CHECKING(compiler sanity)
-+AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.), AC_MSG_WARN(Skipping test due to crosscompilation))
-
- ETCSCREENRC="\"/usr/local/etc/screenrc\""
- if test -n "$prefix"; then
diff --git a/app-misc/screen/files/screen-4.0.3-setenv_autoconf.patch b/app-misc/screen/files/screen-4.0.3-setenv_autoconf.patch
deleted file mode 100644
index e47a15d66c23..000000000000
--- a/app-misc/screen/files/screen-4.0.3-setenv_autoconf.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- configure.in.DIST 2006-10-31 21:39:07.010473000 -0800
-+++ configure.in 2006-10-31 21:43:05.630162000 -0800
-@@ -1211,15 +1211,32 @@
- AC_HEADER_DIRENT
-
- AC_MSG_CHECKING(for setenv)
--AH_TEMPLATE([USESETENV], [If your system has setenv() and unsetenv() define USESETENV])
--AC_TRY_LINK(,[setenv((char *)0,(char *)0);unsetenv((char *)0);], AC_MSG_RESULT(yes);AC_DEFINE(USESETENV),
--AC_MSG_RESULT(no)
--AC_MSG_CHECKING(for putenv)
--AH_TEMPLATE([NEEDPUTENV],
--[If your system does not come with a setenv()/putenv()/getenv()
-- functions, you may bring in our own code by defining NEEDPUTENV.])
--AC_TRY_LINK(,[putenv((char *)0);unsetenv((char *)0);], AC_MSG_RESULT(yes) , AC_MSG_RESULT(no);AC_DEFINE(NEEDPUTENV)
--))
-+if test -z "$ac_setenv_args"; then
-+ AC_TRY_LINK(
-+ [#include <stdlib.h>],
-+ [
-+ setenv((char *) 0, (char *) 0, 0);
-+ ], ac_setenv_args=3)
-+fi
-+if test -z "$ac_setenv_args"; then
-+ AC_TRY_LINK(
-+ [#include <stdlib.h>],
-+ [
-+ setenv((char *) 0, (char *) 0);
-+ ], ac_setenv_args=2)
-+fi
-+if test -n "$ac_setenv_args"; then
-+ AC_DEFINE(USESETENV)
-+ if test "$ac_setenv_args" = 3; then
-+ AC_DEFINE(HAVE_SETENV_3)
-+ elif test "$ac_setenv_args" = 2; then
-+ AC_DEFINE(HAVE_SETENV_2)
-+ fi
-+else
-+ AC_MSG_RESULT(no)
-+ AC_MSG_CHECKING(for putenv)
-+ AC_TRY_LINK(,[putenv((char *)0);unsetenv((char *)0);], AC_MSG_RESULT(yes) , AC_MSG_RESULT(no);AC_DEFINE(NEEDPUTENV))
-+fi
- AC_MSG_CHECKING([for nl_langinfo(CODESET)])
- AH_TEMPLATE([HAVE_NL_LANGINFO],
- [define HAVE_NL_LANGINFO if your system has the nl_langinfo() call
---- config.h.in.DIST 2006-10-31 21:43:23.233714000 -0800
-+++ config.h.in 2006-10-31 21:44:27.346275000 -0800
-@@ -548,6 +548,16 @@
- #undef USESETENV
-
- /*
-+ * If setenv() takes 3 arguments define HAVE_SETENV_3
-+ */
-+#undef HAVE_SETENV_3
-+
-+/*
-+ * If setenv() takes 2 arguments define HAVE_SETENV_2
-+ */
-+#undef HAVE_SETENV_2
-+
-+/*
- * If your system does not come with a setenv()/putenv()/getenv()
- * functions, you may bring in our own code by defining NEEDPUTENV.
- */
---- misc.c.DIST 2006-10-31 20:55:42.481760000 -0800
-+++ misc.c 2006-10-31 21:53:24.143551000 -0800
-@@ -613,11 +613,11 @@
- */
- # endif /* NEEDSETENV */
- #else /* USESETENV */
--# if defined(linux) || defined(__convex__) || (BSD >= 199103)
-+# if HAVE_SETENV_3
- setenv(var, value, 1);
- # else
- setenv(var, value);
--# endif /* linux || convex || BSD >= 199103 */
-+# endif /* HAVE_SETENV_3 */
- #endif /* USESETENV */
- }
-
diff --git a/app-misc/screen/screen-4.0.3-r6.ebuild b/app-misc/screen/screen-4.0.3-r6.ebuild
deleted file mode 100644
index bcea1e7538d1..000000000000
--- a/app-misc/screen/screen-4.0.3-r6.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-WANT_AUTOCONF="2.5"
-
-inherit eutils flag-o-matic toolchain-funcs pam autotools user
-
-DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nethack pam selinux multiuser"
-
-DEPEND=">=sys-libs/ncurses-5.2
- pam? ( virtual/pam )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-screen )"
-
-pkg_setup() {
- # Make sure utmp group exists, as it's used later on.
- enewgroup utmp 406
-}
-
-src_prepare() {
- # Bug 34599: integer overflow in 4.0.1
- # (Nov 29 2003 -solar)
- epatch "${FILESDIR}"/screen-4.0.1-int-overflow-fix.patch
-
- # Bug 31070: configure problem which affects alpha
- # (13 Jan 2004 agriffis)
- epatch "${FILESDIR}"/screen-4.0.1-vsprintf.patch
-
- # uclibc doesnt have sys/stropts.h
- if ! (echo '#include <sys/stropts.h>' | $(tc-getCC) -E - &>/dev/null) ; then
- epatch "${FILESDIR}"/4.0.2-no-pty.patch
- fi
-
- # Don't use utempter even if it is found on the system
- epatch "${FILESDIR}"/4.0.2-no-utempter.patch
-
- # Don't link against libelf even if it is found on the system
- epatch "${FILESDIR}"/4.0.2-no-libelf.patch
-
- # Patch for time function on 64bit systems
- epatch "${FILESDIR}"/4.0.2-64bit-time.patch
-
- # Patch that makes %u work for windowlist -b formats
- epatch "${FILESDIR}"/4.0.2-windowlist-multiuser-fix.patch
-
- # Open tty in non-blocking mode
- epatch "${FILESDIR}"/4.0.2-nonblock.patch
-
- # compability for sys-devel/autoconf-2.62
- epatch "${FILESDIR}"/screen-4.0.3-config.h-autoconf-2.62.patch
-
- # crosscompile patch
- epatch "${FILESDIR}"/"${P}"-crosscompile.patch
-
- # sched.h is a system header and causes problems with some C libraries
- mv sched.h _sched.h || die
- sed -i '/include/s:sched.h:_sched.h:' screen.h || die
-
- # Allow for more rendition (color/attribute) changes in status bars
- sed -i \
- -e "s:#define MAX_WINMSG_REND 16:#define MAX_WINMSG_REND 64:" \
- screen.c \
- || die "sed screen.c failed"
-
- # Fix manpage.
- sed -i \
- -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/usr/local/screens:${EPREFIX}/var/run/screen:g" \
- -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
- -e "s:/local/screens/S-:${EPREFIX}/var/run/screen/S-:g" \
- doc/screen.1 \
- || die "sed doc/screen.1 failed"
-
- # proper setenv detection for Solaris
- epatch "${FILESDIR}"/${P}-setenv_autoconf.patch
-
- # Allow TERM string large enough to use with rxvt-unicode-256color
- # Allow usernames up to 32 chars
- epatch "${FILESDIR}"/${PV}-extend-d_termname-ng2.patch
-
- # support CPPFLAGS
- epatch "${FILESDIR}"/${P}-cppflags.patch
-
- sed \
- -e 's:termlib:tinfo:g' \
- -i configure.in || die
-
- # reconfigure
- eautoconf
-}
-
-src_configure() {
- append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
- [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
-
- use nethack || append-cppflags "-DNONETHACK"
- use debug && append-cppflags "-DDEBUG"
-
- econf \
- --with-socket-dir="${EPREFIX}/var/run/screen" \
- --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
- --with-pty-mode=0620 \
- --with-pty-group=5 \
- --enable-rxvt_osc \
- --enable-telnet \
- --enable-colors256 \
- $(use_enable pam) \
- $(use multiuser || echo --disable-socket-dir)
-
- # Second try to fix bug 12683, this time without changing term.h
- # The last try seemed to break screen at run-time.
- # (16 Jan 2003 agriffis)
- LC_ALL=POSIX make term.h || die "Failed making term.h"
-}
-
-src_install() {
- dobin screen
-
- if use multiuser || use prefix
- then
- fperms 4755 /usr/bin/screen
- else
- fowners root:utmp /usr/bin/screen
- fperms 2755 /usr/bin/screen
- fi
-
- insinto /usr/share/screen
- doins terminfo/{screencap,screeninfo.src}
- insinto /usr/share/screen/utf8encodings
- doins utf8encodings/??
- insinto /etc
- doins "${FILESDIR}"/screenrc
-
- pamd_mimic_system screen auth
-
- dodoc \
- README ChangeLog INSTALL TODO NEWS* patchlevel.h \
- doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-
- doman doc/screen.1
- doinfo doc/screen.info*
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]
- then
- elog "Some dangerous key bindings have been removed or changed to more safe values."
- elog "We enable some xterm hacks in our default screenrc, which might break some"
- elog "applications. Please check /etc/screenrc for information on these changes."
- fi
-}
diff --git a/app-misc/screen/screen-4.0.3-r7.ebuild b/app-misc/screen/screen-4.0.3-r7.ebuild
deleted file mode 100644
index 63d6ed99a75c..000000000000
--- a/app-misc/screen/screen-4.0.3-r7.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-WANT_AUTOCONF="2.5"
-
-inherit eutils flag-o-matic toolchain-funcs pam autotools user
-
-DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nethack pam selinux multiuser"
-
-DEPEND=">=sys-libs/ncurses-5.2
- pam? ( virtual/pam )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-screen )"
-
-pkg_setup() {
- # Make sure utmp group exists, as it's used later on.
- enewgroup utmp 406
-}
-
-src_prepare() {
- # Bug 34599: integer overflow in 4.0.1
- # (Nov 29 2003 -solar)
- epatch "${FILESDIR}"/screen-4.0.1-int-overflow-fix.patch
-
- # Bug 31070: configure problem which affects alpha
- # (13 Jan 2004 agriffis)
- epatch "${FILESDIR}"/screen-4.0.1-vsprintf.patch
-
- # uclibc doesnt have sys/stropts.h
- if ! (echo '#include <sys/stropts.h>' | $(tc-getCC) -E - &>/dev/null) ; then
- epatch "${FILESDIR}"/4.0.2-no-pty.patch
- fi
-
- # Don't use utempter even if it is found on the system
- epatch "${FILESDIR}"/4.0.2-no-utempter.patch
-
- # Don't link against libelf even if it is found on the system
- epatch "${FILESDIR}"/4.0.2-no-libelf.patch
-
- # Patch for time function on 64bit systems
- epatch "${FILESDIR}"/4.0.2-64bit-time.patch
-
- # Patch that makes %u work for windowlist -b formats
- epatch "${FILESDIR}"/4.0.2-windowlist-multiuser-fix.patch
-
- # Open tty in non-blocking mode
- epatch "${FILESDIR}"/4.0.2-nonblock.patch
-
- # compability for sys-devel/autoconf-2.62
- epatch "${FILESDIR}"/screen-4.0.3-config.h-autoconf-2.62.patch
-
- # crosscompile patch
- epatch "${FILESDIR}"/"${P}"-crosscompile.patch
-
- # sched.h is a system header and causes problems with some C libraries
- mv sched.h _sched.h || die
- sed -i '/include/s:sched.h:_sched.h:' screen.h || die
-
- # Allow for more rendition (color/attribute) changes in status bars
- sed -i \
- -e "s:#define MAX_WINMSG_REND 16:#define MAX_WINMSG_REND 64:" \
- screen.c \
- || die "sed screen.c failed"
-
- # Fix manpage.
- sed -i \
- -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/usr/local/screens:${EPREFIX}/var/run/screen:g" \
- -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
- -e "s:/local/screens/S-:${EPREFIX}/var/run/screen/S-:g" \
- doc/screen.1 \
- || die "sed doc/screen.1 failed"
-
- # proper setenv detection for Solaris
- epatch "${FILESDIR}"/${P}-setenv_autoconf.patch
-
- # Allow TERM string large enough to use with rxvt-unicode-256color
- # Allow usernames up to 32 chars
- epatch "${FILESDIR}"/${PV}-extend-d_termname-ng2.patch
-
- # support CPPFLAGS
- epatch "${FILESDIR}"/${P}-cppflags.patch
-
- sed \
- -e 's:termlib:tinfo:g' \
- -i configure.in || die
-
- # reconfigure
- eautoconf
-}
-
-src_configure() {
- append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
- [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
-
- use nethack || append-cppflags "-DNONETHACK"
- use debug && append-cppflags "-DDEBUG"
-
- econf \
- --with-socket-dir="${EPREFIX}/var/run/screen" \
- --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
- --with-pty-mode=0620 \
- --with-pty-group=5 \
- --enable-rxvt_osc \
- --enable-telnet \
- --enable-colors256 \
- $(use_enable pam) \
- $(use multiuser || echo --disable-socket-dir)
-
- # Second try to fix bug 12683, this time without changing term.h
- # The last try seemed to break screen at run-time.
- # (16 Jan 2003 agriffis)
- LC_ALL=POSIX make term.h || die "Failed making term.h"
-}
-
-src_install() {
- dobin screen
-
- if use multiuser || use prefix
- then
- fperms 4755 /usr/bin/screen
- else
- fowners root:utmp /usr/bin/screen
- fperms 2755 /usr/bin/screen
- fi
-
- insinto /usr/share/screen
- doins terminfo/{screencap,screeninfo.src}
- insinto /usr/share/screen/utf8encodings
- doins utf8encodings/??
- insinto /etc
- doins "${FILESDIR}"/screenrc
-
- pamd_mimic_system screen auth
-
- dodoc \
- README ChangeLog INSTALL TODO NEWS* patchlevel.h \
- doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-
- doman doc/screen.1
- doinfo doc/screen.info*
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]
- then
- elog "Some dangerous key bindings have been removed or changed to more safe values."
- elog "We enable some xterm hacks in our default screenrc, which might break some"
- elog "applications. Please check /etc/screenrc for information on these changes."
- fi
-}
diff --git a/app-misc/screen/screen-4.0.3-r8.ebuild b/app-misc/screen/screen-4.0.3-r8.ebuild
deleted file mode 100644
index 3e574a1fbce8..000000000000
--- a/app-misc/screen/screen-4.0.3-r8.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-WANT_AUTOCONF="2.5"
-
-inherit eutils flag-o-matic toolchain-funcs pam autotools user
-
-DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-SRC_URI="ftp://ftp.uni-erlangen.de/pub/utilities/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nethack pam selinux multiuser"
-
-DEPEND=">=sys-libs/ncurses-5.2
- pam? ( virtual/pam )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-screen )
- !<sys-apps/openrc-0.11.6"
-
-pkg_setup() {
- # Make sure utmp group exists, as it's used later on.
- enewgroup utmp 406
-}
-
-src_prepare() {
- # Bug 34599: integer overflow in 4.0.1
- # (Nov 29 2003 -solar)
- epatch "${FILESDIR}"/screen-4.0.1-int-overflow-fix.patch
-
- # Bug 31070: configure problem which affects alpha
- # (13 Jan 2004 agriffis)
- epatch "${FILESDIR}"/screen-4.0.1-vsprintf.patch
-
- # uclibc doesnt have sys/stropts.h
- if ! (echo '#include <sys/stropts.h>' | $(tc-getCC) -E - &>/dev/null) ; then
- epatch "${FILESDIR}"/4.0.2-no-pty.patch
- fi
-
- # Don't use utempter even if it is found on the system
- epatch "${FILESDIR}"/4.0.2-no-utempter.patch
-
- # Don't link against libelf even if it is found on the system
- epatch "${FILESDIR}"/4.0.2-no-libelf.patch
-
- # Patch for time function on 64bit systems
- epatch "${FILESDIR}"/4.0.2-64bit-time.patch
-
- # Patch that makes %u work for windowlist -b formats
- epatch "${FILESDIR}"/4.0.2-windowlist-multiuser-fix.patch
-
- # Open tty in non-blocking mode
- epatch "${FILESDIR}"/4.0.2-nonblock.patch
-
- # compability for sys-devel/autoconf-2.62
- epatch "${FILESDIR}"/screen-4.0.3-config.h-autoconf-2.62.patch
-
- # crosscompile patch
- epatch "${FILESDIR}"/"${P}"-crosscompile.patch
-
- # sched.h is a system header and causes problems with some C libraries
- mv sched.h _sched.h || die
- sed -i '/include/s:sched.h:_sched.h:' screen.h || die
-
- # Allow for more rendition (color/attribute) changes in status bars
- sed -i \
- -e "s:#define MAX_WINMSG_REND 16:#define MAX_WINMSG_REND 64:" \
- screen.c \
- || die "sed screen.c failed"
-
- # Fix manpage.
- sed -i \
- -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/usr/local/screens:${EPREFIX}/run/screen:g" \
- -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
- -e "s:/local/screens/S-:${EPREFIX}/run/screen/S-:g" \
- doc/screen.1 \
- || die "sed doc/screen.1 failed"
-
- # proper setenv detection for Solaris
- epatch "${FILESDIR}"/${P}-setenv_autoconf.patch
-
- # Allow TERM string large enough to use with rxvt-unicode-256color
- # Allow usernames up to 32 chars
- epatch "${FILESDIR}"/${PV}-extend-d_termname-ng2.patch
-
- # support CPPFLAGS
- epatch "${FILESDIR}"/${P}-cppflags.patch
-
- sed \
- -e 's:termlib:tinfo:g' \
- -i configure.in || die
-
- # reconfigure
- eautoconf
-}
-
-src_configure() {
- append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
- [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl
-
- use nethack || append-cppflags "-DNONETHACK"
- use debug && append-cppflags "-DDEBUG"
-
- econf \
- --with-socket-dir="${EPREFIX}/run/screen" \
- --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
- --with-pty-mode=0620 \
- --with-pty-group=5 \
- --enable-rxvt_osc \
- --enable-telnet \
- --enable-colors256 \
- $(use_enable pam)
-
- # Second try to fix bug 12683, this time without changing term.h
- # The last try seemed to break screen at run-time.
- # (16 Jan 2003 agriffis)
- LC_ALL=POSIX make term.h || die "Failed making term.h"
-}
-
-src_install() {
- local tmpfiles_perms tmpfiles_group
-
- dobin screen
-
- if use multiuser ; then
- use prefix || fperms 4755 /usr/bin/screen
- tmpfiles_perms="0755"
- tmpfiles_group="root"
- else
- fowners root:utmp /usr/bin/screen
- fperms 2755 /usr/bin/screen
- tmpfiles_perms="0775"
- tmpfiles_group="utmp"
- fi
-
- dodir /etc/tmpfiles.d
- echo "d /run/screen ${tmpfiles_perms} root ${tmpfiles_group}" >"${ED}"/etc/tmpfiles.d/screen.conf
-
- insinto /usr/share/screen
- doins terminfo/{screencap,screeninfo.src}
- insinto /usr/share/screen/utf8encodings
- doins utf8encodings/??
- insinto /etc
- doins "${FILESDIR}"/screenrc
-
- pamd_mimic_system screen auth
-
- dodoc \
- README ChangeLog INSTALL TODO NEWS* patchlevel.h \
- doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-
- doman doc/screen.1
- doinfo doc/screen.info*
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]
- then
- elog "Some dangerous key bindings have been removed or changed to more safe values."
- elog "We enable some xterm hacks in our default screenrc, which might break some"
- elog "applications. Please check /etc/screenrc for information on these changes."
- fi
-
- ewarn "This revision changes the screen socket location to /run/screen."
-}
diff --git a/app-misc/screen/screen-4.2.1-r2.ebuild b/app-misc/screen/screen-4.2.1-r2.ebuild
deleted file mode 100644
index bb6e77a0207c..000000000000
--- a/app-misc/screen/screen-4.2.1-r2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic pam toolchain-funcs user
-
-DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=" ~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nethack pam selinux multiuser"
-
-CDEPEND="
- >=sys-libs/ncurses-5.2:0=
- pam? ( virtual/pam )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
- sys-apps/texinfo"
-
-pkg_setup() {
- # Make sure utmp group exists, as it's used later on.
- enewgroup utmp 406
-}
-
-src_prepare() {
- # Don't use utempter even if it is found on the system
- epatch "${FILESDIR}"/4.0.2-no-utempter.patch
-
- # sched.h is a system header and causes problems with some C libraries
- mv sched.h _sched.h || die
- sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
-
- # Fix manpage.
- sed -i \
- -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
- -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
- -e "s:/local/screens/S-:${EPREFIX}/tmp/screen/S-:g" \
- doc/screen.1 \
- || die
-
- # reconfigure
- eautoreconf
-}
-
-src_configure() {
- append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # https://lists.gnu.org/archive/html/screen-devel/2014-04/msg00095.html
- append-cppflags -D_XOPEN_SOURCE \
- -D_XOPEN_SOURCE_EXTENDED=1 \
- -D__EXTENSIONS__
- append-libs -lsocket -lnsl
- fi
-
- use nethack || append-cppflags "-DNONETHACK"
- use debug && append-cppflags "-DDEBUG"
-
- econf \
- --with-socket-dir="${EPREFIX}/tmp/screen" \
- --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
- --with-pty-mode=0620 \
- --with-pty-group=5 \
- --enable-rxvt_osc \
- --enable-telnet \
- --enable-colors256 \
- $(use_enable pam)
-}
-
-src_compile() {
- LC_ALL=POSIX emake comm.h term.h
- emake osdef.h
-
- emake -C doc screen.info
- default
-}
-
-src_install() {
- local tmpfiles_perms tmpfiles_group
-
- dobin screen
-
- if use multiuser || use prefix
- then
- fperms 4755 /usr/bin/screen
- tmpfiles_perms="0755"
- tmpfiles_group="root"
- else
- fowners root:utmp /usr/bin/screen
- fperms 2755 /usr/bin/screen
- tmpfiles_perms="0775"
- tmpfiles_group="utmp"
- fi
-
- dodir /etc/tmpfiles.d
- echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
- > "${ED}"/etc/tmpfiles.d/screen.conf
-
- insinto /usr/share/screen
- doins terminfo/{screencap,screeninfo.src}
- insinto /usr/share/screen/utf8encodings
- doins utf8encodings/??
- insinto /etc
- doins "${FILESDIR}"/screenrc
-
- pamd_mimic_system screen auth
-
- dodoc \
- README ChangeLog INSTALL TODO NEWS* patchlevel.h \
- doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-
- doman doc/screen.1
- doinfo doc/screen.info
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]
- then
- elog "Some dangerous key bindings have been removed or changed to more safe values."
- elog "We enable some xterm hacks in our default screenrc, which might break some"
- elog "applications. Please check /etc/screenrc for information on these changes."
- fi
-
- # Add /tmp/screen in case it doesn't exist yet. This should solve
- # problems like bug #508634 where tmpfiles.d isn't in effect.
- local rundir="${EROOT%/}/tmp/screen"
- if [[ ! -d ${rundir} ]] ; then
- if use multiuser || use prefix ; then
- tmpfiles_group="root"
- else
- tmpfiles_group="utmp"
- fi
- mkdir -m 0775 "${rundir}"
- chgrp ${tmpfiles_group} "${rundir}"
- fi
-
- ewarn "This revision changes the screen socket location to ${rundir}"
-}
diff --git a/app-misc/screen/screen-4.3.1-r1.ebuild b/app-misc/screen/screen-4.3.1-r1.ebuild
index aa614f09aa0d..f18190997f2a 100644
--- a/app-misc/screen/screen-4.3.1-r1.ebuild
+++ b/app-misc/screen/screen-4.3.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug nethack pam selinux multiuser"
CDEPEND="
diff --git a/app-misc/screen/screen-4.3.1.ebuild b/app-misc/screen/screen-4.3.1.ebuild
deleted file mode 100644
index 48a082b5100c..000000000000
--- a/app-misc/screen/screen-4.3.1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic pam toolchain-funcs user
-
-DESCRIPTION="Full-screen window manager that multiplexes physical terminals between several processes"
-HOMEPAGE="https://www.gnu.org/software/screen/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nethack pam selinux multiuser"
-
-CDEPEND="
- >=sys-libs/ncurses-5.2:0=
- pam? ( virtual/pam )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-screen )"
-DEPEND="${CDEPEND}
- sys-apps/texinfo"
-
-pkg_setup() {
- # Make sure utmp group exists, as it's used later on.
- enewgroup utmp 406
-}
-
-src_prepare() {
- # Don't use utempter even if it is found on the system
- epatch "${FILESDIR}"/${PN}-4.3.0-no-utempter.patch
-
- # sched.h is a system header and causes problems with some C libraries
- mv sched.h _sched.h || die
- sed -i '/include/ s:sched.h:_sched.h:' screen.h || die
-
- # Fix manpage.
- sed -i \
- -e "s:/usr/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/usr/local/screens:${EPREFIX}/tmp/screen:g" \
- -e "s:/local/etc/screenrc:${EPREFIX}/etc/screenrc:g" \
- -e "s:/etc/utmp:${EPREFIX}/var/run/utmp:g" \
- -e "s:/local/screens/S-:${EPREFIX}/tmp/screen/S-:g" \
- doc/screen.1 \
- || die
-
- # reconfigure
- eautoreconf
-}
-
-src_configure() {
- append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}"
-
- if [[ ${CHOST} == *-solaris* ]] ; then
- # https://lists.gnu.org/archive/html/screen-devel/2014-04/msg00095.html
- append-cppflags -D_XOPEN_SOURCE \
- -D_XOPEN_SOURCE_EXTENDED=1 \
- -D__EXTENSIONS__
- append-libs -lsocket -lnsl
- fi
-
- use nethack || append-cppflags "-DNONETHACK"
- use debug && append-cppflags "-DDEBUG"
-
- econf \
- --with-socket-dir="${EPREFIX}/tmp/screen" \
- --with-sys-screenrc="${EPREFIX}/etc/screenrc" \
- --with-pty-mode=0620 \
- --with-pty-group=5 \
- --enable-rxvt_osc \
- --enable-telnet \
- --enable-colors256 \
- $(use_enable pam)
-}
-
-src_compile() {
- LC_ALL=POSIX emake comm.h term.h
- emake osdef.h
-
- emake -C doc screen.info
- default
-}
-
-src_install() {
- local tmpfiles_perms tmpfiles_group
-
- dobin screen
-
- if use multiuser || use prefix
- then
- fperms 4755 /usr/bin/screen
- tmpfiles_perms="0755"
- tmpfiles_group="root"
- else
- fowners root:utmp /usr/bin/screen
- fperms 2755 /usr/bin/screen
- tmpfiles_perms="0775"
- tmpfiles_group="utmp"
- fi
-
- dodir /etc/tmpfiles.d
- echo "d /tmp/screen ${tmpfiles_perms} root ${tmpfiles_group}" \
- > "${ED}"/etc/tmpfiles.d/screen.conf
-
- insinto /usr/share/screen
- doins terminfo/{screencap,screeninfo.src}
- insinto /usr/share/screen/utf8encodings
- doins utf8encodings/??
- insinto /etc
- doins "${FILESDIR}"/screenrc
-
- pamd_mimic_system screen auth
-
- dodoc \
- README ChangeLog INSTALL TODO NEWS* patchlevel.h \
- doc/{FAQ,README.DOTSCREEN,fdpat.ps,window_to_display.ps}
-
- doman doc/screen.1
- doinfo doc/screen.info
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]
- then
- elog "Some dangerous key bindings have been removed or changed to more safe values."
- elog "We enable some xterm hacks in our default screenrc, which might break some"
- elog "applications. Please check /etc/screenrc for information on these changes."
- fi
-
- # Add /tmp/screen in case it doesn't exist yet. This should solve
- # problems like bug #508634 where tmpfiles.d isn't in effect.
- local rundir="${EROOT%/}/tmp/screen"
- if [[ ! -d ${rundir} ]] ; then
- if use multiuser || use prefix ; then
- tmpfiles_group="root"
- else
- tmpfiles_group="utmp"
- fi
- mkdir -m 0775 "${rundir}"
- chgrp ${tmpfiles_group} "${rundir}"
- fi
-
- ewarn "This revision changes the screen socket location to ${rundir}"
-}
diff --git a/app-misc/tracker/tracker-1.2.6.ebuild b/app-misc/tracker/tracker-1.2.6.ebuild
index 8fb6dcbff3ba..a189b8a4a237 100644
--- a/app-misc/tracker/tracker-1.2.6.ebuild
+++ b/app-misc/tracker/tracker-1.2.6.ebuild
@@ -92,6 +92,7 @@ RDEPEND="
DEPEND="${RDEPEND}
${PYTHON_DEPS}
$(vala_depend)
+ dev-util/gdbus-codegen
>=dev-util/gtk-doc-am-1.8
>=dev-util/intltool-0.40.0
>=sys-devel/gettext-0.17
diff --git a/app-misc/tracker/tracker-1.4.0.ebuild b/app-misc/tracker/tracker-1.4.0.ebuild
index a378ffed52c0..96c5f0e633ec 100644
--- a/app-misc/tracker/tracker-1.4.0.ebuild
+++ b/app-misc/tracker/tracker-1.4.0.ebuild
@@ -96,6 +96,7 @@ RDEPEND="
DEPEND="${RDEPEND}
${PYTHON_DEPS}
$(vala_depend)
+ dev-util/gdbus-codegen
>=dev-libs/libxslt-1
>=dev-util/gtk-doc-am-1.8
>=dev-util/intltool-0.40.0
diff --git a/app-misc/tracker/tracker-1.4.1.ebuild b/app-misc/tracker/tracker-1.4.1.ebuild
index 3bbeff9eebb8..97abe16e2648 100644
--- a/app-misc/tracker/tracker-1.4.1.ebuild
+++ b/app-misc/tracker/tracker-1.4.1.ebuild
@@ -96,6 +96,7 @@ RDEPEND="
DEPEND="${RDEPEND}
${PYTHON_DEPS}
$(vala_depend)
+ dev-util/gdbus-codegen
>=dev-libs/libxslt-1
>=dev-util/gtk-doc-am-1.8
>=dev-util/intltool-0.40.0
diff --git a/app-office/impressive/impressive-0.10.5.ebuild b/app-office/impressive/impressive-0.10.5.ebuild
index f72ffa52819c..56345d19a079 100644
--- a/app-office/impressive/impressive-0.10.5.ebuild
+++ b/app-office/impressive/impressive-0.10.5.ebuild
@@ -21,6 +21,7 @@ IUSE=""
DEPEND=""
RDEPEND="${PYTHON_DEPS}
+ !>=dev-python/pillow-3.0.0
app-text/pdftk
virtual/python-imaging[${PYTHON_USEDEP}]
dev-python/pygame[${PYTHON_USEDEP}]
diff --git a/app-office/impressive/impressive-0.11.0b.ebuild b/app-office/impressive/impressive-0.11.0b-r1.ebuild
index 0f79ef3f6ae8..db4e6db429c0 100644
--- a/app-office/impressive/impressive-0.11.0b.ebuild
+++ b/app-office/impressive/impressive-0.11.0b-r1.ebuild
@@ -35,6 +35,12 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
S=${WORKDIR}/${MY_PN}-${PV}
+src_prepare() {
+ sed \
+ -e 's:tostring:tobytes:g' \
+ -i impressive.py || die
+}
+
src_install() {
python_foreach_impl python_doscript ${PN}.py
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index a9bf77267306..a7c9abacebff 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -9,7 +9,9 @@ DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac0
DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d SHA512 15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b WHIRLPOOL a06c9e520e6f2b40c90cb703689527faf9ed6dbe0c0c3810ad276933daa21d56465c286d3de0fe6d5330be7968ae77cff1d30151d62fb34cc7fb57535e82edd6
DIST libreoffice-5.0.1.2.tar.xz 167364360 SHA256 0751b9caebeb54e2c6702a58aae66a29ac59414088ccd4e7d84625d02d0fd21a SHA512 d58d104705fd80425a00ce61771dbd4bef74cda20028fb2afcc1ea44aa304048b8e96bf654ecc2619362a09d05801212bee1e9bc9c80e693c986021a55c0e725 WHIRLPOOL eadd72f705745632c05efcb2e4c85c3440be18f16f16805f241a653c39f204145a10e6e2cbb432d3a4801e652affd677756ee1f6cad1db120c5ffc47843a89f6
DIST libreoffice-5.0.2.2.tar.xz 166869100 SHA256 01f0680709432039762fa608bcb1240786d2b6549099a96095aab92dcebbc176 SHA512 7a72ed01b0f9fc131b7241ea4d1bb70bc813752e33d8e823e91a769d77308d2eec2d32a0fac61bdb41fd605a6f91dbaa3d5478a0b150e64fa9f7e47724f46cce WHIRLPOOL 85a592a0f478b1957d22d932adee758d48084c0c7ee00c0549fa8c956fd30f5eead09f6fc802d22d9613bda8da0c708ec99fb6d10fd82e0922c6da96a326a14c
+DIST libreoffice-5.0.3.1.tar.xz 166989184 SHA256 5502477772d6b986fc0486e7ec4e1fd7d99796f9bf63610d4dec84d77f165585 SHA512 0e157f2f126f530dbcf4849a78ce04e6abb92aed3308aae5d0b644377afea572869660624ef4ceeedcb29eaefb3c9e6defd1241a4e6be931dd39a7286325a288 WHIRLPOOL 3074c618bf98f88de6b21759c6b183e2c836e0f1577ed5b1af4eb2cd1de71b606abc151a29d2f491f4bdfbecd1f6df9eb3f21252c81205c4edcfbd1ae9611619
DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869 WHIRLPOOL 2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49
DIST libreoffice-help-5.0.1.2.tar.xz 1884112 SHA256 c71db94564307f4bcea4d556a37d5ea946c87007fbf03fc7801fbe7bc197e947 SHA512 edea7ade0a4a742788b8ceba627e9afe7ed29b4feaf6d091023697fb676421ee0a191e592991c6627d22ba7a41af2d847b188c23e42ef25f1067533b5d2a80c2 WHIRLPOOL fc54629ee68f7c22ab07295b2569313a129f63850e67f1f3bd50bdc20a3d494ad48ca14f14f0a440fef78cceed2117ba31cac0930ac5b0382f285a31acc77b86
DIST libreoffice-help-5.0.2.2.tar.xz 1882964 SHA256 4342a5593ba8a33b1d63549f256a4127a0b51cc1a53faffdc2708f04fef5f094 SHA512 1000423578211dc843dcedb9f864634235ab09d5234f8d8fe2897065207bdf6cd3bca7cdc1b3c012de0c78b585978a25c0df5048779bd0b9a734c9160064e313 WHIRLPOOL 8b92bcd19487c1c286a477ff0dc1b7e6bd9aaf862cfe002fadc25d461add4c4f2f8ee1e45ac0426dc2d27a6322317cacb7f65e9d0a6e6d6dad01075d18476363
+DIST libreoffice-help-5.0.3.1.tar.xz 1882408 SHA256 22187900e65408f03ecb0a6463d7587ca27e32cd341d9ba0e55a99d8cdb3bc45 SHA512 25bcc9343b6df145618e6e6a6427173418243bdc066b447764999704ffae2dcafa1a295828512aa3c8362e9a843267b7634d6b2c268bb57587fdd77c03b37522 WHIRLPOOL cce758b2a8d66218bd94c4c66680a847cb5a0b9583798e8252acbd491bd18cfca56951fddc17ae270f69423346a7023f078d655bd6c07a51abef04887e0c4d51
diff --git a/app-office/libreoffice/libreoffice-5.0.3.1.ebuild b/app-office/libreoffice/libreoffice-5.0.3.1.ebuild
new file mode 100644
index 000000000000..912f7c6388d2
--- /dev/null
+++ b/app-office/libreoffice/libreoffice-5.0.3.1.ebuild
@@ -0,0 +1,609 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_REQUIRED="optional"
+QT_MINIMAL="4.7.4"
+KDE_SCM="git"
+CMAKE_REQUIRED="never"
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_REQ_USE="threads,xml"
+
+# experimental ; release ; old
+# Usually the tarballs are moved a lot so this should make
+# everyone happy.
+DEV_URI="
+ http://dev-builds.libreoffice.org/pre-releases/src
+ http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
+ http://download.documentfoundation.org/libreoffice/old/${PV}/
+"
+EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice"
+ADDONS_URI="http://dev-www.libreoffice.org/src/"
+
+BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
+# PATCHSET="${P}-patchset-01.tar.xz"
+
+[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
+inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+unset SCM_ECLASS
+
+DESCRIPTION="LibreOffice, a full office productivity suite"
+HOMEPAGE="http://www.libreoffice.org"
+SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
+[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
+
+# Split modules following git/tarballs
+# Core MUST be first!
+# Help is used for the image generator
+MODULES="core help"
+# Only release has the tarballs
+if [[ ${PV} != *9999* ]]; then
+ for i in ${DEV_URI}; do
+ for mod in ${MODULES}; do
+ if [[ ${mod} == core ]]; then
+ SRC_URI+=" ${i}/${P}.tar.xz"
+ else
+ SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
+ fi
+ done
+ unset mod
+ done
+ unset i
+fi
+unset DEV_URI
+
+# Really required addons
+# These are bundles that can't be removed for now due to huge patchsets.
+# If you want them gone, patches are welcome.
+ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
+ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
+ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
+SRC_URI+=" ${ADDONS_SRC}"
+
+unset ADDONS_URI
+unset EXT_URI
+unset ADDONS_SRC
+
+IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
+
+LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
+# Unpackaged separate extensions:
+# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
+# hunart: only on ooo extensions -> fubared download path somewhere on sf
+# numbertext, typo, validator, watch-window: ^^
+# oooblogger: no homepage or anything
+# Extensions that need extra work:
+for lo_xt in ${LO_EXTS}; do
+ IUSE+=" libreoffice_extensions_${lo_xt}"
+done
+unset lo_xt
+
+LICENSE="|| ( LGPL-3 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == *9999* ]] || \
+KEYWORDS=""
+# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+COMMON_DEPEND="
+ ${PYTHON_DEPS}
+ app-arch/zip
+ app-arch/unzip
+ >=app-text/hunspell-1.3.2-r3
+ app-text/mythes
+ >=app-text/libabw-0.1.0
+ >=app-text/libexttextcat-3.2
+ >=app-text/libebook-0.1.1
+ >=app-text/libetonyek-0.1.2
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.5
+ >=app-text/libodfgen-0.1.0
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ =app-text/libwps-0.4*
+ >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ >=dev-libs/boost-1.55:=
+ dev-libs/expat
+ >=dev-libs/hyphen-2.7.1
+ >=dev-libs/icu-4.8.1.1:=
+ =dev-libs/liborcus-0.7*
+ >=dev-libs/librevenge-0.0.1
+ >=dev-libs/nspr-4.8.8
+ >=dev-libs/nss-3.12.9
+ >=dev-lang/perl-5.0
+ !libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+ libressl? ( dev-libs/libressl )
+ >=dev-libs/redland-1.0.16
+ media-gfx/graphite2
+ >=media-libs/fontconfig-2.8.0
+ media-libs/freetype:2
+ >=media-libs/glew-1.10
+ >=media-libs/harfbuzz-0.9.18:=[icu(+)]
+ media-libs/lcms:2
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libvisio-0.1.0
+ >=net-misc/curl-7.21.4
+ net-libs/neon
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ virtual/jpeg:0
+ >=x11-libs/cairo-1.10.0[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ virtual/glu
+ virtual/opengl
+ bluetooth? ( net-wireless/bluez )
+ coinmp? ( sci-libs/coinor-mp )
+ collada? ( >=media-libs/opencollada-1.2.2_p20150207 )
+ cups? ( net-print/cups )
+ dbus? ( >=dev-libs/dbus-glib-0.92 )
+ eds? ( gnome-extra/evolution-data-server )
+ firebird? ( >=dev-db/firebird-2.5 )
+ gltf? ( media-libs/libgltf )
+ gnome? ( gnome-base/gconf:2 )
+ gtk? (
+ x11-libs/gdk-pixbuf[X]
+ >=x11-libs/gtk+-2.24:2
+ )
+ gtk3? ( >=x11-libs/gtk+-3.8:3 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ jemalloc? ( dev-libs/jemalloc )
+ libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
+ libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
+ libreoffice_extensions_wiki-publisher? (
+ dev-java/commons-codec:0
+ dev-java/commons-httpclient:3
+ dev-java/commons-lang:2.1
+ dev-java/commons-logging:0
+ dev-java/tomcat-servlet-api:3.0
+ )
+ mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
+ postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
+ telepathy? (
+ dev-libs/glib:2
+ >=net-libs/telepathy-glib-0.18.0
+ >=x11-libs/gtk+-2.24:2
+ )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice-bin
+ !app-office/libreoffice-bin-debug
+ !<app-office/openoffice-bin-3.4.0-r1
+ !app-office/openoffice
+ media-fonts/libertine
+ media-fonts/liberation-fonts
+ media-fonts/urw-fonts
+ java? ( >=virtual/jre-1.6 )
+ kde? ( $(add_kdeapps_dep kioclient) )
+ vlc? ( media-video/vlc )
+"
+
+if [[ ${PV} != *9999* ]]; then
+ PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
+else
+ # Translations are not reliable on live ebuilds
+ # rather force people to use english only.
+ PDEPEND="!app-office/libreoffice-l10n"
+fi
+
+# FIXME: cppunit should be moved to test conditional
+# after everything upstream is under gbuild
+# as dmake execute tests right away
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/libatomic_ops-7.2d
+ >=dev-libs/libxml2-2.7.8
+ dev-libs/libxslt
+ dev-perl/Archive-Zip
+ dev-util/cppunit
+ >=dev-util/gperf-3
+ dev-util/intltool
+ >=dev-util/mdds-0.12.0:=
+ media-libs/glm
+ net-misc/npapi-sdk
+ >=sys-apps/findutils-4.4.2
+ sys-devel/bison
+ sys-apps/coreutils
+ sys-devel/flex
+ sys-devel/gettext
+ >=sys-devel/make-3.82
+ sys-devel/ucpp
+ sys-libs/zlib
+ virtual/pkgconfig
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-proto/randrproto
+ x11-proto/xextproto
+ x11-proto/xineramaproto
+ x11-proto/xproto
+ java? (
+ >=virtual/jdk-1.6
+ >=dev-java/ant-core-1.7
+ )
+ odk? ( >=app-doc/doxygen-1.8.4 )
+ test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+ # not upstreamable stuff
+ "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+)
+
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ bluetooth? ( dbus )
+ collada? ( gltf )
+ gnome? ( gtk )
+ eds? ( gnome )
+ telepathy? ( gtk )
+ libreoffice_extensions_nlpsolver? ( java )
+ libreoffice_extensions_scripting-beanshell? ( java )
+ libreoffice_extensions_scripting-javascript? ( java )
+ libreoffice_extensions_wiki-publisher? ( java )
+"
+
+CHECKREQS_MEMORY="512M"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
+
+pkg_pretend() {
+ local pgslot
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ check-reqs_pkg_pretend
+
+ if [[ $(gcc-major-version) -lt 4 ]] || \
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
+ ; then
+ eerror "Compilation with gcc older than 4.6 is not supported"
+ die "Too old gcc found."
+ fi
+ fi
+
+ # Ensure pg version but we have to be sure the pg is installed (first
+ # install on clean system)
+ if use postgres && has_version dev-db/postgresql; then
+ pgslot=$(postgresql-config show)
+ if [[ ${pgslot//.} < 90 ]] ; then
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror " postgresql-config set 9.0"
+ die "PostgreSQL slot is not set to 9.0 or higher."
+ fi
+ fi
+}
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+ kde4-base_pkg_setup
+ python-single-r1_pkg_setup
+
+ [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
+}
+
+src_unpack() {
+ local mod mod2 dest tmplfile tmplname mypv
+
+ [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
+ use branding && unpack "${BRANDING}"
+
+ if [[ ${PV} != *9999* ]]; then
+ unpack "${P}.tar.xz"
+ for mod in ${MODULES}; do
+ [[ ${mod} == core ]] && continue
+ unpack "${PN}-${mod}-${PV}.tar.xz"
+ done
+ else
+ for mod in ${MODULES}; do
+ mypv=${PV/.9999}
+ [[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+ [[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
+ git-r3_src_unpack
+ if [[ ${mod} != core ]]; then
+ mod2=${mod}
+ # mapping does not match on help
+ [[ ${mod} == help ]] && mod2="helpcontent2"
+ mkdir -p "${S}/${mod2}/" || die
+ mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
+ rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
+ fi
+ done
+ unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
+ fi
+}
+
+src_prepare() {
+ # optimization flags
+ export GMAKE_OPTIONS="${MAKEOPTS}"
+ # System python 2.7 enablement:
+ export PYTHON_CFLAGS=$(python_get_CFLAGS)
+ export PYTHON_LIBS=$(python_get_LIBS)
+
+ if use collada; then
+ export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+ export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+ fi
+
+ # patchset
+ if [[ -n ${PATCHSET} ]]; then
+ EPATCH_FORCE="yes" \
+ EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
+ EPATCH_SUFFIX="patch" \
+ epatch
+ fi
+
+ base_src_prepare
+
+ AT_M4DIR="m4" eautoreconf
+ # hack in the autogen.sh
+ touch autogen.lastrun
+
+ # system pyuno mess
+ sed \
+ -e "s:%eprefix%:${EPREFIX}:g" \
+ -e "s:%libdir%:$(get_libdir):g" \
+ -i pyuno/source/module/uno.py \
+ -i pyuno/source/officehelper.py || die
+ # sed in the tests
+ sed -i \
+ -e 's#all : build unitcheck#all : build#g' \
+ solenv/gbuild/Module.mk || die
+ sed -i \
+ -e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
+ -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+ Makefile.in || die
+
+ if use branding; then
+ # hack...
+ mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
+ fi
+}
+
+src_configure() {
+ local java_opts
+ local internal_libs
+ local lo_ext
+ local ext_opts
+
+ # sane: just sane.h header that is used for scan in writer, not
+ # linked or anything else, worthless to depend on
+ # vigra: just uses templates from there
+ # it is serious pain in the ass for packaging
+ # should be replaced by boost::gil if someone interested
+ internal_libs+="
+ --without-system-sane
+ --without-system-vigra
+ "
+
+ # libreoffice extensions handling
+ for lo_xt in ${LO_EXTS}; do
+ if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == "scripting-javascript" ]]; then
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ${lo_xt})"
+ else
+ ext_opts+=" $(use_enable libreoffice_extensions_${lo_xt} ext-${lo_xt})"
+ fi
+ done
+
+ if use java; then
+ # hsqldb: system one is too new
+ java_opts="
+ --without-junit
+ --without-system-hsqldb
+ --with-ant-home="${ANT_HOME}"
+ --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
+ --with-jvm-path="${EPREFIX}/usr/lib/"
+ "
+
+ use libreoffice_extensions_scripting-beanshell && \
+ java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)"
+
+ use libreoffice_extensions_scripting-javascript && \
+ java_opts+=" --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar)"
+
+ if use libreoffice_extensions_wiki-publisher; then
+ java_opts+="
+ --with-commons-codec-jar=$(java-pkg_getjar commons-codec commons-codec.jar)
+ --with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
+ --with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
+ --with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
+ --with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
+ "
+ fi
+ fi
+
+ # system headers/libs/...: enforce using system packages
+ # --enable-cairo: ensure that cairo is always required
+ # --enable-graphite: disabling causes build breakages
+ # --enable-*-link: link to the library rather than just dlopen on runtime
+ # --enable-release-build: build the libreoffice as release
+ # --disable-fetch-external: prevent dowloading during compile phase
+ # --disable-gnome-vfs: old gnome virtual fs support
+ # --disable-kdeab: kde3 adressbook
+ # --disable-kde: kde3 support
+ # --disable-systray: quickstarter does not actually work at all so do not
+ # promote it
+ # --enable-extension-integration: enable any extension integration support
+ # --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
+ # --disable-report-builder: too much java packages pulled in without pkgs
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
+ --with-system-headers \
+ --with-system-libs \
+ --with-system-jars \
+ --with-system-dicts \
+ --enable-cairo-canvas \
+ --enable-graphite \
+ --enable-largefile \
+ --enable-mergelibs \
+ --enable-neon \
+ --enable-python=system \
+ --enable-randr \
+ --enable-randr-link \
+ --enable-release-build \
+ --disable-hardlink-deliver \
+ --disable-ccache \
+ --disable-crashdump \
+ --disable-dependency-tracking \
+ --disable-epm \
+ --disable-fetch-external \
+ --disable-gnome-vfs \
+ --disable-gstreamer-0-10 \
+ --disable-report-builder \
+ --disable-kdeab \
+ --disable-kde \
+ --disable-online-update \
+ --disable-systray \
+ --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") \
+ --with-build-version="Gentoo official package" \
+ --enable-extension-integration \
+ --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
+ --with-external-tar="${DISTDIR}" \
+ --with-lang="" \
+ --with-parallelism=$(makeopts_jobs) \
+ --with-system-ucpp \
+ --with-vendor="Gentoo Foundation" \
+ --with-x \
+ --without-fonts \
+ --without-myspell-dicts \
+ --without-help \
+ --with-helppack-integration \
+ --without-sun-templates \
+ $(use_enable bluetooth sdremote-bluetooth) \
+ $(use_enable coinmp) \
+ $(use_enable collada) \
+ $(use_enable cups) \
+ $(use_enable debug) \
+ $(use_enable dbus) \
+ $(use_enable eds evolution2) \
+ $(use_enable firebird firebird-sdbc) \
+ $(use_enable gltf) \
+ $(use_enable gnome gconf) \
+ $(use_enable gnome gio) \
+ $(use_enable gnome lockdown) \
+ $(use_enable gstreamer gstreamer-1-0) \
+ $(use_enable gtk) \
+ $(use_enable gtk3) \
+ $(use_enable kde kde4) \
+ $(use_enable mysql ext-mariadb-connector) \
+ $(use_enable odk) \
+ $(use_enable postgres postgresql-sdbc) \
+ $(use_enable telepathy) \
+ $(use_enable vlc) \
+ $(use_with coinmp system-coinmp) \
+ $(use_with collada system-opencollada) \
+ $(use_with gltf system-libgltf) \
+ $(use_with java) \
+ $(use_with mysql system-mysql-cppconn) \
+ $(use_with odk doxygen) \
+ ${internal_libs} \
+ ${java_opts} \
+ ${ext_opts}
+}
+
+src_compile() {
+ # more and more LO stuff tries to use OpenGL, including tests during build
+ # bug 501508, bug 540624, bug 545974 and probably more
+ addpredict /dev/dri
+ addpredict /dev/ati
+ addpredict /dev/nvidiactl
+
+ # hack for offlinehelp, this needs fixing upstream at some point
+ # it is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ (
+ grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
+ source "${T}/config_host.mk" 2&> /dev/null
+
+ local path="${WORKDIR}/helpcontent2/source/auxiliary/"
+ mkdir -p "${path}" || die
+
+ echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
+ perl "${S}/helpcontent2/helpers/create_ilst.pl" \
+ -dir=icon-themes/galaxy/res/helpimg \
+ > "${path}/helpimg.ilst"
+ [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+ )
+
+ local target
+ use test && target="build" || target="build-nocheck"
+
+ # this is not a proper make script
+ make ${target} || die
+}
+
+src_test() {
+ make unitcheck || die
+ make slowcheck || die
+}
+
+src_install() {
+ # This is not Makefile so no buildserver
+ make DESTDIR="${D}" distro-pack-install -o build -o check || die
+
+ # Fix bash completion placement
+ newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ bashcomp_alias \
+ libreoffice \
+ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
+ rm -rf "${ED}"/etc/ || die
+
+ if use branding; then
+ insinto /usr/$(get_libdir)/${PN}/program
+ newins "${WORKDIR}/branding-sofficerc" sofficerc
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+ fi
+
+ # Hack for offlinehelp, this needs fixing upstream at some point.
+ # It is broken because we send --without-help
+ # https://bugs.freedesktop.org/show_bug.cgi?id=46506
+ insinto /usr/$(get_libdir)/libreoffice/help
+ doins xmlhelp/util/*.xsl
+
+ # Remove desktop files for support to old installs that can't parse mime
+ rm -rf "${ED}"/usr/share/mimelnk/
+
+ # FIXME: Hack add missing file
+ insinto /usr/$(get_libdir)/${PN}/program
+ doins "${S}"/instdir/program/libsaxlo.so
+
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+}
+
+pkg_preinst() {
+ # Cache updates - all handled by kde eclass for all environments
+ kde4-base_pkg_preinst
+}
+
+pkg_postinst() {
+ kde4-base_pkg_postinst
+
+ use java || \
+ ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+ kde4-base_pkg_postrm
+}
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 0f66fbaa22b7..e528ce16a724 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -108,7 +108,7 @@ COMMON_DEPEND="
>=app-text/libodfgen-0.1.0
app-text/libwpd:0.10[tools]
app-text/libwpg:0.3
- =app-text/libwps-0.4*
+ >=app-text/libwps-0.4.2
>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
>=dev-cpp/clucene-2.3.3.4-r2
=dev-cpp/libcmis-0.5*
diff --git a/app-officeext/languagetool/Manifest b/app-officeext/languagetool/Manifest
index e6ec4700fd9e..8975e0a5ae51 100644
--- a/app-officeext/languagetool/Manifest
+++ b/app-officeext/languagetool/Manifest
@@ -1,3 +1,4 @@
DIST LanguageTool-2.5.oxt 46952282 SHA256 0ceb08b67c1d85505f3e97a978316ed54ade4d7bfd6ef848c02b710ee3deee17 SHA512 8813a7d3e4c199d416287ab9af38b8429f7d484bc6e93f775917ba968a302b3a64581588e5464cce9b6b368aabe62576f8cb9d4d8ad27e8d04f1ef622dcd081d WHIRLPOOL 6d2742d11a039953c9c4c728f2188fd3bb5c98f10bfaefb726c38346126359b01a59756c11560e4c0438af9a10dd8cbc80b82787491c90962b770ee614886fa1
DIST LanguageTool-2.7.oxt 52195597 SHA256 18fa219a674f449cb1925a16dfe6b8f94bfcc1cb678506ce100db361dccdd075 SHA512 6ea98063939e32430adaaf3915776939ed5cd0b43d4fcb70ebd1b0780d844253295bd65e3fa5d745e67947d91613785a6425107f326596fa380f93a02b6508bd WHIRLPOOL 7d26d021b4935680bba696add8e89b11146d40967e60521fc8818bb47975fb082ea42d379e35d9cf5d17ea1c5cabd67baa915a3d9920b2dac4fdf38d4efc9773
DIST LanguageTool-2.9.oxt 55628675 SHA256 e8d4c262e33a046b57590199b920ff765e6a865c96714f8aac0339f982456cf0 SHA512 eddd2dda2da966beac1fe3a94eb0564e485bc4b45ada9c52dedaba256e8d8d64cb510df4e35f2805ccbae03b5e9d0fde92ec988b01f3c6a0265a6b3eb83fc810 WHIRLPOOL c9dfe02c48e6767beb4406bb54f9279fd71b98cb427225468f5267191e1a9dcc190abc3cedb51c3111caff194550ddd030aa98ef5f874005d7debc21f163de6e
+DIST LanguageTool-3.1.oxt 56681035 SHA256 cd74a911a7501c9a6263458a51b9e33baacc536b384b8bedb18f2b13706bc937 SHA512 9e41e34d6476bb799259ba4689c63704da24195ce46bb9c8055ce6264fbe706baacc9b84cd5bc870fdbe919f4ccfa2744fe19d40da68b121f8d95fc64e27114e WHIRLPOOL 29eeae88310796704dc0f956e463d28839d4f5e8b20ee802eab630c1e045f5ec6284899aa3f1dea790c1909320b5f2ff82ded8e66c657ecf4fcb2579a5f25797
diff --git a/app-officeext/languagetool/languagetool-3.1.ebuild b/app-officeext/languagetool/languagetool-3.1.ebuild
new file mode 100644
index 000000000000..8c3232c01751
--- /dev/null
+++ b/app-officeext/languagetool/languagetool-3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_P="LanguageTool-${PV}"
+
+OFFICE_REQ_USE="java"
+
+OFFICE_EXTENSIONS=(
+ "${MY_P}.oxt"
+)
+
+inherit office-ext-r1
+
+DESCRIPTION="Style and Grammar Checker for libreoffice"
+HOMEPAGE="https://www.languagetool.org/"
+SRC_URI="https://www.languagetool.org/download/${MY_P}.oxt"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.7"
diff --git a/app-officeext/ooofbtools/Manifest b/app-officeext/ooofbtools/Manifest
index c3458ecc4b95..58f667aae337 100644
--- a/app-officeext/ooofbtools/Manifest
+++ b/app-officeext/ooofbtools/Manifest
@@ -1,3 +1,2 @@
-DIST OOoFBTools-2.34.zip 4810850 SHA256 9fea8bb702c484547378f2771bbb16065b09f9b36954b87970de6fa2b54a58b5 SHA512 0d470837a1bdea713b2b711bc73774748513bdb29ecf4bedaadc770b544980ecfcf1f820e41194a77b11c2abc1432d491f111a32b812ecce769a76ac71154fc9 WHIRLPOOL a4fc2e5ebe85c83e8f037914d07145eae586dcff27fab550768f9cdf30c95d28ea8ee670ab897caf3ea294cd9e70590eb0705689484a799eadc0b16a26194799
-DIST OOoFBTools-2.35.zip 4806386 SHA256 fe361f7126d5fcd28ab12eb162443ae87520248d1274bf3d13502b8c5cd542c8 SHA512 36d69a1accf24be5944239fb37161785884034a67d2771b564c6b65a9ec24b79eab33be41868db431964f71e0c824d083c02e4bb5d78aa39ec8984f1597c7d26 WHIRLPOOL f3777ac078c4d7e850e6ba3bdbab3101f1beb40f59e99af20f7076dee04736916a2cc5b5e08eeaf77d6923e50710dba9259120590e1b2f427920911b7523ad56
DIST OOoFBTools-2.36.zip 4806554 SHA256 76971acfb0ce3a618925bc5d38910c631f1267419c283cd4153f355a1ad59aa8 SHA512 16bf990c177a600ca40d27d6c7df71d12078d3850c032ecde131e378da9791b8d0619223cae4ac4f0e3ce717c6cbde0ad5f8d0f558f9e4d64b93b97adc6365ad WHIRLPOOL 2cf50d2c9e3d9f60307f95e9e4d0437308983d6042a07073a196ccc3cdacf0ebc346ffb57581e72dcf469b4a8d0f7f449414a303878f9d7af42cb42fba024bb1
+DIST OOoFBTools-2.38.zip 4833754 SHA256 ee039cf7ae2767916cc79b25d5b852a54089773db458aa695b064e3d803da757 SHA512 2ff6bb251b5913cb7ceb430aba6ee47a5b2e2c7b78be8b291d67410903d3679ef8e01554f504cd86993fb717173d2a9c4080b5059f3e1064be075e67766c07d5 WHIRLPOOL 52fcd3bc82eab952080c6e1b18ed12b1568e4dd7299b55b2433efc8f5420f304ae32bbc3a9fe191c9a614f42aa5e04da976758cf9262e94adc238b887d6ecb9e
diff --git a/app-officeext/ooofbtools/ooofbtools-2.34.ebuild b/app-officeext/ooofbtools/ooofbtools-2.34.ebuild
deleted file mode 100644
index 85b1763c62d7..000000000000
--- a/app-officeext/ooofbtools/ooofbtools-2.34.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="OOoFBTools"
-
-OFFICE_EXTENSIONS=(
- "${MY_PN}.oxt"
-)
-
-inherit office-ext-r1
-
-DESCRIPTION="Extension for converting and processing eBooks in FictionBook2 format with validator"
-HOMEPAGE="https://sourceforge.net/projects/fbtools/"
-SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/libxml2"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-OFFICE_EXTENSIONS_LOCATION="${S}"
-
-src_prepare() {
- # Remove Windows cruft
- pushd "${WORKDIR}/${MY_PN}.oxt" 2>/dev/null
- rm -r win32 || die
- popd 2>/dev/null
-}
-
-src_install() {
- office-ext-r1_src_install
- dodoc ChangeLog*
-}
diff --git a/app-officeext/ooofbtools/ooofbtools-2.35.ebuild b/app-officeext/ooofbtools/ooofbtools-2.38.ebuild
index f9b8f6c2a572..c442c9362ee9 100644
--- a/app-officeext/ooofbtools/ooofbtools-2.35.ebuild
+++ b/app-officeext/ooofbtools/ooofbtools-2.38.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-DEPEND="app-arch/unzip"
+DEPEND=""
RDEPEND="dev-libs/libxml2"
S="${WORKDIR}/${MY_PN}-${PV}"
@@ -29,9 +29,9 @@ OFFICE_EXTENSIONS_LOCATION="${S}"
src_prepare() {
# Remove Windows cruft
- pushd "${WORKDIR}/${MY_PN}.oxt" 2>/dev/null
+ pushd "${WORKDIR}/${MY_PN}.oxt" 2>/dev/null || die
rm -r win32 || die
- popd 2>/dev/null
+ popd 2>/dev/null || die
}
src_install() {
diff --git a/app-portage/eix/eix-0.30.11.ebuild b/app-portage/eix/eix-0.30.11.ebuild
index 474f281028b9..7254e3d785fe 100644
--- a/app-portage/eix/eix-0.30.11.ebuild
+++ b/app-portage/eix/eix-0.30.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.bz2"
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"
+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 )
diff --git a/app-text/dos2unix/dos2unix-7.3-r1.ebuild b/app-text/dos2unix/dos2unix-7.3-r1.ebuild
index 41d635e3fe53..48628968f27b 100644
--- a/app-text/dos2unix/dos2unix-7.3-r1.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
IUSE="debug nls test"
RDEPEND="
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index f5b149468b1f..2321bf51ba62 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,3 +1,4 @@
DIST libwps-0.2.9.tar.xz 387340 SHA256 cf9a17a6c0452ab32cce342c1410f1620c66f9cb6f9431b82f95da7fe9730177 SHA512 60ddc8db5a90589248a0a8f90950907ca3be3362983f6c4847670e6eaf4d7ad22a2b6795b0a1b0a1920075f25f1ffcfd581757c26bfb74deacd000e94459da34 WHIRLPOOL bc847cb65c72daa01db5d6f17a20cbaff741fab1fc7a63d789993334b7853009f59c1ca370d7d3798a26b294c96c3435664314b07ff5a2324fa7ca7980378fe8
DIST libwps-0.3.1.tar.xz 410376 SHA256 bb2c2a7db5121411ba705ccf3452cdce51d9798384fd9621e9702ba802878e93 SHA512 f628e6532b32331c7df0d97a9b71bf1f97347634657148b47d46ba7c2fd888d7fa9ffe52f31cfc24f86688c9c713bfaff360c7fe9f4a92d646cf8f21e7f5c2b1 WHIRLPOOL ebe35fabf22aedccfe3ca35e46971a26332040852357ea0f2241534261c77d597da38766192661ecd6fa24881e0bf9de4a80bdfea300129420d4635924434110
DIST libwps-0.4.1.tar.xz 476732 SHA256 bf915125d647aec18f63d593eb9385bce1e3cdb48649c1c90782d0e0ff5e976a SHA512 675b1d54436d568a990a305267daf33ebfb064e54b7b220f1ada850db85d1780590e161d27a68aa3b33807fab20a73e862f3dfffb62a8a5ff20192ed6f85063f WHIRLPOOL 56d849615588d2a6e33f1f20367b8ce5685bcc1cac6651fd1f48cda238c851fdaa81658d73557ae5f2e4d4f0ca690517543cbeb0a940bbdca2f3347b938d7d7b
+DIST libwps-0.4.2.tar.xz 543052 SHA256 e4fa907dd2b49b309fb4a860332bc44158570e02cb4ec07d4c8577b374b9f935 SHA512 6e91a4dbb26335b6d4db47daec70d4f50313a8101de1dccce592cec49e00aaf50256580b3ea0c37f24b7ad1cc065a82e0a71deb0cfcd23dabf0a2627d915f48f WHIRLPOOL 137f54be1a0d342205275891008a8de32ae3ee6ba6c2cdafccd61112e4e99e82039a471ef2aa98f0a935a470f48cc59690e8e783e676cde50a78ff1e56558e6c
diff --git a/app-text/libwps/libwps-0.4.2.ebuild b/app-text/libwps/libwps-0.4.2.ebuild
new file mode 100644
index 000000000000..a4f3ee0b8d0e
--- /dev/null
+++ b/app-text/libwps/libwps-0.4.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="http://libwps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~x86"
+IUSE="doc debug static-libs"
+
+RDEPEND="
+ app-text/libwpd:0.10
+ dev-libs/boost:=
+ dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+ econf \
+ --disable-werror \
+ $(use_enable static-libs static) \
+ --docdir=/usr/share/doc/${PF} \
+ $(use_with doc docs) \
+ $(use_enable debug)
+}
+
+src_install() {
+ default
+ prune_libtool_files --all
+}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 165c74e9890e..da9c5b72d5be 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -1,5 +1,3 @@
DIST xapian-omega-1.2.19.tar.xz 419804 SHA256 ca0a9afe2d1ced933408fc0b089c96cd55f90d7b06ae9708eb84294cd77e35ed SHA512 95be43eb25c7da59db7c396879a1bc35df70f0412a66d56c8ef1bc90d7f5930bc8e83fc5e1b3bc8a791fa92ea6e705fb0df5833265f4e95cd8bcce49dda7c976 WHIRLPOOL 101c34c2603d1287685a642b2d9be2aa1eb2779161b1f662f0ba7f91563b319eb0b0dd6def688122df991e56b6fe491cfec5ed93c10ee205948c5885c0d83f2f
-DIST xapian-omega-1.2.20.tar.xz 420488 SHA256 41f00ef7e650d10702d87b089a0103554ca3f038acc66df1bdbf852bb1d87fb9 SHA512 187b4d3a918f3b02b0a1737baedfff253455b16f3fd1b47ed3d93c4f53b41657d001929efc716467eefeb6daa437d1b530681ed250f8d665e86eedf7d0737756 WHIRLPOOL 65ea58a8743f4472e7242a20e4170782765f60e62ce8157341e7cfbf2ccbabd702262edfdd5cffb0c4562d50703235a7a235a1d03ef62453aae4e6405b69c606
DIST xapian-omega-1.2.21.tar.xz 435624 SHA256 862d3a5d7052fc13c16eed51c42d774c4ab1c56967c477d994995b753dc9527e SHA512 8aa669fbf3253b72e742bed93a9ec972e33f49327cf0e912a21b33e3f586cf35041a50f107fe4767f8906996e86f8a6126efc8232e72045e8243b0ab1b30e1e9 WHIRLPOOL 8a6b555ef6eeacbca24b2c80468b3195eacc66084243d0340709a6c556cb03009022b8716b5e2aef0f6c382aaf5dbec8f29a01589808170fa26e73ccc988bdff
-DIST xapian-omega-1.3.2.tar.xz 449872 SHA256 951434ffa95651607589fcdde6548cbdd1b67dde264aa34234c293690fb7fc0d SHA512 92e9c58206fba424f92d88fa7a36fe21d350de0c0cd71857ff1db3c423dd40b4e7d5e331d13de3b905907b0d9a549d2888cdcd3125ece52452e7c304d2f437a0 WHIRLPOOL 0473913bb8c9752859d15a92159d250e3ef585331ccfb2eaea805670c3629a86e3091849067eeb0541fc1b23be2db5c8a5b7f9c73e49fc2fa35a54f6faa66782
DIST xapian-omega-1.3.3.tar.xz 464308 SHA256 d28c05d5c920dae142fe69abec074b7916f027d749d2d0290d04133d2d6ad6f0 SHA512 4ea980b96526e1bc88329991e34b174944c8f87ba1b0d0f199bb2c7545ce80bc5307935d8322b6e8fa48b28dc6ead728fc5bebe7e13758602f952eac60302dd5 WHIRLPOOL b748a27225d097e3dca6d25935cbc40da5905795efc302affe13a3ba015b5fc1c15eef69e4d0ea460378f7aac6cce5896073ebb6856d46d6651a97bd626d3a39
diff --git a/app-text/xapian-omega/xapian-omega-1.2.20.ebuild b/app-text/xapian-omega/xapian-omega-1.2.20.ebuild
deleted file mode 100644
index 83c32bf2ce37..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.2.20.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/xapian-${PV}
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
- emake DESTDIR="${D}" install
-
- #move docs to /usr/share/doc/${PF}.
- mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}"
-
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/app-text/xapian-omega/xapian-omega-1.3.2.ebuild b/app-text/xapian-omega/xapian-omega-1.3.2.ebuild
deleted file mode 100644
index e4503526ca5c..000000000000
--- a/app-text/xapian-omega/xapian-omega-1.3.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
-SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
-HOMEPAGE="http://www.xapian.org/"
-S="${WORKDIR}/xapian-omega-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/xapian-${PV}
- dev-lang/perl
- dev-libs/libpcre
- sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_install () {
- emake DESTDIR="${D}" install
-
- #move docs to /usr/share/doc/${PF}.
- mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}"
-
- dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
-}
diff --git a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild b/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
index e100d6b65028..506dabe3dd32 100644
--- a/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
+++ b/dev-db/couchdb/couchdb-1.6.1-r2.ebuild
@@ -36,6 +36,7 @@ pkg_setup() {
src_prepare() {
sed -i ./src/couchdb/priv/Makefile.* -e 's|-Werror||g'
epatch "${FILESDIR}/${PV}-erlang-18.patch"
+ eautoreconf
}
src_configure() {
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index f9d71d8fb627..5c336689a6fe 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -1,6 +1,7 @@
DIST mariadb-10.0.21.tar.gz 56216903 SHA256 4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545 SHA512 75aa4b019f3432a61483bb325a0f088ea92d6fede44d7a300c15659411c8927fa2a0586182226315b6d6796641ca1d8746f7fd49e21fe21505adec1fc38ae32f WHIRLPOOL b086fb34363b2426f5e91c14916b747787feadf37c609f4aea1f08bd235e9e97df17f5bfa0eb9e65e93fbed3df5eb6c021287c4eb987a3362ea87cf96eaf268e
DIST mariadb-10.1.7.tar.gz 53812743 SHA256 5bd3b80cf0f312751271a3446c12579c7081f93406e59a0cdfda8e133423c88f SHA512 4a496ba22ccc839d412dd4858cb66464b499693c4ff89ea773a967bccc7d53a52622f3d494d6f889c5325b079d83ba17b25abae2bc9fc22b76c601fc51542f5a WHIRLPOOL 2366c46a7c6d83dd9fe7cac9affcb00387a574912ad9350c11279d31fd384e5fcc18a5d297765086b2f9208e5b899a7707cfb199d047309b89725d0e9582cd9d
DIST mariadb-5.5.45.tar.gz 45686618 SHA256 4dc3aff6941ef1068412002915d795bcf67db0eaa38a5c6f3af57474c4226fb0 SHA512 57501670605cfcdd231ef57d2db7ac9bf460856e63c0660d050ad11aa0392d3d6ce6730ae119dca5d00847c9170990f375c8499593bf0d02c1995395191236ba WHIRLPOOL e5ef471c097c2b8921596b88f26df6914e031daafdcd878d79a16c20be6ba8c97fb79069e48d7d1b9aa405ced063f66feac1c52503907e06ee4b577def2c57fa
+DIST mariadb-5.5.46.tar.gz 45683962 SHA256 45b66b7adc87cad32e553df1d5211e5b6426b78a3bc318a5ccde088bf93e6e10 SHA512 91e5d3d46da9932fdd80125abf77cea411158e04212ae6dea1aa7a9260626c9dfded967af7173a152f488f38c35ff423fcba4098fa337814956c6fa8719c6080 WHIRLPOOL 7da1dc60dca37605c56291544b6d0dfc09a7a76c139b14d1277980d079251d02389efdbde56d23402d659e9c0830fd7ab7998833e1b5fcd33dcab436ea21b74c
DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326
DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa
DIST mysql-extras-20150717-1707Z.tar.bz2 1491956 SHA256 d67cc1e2c581ab7c57122b7d29864643869799893a95a158a18e14201d4ffc10 SHA512 3a7cb07773099e766f8e796d4e555d42874b85285cc2c7c60220370cc6aafc36a60eb340008637298d85d83f529e73392895a81c1438ffccff9eb8f354b29ba9 WHIRLPOOL 11e75f4b696e2547c1da40e69d8ab75df4bf7080426204c040632f24846407b07d71061c09c4ff4a1d21a9d14a94769d8f8ef62421d0aecd99efe832caf4dd22
diff --git a/dev-db/mariadb/mariadb-5.5.46.ebuild b/dev-db/mariadb/mariadb-5.5.46.ebuild
new file mode 100644
index 000000000000..07001858ff32
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.46.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+MY_EXTRAS_VER="20150509-1847Z"
+
+# Build system
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if ! use "minimal" ; then
+
+ if [[ $UID -eq 0 ]]; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Run CTest (test-units)
+ cmake-utils_src_test
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+ # Enable parallel testing, auto will try to detect number of cores
+ # You may set this by hand.
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${T}"/var-tests{,/log}
+
+ # create symlink for the tests to find the replace util
+ ln -s "${BUILD_DIR}/extra/replace" "${BUILD_DIR}/client/"
+
+ # These are failing in MariaDB 5.5 for now and are believed to be
+ # false positives:
+ #
+ # main.information_schema, binlog.binlog_statement_insert_delayed,
+ # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql,
+ # funcs_1.is_columns_mysql
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test, main.mysql_client_test_nonblock:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+ # fails due to bad cleanup of previous tests when run in parallel
+ # The tool is deprecated anyway
+ # Bug 532288
+
+ for t in main.mysql_client_test main.mysql_client_test_nonblock \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help \
+ archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \
+ funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # Run mysql tests
+ pushd "${TESTDIR}"
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+ --testcase-timeout=30
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ popd
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+
+ else
+
+ einfo "Skipping server tests due to minimal build."
+ fi
+}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
index 3d90b402d33b..2e20b9fdcaa5 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://mysql/Downloads/${URI_DIR}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ppc64 sparc x86"
IUSE="debug examples gcov static-libs"
DEPEND="virtual/libmysqlclient:=
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index b071bdf1c210..059566be58e3 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,5 +1,6 @@
DIST mysql-5.5.44.tar.gz 21789766 SHA256 85f05b257db39e63c82ff4b5ce4e0c6d2b07560b5fc1646d47d7ae48eab3e5de SHA512 05707b96c3e0d39ca103d965640aa1a9461a513f788fc7f2acce4b3933ec578b3d66df53955b0dff1b6c9e5acd98441cfe1df5b3154a1058293babc39c26dad5 WHIRLPOOL 870d9728c78f6732fcd6f95e62833a769c937c96298a39bb023b33a9138552e254d2a3f6285d8f4f0b740de9d7397fa1a0987234a0a4dfa13c787fc068053d78
DIST mysql-5.5.45.tar.gz 21832364 SHA256 744efd3c39265b5fdeebd25f58ecb34a6eb06e02d9ec2febd3164942f2c89332 SHA512 1c8ddf294232b106562537d6e9b4a3956dd1a290562f313d311f2bbe09f1cb95c28e7e9a4c92a1fcc91a394514bc1190d185b1134003a9f6183ecc2a06d618e8 WHIRLPOOL 3daed09edfc1ca7a0ae379b876e061c2318755fdd14be9630b7c5311985e91ea46cf0e0b1eab98c758cc2809d5d562fcfd2f22022100051746343e147f3d4ebc
+DIST mysql-5.5.46.tar.gz 21838374 SHA256 93e0d91f1b380508edcecdd102cbec79a609d6b594a8814922db1c0fd11c8c3e SHA512 c2db730318d4c16793d62dbd937c1ff739fffabab6d1689b94252f5501ff36917ddf80a8144583492c05220b3ae33f29ecbcec10f6d8ae0a0b10142be719fc27 WHIRLPOOL 355260ae0e7385c7d00b289e37af09374bc8320f69a55d7ee0469283382f197fd430be32019668b1f29cda69f9d76965d4ee749cb93f1e8263799673e4f0f535
DIST mysql-5.6.26.tar.gz 33278710 SHA256 b44c6ce5f95172c56c73edfa8b710b39242ec7af0ab182c040208c41866e5070 SHA512 455bf66e1c63e3368a3dd53f80a3393e33a20605cde320ee0bb61339d0853c2187d4947812405b85ea93a7da722787e958515fc69807c3fab131878fe9604f62 WHIRLPOOL e5fe46e4f1c8a20d955b5921c6773823cb1c01bd78319485528c478f213a37dc8ce8a1bc5c61904595e8931dec1376d471387a3f85119a0791cb8f6d9303eb6f
DIST mysql-5.6.27.tar.gz 33327156 SHA256 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512 2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09 WHIRLPOOL 4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7
DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4
diff --git a/dev-db/mysql/mysql-5.5.46.ebuild b/dev-db/mysql/mysql-5.5.46.ebuild
new file mode 100644
index 000000000000..9a964d7e3633
--- /dev/null
+++ b/dev-db/mysql/mysql-5.5.46.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+MY_EXTRAS_VER="20150127-1351Z"
+MY_PV="${PV//_alpha_pre/-m}"
+MY_PV="${MY_PV//_/-}"
+
+# Build type
+BUILD="cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE="$IUSE"
+
+# Define the mysql-extras source
+EGIT_REPO_URI="git://anongit.gentoo.org/proj/mysql-extras.git"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these.
+EPATCH_EXCLUDE=''
+
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+RDEPEND="${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+
+# Official test instructions:
+# USE='embedded extraengine perl ssl static-libs community' \
+# FEATURES='test userpriv -usersandbox' \
+# ebuild mysql-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+
+ local TESTDIR="${BUILD_DIR}/mysql-test"
+ local retstatus_unit
+ local retstatus_tests
+
+ # Bug #213475 - MySQL _will_ object strenously if your machine is named
+ # localhost. Also causes weird failures.
+ [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
+
+ if ! use "minimal" ; then
+
+ if [[ $UID -eq 0 ]]; then
+ die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
+ fi
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+ addpredict /this-dir-does-not-exist/t9.MYI
+
+ # Run CTest (test-units)
+ cmake-utils_src_test
+ retstatus_unit=$?
+ [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+ # Ensure that parallel runs don't die
+ export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
+ # Enable parallel testing, auto will try to detect number of cores
+ # You may set this by hand.
+ # The default maximum is 8 unless MTR_MAX_PARALLEL is increased
+ export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
+
+ # create directories because mysqladmin might right out of order
+ mkdir -p "${T}"/var-tests{,/log}
+
+ # create symlink for the tests to find mysql_tzinfo_to_sql
+ ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/"
+
+ # These are failing in MySQL 5.5 for now and are believed to be
+ # false positives:
+ #
+ # main.information_schema, binlog.binlog_statement_insert_delayed,
+ # main.mysqld--help-notwin
+ # fails due to USE=-latin1 / utf8 default
+ #
+ # main.mysql_client_test:
+ # segfaults at random under Portage only, suspect resource limits.
+ #
+ # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam
+ # fails due to bad cleanup of previous tests when run in parallel
+ # The tool is deprecated anyway
+ # Bug 532288
+
+ for t in main.mysql_client_test \
+ binlog.binlog_statement_insert_delayed main.information_schema \
+ main.mysqld--help-notwin main.mysqlhotcopy_archive main.mysqlhotcopy_myisam ; do
+ mysql-v2_disable_test "$t" "False positives in Gentoo"
+ done
+
+ # Run mysql tests
+ pushd "${TESTDIR}"
+
+ # run mysql-test tests
+ perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
+ --testcase-timeout=30 --reorder
+ retstatus_tests=$?
+ [[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ popd
+
+ # Cleanup is important for these testcases.
+ pkill -9 -f "${S}/ndb" 2>/dev/null
+ pkill -9 -f "${S}/sql" 2>/dev/null
+
+ failures=""
+ [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
+ [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
+ has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
+
+ [[ -z "$failures" ]] || die "Test failures: $failures"
+ einfo "Tests successfully completed"
+
+ else
+
+ einfo "Skipping server tests due to minimal build."
+ fi
+}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.3.13.3.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.3.13.3.ebuild
index 0e669170079f..6acdbf4463f9 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.3.13.3.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.3.13.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.zip"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.14.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.14.1.ebuild
index 0e669170079f..6acdbf4463f9 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.4.14.1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.4.14.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.zip"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 hppa ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index c4c638911a4f..301b3e3846b0 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,11 +1,6 @@
-DIST postgresql-9.0.22.tar.bz2 15046629 SHA256 94d4b20d854cd7fa4c9c322c0b602751edbc5ca0d4f29fe92f996e28bb32f8a5 SHA512 19e7888f92c0cc6c948dd78831768fd7184fc4bc25ca1950a76f5175ed1763b8a34949e90eebbb063b072fbcac64c9fdf6072f5a22eaaae0c33e93cf6c49955b WHIRLPOOL 8b785c90a40fc32975cb81a9d8bf22bdd8667fd26710a962cecbf81c25f6348b3c49f30a91066ad8bb1bffce55658bab50181a2a82e217a7e71d7d361f2e5d92
DIST postgresql-9.0.23.tar.bz2 15045569 SHA256 3dbcbe19c814139a3f4be8bc6b49db804753cbc49979f345083e835c52b4d7de SHA512 db8fe64a5a5a1caae97e792ee5b8bcc375c6d6e10ef9c35f1003f174745568854dc5a7a58dbaf46794dcd35dee5a13f6eb1ba356f9618134b601b7759c753c9f WHIRLPOOL 5177facff628271a0d57d1f2925cfc04796020492c4102f0b0c6fa34149da9ddd9ccb0a38629e320521fe82163bdd4aa56f74af3a887ff4389cd9f62e921c53a
-DIST postgresql-9.1.18.tar.bz2 15822081 SHA256 2726d526666904b454f87fe2ae54357c2ab9eb8aba299a4c904829b7598584a8 SHA512 ba51e431c947b749c6522fd887ecbf50bf50cc08f2323b122a35fb18fccceb46d50f0e632a5b19df9855b5a29c98534d19f241d31e5bc235b0b06e8fb210210e WHIRLPOOL 59b5e6fb5626d630e41a8c0497480948d5bb0751fffbe1602dc62009948bad047c2ddc805caa3510157924c0fc74ead2fb2a71d0569d5c1b56eae753d9dbcd1a
DIST postgresql-9.1.19.tar.bz2 15843978 SHA256 cbd5057451147dd63a1e764176a4e17a7795773be1e4266ea9faa951064c0ec6 SHA512 23dd4108556edcc667f599c5663356a1106bc239a1c5337d153c13a1e1871d52316825b84802bbc1d79612dfa4c9c77f4c4b96d59d23d7338988bdf370e956d4 WHIRLPOOL 6845fd8071032e987ab65a642ca04adbc8b464332bac8c346f01e011411947aa4341ea596fd910342124fcbae4cc25410c25ab695894b0b68d20441df5424722
-DIST postgresql-9.2.13.tar.bz2 16401289 SHA256 5dcbd6209a8c0f508504fa433486583a42caaa240c823e1b3576db8a72db6a44 SHA512 0bcf8284aad756a70cd5e6d34a9f2cc17825151740da1c90a459edbf188a9a366831b71999803d301f0de35a5778f524b72779818b89599ffeb41cf1c2140077 WHIRLPOOL 3859e3e5c994441bc931ee92042a08eeb7b1196301b603f311372c2c2c65083b38713f4eac3e06c243703c2446a260b1ae861b7690f1fea03184d0518b10b486
DIST postgresql-9.2.14.tar.bz2 16451398 SHA256 54c20b3f320a48c38487f2711e98b2fa3f9ce4305905a294ad0449e8b4fb292e SHA512 268015d9e397ee62eebbbc9abf1ee25d0d4aa6bf5943b404009b3aab31f485b8523353c679beed34cc00304b9d4c7aca9de0ba841d9841dbf885d05d1a5692a1 WHIRLPOOL 4f6d5d6989a67d14082ddb215411b55d0dc0be29772e6a593b4df133489ff4a7e6c265d0830adba64d4c6be47e17a949cbc21d6570dceb9362399649af2be88e
DIST postgresql-9.3.10.tar.bz2 16995860 SHA256 e5444f0f76aff98a251400b7c28bc361d65e3d72d8d6cb9bb5d8361a69541531 SHA512 6b048fd1d0b38f72bab6ea70e40f10e7b805b94fc4c6fd865e0ec5e86da3c54043f20059dbf716d29eb4ca787dc50da561b1c7b48ab9f3096ebc651300855672 WHIRLPOOL b8ea15a04d18535662832d444b556aedffaa8c954b52dcd42d548f53f93b8a9dbfbe9298f63c26d44c8b757e8c10d76711c303cd83c84d9c86bf23c2837e74ce
-DIST postgresql-9.3.9.tar.bz2 16959310 SHA256 f73bd0ec2028511732430beb22414a022d2114231366e8cbe78c149793910549 SHA512 c6a9cae07968c99039910bb98d3e365fc285d2cdef02dd594128bd69ae65926392b18b65b0e13c3f17c366413bffbe226b6e8ce3453774b0439745b18ea129a8 WHIRLPOOL bcbc66a7b846b42c2d17d187e8b2c751afda8e5cdc7fa385ba1145f84e34950fad3b82fc1d04ae7ff9b7de01fd5705d9e507aa841880b97df2edb2ac8749a5fd
-DIST postgresql-9.4.4.tar.bz2 17616272 SHA256 538ed99688d6fdbec6fd166d1779cf4588bf2f16c52304e5ef29f904c43b0013 SHA512 e0f0efc2e3a01c93dad98796476808d60be243841104ceb496d2227214a9b4c5a32c5f550f0a456b0c64f2458aae32026960b63f68188269d367d900683a6061 WHIRLPOOL 9041b4b4e1b53bc97345fe587bc874df1185ef76fe105bfb54e9c882f3fd51841448e92deb12e1415ce76158da0683fcff333e08b9e54a8be565562ebfec6175
DIST postgresql-9.4.5.tar.bz2 17660960 SHA256 b87c50c66b6ea42a9712b5f6284794fabad0616e6ae420cf0f10523be6d94a39 SHA512 01ad4b5a097efa70f74a9e96b764c32953a9df57d6bf81b893a1e552475f6aba0381580dcd1f27b2c443ce89fecc429eeeb0219af60a0b2f84798f76eb1757f5 WHIRLPOOL 8ea0e9a40cefa53568071f2137bac996898f9bd486cfb5cfcf8bb49590816833f37878f10caabffb9d3127e047f00c916b8830594a485ebe16fb9fe6fc834c95
DIST postgresql-9.5beta1.tar.bz2 18291273 SHA256 b53199e2667982de2039ad7e30467f67c5d7af678e69d6211de8ba1cac75c9f0 SHA512 e8881939bdba346f3770102324d7b011c16e4529603280459e17587e06d933c9f3505b40c5cc82ed3f0410ffd88b5e2f18b2a3272aa4680c3798cf7a0fcc0374 WHIRLPOOL 0cf2c3fd40b2a8d482da5a1597abbc20d239f577c6472a03f8d9795a3e8ef142dfaad7a1eeebf2b2544e34712c243bbd9de63fb4045c4ce15dbde8ec74acb707
diff --git a/dev-db/postgresql/postgresql-9.0.22-r1.ebuild b/dev-db/postgresql/postgresql-9.0.22-r1.ebuild
deleted file mode 100644
index 66d27da22e5d..000000000000
--- a/dev-db/postgresql/postgresql-9.0.22-r1.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
- libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with kerberos krb5) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- $(use_with uuid ossp-uuid) \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.0.22.ebuild b/dev-db/postgresql/postgresql-9.0.22.ebuild
deleted file mode 100644
index f2c329c4baed..000000000000
--- a/dev-db/postgresql/postgresql-9.0.22.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with kerberos krb5) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- $(use_with uuid ossp-uuid) \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.0.23.ebuild b/dev-db/postgresql/postgresql-9.0.23.ebuild
index eb3eb2217795..174a686213e4 100644
--- a/dev-db/postgresql/postgresql-9.0.23.ebuild
+++ b/dev-db/postgresql/postgresql-9.0.23.ebuild
@@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.1.18-r1.ebuild b/dev-db/postgresql/postgresql-9.1.18-r1.ebuild
deleted file mode 100644
index 94d61202cf4e..000000000000
--- a/dev-db/postgresql/postgresql-9.1.18-r1.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
- libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- # Fix bug 486556 where the server would crash at start up because of
- # an infinite loop caused by a self-referencing symlink.
- epatch "${FILESDIR}/postgresql-9.1-tz-dir-overflow.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with kerberos krb5) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- $(use_with uuid ossp-uuid) \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.1.18.ebuild b/dev-db/postgresql/postgresql-9.1.18.ebuild
deleted file mode 100644
index e3266b0ce3db..000000000000
--- a/dev-db/postgresql/postgresql-9.1.18.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"
-
-# Testing within Portage's environment is broken, and the patch no
-# longer applies cleanly.
-RESTRICT="test"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- epatch "${FILESDIR}/pg_ctl-exit-status.patch"
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- # Fix bug 486556 where the server would crash at start up because of
- # an infinite loop caused by a self-referencing symlink.
- epatch "${FILESDIR}/postgresql-9.1-tz-dir-overflow.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with kerberos krb5) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- $(use_with uuid ossp-uuid) \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init-pre_9.2" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.1.19.ebuild b/dev-db/postgresql/postgresql-9.1.19.ebuild
index ea91d7b31c89..e2ab37ede1c9 100644
--- a/dev-db/postgresql/postgresql-9.1.19.ebuild
+++ b/dev-db/postgresql/postgresql-9.1.19.ebuild
@@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.2.13-r1.ebuild b/dev-db/postgresql/postgresql-9.2.13-r1.ebuild
deleted file mode 100644
index af0a7f32e3ae..000000000000
--- a/dev-db/postgresql/postgresql-9.2.13-r1.ebuild
+++ /dev/null
@@ -1,390 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
- libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- # Fix bug 486556 where the server would crash at start up because of
- # an infinite loop caused by a self-referencing symlink.
- epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with kerberos krb5) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- $(use_with uuid ossp-uuid) \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
-
-src_test() {
- einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
- if use server && [[ ${UID} -ne 0 ]] ; then
- emake check
-
- einfo "If you think other tests besides the regression tests are necessary, please"
- einfo "submit a bug including a patch for this ebuild to enable them."
- else
- use server || \
- ewarn 'Tests cannot be run without the "server" use flag enabled.'
- [[ ${UID} -eq 0 ]] || \
- ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
- ewarn 'Skipping.'
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.2.13.ebuild b/dev-db/postgresql/postgresql-9.2.13.ebuild
deleted file mode 100644
index 429de5926b4f..000000000000
--- a/dev-db/postgresql/postgresql-9.2.13.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- # Fix bug 486556 where the server would crash at start up because of
- # an infinite loop caused by a self-referencing symlink.
- epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with kerberos krb5) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- $(use_with uuid ossp-uuid) \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
-
-src_test() {
- einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
- if use server && [[ ${UID} -ne 0 ]] ; then
- emake check
-
- einfo "If you think other tests besides the regression tests are necessary, please"
- einfo "submit a bug including a patch for this ebuild to enable them."
- else
- use server || \
- ewarn 'Tests cannot be run without the "server" use flag enabled.'
- [[ ${UID} -eq 0 ]] || \
- ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
- ewarn 'Skipping.'
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.2.14.ebuild b/dev-db/postgresql/postgresql-9.2.14.ebuild
index f24a67c7ad6d..6ec39d36a746 100644
--- a/dev-db/postgresql/postgresql-9.2.14.ebuild
+++ b/dev-db/postgresql/postgresql-9.2.14.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.3.10.ebuild b/dev-db/postgresql/postgresql-9.3.10.ebuild
index 119c604e9e46..dc084ca55d17 100644
--- a/dev-db/postgresql/postgresql-9.3.10.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.10.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.3.9-r1.ebuild b/dev-db/postgresql/postgresql-9.3.9-r1.ebuild
deleted file mode 100644
index cfd6214cb00e..000000000000
--- a/dev-db/postgresql/postgresql-9.3.9-r1.ebuild
+++ /dev/null
@@ -1,390 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
- libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- # Fix bug 486556 where the server would crash at start up because of
- # an infinite loop caused by a self-referencing symlink.
- epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with kerberos krb5) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- $(use_with uuid ossp-uuid) \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
-
-src_test() {
- einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
- if use server && [[ ${UID} -ne 0 ]] ; then
- emake check
-
- einfo "If you think other tests besides the regression tests are necessary, please"
- einfo "submit a bug including a patch for this ebuild to enable them."
- else
- use server || \
- ewarn 'Tests cannot be run without the "server" use flag enabled.'
- [[ ${UID} -eq 0 ]] || \
- ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
- ewarn 'Skipping.'
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.3.9.ebuild b/dev-db/postgresql/postgresql-9.3.9.ebuild
deleted file mode 100644
index 093d090b10e1..000000000000
--- a/dev-db/postgresql/postgresql-9.3.9.ebuild
+++ /dev/null
@@ -1,387 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-uuid? ( dev-libs/ossp-uuid )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- # Fix bug 486556 where the server would crash at start up because of
- # an infinite loop caused by a self-referencing symlink.
- epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with kerberos krb5) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- $(use_with uuid ossp-uuid) \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
-
-src_test() {
- einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
- if use server && [[ ${UID} -ne 0 ]] ; then
- emake check
-
- einfo "If you think other tests besides the regression tests are necessary, please"
- einfo "submit a bug including a patch for this ebuild to enable them."
- else
- use server || \
- ewarn 'Tests cannot be run without the "server" use flag enabled.'
- [[ ${UID} -eq 0 ]] || \
- ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
- ewarn 'Skipping.'
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.4.4-r1.ebuild b/dev-db/postgresql/postgresql-9.4.4-r1.ebuild
deleted file mode 100644
index ffccfd7d50f7..000000000000
--- a/dev-db/postgresql/postgresql-9.4.4-r1.ebuild
+++ /dev/null
@@ -1,422 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
- local front back
- while [[ ${#} -gt 1 ]]; do
- front+="${1}? ( "
- back+=" )"
- shift
- done
- echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
- ${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
- $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- # Fix bug 555198: Correct typo in assembly code for alpha architecture
- epatch "${FILESDIR}/${PN}-${SLOT}-alpha-fix-read-memory-barrier.patch"
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- # Fix bug 486556 where the server would crash at start up because of
- # an infinite loop caused by a self-referencing symlink.
- epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- local i uuid_config=""
- if use uuid; then
- for i in ${UTIL_LINUX_LIBC[@]}; do
- use ${i} && uuid_config="--with-uuid=e2fs"
- done
- for i in ${BSD_LIBC[@]}; do
- use ${i} && uuid_config="--with-uuid=bsd"
- done
- [[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
- fi
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- ${uuid_config} \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
-
-src_test() {
- einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
- if use server && [[ ${UID} -ne 0 ]] ; then
- emake check
-
- einfo "If you think other tests besides the regression tests are necessary, please"
- einfo "submit a bug including a patch for this ebuild to enable them."
- else
- use server || \
- ewarn 'Tests cannot be run without the "server" use flag enabled.'
- [[ ${UID} -eq 0 ]] || \
- ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
- ewarn 'Skipping.'
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.4.4-r2.ebuild b/dev-db/postgresql/postgresql-9.4.4-r2.ebuild
deleted file mode 100644
index 6d720f0fdf82..000000000000
--- a/dev-db/postgresql/postgresql-9.4.4-r2.ebuild
+++ /dev/null
@@ -1,425 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap libressl nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= )
- libressl? ( dev-libs/libressl:= )
-)
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
- local front back
- while [[ ${#} -gt 1 ]]; do
- front+="${1}? ( "
- back+=" )"
- shift
- done
- echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
- ${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
- $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- # Fix bug 555198: Correct typo in assembly code for alpha architecture
- epatch "${FILESDIR}/${PN}-${SLOT}-alpha-fix-read-memory-barrier.patch"
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- # Fix bug 486556 where the server would crash at start up because of
- # an infinite loop caused by a self-referencing symlink.
- epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- local i uuid_config=""
- if use uuid; then
- for i in ${UTIL_LINUX_LIBC[@]}; do
- use ${i} && uuid_config="--with-uuid=e2fs"
- done
- for i in ${BSD_LIBC[@]}; do
- use ${i} && uuid_config="--with-uuid=bsd"
- done
- [[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
- fi
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- ${uuid_config} \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
-
-src_test() {
- einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
- if use server && [[ ${UID} -ne 0 ]] ; then
- emake check
-
- einfo "If you think other tests besides the regression tests are necessary, please"
- einfo "submit a bug including a patch for this ebuild to enable them."
- else
- use server || \
- ewarn 'Tests cannot be run without the "server" use flag enabled.'
- [[ ${UID} -eq 0 ]] || \
- ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
- ewarn 'Skipping.'
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.4.4.ebuild b/dev-db/postgresql/postgresql-9.4.4.ebuild
deleted file mode 100644
index 79d9153f86ca..000000000000
--- a/dev-db/postgresql/postgresql-9.4.4.ebuild
+++ /dev/null
@@ -1,419 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_{6,7},3_{2,3,4}} )
-
-inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
- systemd user versionator
-
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-
-SLOT="$(get_version_component_range 1-2)"
-
-SRC_URI="mirror://postgresql/source/v${PV}/postgresql-${PV}.tar.bz2"
-
-LICENSE="POSTGRESQL GPL-2"
-DESCRIPTION="PostgreSQL RDBMS"
-HOMEPAGE="http://www.postgresql.org/"
-
-LINGUAS="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr
- zh_CN zh_TW"
-IUSE="doc kerberos kernel_linux ldap nls pam perl -pg_legacytimestamp python
- +readline selinux +server ssl static-libs tcl threads uuid xml zlib"
-
-for lingua in ${LINGUAS}; do
- IUSE+=" linguas_${lingua}"
-done
-
-wanted_languages() {
- local enable_langs
-
- for lingua in ${LINGUAS} ; do
- use linguas_${lingua} && enable_langs+="${lingua} "
- done
-
- echo -n ${enable_langs}
-}
-
-CDEPEND="
->=app-eselect/eselect-postgresql-1.2.0
-sys-apps/less
-virtual/libintl
-kerberos? ( virtual/krb5 )
-ldap? ( net-nds/openldap )
-pam? ( virtual/pam )
-perl? ( >=dev-lang/perl-5.8 )
-python? ( ${PYTHON_DEPS} )
-readline? ( sys-libs/readline:0= )
-ssl? ( >=dev-libs/openssl-0.9.6-r1:0= )
-tcl? ( >=dev-lang/tcl-8:0= )
-xml? ( dev-libs/libxml2 dev-libs/libxslt )
-zlib? ( sys-libs/zlib )
-"
-
-# uuid flags -- depend on sys-apps/util-linux for Linux libcs, or if no
-# supported libc in use depend on dev-libs/ossp-uuid. For BSD systems,
-# the libc includes UUID functions.
-UTIL_LINUX_LIBC=( elibc_{glibc,uclibc,musl} )
-BSD_LIBC=( elibc_{Free,Net,Open}BSD )
-
-nest_usedep() {
- local front back
- while [[ ${#} -gt 1 ]]; do
- front+="${1}? ( "
- back+=" )"
- shift
- done
- echo "${front}${1}${back}"
-}
-
-IUSE+=" ${UTIL_LINUX_LIBC[@]} ${BSD_LIBC[@]}"
-CDEPEND+="
-uuid? (
- ${UTIL_LINUX_LIBC[@]/%/? ( sys-apps/util-linux )}
- $(nest_usedep ${UTIL_LINUX_LIBC[@]/#/!} ${BSD_LIBC[@]/#/!} dev-libs/ossp-uuid)
-)"
-
-DEPEND="${CDEPEND}
-!!<sys-apps/sandbox-2.0
-sys-devel/bison
-sys-devel/flex
-nls? ( sys-devel/gettext )
-xml? ( virtual/pkgconfig )
-"
-
-RDEPEND="${CDEPEND}
-!dev-db/postgresql-docs:${SLOT}
-!dev-db/postgresql-base:${SLOT}
-!dev-db/postgresql-server:${SLOT}
-selinux? ( sec-policy/selinux-postgresql )
-"
-
-pkg_setup() {
- use server && CONFIG_CHECK="~SYSVIPC" linux-info_pkg_setup
-
- enewgroup postgres 70
- enewuser postgres 70 /bin/sh /var/lib/postgresql postgres
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # Work around PPC{,64} compilation bug where bool is already defined
- sed '/#ifndef __cplusplus/a #undef bool' -i src/include/c.h || die
-
- # Set proper run directory
- sed "s|\(PGSOCKET_DIR\s\+\)\"/tmp\"|\1\"${EPREFIX}/run/postgresql\"|" \
- -i src/include/pg_config_manual.h || die
-
- use server || epatch "${FILESDIR}/${PN}-${SLOT}-no-server.patch"
-
- # Fix bug 486556 where the server would crash at start up because of
- # an infinite loop caused by a self-referencing symlink.
- epatch "${FILESDIR}/postgresql-9.2-9.4-tz-dir-overflow.patch"
-
- if use pam ; then
- sed -e "s/\(#define PGSQL_PAM_SERVICE \"postgresql\)/\1-${SLOT}/" \
- -i src/backend/libpq/auth.c || \
- die 'PGSQL_PAM_SERVICE rename failed.'
- fi
-
- epatch_user
-}
-
-src_configure() {
- case ${CHOST} in
- *-darwin*|*-solaris*)
- use nls && append-libs intl
- ;;
- esac
-
- export LDFLAGS_SL="${LDFLAGS}"
- export LDFLAGS_EX="${LDFLAGS}"
-
- local PO="${EPREFIX%/}"
-
- local i uuid_config=""
- if use uuid; then
- for i in ${UTIL_LINUX_LIBC[@]}; do
- use ${i} && uuid_config="--with-uuid=e2fs"
- done
- for i in ${BSD_LIBC[@]}; do
- use ${i} && uuid_config="--with-uuid=bsd"
- done
- [[ -z $uuid_config ]] && uuid_config="--with-uuid=ossp"
- fi
-
- econf \
- --prefix="${PO}/usr/$(get_libdir)/postgresql-${SLOT}" \
- --datadir="${PO}/usr/share/postgresql-${SLOT}" \
- --docdir="${PO}/usr/share/doc/${PF}" \
- --includedir="${PO}/usr/include/postgresql-${SLOT}" \
- --mandir="${PO}/usr/share/postgresql-${SLOT}/man" \
- --sysconfdir="${PO}/etc/postgresql-${SLOT}" \
- --with-system-tzdata="${PO}/usr/share/zoneinfo" \
- $(use_enable !pg_legacytimestamp integer-datetimes) \
- $(use_enable threads thread-safety) \
- $(use_with kerberos gssapi) \
- $(use_with ldap) \
- $(use_with pam) \
- $(use_with perl) \
- $(use_with python) \
- $(use_with readline) \
- $(use_with ssl openssl) \
- $(use_with tcl) \
- ${uuid_config} \
- $(use_with xml libxml) \
- $(use_with xml libxslt) \
- $(use_with zlib) \
- "$(use_enable nls nls "$(wanted_languages)")"
-}
-
-src_compile() {
- emake
- emake -C contrib
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- emake DESTDIR="${D}" install -C contrib
-
- dodoc README HISTORY doc/{TODO,bug.template}
-
- # man pages are already built, but if we have the target make them,
- # they'll be generated from source before being installed so we
- # manually install man pages.
- # We use ${SLOT} instead of doman for postgresql.eselect
- insinto /usr/share/postgresql-${SLOT}/man/
- doins -r doc/src/sgml/man{1,3,7}
- if ! use server; then
- # Remove man pages for non-existent binaries
- for m in {initdb,pg_{controldata,ctl,resetxlog},post{gres,master}}; do
- rm "${ED}/usr/share/postgresql-${SLOT}/man/man1/${m}.1"
- done
- fi
- docompress /usr/share/postgresql-${SLOT}/man/man{1,3,7}
-
- insinto /etc/postgresql-${SLOT}
- newins src/bin/psql/psqlrc.sample psqlrc
-
- dodir /etc/eselect/postgresql/slots/${SLOT}
- echo "postgres_ebuilds=\"\${postgres_ebuilds} ${PF}\"" > \
- "${ED}/etc/eselect/postgresql/slots/${SLOT}/base"
-
- use static-libs || find "${ED}" -name '*.a' -delete
-
- if use doc ; then
- docinto html
- dodoc doc/src/sgml/html/*
-
- docinto sgml
- dodoc doc/src/sgml/*.{sgml,dsl}
- fi
-
- if use server; then
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.confd" | newconfd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.init-9.3" | newinitd - ${PN}-${SLOT}
-
- sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \
- "${FILESDIR}/${PN}.service" | \
- systemd_newunit - ${PN}-${SLOT}.service
-
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}-${SLOT}.conf
-
- newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir
-
- use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session
-
- if use prefix ; then
- keepdir /run/postgresql
- fperms 0775 /run/postgresql
- fi
- fi
-}
-
-pkg_postinst() {
- postgresql-config update
-
- elog "If you need a global psqlrc-file, you can place it in:"
- elog " ${EROOT%/}/etc/postgresql-${SLOT}/"
-
- if use server ; then
- elog
- elog "Gentoo specific documentation:"
- elog "https://wiki.gentoo.org/wiki/PostgreSQL"
- elog
- elog "Official documentation:"
- elog "http://www.postgresql.org/docs/${SLOT}/static/index.html"
- elog
- elog "The default location of the Unix-domain socket is:"
- elog " ${EROOT%/}/run/postgresql/"
- elog
- elog "Before initializing the database, you may want to edit PG_INITDB_OPTS"
- elog "so that it contains your preferred locale in:"
- elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- elog
- elog "Then, execute the following command to setup the initial database"
- elog "environment:"
- elog " emerge --config =${CATEGORY}/${PF}"
- fi
-}
-
-pkg_prerm() {
- if use server && [[ -z ${REPLACED_BY_VERSION} ]] ; then
- ewarn "Have you dumped and/or migrated the ${SLOT} database cluster?"
- ewarn "\thttps://wiki.gentoo.org/wiki/PostgreSQL/QuickStart#Migrating_PostgreSQL"
-
- ebegin "Resuming removal in 10 seconds (Control-C to cancel)"
- sleep 10
- eend 0
- fi
-}
-
-pkg_postrm() {
- postgresql-config update
-}
-
-pkg_config() {
- use server || die "USE flag 'server' not enabled. Nothing to configure."
-
- [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \
- && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/"
- [[ -z "${DATA_DIR}" ]] \
- && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data"
-
- # environment.bz2 may not contain the same locale as the current system
- # locale. Unset and source from the current system locale.
- if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then
- unset LANG
- unset LC_CTYPE
- unset LC_NUMERIC
- unset LC_TIME
- unset LC_COLLATE
- unset LC_MONETARY
- unset LC_MESSAGES
- unset LC_ALL
- source "${EROOT%/}/etc/env.d/02locale"
- [ -n "${LANG}" ] && export LANG
- [ -n "${LC_CTYPE}" ] && export LC_CTYPE
- [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC
- [ -n "${LC_TIME}" ] && export LC_TIME
- [ -n "${LC_COLLATE}" ] && export LC_COLLATE
- [ -n "${LC_MONETARY}" ] && export LC_MONETARY
- [ -n "${LC_MESSAGES}" ] && export LC_MESSAGES
- [ -n "${LC_ALL}" ] && export LC_ALL
- fi
-
- einfo "You can modify the paths and options passed to initdb by editing:"
- einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}"
- einfo
- einfo "Information on options that can be passed to initdb are found at:"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
- einfo " http://www.postgresql.org/docs/${SLOT}/static/app-initdb.html"
- einfo
- einfo "PG_INITDB_OPTS is currently set to:"
- if [[ -z "${PG_INITDB_OPTS}" ]] ; then
- einfo " (none)"
- else
- einfo " ${PG_INITDB_OPTS}"
- fi
- einfo
- einfo "Configuration files will be installed to:"
- einfo " ${PGDATA}"
- einfo
- einfo "The database cluster will be created in:"
- einfo " ${DATA_DIR}"
- einfo
- while [ "$correct" != "true" ] ; do
- einfo "Are you ready to continue? (y/n)"
- read answer
- if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then
- correct="true"
- elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then
- die "Aborting initialization."
- else
- echo "Answer not recognized"
- fi
- done
-
- if [ -n "$(ls -A ${DATA_DIR} 2> /dev/null)" ] ; then
- eerror "The given directory, '${DATA_DIR}', is not empty."
- eerror "Modify DATA_DIR to point to an empty directory."
- die "${DATA_DIR} is not empty."
- fi
-
- einfo "Creating the data directory ..."
- if [[ ${EUID} == 0 ]] ; then
- mkdir -p "${DATA_DIR}"
- chown -Rf postgres:postgres "${DATA_DIR}"
- chmod 0700 "${DATA_DIR}"
- fi
-
- einfo "Initializing the database ..."
-
- if [[ ${EUID} == 0 ]] ; then
- su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}"
- else
- "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS}
- fi
-
- if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then
- mv "${DATA_DIR%/}"/{pg_{hba,ident},postgresql}.conf "${PGDATA}"
- ln -s "${PGDATA%/}"/{pg_{hba,ident},postgresql}.conf "${DATA_DIR%/}"
- fi
-
- cat <<- EOF >> "${PGDATA%/}"/postgresql.conf
- # This is here because of https://bugs.gentoo.org/show_bug.cgi?id=518522
- # On the off-chance that you might need to work with UTF-8 encoded
- # characters in PL/Perl
- plperl.on_init = 'use utf8; use re; package utf8; require "utf8_heavy.pl";'
- EOF
-
- einfo "The autovacuum function, which was in contrib, has been moved to the main"
- einfo "PostgreSQL functions starting with 8.1, and starting with 8.4 is now enabled"
- einfo "by default. You can disable it in the cluster's:"
- einfo " ${PGDATA%/}/postgresql.conf"
- einfo
- einfo "The PostgreSQL server, by default, will log events to:"
- einfo " ${DATA_DIR%/}/postmaster.log"
- einfo
- if use prefix ; then
- einfo "The location of the configuration files have moved to:"
- einfo " ${PGDATA}"
- einfo "To start the server:"
- einfo " pg_ctl start -D ${DATA_DIR} -o '-D ${PGDATA} --data-directory=${DATA_DIR}'"
- einfo "To stop:"
- einfo " pg_ctl stop -D ${DATA_DIR}"
- einfo
- einfo "Or move the configuration files back:"
- einfo "mv ${PGDATA}*.conf ${DATA_DIR}"
- else
- einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL"
- einfo "instead of 'pg_ctl'."
- fi
-}
-
-src_test() {
- einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-
- if use server && [[ ${UID} -ne 0 ]] ; then
- emake check
-
- einfo "If you think other tests besides the regression tests are necessary, please"
- einfo "submit a bug including a patch for this ebuild to enable them."
- else
- use server || \
- ewarn 'Tests cannot be run without the "server" use flag enabled.'
- [[ ${UID} -eq 0 ]] || \
- ewarn 'Tests cannot be run as root. Enable "userpriv" in FEATURES.'
-
- ewarn 'Skipping.'
- fi
-}
diff --git a/dev-db/postgresql/postgresql-9.4.5.ebuild b/dev-db/postgresql/postgresql-9.4.5.ebuild
index b3d58b04579f..a411b3837669 100644
--- a/dev-db/postgresql/postgresql-9.4.5.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.5.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 0e36e5770d96..e73f32b01587 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,2 +1,2 @@
-DIST tiled-0.11.0.tar.gz 2324668 SHA256 0d4b028902dfe08f18b542bfd9eaaf08886c1f685b2e176f438c3bf9d72e410d SHA512 c3eb230225a144938069b54bcedfe9927dd42358ca91d8922f56a4e566f0041b4b33aef3d87ef4b3b58634e9e98efd98a7132f419c2dd18d563f28393df066f8 WHIRLPOOL f28764e1d0904acecef826b4c35d7f56513c9b0cee682fbe1abf45989a1c6076d9eaa0285dff3daa64d88b8061dd3aec1fbae52208e1ea3510a2b4f167ed2270
DIST tiled-0.12.3.tar.gz 2372813 SHA256 8078b266cc4902451e14b1efb6c8eba69f610e5056fcb74d1d30b5b236253200 SHA512 a8b5cb2201806e6b5a0e5079a9e12fbffcbb79f2df0a193e3c3e80424df1c8c4c94ae23c1553a82a1813d4bc65d9da54d79faa41a8983233aa67023e2348cc4b WHIRLPOOL 6deb8f40aea684619c5aee3746080f0543c8a7d3dfc37d76afbd447bc34923afdbb4b676553e6e33d187a0702dfa0514ec4b567a02a95dbd4a5e87bc28c7fa92
+DIST tiled-0.14.2.tar.gz 2941171 SHA256 11ab1ae659d63e0fc6b78a319eab72c3a058a57c6c4bbd334a3e9f258ac0a6f5 SHA512 5fd47f56f1f29fa5cb48ec82f3ac2f4fd3c3addcdd35fc5e4fe742b83ebafe72c67d37c21e73bd5ac383070d68ed270dacc86f6c3959abbada915dfea19b5acf WHIRLPOOL 7cefcd1753614e07ff296d63f0b1a661caae8feeab0b8fb4f032b55443fb6512473443c7329ae7969018b6861ab9fc0dcdfddf743b7e63d1b8d6a668d89a68e9
diff --git a/dev-games/tiled/tiled-0.11.0.ebuild b/dev-games/tiled/tiled-0.14.2.ebuild
index d33d1a1992e7..69e780c15281 100644
--- a/dev-games/tiled/tiled-0.11.0.ebuild
+++ b/dev-games/tiled/tiled-0.14.2.ebuild
@@ -4,49 +4,57 @@
EAPI=5
-PLOCALES="cs de en es fr he it ja lv nl pt pt_BR ru zh zh_TW"
PYTHON_COMPAT=( python2_7 )
-inherit multilib l10n python-single-r1 qt4-r2
+inherit fdo-mime multilib python-single-r1 qmake-utils
DESCRIPTION="A general purpose tile map editor"
HOMEPAGE="http://www.mapeditor.org/"
SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
-LICENSE="BSD-2 GPL-2+"
+LICENSE="BSD BSD-2 GPL-2+"
SLOT="0"
KEYWORDS="~amd64"
IUSE="examples python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-DEPEND=">=dev-qt/qtcore-4.7:4
- >=dev-qt/qtgui-4.7:4
- >=dev-qt/qtopengl-4.7:4
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
sys-libs/zlib
- python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS COPYING NEWS README.md )
+ python? ( ${PYTHON_DEPS} )
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
pkg_setup() {
use python && python-single-r1_pkg_setup
}
-src_prepare() {
- rm -r src/zlib || die
- sed -e "s/^LANGUAGES =.*/LANGUAGES = $(l10n_get_locales)/" \
- -i translations/translations.pro || die
-}
-
src_configure() {
- eqmake4 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
+ eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
}
src_install() {
- qt4-r2_src_install
+ emake INSTALL_ROOT="${D}" install
+
+ dodoc AUTHORS COPYING NEWS README.md
if use examples ; then
docompress -x /usr/share/doc/${PF}/examples
dodoc -r examples
fi
}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ fdo-mime_mime_database_update
+}
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 9794b84a1b83..173d1b6a7564 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,5 +1,3 @@
-DIST asm-1.4.3.tar.gz 135980 SHA256 45970ef619fb39d30c48379ef362b2e2738586382df1d8090519736219c22a01 SHA512 c8bbcd702bb8593cf31a313fc82c4951f8b46b2818ba93571f9fbb909dbb50e1766111e25e5bb6cc73f9929dff7caf55c05c0e4fc66331591a3ddf087ce75641 WHIRLPOOL 109e3ffb86df3c645bc8c74b0768b1632aad271234556793b0ca64bba35cd8558394d12bfd3a77baf8dd85d17a04d5db15e230dfb5848526b9d559684fdc3989
-DIST asm-1.5.3.tar.gz 151370 SHA256 e58fda42c5a539ba2a1b99aa68329c27f3732299cf0942f654799b9f1fed1d3a SHA512 85ecf5bf676dc2a0a1ec6486f0d89b2da86b6fa4226b18b729c0cd7c648a4ed567d34871aa480b08bab37897ddb0c120c05b4dc299ebd79524319c4072b45ccc WHIRLPOOL 5b4674e484718b950fed1129b2cb9f9be81bfce6de256fe1048ae5305c522d9ae686b6a99601a705dd25a491f8a85e9652e96d3349f937d00e284e6f959e533f
DIST asm-2.0.tar.gz 258426 SHA256 8c0b305819f123aa3333efb66acbeb8f5deb8cef5419c1d940310c7fbe7c194e SHA512 6736d7cccecfb6de999a2f5fdf527112206b056646da70f3597f272138b191b5b28ee620aa1a708c9941416eca7bb56c5dcf947ec377c9899f05aaf014186c4d WHIRLPOOL 779b1ea46fbd9458eb00ec59e035492f1fa1ec2f5fa03a01547f3ef1600a0f886d6f51b96b5e47e972db47d709f381788eaa023ce8cdbb3c36590339b632f4cc
DIST asm-2.2.3.tar.gz 287535 SHA256 56c5ce25bff92c3641b6435e28eee71718bc4eb62d4964faa9da6bb9d1002344 SHA512 765b145a42cc02ef3066a6922afacdc70e63d7713c971e76621e7e03bdfd7e9426ca61a4b302fa0ad78f88046bfda5382befe84b690eb8102c7df912c0f0b73a WHIRLPOOL aca2299cf522034685a3ac008067a30230aaa811fc96cc3451b81b937903e21759c512330638acfc48101680576d90db46b915d097abdd902b3a58825877c4bf
DIST asm-3.3.1.tar.gz 854626 SHA256 69a523d41c82d7979c9b47271e31187e23c064e1d2a93b52950463bcb80197f5 SHA512 b0dffde873dcdfd8328736cfaeb8a3fca2e0788fa642d3af0c995d55c6ca4b1847e35c24100277a453b518305c5fe234d1935fa8de9b25bddd5dee5f1d4a4d44 WHIRLPOOL 90158f7fd87eae641e20aaca736debbd34b70e22feae1021c5f47255b8b9e8305460444e1f070288292b64a6aef3c083c81b520343f97b570ec1799d56d13874
diff --git a/dev-java/asm/asm-1.4.3-r3.ebuild b/dev-java/asm/asm-1.4.3-r3.ebuild
deleted file mode 100644
index a2df87c9a54f..000000000000
--- a/dev-java/asm/asm-1.4.3-r3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.objectweb.org"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="1.4"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.3
- dev-java/ant-core
- dev-java/ant-owanttask"
-RDEPEND=">=virtual/jre-1.3"
-
-RESTRICT="test"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- echo "objectweb.ant.tasks.path /usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
- >> build.properties
-}
-
-src_compile() {
- eant jar $(use_doc jdoc)
-}
-
-src_install() {
- for x in output/dist/lib/*.jar ; do
- java-pkg_newjar ${x} $(basename ${x/-${PV}})
- done
-
- use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/asm/asm-1.4.3-r4.ebuild b/dev-java/asm/asm-1.4.3-r4.ebuild
deleted file mode 100644
index 410ba50a6d35..000000000000
--- a/dev-java/asm/asm-1.4.3-r4.ebuild
+++ /dev/null
@@ -1,38 +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"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.objectweb.org"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="1.4"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-DEPEND=">=virtual/jdk-1.3
- dev-java/ant-core
- dev-java/ant-owanttask"
-RDEPEND=">=virtual/jre-1.3"
-RESTRICT="test"
-
-src_prepare() {
- echo "objectweb.ant.tasks.path ${EPREFIX}/usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
- >> build.properties
-}
-
-src_compile() {
- eant jar $(use_doc jdoc)
-}
-
-src_install() {
- for x in output/dist/lib/*.jar ; do
- java-pkg_newjar ${x} $(basename ${x/-${PV}})
- done
- use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/asm/asm-1.5.3-r1.ebuild b/dev-java/asm/asm-1.5.3-r1.ebuild
deleted file mode 100644
index bae27a980191..000000000000
--- a/dev-java/asm/asm-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.objectweb.org"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="1.5"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc source"
-DEPEND=">=virtual/jdk-1.3
- dev-java/ant-core
- dev-java/ant-owanttask
- source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.3"
-
-RESTRICT="test"
-
-src_prepare() {
- echo "objectweb.ant.tasks.path ${EPREFIX}/usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
- >> build.properties
-}
-
-EANT_DOC_TARGET=jdoc
-
-src_install() {
- for x in output/dist/lib/*.jar ; do
- java-pkg_newjar ${x} $(basename ${x/-${PV}})
- done
- use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/asm/asm-1.5.3.ebuild b/dev-java/asm/asm-1.5.3.ebuild
deleted file mode 100644
index 8f3ce183b087..000000000000
--- a/dev-java/asm/asm-1.5.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="http://asm.objectweb.org"
-SRC_URI="http://download.forge.objectweb.org/${PN}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="1.5"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc source"
-DEPEND=">=virtual/jdk-1.3
- dev-java/ant-core
- dev-java/ant-owanttask
- source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.3"
-
-RESTRICT="test"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- echo "objectweb.ant.tasks.path /usr/share/ant-owanttask/lib/ow_util_ant_tasks.jar" \
- >> build.properties
-}
-
-EANT_DOC_TARGET=jdoc
-
-src_install() {
- for x in output/dist/lib/*.jar ; do
- java-pkg_newjar ${x} $(basename ${x/-${PV}})
- done
- use doc && java-pkg_dohtml -r output/dist/doc/javadoc/user/*
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/icedtea/files/TryXShmAttach.patch b/dev-java/icedtea/files/TryXShmAttach.patch
new file mode 100644
index 000000000000..4157bb6bac49
--- /dev/null
+++ b/dev-java/icedtea/files/TryXShmAttach.patch
@@ -0,0 +1,201 @@
+
+# HG changeset patch
+# User andrew
+# Date 1438275152 -3600
+# Node ID a2334007f1a8504d2bd4a2c2a037732c289649c3
+# Parent ab23850139cb2c666e613010842a1f984b184a3a
+PR2568: openjdk causes a full desktop crash on RHEL 6 i586
+Summary: Re-apply "8025775: JNI warnings in TryXShmAttach"; some changes lost in bad merge changeset 4b26f93b23ba
+
+diff -r ab23850139cb -r a2334007f1a8 src/solaris/classes/sun/awt/X11/XConstants.java
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XConstants.java Wed Oct 23 10:50:34 2013 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XConstants.java Thu Jul 30 17:52:32 2015 +0100
+@@ -699,9 +699,4 @@
+ public static final long XkbModifierMapMask = (1L<<2);
+ public static final long XkbVirtualModsMask = (1L<<6); //server map
+
+- /*****************************************************************
+- * X SHARED MEMORY EXTENSION FUNCTIONS
+- *****************************************************************/
+-
+- public static final int X_ShmAttach = 1;
+ }
+diff -r ab23850139cb -r a2334007f1a8 src/solaris/classes/sun/awt/X11/XErrorHandler.java
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java Wed Oct 23 10:50:34 2013 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java Thu Jul 30 17:52:32 2015 +0100
+@@ -41,29 +41,6 @@
+ return XErrorHandlerUtil.SAVED_XERROR_HANDLER(display, err);
+ }
+ }
+-
+- /**
+- * This is a base synthetic error handler containing a boolean flag which allows
+- * to show that an error is handled or not.
+- */
+- public static class XErrorHandlerWithFlag extends XBaseErrorHandler {
+- private volatile boolean errorOccurred = false;
+-
+- public boolean getErrorOccurredFlag() {
+- return errorOccurred;
+- }
+-
+- /**
+- * Sets an internal boolean flag to a particular value. Should be always called
+- * with {@code false} value of the parameter {@code errorOccurred} before this
+- * error handler is set as current.
+- * @param errorOccurred {@code true} to indicate that an error was handled,
+- * {@code false} to reset the internal boolean flag
+- */
+- public void setErrorOccurredFlag(boolean errorOccurred) {
+- this.errorOccurred = errorOccurred;
+- }
+- }
+
+ /*
+ * Instead of validating window id, we simply call XGetWindowProperty,
+@@ -99,75 +76,4 @@
+ return theInstance;
+ }
+ }
+-
+- /**
+- * This is a synthetic error handler for errors generated by the native function
+- * {@code XShmAttach}. If an error is handled, an internal boolean flag of the
+- * handler is set to {@code true}.
+- */
+- public static final class XShmAttachHandler extends XErrorHandlerWithFlag {
+- private XShmAttachHandler() {}
+-
+- @Override
+- public int handleError(long display, XErrorEvent err) {
+- if (err.get_minor_code() == XConstants.X_ShmAttach) {
+- setErrorOccurredFlag(true);
+- return 0;
+- }
+- return super.handleError(display, err);
+- }
+-
+- // Shared instance
+- private static XShmAttachHandler theInstance = new XShmAttachHandler();
+- public static XShmAttachHandler getInstance() {
+- return theInstance;
+- }
+- }
+-
+- /**
+- * This is a synthetic error handler for {@code BadAlloc} errors generated by the
+- * native {@code glX*} functions. Its internal boolean flag is set to {@code true},
+- * if an error is handled.
+- */
+- public static final class GLXBadAllocHandler extends XErrorHandlerWithFlag {
+- private GLXBadAllocHandler() {}
+-
+- @Override
+- public int handleError(long display, XErrorEvent err) {
+- if (err.get_error_code() == XConstants.BadAlloc) {
+- setErrorOccurredFlag(true);
+- return 0;
+- }
+- return super.handleError(display, err);
+- }
+-
+- private static GLXBadAllocHandler theInstance = new GLXBadAllocHandler();
+- public static GLXBadAllocHandler getInstance() {
+- return theInstance;
+- }
+- }
+-
+- /**
+- * This is a synthetic error handler for errors generated by the native function
+- * {@code XChangeWindowAttributes}. If an error is handled, an internal boolean
+- * flag of the handler is set to {@code true}.
+- */
+- public static final class XChangeWindowAttributesHandler extends XErrorHandlerWithFlag {
+- private XChangeWindowAttributesHandler() {}
+-
+- @Override
+- public int handleError(long display, XErrorEvent err) {
+- if ((err.get_request_code() == XProtocolConstants.X_ChangeWindowAttributes) &&
+- (err.get_error_code() == XConstants.BadAccess)) {
+- setErrorOccurredFlag(true);
+- return 0;
+- }
+- return super.handleError(display, err);
+- }
+-
+- private static XChangeWindowAttributesHandler theInstance = new XChangeWindowAttributesHandler();
+- public static XChangeWindowAttributesHandler getInstance() {
+- return theInstance;
+- }
+- }
+ }
+diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/awt/awt_GraphicsEnv.h
+--- openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h Wed Oct 23 10:50:34 2013 +0200
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h Thu Jul 30 17:52:32 2015 +0100
+@@ -54,7 +54,7 @@
+
+ void TryInitMITShm(JNIEnv *env, jint *shmExt, jint *shmPixmaps);
+ void resetXShmAttachFailed();
+-jboolean TryXShmAttach(JNIEnv *env, Display *display, XShmSegmentInfo *shminfo);
++jboolean isXShmAttachFailed();
+
+ #endif /* MITSHM */
+
+diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/awt/awt_xembed_server.c
+--- openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c Wed Oct 23 10:50:34 2013 +0200
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c Thu Jul 30 17:52:32 2015 +0100
+@@ -644,19 +644,12 @@
+ return dim;
+ }
+
+-Boolean isMapped(JNIEnv* env, Window w) {
++Boolean isMapped(Window w) {
+ XWindowAttributes attr;
+ Status status = 0;
+- jboolean errorOccurredFlag;
+- jobject errorHandlerRef;
+- jobject savedError;
+- unsigned char xerror_code;
+-
+- EXEC_WITH_XERROR_HANDLER(env, "sun/awt/X11/XErrorHandler$IgnoreBadWindowHandler",
+- "()Lsun/awt/X11/XErrorHandler$IgnoreBadWindowHandler;", JNI_FALSE,
+- errorHandlerRef, errorOccurredFlag,
+- status = XGetWindowAttributes(awt_display, w, &attr));
+- xerror_code = GET_XERROR_CODE(env, savedError);
++ WITH_XERROR_HANDLER(xerror_ignore_bad_window);
++ status = XGetWindowAttributes(awt_display, w, &attr);
++ RESTORE_XERROR_HANDLER;
+ if (status == 0 || xerror_code != Success) {
+ return False;
+ }
+@@ -692,7 +685,7 @@
+ sdata->version = *data;
+ flags = *(data+1);
+ new_mapped = (flags & XEMBED_MAPPED) != 0;
+- currently_mapped = isMapped(env, sdata->handle);
++ currently_mapped = isMapped(sdata->handle);
+ if (new_mapped != currently_mapped) {
+ if (new_mapped) {
+ XMapWindow(awt_display, sdata->handle);
+diff -r ab23850139cb -r a2334007f1a8 src/solaris/native/sun/java2d/x11/X11SurfaceData.c
+--- openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Wed Oct 23 10:50:34 2013 +0200
++++ openjdk/jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c Thu Jul 30 17:52:32 2015 +0100
+@@ -551,8 +551,6 @@
+ {
+ XImage *img = NULL;
+ XShmSegmentInfo *shminfo;
+- JNIEnv* env;
+- jboolean xShmAttachResult;
+
+ shminfo = malloc(sizeof(XShmSegmentInfo));
+ if (shminfo == NULL) {
+@@ -603,7 +601,7 @@
+ */
+ shmctl(shminfo->shmid, IPC_RMID, 0);
+
+- if (xShmAttachResult == JNI_FALSE) {
++ if (isXShmAttachFailed() == JNI_TRUE) {
+ J2dRlsTraceLn1(J2D_TRACE_ERROR,
+ "X11SD_SetupSharedSegment XShmAttach has failed: %s",
+ strerror(errno));
+
diff --git a/dev-java/icedtea/icedtea-7.2.6.1.ebuild b/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild
index 2027cea9899f..9645c540adfb 100644
--- a/dev-java/icedtea/icedtea-7.2.6.1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild
@@ -284,6 +284,10 @@ src_configure() {
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+ # https://bugs.gentoo.org/show_bug.cgi?id=561500
+ ln -s "${FILESDIR}/TryXShmAttach.patch" || die
+ export DISTRIBUTION_PATCHES="TryXShmAttach.patch"
+
econf ${config} \
--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
--with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
diff --git a/dev-java/invokebinder/Manifest b/dev-java/invokebinder/Manifest
index a1dfa6bc1e94..966c75c5a0e4 100644
--- a/dev-java/invokebinder/Manifest
+++ b/dev-java/invokebinder/Manifest
@@ -1 +1,2 @@
DIST invokebinder-1.2.tar.gz 28581 SHA256 378ab47e625729974b25c81a60abd425abf155a27f60c7c2728ad3a78fd9a1d4 SHA512 aaf56fa008307d56805c6de7d47285d358f4c5018f1704a8f3b44c5bda5045dc20f588e70ce6fbb3486a48f80d30a7669d568e373717401780b13dd4737a8b16 WHIRLPOOL 1c46acfcb2d6c2c53bb24e94aca5afdc578fb6a72c7b3f83e80c22e69cb98e44257c10ba92bfa86c4ec766fea6216cb0604d9be5b2bb755efcae0fa5b0bc8859
+DIST invokebinder-1.6.tar.gz 36027 SHA256 db59600de448c9253976c0a288ad6575edbdc83ed6a6d58332b902ab9d337c4d SHA512 cacdd6dd5fe74bbba940be1b3d53b183adc247b74e89cc0784805b2ad2c63d12ca1abe20bacf0a90ea50db7574e43d4ac52b5a46e61912e5153e2ac2f6bc559a WHIRLPOOL 967f8bb39b588d381e3495756e79b7e738f631935aadddf5c6396d7367fcd19584f4d4ae3cb9734aafac17ca62906da8fc0459a9194f9f55671d5503b19265de
diff --git a/dev-java/invokebinder/files/invokebinder-1.6-build.xml b/dev-java/invokebinder/files/invokebinder-1.6-build.xml
new file mode 100644
index 000000000000..55c846cf0427
--- /dev/null
+++ b/dev-java/invokebinder/files/invokebinder-1.6-build.xml
@@ -0,0 +1,230 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. -->
+<!-- ====================================================================== -->
+
+<!-- ====================================================================== -->
+<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== -->
+<!-- ====================================================================== -->
+<!-- -->
+<!-- Any modifications will be overwritten. -->
+<!-- -->
+<!-- Generated by Maven Ant Plugin on 10/12/15 9:24 PM -->
+<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ -->
+<!-- -->
+<!-- ====================================================================== -->
+
+<project name="invokebinder-from-maven" default="package" basedir=".">
+
+ <!-- ====================================================================== -->
+ <!-- Build environment properties -->
+ <!-- ====================================================================== -->
+
+ <property file="${user.home}/.m2/maven.properties"/>
+ <property file="maven-build.properties"/>
+
+ <property name="maven.build.finalName" value="invokebinder-1.6"/>
+ <property name="maven.build.dir" value="target"/>
+ <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
+ <property name="maven.build.srcDir.0" value="src/main/java"/>
+ <property name="maven.build.resourceDir.0" value="src/main/resources"/>
+ <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/>
+ <property name="maven.build.testDir.0" value="src/test/java"/>
+ <property name="maven.build.testResourceDir.0" value="src/test/resources"/>
+ <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/>
+ <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/>
+
+ <property name="maven.repo.local" value="${user.home}/.m2/repository"/>
+ <property name="maven.settings.offline" value="false"/>
+ <property name="maven.settings.interactiveMode" value="true"/>
+
+ <!-- ====================================================================== -->
+ <!-- Defining classpaths -->
+ <!-- ====================================================================== -->
+
+ <path id="build.classpath"/>
+ <path id="build.test.classpath">
+ <pathelement location="${maven.repo.local}/junit/junit/4.9/junit-4.9.jar"/>
+ <pathelement location="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ </path>
+
+ <!-- ====================================================================== -->
+ <!-- Cleaning up target -->
+ <!-- ====================================================================== -->
+
+ <target name="clean" description="Clean the output directory">
+ <delete dir="${maven.build.dir}"/>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Compilation target -->
+ <!-- ====================================================================== -->
+
+ <target name="compile" description="Compile the code">
+ <mkdir dir="${maven.build.outputDir}"/>
+ <javac destdir="${maven.build.outputDir}"
+ encoding="UTF-8"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ target="1.7"
+ verbose="false"
+ fork="false"
+ source="1.7">
+ <src>
+ <pathelement location="${maven.build.srcDir.0}"/>
+ </src>
+ <classpath refid="build.classpath"/>
+ </javac>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Test-compilation target -->
+ <!-- ====================================================================== -->
+
+ <target name="compile-tests"
+ depends="compile"
+ description="Compile the test code"
+ unless="maven.test.skip">
+ <mkdir dir="${maven.build.testOutputDir}"/>
+ <javac destdir="${maven.build.testOutputDir}"
+ encoding="UTF-8"
+ nowarn="false"
+ debug="true"
+ optimize="false"
+ deprecation="true"
+ target="1.7"
+ verbose="false"
+ fork="false"
+ source="1.7">
+ <src>
+ <pathelement location="${maven.build.testDir.0}"/>
+ </src>
+ <classpath>
+ <path refid="build.test.classpath"/>
+ <pathelement location="${maven.build.outputDir}"/>
+ </classpath>
+ </javac>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Run all tests -->
+ <!-- ====================================================================== -->
+
+ <target name="test"
+ depends="compile-tests, junit-missing"
+ unless="junit.skipped"
+ description="Run the test cases">
+ <mkdir dir="${maven.test.reports}"/>
+ <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+ <sysproperty key="basedir" value="."/>
+ <formatter type="xml"/>
+ <formatter type="plain" usefile="false"/>
+ <classpath>
+ <path refid="build.test.classpath"/>
+ <pathelement location="${maven.build.outputDir}"/>
+ <pathelement location="${maven.build.testOutputDir}"/>
+ </classpath>
+ <batchtest todir="${maven.test.reports}" unless="test">
+ <fileset dir="${maven.build.testDir.0}">
+ <include name="**/Test*.java"/>
+ <include name="**/*Test.java"/>
+ <include name="**/*TestCase.java"/>
+ <exclude name="**/*Abstract*Test.java"/>
+ </fileset>
+ </batchtest>
+ <batchtest todir="${maven.test.reports}" if="test">
+ <fileset dir="${maven.build.testDir.0}">
+ <include name="**/${test}.java"/>
+ <exclude name="**/*Abstract*Test.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <target name="test-junit-present">
+ <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
+ </target>
+
+ <target name="test-junit-status"
+ depends="test-junit-present">
+ <condition property="junit.missing">
+ <and>
+ <isfalse value="${junit.present}"/>
+ <isfalse value="${maven.test.skip}"/>
+ </and>
+ </condition>
+ <condition property="junit.skipped">
+ <or>
+ <isfalse value="${junit.present}"/>
+ <istrue value="${maven.test.skip}"/>
+ </or>
+ </condition>
+ </target>
+
+ <target name="junit-missing"
+ depends="test-junit-status"
+ if="junit.missing">
+ <echo>=================================== WARNING ===================================</echo>
+ <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
+ <echo>===============================================================================</echo>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Javadoc target -->
+ <!-- ====================================================================== -->
+
+ <target name="javadoc" description="Generates the Javadoc of the application">
+ <javadoc sourcepath="${maven.build.srcDir.0}"
+ packagenames="*"
+ destdir="${maven.reporting.outputDirectory}/apidocs"
+ access="protected"
+ old="false"
+ verbose="false"
+ version="true"
+ use="true"
+ author="true"
+ splitindex="false"
+ nodeprecated="false"
+ nodeprecatedlist="false"
+ notree="false"
+ noindex="false"
+ nohelp="false"
+ nonavbar="false"
+ serialwarn="false"
+ charset="ISO-8859-1"
+ linksource="false"
+ breakiterator="false"/>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- Package target -->
+ <!-- ====================================================================== -->
+
+ <target name="package" depends="compile,test" description="Package the application">
+ <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar"
+ compress="true"
+ index="false"
+ basedir="${maven.build.outputDir}"
+ excludes="**/package.html"/>
+ </target>
+
+ <!-- ====================================================================== -->
+ <!-- A dummy target for the package named after the type it creates -->
+ <!-- ====================================================================== -->
+
+ <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+ <!-- ====================================================================== -->
+ <!-- Download dependencies target -->
+ <!-- ====================================================================== -->
+
+ <target name="test-offline">
+ <condition property="maven.mode.offline">
+ <equals arg1="${maven.settings.offline}" arg2="true"/>
+ </condition>
+ </target>
+
+</project>
diff --git a/dev-java/invokebinder/invokebinder-1.6.ebuild b/dev-java/invokebinder/invokebinder-1.6.ebuild
new file mode 100644
index 000000000000..dbc0c0312060
--- /dev/null
+++ b/dev-java/invokebinder/invokebinder-1.6.ebuild
@@ -0,0 +1,45 @@
+# 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="Provide a friendly DSL for binding method handles"
+HOMEPAGE="https://github.com/headius/invokebinder"
+SRC_URI="https://github.com/headius/${PN}/archive/${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+
+S="${WORKDIR}/${PN}-${P}"
+
+DEPEND=">=virtual/jdk-1.7
+ test? (
+ dev-java/ant-junit:0
+ )"
+RDEPEND=">=virtual/jre-1.7"
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_TEST_TARGET="test"
+
+java_prepare() {
+ cp "${FILESDIR}"/${P}-build.xml build.xml || die
+}
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar "target/${P}.jar" "${PN}.jar"
+ use source && java-pkg_dosrc src/main/java/com
+ if use doc; then
+ java-pkg_dojavadoc target/site/apidocs
+ dodoc README.markdown
+ fi
+}
diff --git a/dev-java/jama/jama-1.0.3-r1.ebuild b/dev-java/jama/jama-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..46145fc46964
--- /dev/null
+++ b/dev-java/jama/jama-1.0.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="Jama"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Java Matrix Package"
+HOMEPAGE="http://math.nist.gov/javanumerics/jama/"
+SRC_URI="http://math.nist.gov/javanumerics/${PN}/${MY_P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
diff --git a/dev-java/jama/jama-1.0.3.ebuild b/dev-java/jama/jama-1.0.3.ebuild
deleted file mode 100644
index c043f057cd02..000000000000
--- a/dev-java/jama/jama-1.0.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit base java-pkg-2
-
-MY_PN="Jama"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A Java Matrix Package"
-HOMEPAGE="http://math.nist.gov/javanumerics/jama/"
-SRC_URI="http://math.nist.gov/javanumerics/${PN}/${MY_P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}"
-
-src_compile() {
- mkdir -p build || die
-
- ejavac -d build $(find Jama -name '*.java')
-
- $(java-config -j) cf ${MY_PN}.jar -C build ${MY_PN} || die
-}
-
-src_install() {
- java-pkg_dojar ${MY_PN}.jar
-
- dodoc Jama/ChangeLog
-
- use doc && java-pkg_dojavadoc Jama/doc
- use source && java-pkg_dosrc Jama
-}
diff --git a/dev-java/javacsv/javacsv-2.1.ebuild b/dev-java/javacsv/javacsv-2.1.ebuild
index 9ab787026bd3..e4dbc11ad399 100644
--- a/dev-java/javacsv/javacsv-2.1.ebuild
+++ b/dev-java/javacsv/javacsv-2.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.csvreader.com/java_csv.php"
SRC_URI="mirror://sourceforge/${PN}/${P/-/}.zip"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jsr101/Manifest b/dev-java/jsr101/Manifest
index a574a72dd1b8..da642fa286ae 100644
--- a/dev-java/jsr101/Manifest
+++ b/dev-java/jsr101/Manifest
@@ -1 +1,2 @@
DIST axis-src-1_4.tar.gz 17041546 SHA256 911b4467f3d6cfe2e50fb7baea7a754e6aa717902d6ed91cef78f8f52bef8572 SHA512 7d08212b04702e76c960ad772a475f5765fef7f9ebe0aea3d4b949c6ba28a62500e8a76a43c7364b7caf36b7f27aee8592744256154670c7a24d29c5c1518258 WHIRLPOOL cf359caa9e645bdefb7c2ff012673dc64af9d4cc4bbe2a082cb64bcb0211d3a844ef797738ae1a3e9f978d0bbd8dc42bac9ecbdf4c734dd30ff52da18bdd7a91
+DIST jsr101-1.4.tar.bz2 18614 SHA256 2f2e793c0ece7240d7b117e2f05eb4b32d29e7fa7b2fbf85d912fb8693b0a55e SHA512 a29cca7e0ed1eb8aff4b70da6d804cb1cd61cdd9a800f420be6794aa927bca6a4146a95d71c8521d4dc16a0da56419f3e82079d942194380dbddb9d44d773317 WHIRLPOOL ad710d84c000f7711d0bcc3d93071160bb85daa0a854ade778ad3e636b49860a25739bd8e175b7c4a2a1b19f6c59451c0781b6b59f8331ce87cfb1c589d1e8f3
diff --git a/dev-java/jsr101/jsr101-1.4-r3.ebuild b/dev-java/jsr101/jsr101-1.4-r3.ebuild
new file mode 100644
index 000000000000..d181e54821e7
--- /dev/null
+++ b/dev-java/jsr101/jsr101-1.4-r3.ebuild
@@ -0,0 +1,32 @@
+# 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="Java(TM) API for XML-Based RPC Specification Interface Classes"
+HOMEPAGE="http://jcp.org/aboutJava/communityprocess/first/jsr101/"
+SRC_URI="http://dev.gentoo.org/~monsieurp/packages/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+CDEPEND="
+ java-virtuals/servlet-api:3.0
+ java-virtuals/saaj-api:0"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
+ ${CDEPEND}"
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="
+ servlet-api-3.0
+ saaj-api
+"
diff --git a/dev-java/netty-buffer/Manifest b/dev-java/netty-buffer/Manifest
index 25704ec1703e..1a0177d137bc 100644
--- a/dev-java/netty-buffer/Manifest
+++ b/dev-java/netty-buffer/Manifest
@@ -1,2 +1,2 @@
DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
-DIST netty-4.0.22.Final.tar.gz 983956 SHA256 d539483235223804d76f8da572b851cd196254f5da7d3ac8e064c626b31748ff SHA512 f216c8431e663533ea5258bc054154d07f791667712c4dd619eae5de55c1b9031cca756a26b49d8a0bb9e3cf61ca5cb295e7a3b3e4e9e98e99cd53963d54912e WHIRLPOOL ca3d9a9b78643414b4361388e8486ab7cbb7d4a479718d89a8f51d90ef7fd580b154f09d1e8014503bececd49fb8841782e933c8cc8f355609ccae1f6510ccc5
+DIST netty-4.0.32.Final.tar.gz 1188681 SHA256 723d8f3495522ad73528c06a65b9c0b5b5b72db341daacd0d64bdc8df3412d04 SHA512 160006fc014c5211010449ba1aca2f2d20320340a077ea27098f1d94702066450da950f3951b1cbcfebdee7506f7ec715bb8c007fa539c15f803ba24690e77c6 WHIRLPOOL 6a7b90d952acfe558bf36a2d0fd3dce3ba33f3047e5caf97ddfb6d3f1bf2ab26294af375b792e281804fb1b5a696f7e14dd15f7d93e26a8979600ea03eeddb1c
diff --git a/dev-java/netty-buffer/files/netty-buffer-4.0.22-build.xml b/dev-java/netty-buffer/files/netty-buffer-4.0.32-build.xml
index 4e3abdbe1fc0..4e3abdbe1fc0 100644
--- a/dev-java/netty-buffer/files/netty-buffer-4.0.22-build.xml
+++ b/dev-java/netty-buffer/files/netty-buffer-4.0.32-build.xml
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.22.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.32.ebuild
index 8b2bf1a13429..8b2bf1a13429 100644
--- a/dev-java/netty-buffer/netty-buffer-4.0.22.ebuild
+++ b/dev-java/netty-buffer/netty-buffer-4.0.32.ebuild
diff --git a/dev-java/netty-codec/Manifest b/dev-java/netty-codec/Manifest
index 25704ec1703e..1a0177d137bc 100644
--- a/dev-java/netty-codec/Manifest
+++ b/dev-java/netty-codec/Manifest
@@ -1,2 +1,2 @@
DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
-DIST netty-4.0.22.Final.tar.gz 983956 SHA256 d539483235223804d76f8da572b851cd196254f5da7d3ac8e064c626b31748ff SHA512 f216c8431e663533ea5258bc054154d07f791667712c4dd619eae5de55c1b9031cca756a26b49d8a0bb9e3cf61ca5cb295e7a3b3e4e9e98e99cd53963d54912e WHIRLPOOL ca3d9a9b78643414b4361388e8486ab7cbb7d4a479718d89a8f51d90ef7fd580b154f09d1e8014503bececd49fb8841782e933c8cc8f355609ccae1f6510ccc5
+DIST netty-4.0.32.Final.tar.gz 1188681 SHA256 723d8f3495522ad73528c06a65b9c0b5b5b72db341daacd0d64bdc8df3412d04 SHA512 160006fc014c5211010449ba1aca2f2d20320340a077ea27098f1d94702066450da950f3951b1cbcfebdee7506f7ec715bb8c007fa539c15f803ba24690e77c6 WHIRLPOOL 6a7b90d952acfe558bf36a2d0fd3dce3ba33f3047e5caf97ddfb6d3f1bf2ab26294af375b792e281804fb1b5a696f7e14dd15f7d93e26a8979600ea03eeddb1c
diff --git a/dev-java/netty-codec/files/netty-codec-4.0.22-build.xml b/dev-java/netty-codec/files/netty-codec-4.0.32-build.xml
index 938e196de1df..938e196de1df 100644
--- a/dev-java/netty-codec/files/netty-codec-4.0.22-build.xml
+++ b/dev-java/netty-codec/files/netty-codec-4.0.32-build.xml
diff --git a/dev-java/netty-codec/netty-codec-4.0.22.ebuild b/dev-java/netty-codec/netty-codec-4.0.32.ebuild
index 80061aa71c47..80061aa71c47 100644
--- a/dev-java/netty-codec/netty-codec-4.0.22.ebuild
+++ b/dev-java/netty-codec/netty-codec-4.0.32.ebuild
diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest
index 25704ec1703e..1a0177d137bc 100644
--- a/dev-java/netty-common/Manifest
+++ b/dev-java/netty-common/Manifest
@@ -1,2 +1,2 @@
DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
-DIST netty-4.0.22.Final.tar.gz 983956 SHA256 d539483235223804d76f8da572b851cd196254f5da7d3ac8e064c626b31748ff SHA512 f216c8431e663533ea5258bc054154d07f791667712c4dd619eae5de55c1b9031cca756a26b49d8a0bb9e3cf61ca5cb295e7a3b3e4e9e98e99cd53963d54912e WHIRLPOOL ca3d9a9b78643414b4361388e8486ab7cbb7d4a479718d89a8f51d90ef7fd580b154f09d1e8014503bececd49fb8841782e933c8cc8f355609ccae1f6510ccc5
+DIST netty-4.0.32.Final.tar.gz 1188681 SHA256 723d8f3495522ad73528c06a65b9c0b5b5b72db341daacd0d64bdc8df3412d04 SHA512 160006fc014c5211010449ba1aca2f2d20320340a077ea27098f1d94702066450da950f3951b1cbcfebdee7506f7ec715bb8c007fa539c15f803ba24690e77c6 WHIRLPOOL 6a7b90d952acfe558bf36a2d0fd3dce3ba33f3047e5caf97ddfb6d3f1bf2ab26294af375b792e281804fb1b5a696f7e14dd15f7d93e26a8979600ea03eeddb1c
diff --git a/dev-java/netty-common/netty-common-4.0.22.ebuild b/dev-java/netty-common/netty-common-4.0.32.ebuild
index 01939ededdc7..01939ededdc7 100644
--- a/dev-java/netty-common/netty-common-4.0.22.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.32.ebuild
diff --git a/dev-java/netty-transport/Manifest b/dev-java/netty-transport/Manifest
index 25704ec1703e..1a0177d137bc 100644
--- a/dev-java/netty-transport/Manifest
+++ b/dev-java/netty-transport/Manifest
@@ -1,2 +1,2 @@
DIST netty-4.0.21.Final.tar.gz 960489 SHA256 e1b5572defaa760dcd8ded4d7691e9daf242b2e1885115b722f2f790d9ef9f75 SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74 WHIRLPOOL 92e96986def775f26286958a9e2c7fe55ab571ad373f9cc25357db71f85f170d7aba7d7854c130c5788f7332665000cd10f666fff06abd0ce57cf4f95008958a
-DIST netty-4.0.22.Final.tar.gz 983956 SHA256 d539483235223804d76f8da572b851cd196254f5da7d3ac8e064c626b31748ff SHA512 f216c8431e663533ea5258bc054154d07f791667712c4dd619eae5de55c1b9031cca756a26b49d8a0bb9e3cf61ca5cb295e7a3b3e4e9e98e99cd53963d54912e WHIRLPOOL ca3d9a9b78643414b4361388e8486ab7cbb7d4a479718d89a8f51d90ef7fd580b154f09d1e8014503bececd49fb8841782e933c8cc8f355609ccae1f6510ccc5
+DIST netty-4.0.32.Final.tar.gz 1188681 SHA256 723d8f3495522ad73528c06a65b9c0b5b5b72db341daacd0d64bdc8df3412d04 SHA512 160006fc014c5211010449ba1aca2f2d20320340a077ea27098f1d94702066450da950f3951b1cbcfebdee7506f7ec715bb8c007fa539c15f803ba24690e77c6 WHIRLPOOL 6a7b90d952acfe558bf36a2d0fd3dce3ba33f3047e5caf97ddfb6d3f1bf2ab26294af375b792e281804fb1b5a696f7e14dd15f7d93e26a8979600ea03eeddb1c
diff --git a/dev-java/netty-transport/files/netty-transport-4.0.22-build.xml b/dev-java/netty-transport/files/netty-transport-4.0.32-build.xml
index 95387c4dc751..95387c4dc751 100644
--- a/dev-java/netty-transport/files/netty-transport-4.0.22-build.xml
+++ b/dev-java/netty-transport/files/netty-transport-4.0.32-build.xml
diff --git a/dev-java/netty-transport/netty-transport-4.0.22.ebuild b/dev-java/netty-transport/netty-transport-4.0.32.ebuild
index 5e639b9adf25..5e639b9adf25 100644
--- a/dev-java/netty-transport/netty-transport-4.0.22.ebuild
+++ b/dev-java/netty-transport/netty-transport-4.0.32.ebuild
diff --git a/dev-java/tomcat-native/tomcat-native-1.1.33.ebuild b/dev-java/tomcat-native/tomcat-native-1.1.33-r1.ebuild
index 8d4011ac8535..2c849c689297 100644
--- a/dev-java/tomcat-native/tomcat-native-1.1.33.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.1.33-r1.ebuild
@@ -4,7 +4,7 @@
EAPI="5"
-inherit base eutils java-pkg-2
+inherit base eutils java-pkg-2 java-ant-2
DESCRIPTION="Native APR library for Tomcat"
@@ -13,30 +13,41 @@ SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.t
HOMEPAGE="http://tomcat.apache.org/"
KEYWORDS="~amd64 ~x86"
LICENSE="Apache-2.0"
-IUSE=""
+IUSE="test"
-RDEPEND="=dev-libs/apr-1*
+RDEPEND="dev-libs/apr:1
dev-libs/openssl:=
- >=virtual/jre-1.5:*"
+ >=virtual/jre-1.7"
-DEPEND=">=virtual/jdk-1.5:*
- ${RDEPEND}"
+DEPEND=">=virtual/jdk-1.7
+ test? ( dev-java/ant-junit:0 )"
-S=${WORKDIR}/${P}-src/jni/native
+S=${WORKDIR}/${P}-src/jni
src_configure(){
+ cd native || die
econf --with-apr=/usr/bin/apr-1-config \
--with-ssl=/usr || die "Could not configure native sources"
}
src_compile() {
+ eant jar -f build.xml
+
+ cd native || die
base_src_compile
}
src_install() {
+ java-pkg_newjar "dist/${P}-dev.jar" "${PN}.jar"
+
+ cd native
emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
}
+src_test() {
+ java-pkg-2_src_test
+}
+
pkg_postinst() {
elog
elog " APR should be available with Tomcat, for more information"
diff --git a/dev-java/vldocking/Manifest b/dev-java/vldocking/Manifest
new file mode 100644
index 000000000000..74129905a63e
--- /dev/null
+++ b/dev-java/vldocking/Manifest
@@ -0,0 +1 @@
+DIST vldocking-3.0.5.zip 1734159 SHA256 a2c25fbe8ca1c2a8f3731e224096625d865eedae1843426624946851c58066f6 SHA512 a9943a767baa68b8cd8a75fad1e6e05e6f0083551c32c9af2b20258e2fe1fcc181a7700cc668b862e0cc2b04392a987ecfb92bf5203f273c72a8e2a2f4a72cd8 WHIRLPOOL 51f1fe5b9365d17e0f3349d1ad8872216dcfd3c643b12303b3b9b19d7a832a4fa643ab3a4071c40857a0a87f2ee563b4d68f2cfaff209d88981b452bd0ea81df
diff --git a/dev-java/vldocking/metadata.xml b/dev-java/vldocking/metadata.xml
new file mode 100644
index 000000000000..ee58970de9c5
--- /dev/null
+++ b/dev-java/vldocking/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>java</herd>
+ <upstream>
+ <remote-id type="github">cmadsen/vldocking</remote-id>
+ </upstream>
+ <maintainer>
+ <email>monsieurp@gentoo.org</email>
+ <name>Patrice Clement</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-java/vldocking/vldocking-3.0.5.ebuild b/dev-java/vldocking/vldocking-3.0.5.ebuild
new file mode 100644
index 000000000000..46f99c8fbfbb
--- /dev/null
+++ b/dev-java/vldocking/vldocking-3.0.5.ebuild
@@ -0,0 +1,38 @@
+# 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="Docking solution for Java Swing"
+HOMEPAGE="https://github.com/cmadsen/vldocking"
+SRC_URI="https://github.com/cmadsen/${PN}/archive/${P}.zip"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/slf4j-log4j12:0
+ dev-java/slf4j-api:0
+"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}
+"
+DEPEND=">=virtual/jdk-1.6
+ app-arch/unzip
+ ${CDEPEND}
+"
+
+JAVA_GENTOO_CLASSPATH="
+ slf4j-log4j12
+ slf4j-api
+"
+
+java_prepare() {
+ java-pkg_clean
+}
diff --git a/dev-lang/ekopath/Manifest b/dev-lang/ekopath/Manifest
index 7fc500120f94..6018d215bb50 100644
--- a/dev-lang/ekopath/Manifest
+++ b/dev-lang/ekopath/Manifest
@@ -2,3 +2,4 @@ DIST ekopath-2015-08-09-installer.run 58521154 SHA256 7ecd2a03012e36851f69ab35f1
DIST ekopath-2015-08-11-installer.run 59150939 SHA256 31f491e3744257ae87b735be418287ac4530bf525cd4c61fdb0f2438f0600e4b SHA512 ada2dc774247e5ea76f35f6f9311d58d99ec599e41befc0820650affae88be6916a2dd50bf9e67e4920db2ab16fc185fb088e523c1abc75ed7bfc5ec261e0eb1 WHIRLPOOL 721deca6bb973bf64219709cd0fc95907a2c5cfb447a295e45410939f700244197fd2a382ae537a847c10368af44fcbc538ddc9529769cfa4613eab118362df7
DIST ekopath-2015-09-10-installer.run 57138157 SHA256 fd4eca09107b9967ba01e508098c00fddbb809ba637e42aa1bb4b7518e947394 SHA512 67f99cbf74e1840de3ee4f1da810031b9e67c1ecfd7de6ff56c8303bdcdf6d9eedbb9eab975d7a6bb1ccbb3c5a65a3f60c7219f2321bd2eb4949f04979142148 WHIRLPOOL d41c1ca250b81d584d4f088ad8b03fe975bbb9fe5d6ef50c2d501904e0f187cefaf41e772c0cbd835106c1fed995a7e754a875fd621314b28bdde19a2a14fb88
DIST ekopath-2015-09-21-installer.run 57536286 SHA256 a3aab3f1cc018222644a7d4e10d0ebe68d38626074e95638d54ae9b690721332 SHA512 3a98635f233055a81435f6dd0044f13efe7b97a7554ca5c9b50586b74a3e848076842ce0bc04c07283e8cbf92bf21fcc9b4ca36888c379ddd3190364fea9bc90 WHIRLPOOL 3bd6debddb33776ca85951a942ff87a869ca6ee0defcd493750f1682dc0f769f5c1e44820510323cd7a983b486cab07b34a955d65b890fe3d0e36171036e678d
+DIST ekopath-2015-10-10-installer.run 57723481 SHA256 0cd16e8c70d3e7938474e8885a721f0e50871a01a742b7a653dd1e6791e32baf SHA512 a4e33475b0fce0f3e9e0b744f1ba898983223cee15861491b6f7c3584c381b25c922fc17a7fd759f609f8c73ecbfbd53eeaaea38ddd9151d1cd7e46d0f1cf883 WHIRLPOOL 45744d16e34297ba47bc028382f1dc29cf0611cbff76a179640629ea89526818b4580c63e69d54541bbe915963c761b9abfe809ee2854be58e73ad80bc4e7143
diff --git a/dev-lang/ekopath/ekopath-6.0.477_p20150809.ebuild b/dev-lang/ekopath/ekopath-6.0.477_p20150809.ebuild
index ab16a2fc6227..c886d1352814 100644
--- a/dev-lang/ekopath/ekopath-6.0.477_p20150809.ebuild
+++ b/dev-lang/ekopath/ekopath-6.0.477_p20150809.ebuild
@@ -38,7 +38,7 @@ src_unpack() {
}
src_prepare() {
- cat > 99${PN} <<-EOF
+ cat > 99${PN} <<-EOF || die
PATH=${EROOT%/}/opt/${PN}/bin
ROOTPATH=${EROOT%/}/opt/${PN}/bin
LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
diff --git a/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild b/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild
index ab16a2fc6227..c886d1352814 100644
--- a/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild
+++ b/dev-lang/ekopath/ekopath-6.0.481_p20150811.ebuild
@@ -38,7 +38,7 @@ src_unpack() {
}
src_prepare() {
- cat > 99${PN} <<-EOF
+ cat > 99${PN} <<-EOF || die
PATH=${EROOT%/}/opt/${PN}/bin
ROOTPATH=${EROOT%/}/opt/${PN}/bin
LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
diff --git a/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild b/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild
index ab16a2fc6227..c886d1352814 100644
--- a/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild
+++ b/dev-lang/ekopath/ekopath-6.0.521_p20150910.ebuild
@@ -38,7 +38,7 @@ src_unpack() {
}
src_prepare() {
- cat > 99${PN} <<-EOF
+ cat > 99${PN} <<-EOF || die
PATH=${EROOT%/}/opt/${PN}/bin
ROOTPATH=${EROOT%/}/opt/${PN}/bin
LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
diff --git a/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild b/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild
index ab16a2fc6227..c886d1352814 100644
--- a/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild
+++ b/dev-lang/ekopath/ekopath-6.0.532_p20150921.ebuild
@@ -38,7 +38,7 @@ src_unpack() {
}
src_prepare() {
- cat > 99${PN} <<-EOF
+ cat > 99${PN} <<-EOF || die
PATH=${EROOT%/}/opt/${PN}/bin
ROOTPATH=${EROOT%/}/opt/${PN}/bin
LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
diff --git a/dev-lang/ekopath/ekopath-6.0.551_p20151010.ebuild b/dev-lang/ekopath/ekopath-6.0.551_p20151010.ebuild
new file mode 100644
index 000000000000..c886d1352814
--- /dev/null
+++ b/dev-lang/ekopath/ekopath-6.0.551_p20151010.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator multilib pax-utils
+
+MY_PV=$(get_version_component_range 1-3)
+DATE=$(get_version_component_range 4)
+DATE=${DATE#p}
+DATE=${DATE:0:4}-${DATE:4:2}-${DATE:6}
+INSTALLER=${PN}-${DATE}-installer.run
+
+DESCRIPTION="PathScale EKOPath Compiler Suite"
+HOMEPAGE="http://www.pathscale.com/ekopath-compiler-suite"
+SRC_URI="http://c591116.r16.cf2.rackcdn.com/${PN}/nightly/Linux/${INSTALLER}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="!!app-arch/rpm"
+RDEPEND=""
+
+RESTRICT="bindist mirror"
+
+QA_PREBUILT="
+ opt/${PN}/lib/${MY_PV}/x8664/*
+ opt/${PN}/bin/*"
+
+S="${WORKDIR}"
+
+src_unpack() {
+ cp "${DISTDIR}/${INSTALLER}" "${S}/" || die
+ chmod +x "${S}/${INSTALLER}" || die
+}
+
+src_prepare() {
+ cat > 99${PN} <<-EOF || die
+ PATH=${EROOT%/}/opt/${PN}/bin
+ ROOTPATH=${EROOT%/}/opt/${PN}/bin
+ LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64
+ MANPATH=${EROOT%/}/opt/${PN}/docs/man
+ EOF
+}
+
+src_install() {
+ # EI_PAX marking is obsolete and PT_PAX breaks the binary.
+ # We must use XT_PAX to run the installer.
+ if [[ ${PAX_MARKINGS} == "XT" ]]; then
+ pax-mark m "${INSTALLER}"
+ fi
+
+ ./"${INSTALLER}" \
+ --prefix "${ED%/}/opt/${PN}" \
+ --mode unattended || die
+
+ if [[ ! -d ${ED%/}/opt/${PN}/lib/${MY_PV} ]]; then
+ local guess
+ cd "${ED%/}/opt/${PN}/lib" && guess=( * )
+
+ if [[ ${guess[@]} ]]; then
+ die "Incorrect release version in PV, guessing it should be: ${guess[*]}"
+ else
+ die "No libdir installed"
+ fi
+ fi
+ [[ -x ${ED%}/opt/${PN}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely"
+
+ rm -r "${ED}/opt/${PN}"/uninstall* || die
+ doenvd 99${PN}
+}
diff --git a/dev-lang/python/python-2.7.10.ebuild b/dev-lang/python/python-2.7.10.ebuild
index 70b1b9fe49e3..ada87dded37c 100644
--- a/dev-lang/python/python-2.7.10.ebuild
+++ b/dev-lang/python/python-2.7.10.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV}/${MY_P}.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"
+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 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.4.3.ebuild b/dev-lang/python/python-3.4.3.ebuild
index fbe5b11722cf..69fc0be10890 100644
--- a/dev-lang/python/python-3.4.3.ebuild
+++ b/dev-lang/python/python-3.4.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.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"
+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 +ncurses +readline sqlite +ssl +threads tk wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index d9c747112a37..f56f4d2f7548 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -12,4 +12,5 @@ DIST ruby-patches-2.0.0_p647.tar.bz2 2947 SHA256 dc173fe94af215fd2c1823f46140e4f
DIST ruby-patches-2.1.6-r1.tar.bz2 2348 SHA256 2c158373217a719f2961c1f2cf2f3494eb43c413dc41ba7f9c1d88c60baca7f7 SHA512 01367d463a3aa72261742ae468d96ca1fb06a2d6b2a7a0cc416e449a7ae602d4478fb2394390636725424f252fa95c5db7d2c8116dc0b1e4477d8d641961980f WHIRLPOOL b39e8b9bdd8d05958b3b4c5884bfdd65c99b9aee2470a48ca748cbf336948bf0bb9f834ce3fec5e9365abaf385de760012f67dec6db257d7cbeff04ce0c5c7fb
DIST ruby-patches-2.1.7.tar.bz2 1931 SHA256 7e02c1b6a6352693bfd5828c9d1a7633a52baa57d8770df182ed0d8b450a3341 SHA512 85928207db4f76e58925e50d39d73db2d521674385ce3232828377e7d7bb4252aafb9f93d6045d4c159bf094b472af61ef9307203db313bf28918fe35e0f3a21 WHIRLPOOL 17a698b0a09be15f444ea34b33e9aa1d029fbd572c565072a92480bf7b6b21f1b6b88b0da3183a486bae30e7e65f3172cd72b7336be1dc5974b62bd8e2b9ef7a
DIST ruby-patches-2.2.2-r1.tar.bz2 3066 SHA256 65342c7cd5146f0d5025932d31e2ed40e1247355d68356e17a06b0ff728fbef1 SHA512 1c578b868db179bca6dd7800528ac23076b1f44519d93b92fafd724d8e5a158512b05cb3d5f7a4f5ada156692978f98cab7dd5b4282701e57c33d50bcda977de WHIRLPOOL 241622b25acdc8b2a7cb912bac2f6e29a4331798ba67507821b3fb295791d7bea8b7933540f2cd47cc7e8477df14be478286d018b7afe9ae121cd8c49c58dc83
+DIST ruby-patches-2.2.3-r1.tar.bz2 3143 SHA256 45ce438c31c62313f193546a883afe19ccb6dda3276d1378eb5dfd33bd7b8bbe SHA512 e5799b8008276d98f3cd1bd57b1b76a39d052a7c920d84ef245961c2db55e96e7b7081b71aa04843844786cdeee759eb415b46d8e44611d5ff8f658ad12be7bb WHIRLPOOL d9d6dd5562574c2597cbb81b9dbb15c345cad9096e24cc82515fd021882a4e7fa375f37e660b1ce2075ef66bc7582bae4d0c3e819713549dbe7c5c3d4c658ded
DIST ruby-patches-2.2.3.tar.bz2 2263 SHA256 a08bfaf193adf8e92e7937c9e8db3ec4a880e80dd9c99a5621a00a9233d4d2cd SHA512 dafbb40254d9703a7ed66314f6d9d0dd4c88485a5cef28ff1e3c7020c28cfaac1561ecfb72a465811b59213dbaf9aece6b52240ae895e47f5be63d7f88bc5543 WHIRLPOOL 54b91871b991d38cd4c573884389aaa4ee81afc14fd918e968f0b82df95264930d71199741be820c816998ca9134c496a028e13d00b93cae3c870981f28c2160
diff --git a/dev-lang/ruby/ruby-2.2.3-r1.ebuild b/dev-lang/ruby/ruby-2.2.3-r1.ebuild
new file mode 100644
index 000000000000..c47b5c48a2ae
--- /dev/null
+++ b/dev-lang/ruby/ruby-2.2.3-r1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#PATCHSET=1
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_P="${PN}-$(get_version_component_range 1-3)"
+S=${WORKDIR}/${MY_P}
+
+SLOT=$(get_version_component_range 1-2)
+MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
+RUBYVERSION=2.2.0
+
+if [[ -n ${PATCHSET} ]]; then
+ if [[ ${PVR} == ${PV} ]]; then
+ PATCHSET="${PV}-r0.${PATCHSET}"
+ else
+ PATCHSET="${PVR}.${PATCHSET}"
+ fi
+else
+ PATCHSET="${PVR}"
+fi
+
+DESCRIPTION="An object-oriented scripting language"
+HOMEPAGE="http://www.ruby-lang.org/"
+SRC_URI="mirror://ruby/2.2/${MY_P}.tar.xz
+ https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl xemacs ncurses +readline"
+
+RDEPEND="
+ berkdb? ( sys-libs/db:= )
+ gdbm? ( sys-libs/gdbm )
+ jemalloc? ( dev-libs/jemalloc )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ socks5? ( >=net-proxy/dante-1.1.13 )
+ ncurses? ( sys-libs/ncurses:0= )
+ readline? ( sys-libs/readline:0 )
+ dev-libs/libyaml
+ virtual/libffi
+ sys-libs/zlib
+ >=app-eselect/eselect-ruby-20141227
+ !<dev-ruby/rdoc-3.9.4
+ !<dev-ruby/rubygems-1.8.10-r1"
+
+DEPEND="${RDEPEND}"
+
+BUNDLED_GEMS="
+ >=dev-ruby/minitest-5.4.3[ruby_targets_ruby22]
+ >=dev-ruby/power_assert-0.2.2[ruby_targets_ruby22]
+ >=dev-ruby/test-unit-3.0.8[ruby_targets_ruby22]
+"
+
+PDEPEND="
+ ${BUNDLED_GEMS}
+ virtual/rubygems[ruby_targets_ruby22]
+ >=dev-ruby/json-1.8.1[ruby_targets_ruby22]
+ >=dev-ruby/rake-0.9.6[ruby_targets_ruby22]
+ rdoc? ( >=dev-ruby/rdoc-4.0.1[ruby_targets_ruby22] )
+ xemacs? ( app-xemacs/ruby-modes )"
+
+src_prepare() {
+ EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+ epatch "${WORKDIR}/patches"
+
+ # We can no longer unbundle all of rake because rubygems now depends
+ # on this. We leave the actual rake code around to bootstrap
+ # rubygems, but remove the bits that would cause a file collision.
+ einfo "Unbundling gems..."
+ cd "$S"
+ rm -r \
+ {bin,lib}/rake lib/rake.rb man/rake.1 \
+ bin/gem || die "removal failed"
+ # Remove bundled gems that we will install via PDEPEND, bug
+ # 539700. Use explicit version numbers to ensure rm fails when they
+ # change so we can update dependencies accordingly.
+ rm gems/{minitest-5.4.3,power_assert-0.2.2,test-unit-3.0.8}.gem || die
+
+ # Fix a hardcoded lib path in configure script
+ sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
+ configure.in || die "sed failed"
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=
+
+ # The Tk module can no longer be built because the module code is no
+ # longer compatible with newer stable versions.
+ # https://bugs.gentoo.org/show_bug.cgi?id=500894
+ local modules="tk"
+
+ # -fomit-frame-pointer makes ruby segfault, see bug #150413.
+ filter-flags -fomit-frame-pointer
+ # In many places aliasing rules are broken; play it safe
+ # as it's risky with newer compilers to leave it as it is.
+ append-flags -fno-strict-aliasing
+ # SuperH needs this
+ use sh && append-flags -mieee
+
+ # Socks support via dante
+ if use socks5 ; then
+ # Socks support can't be disabled as long as SOCKS_SERVER is
+ # set and socks library is present, so need to unset
+ # SOCKS_SERVER in that case.
+ unset SOCKS_SERVER
+ fi
+
+ # Increase GC_MALLOC_LIMIT if set (default is 8000000)
+ if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
+ append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
+ fi
+
+ # ipv6 hack, bug 168939. Needs --enable-ipv6.
+ use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
+
+ # Determine which modules *not* to build depending in the USE flags.
+ if ! use readline ; then
+ modules="${modules},readline"
+ fi
+ if ! use berkdb ; then
+ modules="${modules},dbm"
+ fi
+ if ! use gdbm ; then
+ modules="${modules},gdbm"
+ fi
+ if ! use ssl ; then
+ modules="${modules},openssl"
+ fi
+ if ! use ncurses ; then
+ modules="${modules},curses"
+ fi
+
+ INSTALL="${EPREFIX}/usr/bin/install -c" econf \
+ --program-suffix=${MY_SUFFIX} \
+ --with-soname=ruby${MY_SUFFIX} \
+ --docdir=${EPREFIX}/usr/share/doc/${P} \
+ --enable-shared \
+ --enable-pthread \
+ --disable-rpath \
+ --with-out-ext="${modules}" \
+ $(use_enable jemalloc jemalloc) \
+ $(use_enable socks5 socks) \
+ $(use_enable doc install-doc) \
+ --enable-ipv6 \
+ $(use_enable debug) \
+ ${myconf} \
+ --enable-option-checking=no \
+ || die "econf failed"
+}
+
+src_compile() {
+ emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_test() {
+ emake -j1 V=1 test || die "make test failed"
+
+ elog "Ruby's make test has been run. Ruby also ships with a make check"
+ elog "that cannot be run until after ruby has been installed."
+ elog
+ if use rubytests; then
+ elog "You have enabled rubytests, so they will be installed to"
+ elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
+ elog "than root, and you must place them into a writeable directory."
+ elog "Then call: "
+ elog
+ elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
+ else
+ elog "Enable the rubytests USE flag to install the make check tests"
+ fi
+}
+
+src_install() {
+ # Remove the remaining bundled gems. We do this late in the process
+ # since they are used during the build to e.g. create the
+ # documentation.
+ rm -rf ext/json || die
+
+ # Ruby is involved in the install process, we don't want interference here.
+ unset RUBYOPT
+
+ local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
+
+ LD_LIBRARY_PATH="${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+ RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
+ for d in $(find "${S}/ext" -type d) ; do
+ RUBYLIB="${RUBYLIB}:$d"
+ done
+ export LD_LIBRARY_PATH RUBYLIB
+
+ emake V=1 DESTDIR="${D}" install || die "make install failed"
+
+ # Remove installed rubygems copy
+ rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
+ rm -r "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
+ rm -r "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
+
+ if use doc; then
+ make DESTDIR="${D}" install-doc || die "make install-doc failed"
+ fi
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r sample
+ fi
+
+ dodoc ChangeLog NEWS doc/NEWS* README* || die
+
+ if use rubytests; then
+ pushd test
+ insinto /usr/share/${PN}-${SLOT}/test
+ doins -r .
+ popd
+ fi
+}
+
+pkg_postinst() {
+ if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
+ eselect ruby set ruby${MY_SUFFIX}
+ fi
+
+ elog
+ elog "To switch between available Ruby profiles, execute as root:"
+ elog "\teselect ruby set ruby(19|20|...)"
+ elog
+}
+
+pkg_postrm() {
+ eselect ruby cleanup
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index d1731a9e0d0d..214299e3a952 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,16 +1,12 @@
DIST pl-6.6.6.tar.gz 14838653 SHA256 9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe44ec1d8d04351a776996d SHA512 a850b0f6b283d34aa77d5e9d8a0053161fa534fa6d8935c7472362ff7b59ea6035de0658d9e38c317e2d92ed810370f2adc3e92b6346fc0ff392d18f1c8012a6 WHIRLPOOL 448d844fe45aee97ad2e37bea3f81dd5eb388e1dcb9f1c4dc54c18991aa91d481bff5b70174fb06edb06c1361759621a570a083fe36d62bffdf6028c49244b2a
DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb WHIRLPOOL 0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e
-DIST swi-prolog-7.2.0-gentoo-patchset-0.tar.gz 1629 SHA256 b41a9c416ea0976c1a5f49d6d10090fa8ac41a6fe82982410fec0f09e73e09f0 SHA512 35449b56aa671ca937b2ee0e40ab7b19cd5a1b68277084a22c06c9e00f1318ab4d6603993b4aa44e9a6d8ab1418661a4d409160b93db04b7ca6e7c199831348e WHIRLPOOL 8a46b84865a2da2f315bf877cc1e464b59abc2891a91a5ee20530af39b353127c9d5ffabc4dea076137d619354dff259524ca28f0d4407c165be08e1b5c6fd38
-DIST swi-prolog-7.2.1-gentoo-patchset-0.tar.gz 1636 SHA256 b8aa8cda2e5903341e4f51187a4901d810ad3b4c03db514315fbf1dea671b924 SHA512 839ebe9ceaf010198edd36a8bd19eccfaba779e95b83a1908f1532d16eb650656758de68ee70195057e4c975d76aff46b2ca3f5c3f93e1698355227678148510 WHIRLPOOL efe93a16272ab99c6dc1bfaedabaddaef389c8c07d34f3ee5af1d417612601c85a39c56ce5b0d7ca167a84537277fcab76290f3fb2427e4b30ff7911d79f8d2d
DIST swi-prolog-7.2.2-gentoo-patchset-0.tar.gz 1414 SHA256 145f585828da45d89c6abebb7707ef224334a6e102dd50302b1af549d8d8a3c8 SHA512 32642e5e133971fbcec777791c050dd548545050353e23e08e0457487d3b5ec46e9491be4cdfb8d0a0a8af613dc64b569969aaa31a0d8691e0c3fdd9b5c645d0 WHIRLPOOL f394d4da284e31e4f431cda1af54d3dd4f2995bf04de985750c7b0f89f2ad6ed2fca8c921ffe711ae83b8f0d478c864bf81b531a9fe71ab9be73df20083e5c21
DIST swi-prolog-7.2.3-gentoo-patchset-0.tar.gz 1418 SHA256 b8cca09211889c3fdca47bcc3093f0811b773553d457b6d4cd423d0a3483ac8b SHA512 6fe185bc6a015bdb0c1466818f2e45897c098d98c091854cb86f1756458585724a8d17c1c8a5593ee054cbe0400c322b27bf107194aa1ba91d478623ff468e39 WHIRLPOOL aa9df0ddc7a01e776074c32f381b92f2738c86ac7a3462749cb24954549e1979c5c8c17038a3161772e41c7f39637ee3547efcda52ef2362e03d814af4cd885b
-DIST swi-prolog-7.3.5-gentoo-patchset-0.tar.gz 1418 SHA256 578af69e8219375bd91959d83363d748d10354e9b7f8025d2229e2c894d148ac SHA512 ec16f0fb8f4c04d3c80547dd385fe8dabe98030f017dffd4ebf76ca2fcae8c564ba95ca3706d5bd2df9a00766fcad99dd0797b72af21dba84ad40b030d13c088 WHIRLPOOL 2b0acc37ba216fdc24a43834d0e26c20f5888c51a8d97b4f3379d7906ecc40f63c7dec45a3321430ca12fec195d9e08d7fd6017415ff7845e2299adce9da502f
-DIST swi-prolog-7.3.6-gentoo-patchset-0.tar.gz 1426 SHA256 e5de1588a2bbb225e78e4494856d2dc3987592bd76abdbe4c8af0a71458eb1d0 SHA512 e0d05aaabd335be1401d2558f8fe176053449e6b5823bcf407a1073f255c019cc869747e3f02627eab9641aadf0de421a945ad9c3a4edca2263590099f4cc972 WHIRLPOOL a878ac0bacd685657bf526cd6ff0bfbe09cf5ac50499b6e4313f1020ae10d7958502eddd5c84c752fdcf2995106ff635e5c4c0087e10f1c3718d262aecd91b0c
DIST swi-prolog-7.3.7-gentoo-patchset-0.tar.gz 1709 SHA256 81f5f0de37f1fe07c25352caa151b3d13f92265fbbf5476f8713dc349fd214ec SHA512 88eec4a4a709714bbde2cbf457064adb193dc51b4c7f143cb9ab5526b4cdf6a434aa81b79c7e65537381b9a166a84ae5666776f572952bffc1ead894eb8bac32 WHIRLPOOL 00b8c5b637173c2725cae62086b58a2acfd475447232d11fa1d9cf038b0a662bf226fb3a39a3b5bd4d22d8c6b51a67d0fbddb09e88d6f778c84022b6d46be0e7
-DIST swipl-7.2.0.tar.gz 16211509 SHA256 801423b8293d08b96b575ffa96d91cce3acf2473f04c23d58657dd668287f8cb SHA512 94c89e7f76ff545821e2e984a630d37863f305fe71f0cc79a3fd4e41e1b69f4a74f924a4f429d054480b2dd030ceba5fc65fefb75933cf19aeb18c0a03863bf6 WHIRLPOOL 815d1a900a501ad8d9cb843bd42bf1756f1d5c70d994637960c7849140b3ab414b26da06c85998870027ec27678050a68d3480bb81ed23978be9e10e7920e631
-DIST swipl-7.2.1.tar.gz 16175699 SHA256 f81bd713c5a7544f9b2af694cc0e74aaaf7a70e0a67203caab6ee9493e1dd01f SHA512 514d89963a7b6cae2e33cb01a2b67cb7ec6fd0dbfa7010608b87a3207626f04cd57ce71f816d10be9ac0266d0f2d243f773fc0bd46b37caf04fc2435748d96be WHIRLPOOL ba396ec4465d9ebdf14efea44fa958d655c87b14af201421a6ac88db17bb46391129f0a9ce9a29229457b0f940892a126f6ee55285dbf0ba9395ed01066585ff
+DIST swi-prolog-7.3.8-gentoo-patchset-0.tar.gz 1430 SHA256 e927f0efce19b949fa9f2d4f5ad53488eafdd66891cd71f5051bed997491bb7d SHA512 989c7d893cc6213f76a9eb5422662dabd9d63489b0a8924a37e3293323d81215ea13510a2fb2a37f07fdee2417aafbd8e07d1f16b2d974da724aebdbb371d47a WHIRLPOOL b24e68a2e600dbf445202228a411077be3e75c838599a375c85c9185628d9109971c3b43622fbe260688961d52bf30d4a490e5961a43d2378132d339c8961420
+DIST swi-prolog-7.3.9-gentoo-patchset-0.tar.gz 1507 SHA256 029541109cc60d176b65d12903ee2e06f209c38ff29421674e660d31d6ee44d4 SHA512 357df9c6e5ce5b046e4ceb7d65b358bd191ff8c912812deba918fe3b76c48a46c9f89f28ddc950de151e47ec57d654c53f537024da5f7f2f373f7466f07f914f WHIRLPOOL 5ac911d2950d4ccffe1db959467215fc8d074b9a842e79aea7d8bc0d14587dce6388707b2c06e3d94474eed8feb939398daa616160642883192e6dbfe7034da2
DIST swipl-7.2.2.tar.gz 16179490 SHA256 c137bbe1d652a6aaa003278045e592637cd9fd5f1d52b05f9f0751bfd9449c8d SHA512 b25ed01e49628d9b463acd0e3687eaef0e3f74e8f834a1442e66913fabf948ae6f6d662c21e3cbb1ca5793ceb96701be31c3b1d2d3a0a9694ea4706f9a64939e WHIRLPOOL 1309284a4d610cb37196aca678d4823bba384ba04a84ef1212c3580bad40da3359fbe4035a13cbfdd21a4eca75df2b8a3c398a1da9061a71ba8da8276c2b17dd
DIST swipl-7.2.3.tar.gz 16192142 SHA256 43657d51b7c5887bc2d2bced50a9822b86a08a6841399b8e76ee877f51d646b5 SHA512 da27a6b171d3b471401f1a91e86a4dbe98973d8a1db8c72aa27e452311d08b893b01a1de8f9f4dafcdac460774b4ea980050256d37284546941e1bdf84f8cd7b WHIRLPOOL de695c8e0317921dcc13898f7a3c88d1012e3f87f633cd25766ca5cb6637b29ca81b9245d015614089291a7d9abd0d8c7109ccae1df9297d78301d241cb258b3
-DIST swipl-7.3.5.tar.gz 16185426 SHA256 e8dd7cf6077dabc6cbefe2087fec36f5219d84ac15c9b8ee89db4dcc17edd91f SHA512 0da707a44907cc152a42f45eb9370622826c3b840c774a976716ae032d1f411b0ac783e28eb9789b55d069921f5186c901b05686f14122cd6741972d4754fdde WHIRLPOOL 6b9e2822d91021c3223ddd0c21ed0c8621df405314c8b995d88a6f235cfc25633eb34605c61f1fd10ed2b29c44a6929b6503cc4d09c72c1fcd65dd41f77ecaa2
-DIST swipl-7.3.6.tar.gz 16188830 SHA256 cb3e0ebccfeda043e32a3706aa0304c9ecdef9da0bf762f27ad9acbabcdb3a08 SHA512 9036edd5704fcd40c2c50a7fa93871bea44ffc98a3707bed8c0b0355648630ffdfeea6ed33a73057eb0c741fb73db2daf24d64f471566e3ca35a24c2c6a1b996 WHIRLPOOL efa48bfbce96ad3907f686a13ca159322cc0554e7c20f56c54250ea774f75a4937d230bb365252242f76bb692c35b2e7a2fa27fd9caa6a75f8bda4b42a51538d
DIST swipl-7.3.7.tar.gz 16065373 SHA256 db291d45753f6fc1af5f0ff174d1770ce4e0455d2eb1f6be7ac3cac263571cc7 SHA512 93987a45cb34df6da1415845a4f79004e9e64a8fe4552f3b74ebb4dc509329a0850000c693090f452541ca1bd9187f7c40b7dc6b0159f650e2bc769bd7d48d21 WHIRLPOOL 277725e359ea29faa8c83e1d9089fdcf9483d20b866a4b36bcc19a09c63bc24379352751524d35c0758e9355c20b53a45180bd4bcec4352ededf2c9ab4c836ee
+DIST swipl-7.3.8.tar.gz 16075095 SHA256 c7a31eac0020831cddd31045bc12dca10b437b737545a8a42fa193a3937ae882 SHA512 98a144e1a22c4b3bc5c0e4865b19930956aa1b60336f4da2538340502b5b27e327db8a4bc498c64ed3b63510c0d5c29ccf51843da70fb787ae1367a312a2f543 WHIRLPOOL 5b23f3f674745297377cc63960899841b73e57de48d24fd1e3de81d34b6db53e2fefd53efb7fd8ab4850d359cf12584a6c2686ead952f55f72fc62bdf223381b
+DIST swipl-7.3.9.tar.gz 16086076 SHA256 0a0b6933bd37cf23446d77839651e0cbbb9d4becd74d9d47fc9d1f26fe409d04 SHA512 b592eafdf5413e1f473a83371ea387adbfa1f64fea1a1e809d2e0eafc11b95fd3e47a429e39dcb6c0c27f490d9ba20702805866e9f9d71d5ba2a135c4adb6043 WHIRLPOOL 0920d8d605be185035d3876adb92ba77c0b9081e66ee8da5fd9cabe83902fb9562fbce39769c137fddbf41f9b6580c267676a4cd21ed91b51f7a60827f5d6a75
diff --git a/dev-lang/swi-prolog/metadata.xml b/dev-lang/swi-prolog/metadata.xml
index 2adce0b36097..49e918fd2050 100644
--- a/dev-lang/swi-prolog/metadata.xml
+++ b/dev-lang/swi-prolog/metadata.xml
@@ -4,5 +4,6 @@
<herd>prolog</herd>
<use>
<flag name='archive'>Use libarchive for extension packs</flag>
+ <flag name='uuid'>Use ossp-uuid for UUID pack</flag>
</use>
</pkgmetadata>
diff --git a/dev-lang/swi-prolog/swi-prolog-7.2.0.ebuild b/dev-lang/swi-prolog/swi-prolog-7.2.0.ebuild
deleted file mode 100644
index 55e2a4878ac0..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.2.0.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
- mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
- archive? ( app-arch/libarchive )
- zlib? ( sys-libs/zlib )
- odbc? ( dev-db/unixODBC )
- readline? ( sys-libs/readline )
- gmp? ( dev-libs/gmp )
- ssl? ( dev-libs/openssl )
- java? ( >=virtual/jdk-1.5 )
- X? (
- virtual/jpeg
- x11-libs/libX11
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXt
- x11-libs/libICE
- x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
- X? ( x11-proto/xproto )
- java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
- EPATCH_FORCE=yes
- EPATCH_SUFFIX=patch
- epatch "${WORKDIR}"/${PV}
-
- # OSX/Intel ld doesn't like an archive without table of contents
- sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- use ppc && append-flags -mno-altivec
- use hardened && append-flags -fno-unit-at-a-time
- use debug && append-flags -DO_DEBUG
-
- # ARCH is used in the configure script to figure out host and target
- # specific stuff
- export ARCH=${CHOST}
-
- export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
- cd "${S}"/src || die
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- $(use_enable gmp) \
- $(use_enable readline) \
- $(use_enable static-libs static) \
- --enable-shared \
- --enable-custom-flags COFLAGS="${CFLAGS}"
-
- if ! use minimal ; then
- local jpltestconf
- if use java && use test ; then
- jpltestconf="--with-junit=$(java-config --classpath junit)"
- fi
-
- cd "${S}/packages" || die
- econf \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- $(use_with archive) \
- $(use_with java jpl) \
- ${jpltestconf} \
- $(use_with odbc) \
- $(use_with ssl) \
- $(use_with X xpce) \
- $(use_with zlib) \
- COFLAGS='"${CFLAGS}"'
- fi
-}
-
-src_compile() {
- cd "${S}"/src || die
- emake
-
- if ! use minimal ; then
- cd "${S}/packages" || die
- emake
- ./report-failed || die "Cannot report failed packages"
- fi
-}
-
-src_test() {
- cd "${S}/src" || die
- emake check
-
- if ! use minimal ; then
- cd "${S}/packages" || die
- emake check
- ./report-failed || die "Cannot report failed packages"
- fi
-}
-
-src_install() {
- emake -C src DESTDIR="${D}" install
-
- if ! use minimal ; then
- emake -C packages DESTDIR="${D}" install
- if use doc ; then
- emake -C packages DESTDIR="${D}" html-install
- fi
- ./packages/report-failed || die "Cannot report failed packages"
- fi
-
- dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.2.1.ebuild b/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
index 55e2a4878ac0..5378ee5d017d 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.2.1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.2.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
+IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test uuid zlib X"
RDEPEND="sys-libs/ncurses
archive? ( app-arch/libarchive )
@@ -26,6 +26,7 @@ RDEPEND="sys-libs/ncurses
gmp? ( dev-libs/gmp )
ssl? ( dev-libs/openssl )
java? ( >=virtual/jdk-1.5 )
+ uuid? ( dev-libs/ossp-uuid )
X? (
virtual/jpeg
x11-libs/libX11
@@ -46,6 +47,10 @@ src_prepare() {
EPATCH_SUFFIX=patch
epatch "${WORKDIR}"/${PV}
+ if ! use uuid; then
+ mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+ fi
+
# OSX/Intel ld doesn't like an archive without table of contents
sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.6.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.8.ebuild
index fbf2c6937c81..c5eb39df2369 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.3.6.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.3.8.ebuild
@@ -16,10 +16,11 @@ SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
+IUSE="archive berkdb debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
RDEPEND="sys-libs/ncurses
archive? ( app-arch/libarchive )
+ berkdb? ( >=sys-libs/db-4 )
zlib? ( sys-libs/zlib )
odbc? ( dev-db/unixODBC )
readline? ( sys-libs/readline )
@@ -81,6 +82,7 @@ src_configure() {
econf \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
$(use_with archive) \
+ $(use_with berkdb bdb ) \
$(use_with java jpl) \
${jpltestconf} \
$(use_with odbc) \
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.5.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.9.ebuild
index fbf2c6937c81..6d28b23a5e5b 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.3.5.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.3.9.ebuild
@@ -16,18 +16,20 @@ SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
+IUSE="archive berkdb debug doc +gmp hardened java minimal odbc +readline ssl static-libs test uuid zlib X"
RDEPEND="sys-libs/ncurses
archive? ( app-arch/libarchive )
+ berkdb? ( >=sys-libs/db-4 )
zlib? ( sys-libs/zlib )
odbc? ( dev-db/unixODBC )
readline? ( sys-libs/readline )
gmp? ( dev-libs/gmp )
- ssl? ( dev-libs/openssl )
+ ssl? ( dev-libs/openssl:0 )
java? ( >=virtual/jdk-1.5 )
+ uuid? ( dev-libs/ossp-uuid )
X? (
- virtual/jpeg
+ virtual/jpeg:0
x11-libs/libX11
x11-libs/libXft
x11-libs/libXpm
@@ -46,6 +48,10 @@ src_prepare() {
EPATCH_SUFFIX=patch
epatch "${WORKDIR}"/${PV}
+ if ! use uuid; then
+ mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+ fi
+
# OSX/Intel ld doesn't like an archive without table of contents
sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
}
@@ -81,6 +87,7 @@ src_configure() {
econf \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
$(use_with archive) \
+ $(use_with berkdb bdb ) \
$(use_with java jpl) \
${jpltestconf} \
$(use_with odbc) \
@@ -108,8 +115,8 @@ src_test() {
if ! use minimal ; then
cd "${S}/packages" || die
- emake check
- ./report-failed || die "Cannot report failed packages"
+ emake USE_PUBLIC_NETWORK_TESTS=false DISPLAY= check
+ ./report-failed || die
fi
}
diff --git a/dev-libs/geoip/geoip-1.6.6.ebuild b/dev-libs/geoip/geoip-1.6.6.ebuild
index c5c62ed5d6c8..5b02c56d784a 100644
--- a/dev-libs/geoip/geoip-1.6.6.ebuild
+++ b/dev-libs/geoip/geoip-1.6.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
LICENSE="LGPL-2.1 GPL-2 MaxMind2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
IUSE="static-libs"
RESTRICT="test"
diff --git a/dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch b/dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch
new file mode 100644
index 000000000000..259b5720c127
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.44.1-bionic-nameser.patch
@@ -0,0 +1,15 @@
+https://bugzilla.gnome.org/756477
+
+fix build w/newer releases of bionic (android)
+
+--- a/gio/gthreadedresolver.c
++++ b/gio/gthreadedresolver.c
+@@ -263,7 +263,7 @@ lookup_by_address_finish (GResolver *resolver,
+
+ #if defined(G_OS_UNIX)
+
+-#ifdef __BIONIC__
++#if defined __BIONIC__ && !defined BIND_4_COMPAT
+ /* Copy from bionic/libc/private/arpa_nameser_compat.h
+ * and bionic/libc/private/arpa_nameser.h */
+ typedef struct {
diff --git a/dev-libs/glib/glib-2.44.1-r1.ebuild b/dev-libs/glib/glib-2.44.1-r1.ebuild
new file mode 100644
index 000000000000..25be8706448d
--- /dev/null
+++ b/dev-libs/glib/glib-2.44.1-r1.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Until bug #537330 glib is a reverse dependency of pkgconfig and, then
+# adding new dependencies end up making stage3 to grow. Every addition needs
+# then to be think very closely.
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+# Building with --disable-debug highly unrecommended. It will build glib in
+# an unusable form as it disables some commonly used API. Please do not
+# convert this to the use_enable form, as it results in a broken build.
+GCONF_DEBUG="yes"
+# Completely useless with or without USE static-libs, people need to use
+# pkg-config
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic multilib \
+ pax-utils python-r1 toolchain-funcs versionator virtualx linux-info multilib-minimal
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI}
+ http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
+REQUIRED_USE="
+ utils? ( ${PYTHON_REQUIRED_USE} )
+ test? ( ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+RDEPEND="
+ !<dev-util/gdbus-codegen-${PV}
+ >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+ xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] )
+ fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+ utils? (
+ ${PYTHON_DEPS}
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+ || (
+ >=dev-libs/elfutils-0.142
+ >=dev-libs/libelf-0.8.12
+ >=sys-freebsd/freebsd-lib-9.2_rc1
+ )
+ )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+"
+DEPEND="${RDEPEND}
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-libs/libxslt-1.0
+ >=sys-devel/gettext-0.11
+ >=dev-util/gtk-doc-am-1.20
+ systemtap? ( >=dev-util/systemtap-1.3 )
+ test? (
+ sys-devel/gdb
+ ${PYTHON_DEPS}
+ >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
+ >=sys-apps/dbus-1.2.14 )
+ !<dev-util/gtk-doc-1.15-r2
+"
+# gobject-introspection blocker to ensure people don't mix
+# different g-i and glib major versions
+
+PDEPEND="!<gnome-base/gvfs-1.6.4-r990
+ dbus? ( gnome-base/dconf )
+ mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+# Earlier versions of gvfs do not work with glib
+
+pkg_setup() {
+ if use kernel_linux ; then
+ CONFIG_CHECK="~INOTIFY_USER"
+ if use test; then
+ CONFIG_CHECK="~IPV6"
+ WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+ export IPV6_DISABLED="yes"
+ fi
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # Prevent build failure in stage3 where pkgconfig is not available, bug #481056
+ mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die
+
+ if use test; then
+ # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+ if ! has_version dev-util/desktop-file-utils ; then
+ ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+ ewarn "think on installing it to get these tests run."
+ sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+ sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
+ sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
+ sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
+ fi
+
+ # gdesktopappinfo requires existing terminal (gnome-terminal or any
+ # other), falling back to xterm if one doesn't exist
+ if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+ ewarn "Some tests will be skipped due to missing terminal program"
+ sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+ fi
+
+ # Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
+ if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:3' ; then
+ ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:3"
+ ewarn "not being present on your system, think on installing them to get these tests run."
+ sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
+ sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
+ sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
+ sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
+ sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
+ sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
+ sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
+ # needed to prevent gdbus-threading from asserting
+ ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
+ fi
+
+ # Some tests need ipv6, upstream bug #667468
+ if [[ -n "${IPV6_DISABLED}" ]]; then
+ sed -i -e "/gdbus\/peer-to-peer/d" gio/tests/gdbus-peer.c || die
+ sed -i -e "/gdbus\/delayed-message-processing/d" gio/tests/gdbus-peer.c || die
+ sed -i -e "/gdbus\/nonce-tcp/d" gio/tests/gdbus-peer.c || die
+ fi
+
+ # thread test fails, upstream bug #679306
+ # FIXME: we need to check if it's still failing as upstream thinks something
+ # is wrong in our setups
+ #epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+
+ # This test is prone to fail, bug #504024, upstream bug #723719
+ sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die
+ else
+ # Don't build tests, also prevents extra deps, bug #512022
+ sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
+ fi
+
+ # gdbus-codegen is a separate package
+ epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"
+
+ epatch "${FILESDIR}/${PN}-2.44.1-bionic-nameser.patch"
+
+ # leave python shebang alone
+ sed -e '/${PYTHON}/d' \
+ -i glib/Makefile.{am,in} || die
+
+ # Gentoo handles completions in a different directory
+ sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+ gio/Makefile.am || die
+
+ epatch_user
+
+ # Also needed to prevent cross-compile failures, see bug #267603
+ eautoreconf
+
+ gnome2_src_prepare
+
+ epunt_cxx
+}
+
+multilib_src_configure() {
+ # Avoid circular depend with dev-util/pkgconfig and
+ # native builds (cross-compiles won't need pkg-config
+ # in the target ROOT to work here)
+ if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then
+ if has_version sys-apps/dbus; then
+ export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+ export DBUS1_LIBS="-ldbus-1"
+ fi
+ export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)"
+ export LIBFFI_LIBS="-lffi"
+ fi
+
+ # These configure tests don't work when cross-compiling.
+ if tc-is-cross-compiler ; then
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756473
+ case ${CHOST} in
+ hppa*|metag*) export glib_cv_stack_grows=yes ;;
+ *) export glib_cv_stack_grows=no ;;
+ esac
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756474
+ export glib_cv_uscore=no
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756475
+ export ac_cv_func_posix_get{pwuid,grgid}_r=yes
+ fi
+
+ local myconf
+
+ case "${CHOST}" in
+ *-mingw*) myconf="${myconf} --with-threads=win32" ;;
+ *) myconf="${myconf} --with-threads=posix" ;;
+ esac
+
+ # FIXME: Always use internal libpcre, bug #254659
+ # (maybe consider going back to system lib)
+ # libelf used only by the gresource bin
+ ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
+ $(use_enable xattr) \
+ $(use_enable fam) \
+ $(use_enable selinux) \
+ $(use_enable static-libs static) \
+ $(use_enable systemtap dtrace) \
+ $(use_enable systemtap systemtap) \
+ $(multilib_native_use_enable utils libelf) \
+ --disable-compile-warnings \
+ --enable-man \
+ --with-pcre=internal \
+ --with-xml-catalog="${EPREFIX}/etc/xml/catalog"
+
+ if multilib_is_native_abi; then
+ local d
+ for d in glib gio gobject; do
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+ done
+ fi
+}
+
+multilib_src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ export XDG_CONFIG_DIRS=/etc/xdg
+ export XDG_DATA_DIRS=/usr/local/share:/usr/share
+ export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+ unset GSETTINGS_BACKEND # bug 352451
+ export LC_TIME=C # bug #411967
+ python_export_best
+
+ # Related test is a bit nitpicking
+ mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+ chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+ # Hardened: gdb needs this, bug #338891
+ if host-is-pax ; then
+ pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \
+ || die "Hardened adjustment failed"
+ fi
+
+ # Need X for dbus-launch session X11 initialization
+ Xemake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ DOCS="AUTHORS ChangeLog* NEWS* README"
+ einstalldocs
+
+ if use utils ; then
+ python_replicate_script "${ED}"/usr/bin/gtester-report
+ else
+ rm "${ED}usr/bin/gtester-report"
+ rm "${ED}usr/share/man/man1/gtester-report.1"
+ fi
+
+ # Do not install charset.alias even if generated, leave it to libiconv
+ rm -f "${ED}/usr/lib/charset.alias"
+
+ # Don't install gdb python macros, bug 291328
+ rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ if has_version '<x11-libs/gtk+-3.0.12:3'; then
+ # To have a clear upgrade path for gtk+-3.0.x users, have to resort to
+ # a warning instead of a blocker
+ ewarn
+ ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
+ ewarn "You should upgrade to a newer version of gtk+:3 immediately."
+ fi
+}
diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml
index 8f096daa22fa..9dda65d6b97c 100644
--- a/dev-libs/glib/metadata.xml
+++ b/dev-libs/glib/metadata.xml
@@ -11,7 +11,8 @@
<flag name="systemtap">Build support for profiling and tracing using
<pkg>dev-util/systemtap</pkg></flag>
<flag name="utils">Install gtester-report utility to generate test
- report files for your software.</flag>
+ report files for your software; build gresource utility with
+ ELF support.</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:gnome:glib</remote-id>
diff --git a/dev-libs/gmp/gmp-6.0.0a.ebuild b/dev-libs/gmp/gmp-6.0.0a.ebuild
index fb3d00c09d04..b10c9d145dde 100644
--- a/dev-libs/gmp/gmp-6.0.0a.ebuild
+++ b/dev-libs/gmp/gmp-6.0.0a.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
LICENSE="|| ( LGPL-3+ GPL-2+ )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="doc cxx pgo static-libs"
DEPEND="sys-devel/m4
diff --git a/dev-libs/libevent/libevent-2.0.22-r2.ebuild b/dev-libs/libevent/libevent-2.0.22-r2.ebuild
new file mode 100644
index 000000000000..b30827f29205
--- /dev/null
+++ b/dev-libs/libevent/libevent-2.0.22-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils libtool multilib-minimal
+
+MY_P="${P}-stable"
+
+DESCRIPTION="A library to execute a function when a specific event occurs on a file descriptor"
+HOMEPAGE="http://libevent.org/"
+SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+# libevent-2.0.so.5
+SLOT="0/2.0-5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug libressl +ssl static-libs test +threads"
+
+DEPEND="
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ )
+"
+RDEPEND="
+ ${DEPEND}
+ !<=dev-libs/9libs-1.0
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/event2/event-config.h
+)
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( README ChangeLog )
+
+src_prepare() {
+ elibtoolize
+
+ # don't waste time building tests/samples
+ # https://github.com/libevent/libevent/pull/143
+ # https://github.com/libevent/libevent/pull/144
+ sed -i \
+ -e 's|^\(SUBDIRS =.*\)sample test\(.*\)$|\1\2|' \
+ Makefile.in || die "sed Makefile.in failed"
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" \
+ econf \
+ $(use_enable debug debug-mode) \
+ $(use_enable debug malloc-replacement) \
+ $(use_enable ssl openssl) \
+ $(use_enable static-libs static) \
+ $(use_enable threads thread-support)
+}
+
+src_test() {
+ # The test suite doesn't quite work (see bug #406801 for the latest
+ # installment in a riveting series of reports).
+ :
+ # emake -C test check | tee "${T}"/tests
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/dev-libs/libevent/libevent-2.1.5-r1.ebuild b/dev-libs/libevent/libevent-2.1.5-r3.ebuild
index 9602758bdcbd..95610a9f1b84 100644
--- a/dev-libs/libevent/libevent-2.1.5-r1.ebuild
+++ b/dev-libs/libevent/libevent-2.1.5-r3.ebuild
@@ -12,7 +12,8 @@ HOMEPAGE="http://libevent.org/"
SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
LICENSE="BSD"
-SLOT="0"
+# libevent-2.1.so.5
+SLOT="0/2.1-5"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug libressl +ssl static-libs test +threads"
@@ -20,7 +21,8 @@ DEPEND="
ssl? (
!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
- )"
+ )
+"
RDEPEND="
${DEPEND}
!<=dev-libs/9libs-1.0
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index dced38df4cf3..1d359c5dcfb7 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,6 +1,5 @@
DIST libgit2-0.20.0.tar.gz 3255478 SHA256 509ab8091623df5b745cd13682539ca2dc2372051d3418355a7acc5b4a20c2f1 SHA512 0512a2d6daa149f6c6bada3b9ea8b228d6ba9180d7030cf41f3e9888fb15f068ef7c7722f636f8750c4643b58453299179d73e0b71e08ae79439060a27efe9d6 WHIRLPOOL 996a3639bd8f598b07f12115a2af0b5d28de51163338c34b39872046776a0144e57a0598ab493dcf717fa16ed093d9b00546009d2a4426a27a0451e97759783b
DIST libgit2-0.21.5.tar.gz 3460366 SHA256 46ca07becbdcda0da96a553d9f45e64ead29276ba14049e4bc8e2730ed1aa494 SHA512 080624aa1479b9b393d4b3341b2dd5640e7d61f21c44b04c54bdd6be589fcdfc628219046f3dfda48f563560a1db1f9ddf0626d2802a1f60122b9609d0412dce WHIRLPOOL 6bdc7d40afb9bf427ffe96d87a920b4421f902f0548018477324d69a563751696a1288c5564d87efbabac779273f1992f6d79f9ac101814cfbcbcdc11584dba3
DIST libgit2-0.22.3.tar.gz 3594098 SHA256 511fe60e7c12c3525b4e0489861e5c1fe0e331d604bee9a3dfb8420c2f288f60 SHA512 2bbb04789702d206e65b18d96752113d2c1b0af7b7779cf7c90c326ec47f535b36327b0171ae1f614179c24275e2c04c51d62e44eedba87530509a29c15ab25c WHIRLPOOL 2fbb2739856e6cef3ae1a103e1b999b3362c79536423e5cd6d46d60276a14e87298ec36e2e03e8ea0fa8ebe28a140ba20ce077fb30ab3fc0d1337ec3b04fde87
-DIST libgit2-0.23.0.tar.gz 3714985 SHA256 49d75c601eb619481ecc0a79f3356cc26b89dfa646f2268e434d7b4c8d90c8a1 SHA512 e0f414529ba6faf877b1848101fda3f5dc4b84e75c56996378c098d1bdc5f03e60c22a1ee5768a8a9a5d5aab313f52ce8df5b1bd3f9bfb2c36aae7117a368f22 WHIRLPOOL 9716f3ac340bd28d151814488898a09df8f867b7a40b59e71c12b6d7d8af3c7ac41ac0ae8de239be0743db03b4451ca87462835faac7f6938d5a82564a7b1f13
-DIST libgit2-0.23.1.tar.gz 3717102 SHA256 113748018e5876bea84af5c749af25b62f58cb4ca82730dcbffaac90c87f7056 SHA512 3932c7d50dc9b6a78ca38edc76be9c78d969062bad4e0a81d46d9f461e35b7bf2afc3bdaf0024ed889db49c02c5a20163cf6e559f06e7364bc5290d6322de14e WHIRLPOOL f3cbe285cee813b92059765c2fb2672b26e154d671604609f2d26fcb26534e3f831d47b09a006718451fe0c40fa01fd58e740a3776aa84afca59fbf2884a2956
DIST libgit2-0.23.2.tar.gz 3717748 SHA256 20c0a6ee92c0e19207dac6ddc336b4ae4a1c4ddf91be0891e4b6e6ccba16df0b SHA512 aa11be93a135eeddd07d2f2a4cba019d42e33f185141caac1d0f89083652aa612f1381e3011396c6078b46f8bbeea894eb5fc25fcebbe13cb14dd9dfd8f40240 WHIRLPOOL 0f83fb7a15f77a13b5e06d81337f0f28bc2e55340b204d8009f5fb7e6ab47e7beb4c79c264a27e581696c87c5fe42927bbef15124c036d2f634ff47a5f8197a9
+DIST libgit2-0.23.3.tar.gz 3718675 SHA256 2d5c80426675928cda6e9a313ae38b2a72c1a55b7c3d4884dc21f7b312ff1eae SHA512 5c4a33e9d0a34bd3c4ab61c9c3fd45fe84204c6941506cd989acda552932205e2edadd9b731cb19c650b1ea69e5ac1ac313c55ea7881ccb8a17f3a3c8db03ef8 WHIRLPOOL 068d1de53a7f8d832ebf38dec674de613327a9ba7c791c270f63e681c5ca09ed578e87361d5f69976883e109b7e818d3b3c7b27c6ae474db197cfe0fe5f735be
diff --git a/dev-libs/libgit2/libgit2-0.23.0.ebuild b/dev-libs/libgit2/libgit2-0.23.0.ebuild
deleted file mode 100644
index 304a08db0103..000000000000
--- a/dev-libs/libgit2/libgit2-0.23.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/23"
-IUSE="examples gssapi ssh test threads trace"
-
-RDEPEND="
- dev-libs/openssl:0
- sys-libs/zlib
- net-libs/http-parser
- gssapi? ( virtual/krb5 )
- ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
- # skip online tests
- sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- $(cmake-utils_use_build test CLAR)
- $(cmake-utils_use_enable trace TRACE)
- $(cmake-utils_use_use gssapi GSSAPI)
- $(cmake-utils_use_use ssh SSH)
- $(cmake-utils_use threads THREADSAFE)
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- if [[ ${EUID} -eq 0 ]] ; then
- # repo::iterator::fs_preserves_error fails if run as root
- # since root can still access dirs with 0000 perms
- ewarn "Skipping tests: non-root privileges are required for all tests to pass"
- else
- local TEST_VERBOSE=1
- cmake-utils_src_test
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use examples ; then
- find examples -name .gitignore -delete || die
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/dev-libs/libgit2/libgit2-0.23.1.ebuild b/dev-libs/libgit2/libgit2-0.23.1.ebuild
deleted file mode 100644
index 304a08db0103..000000000000
--- a/dev-libs/libgit2/libgit2-0.23.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~ppc-macos"
-fi
-
-DESCRIPTION="A linkable library for Git"
-HOMEPAGE="https://libgit2.github.com/"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="0/23"
-IUSE="examples gssapi ssh test threads trace"
-
-RDEPEND="
- dev-libs/openssl:0
- sys-libs/zlib
- net-libs/http-parser
- gssapi? ( virtual/krb5 )
- ssh? ( net-libs/libssh2 )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
-
-src_prepare() {
- # skip online tests
- sed -i '/libgit2_clar/s/-ionline/-xonline/' CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- $(cmake-utils_use_build test CLAR)
- $(cmake-utils_use_enable trace TRACE)
- $(cmake-utils_use_use gssapi GSSAPI)
- $(cmake-utils_use_use ssh SSH)
- $(cmake-utils_use threads THREADSAFE)
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- if [[ ${EUID} -eq 0 ]] ; then
- # repo::iterator::fs_preserves_error fails if run as root
- # since root can still access dirs with 0000 perms
- ewarn "Skipping tests: non-root privileges are required for all tests to pass"
- else
- local TEST_VERBOSE=1
- cmake-utils_src_test
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use examples ; then
- find examples -name .gitignore -delete || die
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/dev-libs/libgit2/libgit2-0.23.2.ebuild b/dev-libs/libgit2/libgit2-0.23.3.ebuild
index 304a08db0103..ab7043ec22f7 100644
--- a/dev-libs/libgit2/libgit2-0.23.2.ebuild
+++ b/dev-libs/libgit2/libgit2-0.23.3.ebuild
@@ -19,10 +19,11 @@ HOMEPAGE="https://libgit2.github.com/"
LICENSE="GPL-2-with-linking-exception"
SLOT="0/23"
-IUSE="examples gssapi ssh test threads trace"
+IUSE="examples gssapi libressl ssh test threads trace"
RDEPEND="
- dev-libs/openssl:0
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
sys-libs/zlib
net-libs/http-parser
gssapi? ( virtual/krb5 )
diff --git a/dev-libs/libiconv/libiconv-1.14-r2.ebuild b/dev-libs/libiconv/libiconv-1.14-r2.ebuild
new file mode 100644
index 000000000000..ae98764740b5
--- /dev/null
+++ b/dev-libs/libiconv/libiconv-1.14-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit libtool toolchain-funcs multilib-minimal
+
+DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
+HOMEPAGE="https://www.gnu.org/software/libiconv/"
+SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="static-libs"
+
+DEPEND="!sys-libs/glibc
+ !userland_GNU? ( !sys-apps/man-pages )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-no-gets.patch
+ elibtoolize
+}
+
+multilib_src_configure() {
+ # Disable NLS support because that creates a circular dependency
+ # between libiconv and gettext
+ ECONF_SOURCE="${S}" \
+ econf \
+ --docdir="\$(datarootdir)/doc/${PF}/html" \
+ --disable-nls \
+ --enable-shared \
+ $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+ use static-libs || find "${ED}" -name 'lib*.la' -delete
+
+ # Install in /lib as utils installed in /lib like gnutar
+ # can depend on this
+ gen_usr_ldscript -a iconv charset
+
+ # If we have a GNU userland, we probably have sys-apps/man-pages
+ # installed, which means we want to rename our copies #503162.
+ # The use of USELAND=GNU is kind of a hack though ...
+ if use userland_GNU ; then
+ cd "${ED}"/usr/share/man || die
+ local f
+ for f in man*/*.[0-9] ; do
+ mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
+ done
+ fi
+}
diff --git a/dev-libs/libintl/Manifest b/dev-libs/libintl/Manifest
new file mode 100644
index 000000000000..ea4c35a81f0e
--- /dev/null
+++ b/dev-libs/libintl/Manifest
@@ -0,0 +1 @@
+DIST gettext-0.19.6.tar.gz 18619659 SHA256 ed4b4c19bd3a3034eb6769500a3592ff616759ef43cf30586dbb7a17c9dd695d SHA512 46adfd4a6d0038aba999658bebe51117e3ab3dc149a9054c1087d3e79ec7ba3371a7e78a8ca30a8872d162c2dc44aba6e67e4d64808c4f92e1e2bd674174f1db WHIRLPOOL 1988f9ddfd603734b4a632291925c8e5b31e7384eea1c6641d52aa58cb6b8f892e7664dd145a53435b7d2a4540ac65aeae1cb528a004c35832087c2820dafbcb
diff --git a/dev-libs/libintl/files/libintl-0.19.5-langinfo.patch b/dev-libs/libintl/files/libintl-0.19.5-langinfo.patch
new file mode 100644
index 000000000000..bf96e69f924c
--- /dev/null
+++ b/dev-libs/libintl/files/libintl-0.19.5-langinfo.patch
@@ -0,0 +1,35 @@
+this has been sent upstream
+
+From eac944b0757963ac1ba035ea72617734510ede22 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Mon, 12 Oct 2015 17:58:51 -0400
+Subject: [PATCH] intl/localename: control langinfo.h inclusion
+
+This header is only used to work around buggy behavior in old versions
+of glibc, so do not include it all the time. Otherwise we get build
+failures on systems that do not provide langinfo.h.
+
+* gettext-runtime/intl/localename.c: Wrap langinfo.h include with same
+ifdefs used in the source later on.
+---
+ gettext-runtime/intl/localename.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
+index f8cf3f2..c27be86 100644
+--- a/gettext-runtime/intl/localename.c
++++ b/gettext-runtime/intl/localename.c
+@@ -38,7 +38,9 @@
+ # if defined __APPLE__ && defined __MACH__
+ # include <xlocale.h>
+ # endif
+-# include <langinfo.h>
++# if __GLIBC__ >= 2 && !defined __UCLIBC__
++# include <langinfo.h>
++# endif
+ # if !defined IN_LIBINTL
+ # include "glthread/lock.h"
+ # endif
+--
+2.5.2
+
diff --git a/dev-libs/libintl/libintl-0.19.6.ebuild b/dev-libs/libintl/libintl-0.19.6.ebuild
new file mode 100644
index 000000000000..a8fbdaca3c5f
--- /dev/null
+++ b/dev-libs/libintl/libintl-0.19.6.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Note: Keep version bumps in sync with sys-devel/gettext.
+
+EAPI="5"
+
+MY_P="gettext-${PV}"
+
+inherit eutils multilib-minimal toolchain-funcs libtool
+
+DESCRIPTION="the GNU international library (split out of gettext)"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+SRC_URI="mirror://gnu/gettext/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="static-libs +threads"
+
+DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]"
+# Block C libraries known to provide libintl.
+RDEPEND="${DEPEND}
+ !sys-libs/glibc
+ !<sys-devel/gettext-0.19.6-r1"
+
+S="${WORKDIR}/${MY_P}/gettext-runtime"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.19.5-langinfo.patch
+
+ # The libtool files are stored higher up, so make sure we run in the
+ # whole tree and not just the subdir we build.
+ elibtoolize "${WORKDIR}"
+}
+
+multilib_src_configure() {
+ local myconf=(
+ # Emacs support is now in a separate package.
+ --without-emacs
+ --without-lispdir
+ # Normally this controls nls behavior in general, but the libintl
+ # subdir is skipped unless this is explicitly set. ugh.
+ --enable-nls
+ # This magic flag enables libintl.
+ --with-included-gettext
+ # The gettext package provides this library.
+ --disable-c++
+ --disable-libasprintf
+ # No java until someone cares.
+ --disable-java
+
+ $(use_enable static-libs static)
+ $(use_enable threads)
+ )
+ ECONF_SOURCE=${S} econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+ # We only need things in the intl/ subdir.
+ emake DESTDIR="${D}" install -C intl
+
+ gen_usr_ldscript -a intl
+}
+
+multilib_src_install_all() {
+ use static-libs || prune_libtool_files --all
+
+ rm -f "${ED}"/usr/share/locale/locale.alias "${ED}"/usr/lib/charset.alias
+
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/dev-libs/libintl/metadata.xml b/dev-libs/libintl/metadata.xml
new file mode 100644
index 000000000000..96a2d586367d
--- /dev/null
+++ b/dev-libs/libintl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>base-system</herd>
+</pkgmetadata>
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 42882caf27af..1689008978ab 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,3 +1,4 @@
DIST libwacom-0.11.tar.bz2 424554 SHA256 995f192e53f09444b79b66986227ebbac477520956363dededa19af3d8746284 SHA512 465f1ea9354bcba7d1c5d9fe146192b7ba1593973690718b2584b4786feb434f672556e7eed799761f96a37fe79bd14ae33ab7695d3ce9d5214cf9bc5b26eecc WHIRLPOOL 7f29b09a9bdee0d9cb2f5712414bdbcccf1b2a31a387020de2c1f911411934a3ae61a1d430b40e3402282fbc60e0d184b82c1cd524e43c8417d678f27063f607
DIST libwacom-0.12.tar.bz2 441360 SHA256 487baeb0b2067fd8ae3871e4a5971684878a35bb5f9c63d6a34fcc7612004d08 SHA512 1dcb7fd8ac9230410f4a582d4150856845a4f4ab545dae331b25efa634161b900c39b6a379174f795b692d2ef6b3887b6e5c175b73c3cfdfc37b182ff0218872 WHIRLPOOL 147dc4f0d834e64e4b2dbd7848abc50a38da7b15bf7e93f76e0a109ae412b4f0cd24053f4694f2703de4d07acdbfb7cc199ebd193e3ab13b2aa9b57498d16a0a
DIST libwacom-0.13.tar.bz2 439767 SHA256 976b8801007ac96c6512751a0ef6903b482cd361f256965c2884196c88788176 SHA512 8474e4da6d4d44cb4dd2db2c203e9e57c646328b25bb0009e91cc358833f64052a24b6e8f9507d3459014ffebccc4b50c99a0f5d6c97b9b5a19c135a165aeba0 WHIRLPOOL 2c88a953aebed3596f6172a3c76c34516fda410770bb7a815ded02ca657fe3e6cf55fdd4dd5529df9cd9ebb9325886c78228b7cb9dbf970e2858fa5d31ab5c3a
+DIST libwacom-0.15.tar.bz2 440516 SHA256 ab65c589d5d6de176c5280ebe9cc1e807b9fa6fce7224b88f280b19464bb7713 SHA512 10c38cb9af4f07a09c0248bff827bc9ceba99200e1298452b5a3745666ccac5ad01b6122563cddff83ec0072ff40321c053f190d4af3477967a4cb419d444aa6 WHIRLPOOL a8b65d32a15cb7c5c5b3e486bae0fddebec7f917ee93d01a65a81f7d9e3525fe74df6af3edb6786eb9946c71f29f0397f8be1ab52df21ac60f0b35a3ec35994a
diff --git a/dev-libs/libwacom/libwacom-0.15.ebuild b/dev-libs/libwacom/libwacom-0.15.ebuild
new file mode 100644
index 000000000000..6165dab9e505
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-0.15.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils udev
+
+DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+SRC_URI="mirror://sourceforge/linuxwacom/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+ dev-libs/glib:2
+ virtual/libgudev:=
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+ if ! use doc; then
+ sed -e 's:^\(SUBDIRS = .* \)doc:\1:' -i Makefile.in || die
+ fi
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ local udevdir="$(get_udevdir)"
+ dodir "${udevdir}/rules.d"
+ # generate-udev-rules must be run from inside tools directory
+ pushd tools > /dev/null
+ ./generate-udev-rules > "${ED}/${udevdir}/rules.d/65-libwacom.rules" || die "generating udev rules failed"
+ popd > /dev/null
+ use doc && dohtml -r doc/html/*
+ prune_libtool_files
+}
diff --git a/dev-libs/npth/npth-1.1.ebuild b/dev-libs/npth/npth-1.1.ebuild
index 99279022043c..8084a24c56a3 100644
--- a/dev-libs/npth/npth-1.1.ebuild
+++ b/dev-libs/npth/npth-1.1.ebuild
@@ -11,5 +11,5 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~x86"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86"
IUSE="static-libs"
diff --git a/dev-libs/npth/npth-1.2.ebuild b/dev-libs/npth/npth-1.2.ebuild
index 7972b9ff3221..d925771f714d 100644
--- a/dev-libs/npth/npth-1.2.ebuild
+++ b/dev-libs/npth/npth-1.2.ebuild
@@ -11,5 +11,5 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="static-libs"
diff --git a/dev-libs/ppl/ppl-1.1.ebuild b/dev-libs/ppl/ppl-1.1.ebuild
index f56deffdd363..d73da146dcd0 100644
--- a/dev-libs/ppl/ppl-1.1.ebuild
+++ b/dev-libs/ppl/ppl-1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://bugseng.com/products/ppl/download/ftp/releases/${PV}/${P}.tar.xz
LICENSE="GPL-3"
SLOT="0/4.13" # SONAMEs
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~sparc-solaris"
IUSE="+cxx doc lpsol pch static-libs test"
RDEPEND=">=dev-libs/gmp-6[cxx]
diff --git a/dev-libs/serd/Manifest b/dev-libs/serd/Manifest
index c638d6fe2804..1b336e490684 100644
--- a/dev-libs/serd/Manifest
+++ b/dev-libs/serd/Manifest
@@ -1,2 +1,3 @@
DIST serd-0.18.2.tar.bz2 291053 SHA256 8e3d8402c33fa217572d3ee936919037420fb237fb8603a7b024ab482a94eac1 SHA512 2e775f50efbefa88d291999a26bf8e6602b5791affc9b9073451eb1406db654a63d2b91eb862ba7e714b5ce9ad51f7b7b259714476cd1532cf17fc072a923c3f WHIRLPOOL 85d8599a3c4f1c26d438b741b70f75b0c3b7265a973b93bafa45f59f3a669b664d979ff49f9894f36c76d1c1826818222a089051b7202a71b85f30d2cba80980
DIST serd-0.20.0.tar.bz2 363807 SHA256 64515f4f5eb27ba2ba151027a72a77672f6ee8a2a3b58991ad5c045135feabbf SHA512 d313abb6423b0b1dd30b5c4f7ede45a5e51b3c8676b49215e106a75d73280e07c48b3895f2d88aeac2117eaf9c82cdb58bfc530895ad17a34d810c256868d1ef WHIRLPOOL 0cb4e6b9c870cc2bf5a34eb5c25a4a5fbcc90737ac646688338b9529baa774da29cd9f8659cdcc8f13e714949ea0ed840af28ed81a869465f8902b3e24cbeb27
+DIST serd-0.22.0.tar.bz2 340371 SHA256 7b030287b4b75f35e6212b145648bec0be6580cc5434caa6d2fe64a38562afd2 SHA512 532f9bcf1edafb4fb74c521c11e3582133096068c883ecdfb97483c1344de6c2effc7cef8efa0c5d919667d5ef51e3f62af0a02faf0d518216e0746933a859d3 WHIRLPOOL 11e3757a322b578ee648e53774d0390de4b295f5f8c187a8f7dc6bc59249845d890548324107b7c9dbf03ab851a61e9e71f5997e1fdefafeaf5610350292d58f
diff --git a/dev-libs/serd/serd-0.22.0.ebuild b/dev-libs/serd/serd-0.22.0.ebuild
new file mode 100644
index 000000000000..f8b9d1df228d
--- /dev/null
+++ b/dev-libs/serd/serd-0.22.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils
+
+DESCRIPTION="Library for RDF syntax which supports reading and writing Turtle and NTriples"
+HOMEPAGE="http://drobilla.net/software/serd/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ doc? ( app-doc/doxygen )"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_prepare() {
+ sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+}
+
+src_configure() {
+ waf-utils_src_configure \
+ --docdir=/usr/share/doc/${PF} \
+ $(use test && echo "--test") \
+ $(use doc && echo "--docs") \
+ $(use static-libs && echo "--static")
+}
+
+src_test() {
+ ./waf test || die
+}
diff --git a/dev-libs/sord/Manifest b/dev-libs/sord/Manifest
index 400f670ef2d5..f5ea10e8ac53 100644
--- a/dev-libs/sord/Manifest
+++ b/dev-libs/sord/Manifest
@@ -1,2 +1,3 @@
DIST sord-0.12.0.tar.bz2 285075 SHA256 126baa06480b6930f874e8c519d4168d8224f7a3203a49b287e24c6bfdf91cb8 SHA512 c24c82fd4d9f74d10923d0cf405d2eabbaabd66b3b11e29719115515edcd8ccbc4a32866ca510dc676ca6ca833b0d9c8ccf43d36f6b0ef010d0211cee821db02 WHIRLPOOL 76d392bd63270fc2c0cb19ce89fc5bc1cc0777ae230912d831ed74705df96d6b7528f36679e53f0d929825db9042592f88746a31af8d65ee187bcb40ae7d1a1c
DIST sord-0.12.2.tar.bz2 303365 SHA256 bd0538d37de5e782023a7261d8ee9d83a792a12eeea7d94dec7a93dd9cda0767 SHA512 2906808138658f89cb6ab939c20e0a092180535629c75b1a0277648af18fb019055dd3cde53f57d7b0d635666be98848bed021ba0bd922a34cfaae3a98c66cbd WHIRLPOOL c731ceb92650b1af7ce4cb53bf209cfc632d74a204eae0b2ea1fcc1ccbca5564a22c83f6e746c1ad9761be4ec155b62cecc5fe90079dff613826d2e275a09df6
+DIST sord-0.14.0.tar.bz2 311442 SHA256 7656d8ec56a43e0f0a168fe78670a7628a42d3a597b53c7a72ac243a74e0f19a SHA512 7c59997752fec7db00f2fca3bf5400b3a57141efe1cee031ca24e69e2c31b3aefbb78f51fe9d46a96b06fe685bc896210bd8271846b878c266a90ec257dc7b55 WHIRLPOOL 9ae84f0ba2f0cedf051251119a4b1f03c67a26a63534dd8af265e5828adac471a3840b02763922f88c13149551371030529fd87f8a8cf7b816f1a5d6dfe391d4
diff --git a/dev-libs/sord/sord-0.14.0.ebuild b/dev-libs/sord/sord-0.14.0.ebuild
new file mode 100644
index 000000000000..d831988d5535
--- /dev/null
+++ b/dev-libs/sord/sord-0.14.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+inherit python-any-r1 waf-utils
+
+DESCRIPTION="Library for storing RDF data in memory"
+HOMEPAGE="http://drobilla.net/software/sord/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND=">=dev-libs/serd-0.14.0"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_prepare() {
+ sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+}
+
+src_configure() {
+ waf-utils_src_configure \
+ --docdir=/usr/share/doc/${PF} \
+ $(use test && echo "--test") \
+ $(use doc && echo "--docs") \
+ $(use static-libs && echo "--static")
+}
+
+src_test() {
+ ./waf test || die
+}
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index ef4d8b948978..292d25d024d3 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -3,3 +3,4 @@ DIST uriparser-0.8.0.tar.bz2 433581 SHA256 1dd9f9779d8f17822bd7d68ba042fd67779b6
DIST uriparser-0.8.1.tar.bz2 341433 SHA256 8ad27e4ea603680c840008d21fb7efea354c79647e90b6fe6788aca18293f094 SHA512 6a1f4cc72a62cd74fa814e262233bd44d882ce4ee189a2ca7a6ef1cb3893492adf801b0391d3eea1f8ef443971f7195cbe8143158514225c875e76d677a9040e WHIRLPOOL 308625b4e612a27b6bf3ae0d70da69be25c8a702470f793d69175d94d16e7440f1d7249026f4cf3ccb51a501b109168dd4a772287e6ba7ceb03702cb753bd6eb
DIST uriparser-0.8.2.tar.bz2 341959 SHA256 6d6e66b0615f65e9e2391933dab7e45eca0947160f10c6b47bc50feda93e508f SHA512 857c12229aece80065f923b6191e5771c6cd26e7eb42e62a35ae5793174df72b818a59c7b4d9a8dbd8f3f5d4b5885b43a05f0e40aa1be9d9b6f6a9b323c56ca9 WHIRLPOOL 56b370eb16c4eed16838c80d71860d6fe66ad4cd5d4cdba72e9bcb0bfc56fd39d479b73fe8f3df27fb8b5b19ca0fda53172b602dd33e946c1829e92b8fe6fd5f
DIST uriparser-0.8.3.tar.bz2 358228 SHA256 28640ddc91809ebedf7bcaa11aeaebcdac4321323e54416c9eb76303adae0fad SHA512 e8fe7f0e48af84d165038ba8c4a324cd0cd9fbabe4b37b0035681f24cf69470d34bdcb15bda36594dd770383b475a91ed8d33e1a897fb8bf9dcb1d2454c55fc1 WHIRLPOOL dd49cb7b64bad476fe8c822d8644a74b9a361a463431186026bd1cc94bc01b9af5bd0b73324b2c01f80a82d90c648f66ba8b5c8545ab71609b01accd33fa40a4
+DIST uriparser-0.8.4.tar.bz2 358408 SHA256 ce7ccda4136974889231e8426a785e7578e66a6283009cfd13f1b24a5e657b23 SHA512 b6238c6495eaa9f7178269d66dbea05a39c51c27137d8ebf39cd02d1c3fa96aa0d1608f5ccb36bf7b454f3238830dd46d7de8299b608f185b2520fc2c955aa1a WHIRLPOOL fc78f6c799ba5665927f1800f1212617744a3eaf3be3c7112409afe53d557e24c8f185137291d534fcf7c9263d64b9d49fa57a3d2c608e39559943c19218d30f
diff --git a/dev-libs/uriparser/uriparser-0.8.4.ebuild b/dev-libs/uriparser/uriparser-0.8.4.ebuild
new file mode 100644
index 000000000000..a52452d55d6d
--- /dev/null
+++ b/dev-libs/uriparser/uriparser-0.8.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Uriparser is a strictly RFC 3986 compliant URI parsing library in C"
+HOMEPAGE="http://uriparser.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc qt4 test unicode"
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig
+ doc? ( >=app-doc/doxygen-1.5.8
+ qt4? ( dev-qt/qthelp:4 ) )
+ test? ( >=dev-util/cpptest-1.1.1 )"
+
+REQUIRED_USE="test? ( unicode )"
+
+src_configure() {
+ econf \
+ --disable-sizedown \
+ $(use_enable test) \
+ --enable-char \
+ $(use_enable unicode wchar_t) \
+ $(use_enable doc) \
+ --docdir=/usr/share/doc/${PF}/
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog THANKS
+
+ if use doc && use qt4; then
+ dodoc doc/*.qch
+ docompress -x /usr/share/doc/${PF}/${P}.qch
+ fi
+}
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index fca65f6ba033..8dd4dad03a1f 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -1,5 +1,3 @@
DIST xapian-bindings-1.2.19.tar.xz 828904 SHA256 3b9434c6144cc347783175c92829f304e86919bbbd44f51b7b4a7148960cde17 SHA512 ac72ec35ae3b767e04e848a9782b41d74e99b6b1f795d5096373911ff549b3bf2e602a91ed0e5f7dce2e43e1dd308af710719e5a80c6a179393aac4af316de30 WHIRLPOOL 33770203390fea6f6048ebdc63cb7031f53a30be3568e3f3f6f8a25f8aa30a284347b402e360c0c2182069e3f6dab067fc5f6cd2b950f45e196afe057e4d80e3
-DIST xapian-bindings-1.2.20.tar.xz 828864 SHA256 98594534697642dee563c0e7fede43fde256f7e03488ea4922800f56baadc401 SHA512 4797431974442b210bb637e1d307a8c7eafb5f60093aee9d86223bacec7f828bd3d30c2d159d34cc160208cd016be3822acd19f1be9159af8f8871d83e7ec688 WHIRLPOOL 9ebeec220142865b6f983f065cef568623d2fb26e5393c2e8a74fc12c3dbb0fefd5541991beb494179ec4bff402164c9a5edafb520013b89ee3ae8fa73f06686
DIST xapian-bindings-1.2.21.tar.xz 842696 SHA256 28a39247ac875be2dc1386c273167aab5c9949227c1070b65ca8de603c06d546 SHA512 bebb4c6fce57f9b54b307bf921e760efe8fbd06d404629cfb80717eed9bfb886c82559c2ba2b333a4e24ce14d389c916ca36924f9d4b2f72fae183d4a00e635b WHIRLPOOL 065efe7c9ad38f8f27a2fb109969b1ec6eb2ef403cb6e194f7c5f4147cb666931f2e70f698f6c974916087489af7ea05e0c8c1a2a39232d1176083b624ff5cf6
-DIST xapian-bindings-1.3.2.tar.xz 1177620 SHA256 bcf9948cd6e51c4e80ed5c1284b3349e667162dcbd048a4136c380adfe570f92 SHA512 65b8cb9a27b19c04179c6b8147110bcac118b5c41308ad87fef7db2b3b16d2032645f5d010492ebd772cb6bc673228b68837159764cb6d8fc09dde11e81174a7 WHIRLPOOL ffb4709a95d4139b4d9863195ec8ffc23a4936a055424b154e0e1f8c6d00bc81e919246e58fe68b76738bee05941a868b38e87ba1302ac3e392152b4592a1d1a
DIST xapian-bindings-1.3.3.tar.xz 1195784 SHA256 a443a16ac8279daa5b50d3308861034f859f71c824ff5fa2d75cfda3cf31858f SHA512 db0f672cdc886b975dcfdec9ec1b30401627fdecdafe5381f0da41da1bebe3c15d80d6126fa443107ba1b7c259f15ff26c08f7b18524f620b2cb8e48f2c4c2d7 WHIRLPOOL beee4de0346bbcb11dd3c5f14b775e61a9cd2dbfc03fd61f12af90e883f09495a2a951543cd001a7e778920901c2a7001cd22d0179c5173f13cf543ce9b60c98
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.20.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.20.ebuild
deleted file mode 100644
index 63c9c466ea86..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.20.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-USE_PHP="php5-4 php5-5 php5-6"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-#mono violates sandbox, we disable it until we figure this out
-#inherit java-pkg-opt-2 mono-env php-ext-source-r2 python
-inherit java-pkg-opt-2 php-ext-source-r2 python-r1
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#IUSE="java lua mono perl php python ruby tcl"
-#REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
-IUSE="java lua perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua perl php python ruby tcl )"
-
-COMMONDEPEND="=dev-libs/xapian-${PV}*
- lua? ( dev-lang/lua:= )
- perl? ( dev-lang/perl:= )
- ruby? ( dev-lang/ruby:= )
- tcl? ( >=dev-lang/tcl-8.1:0= )"
-# mono? ( >=dev-lang/mono-1.0.8 )
-DEPEND="${COMMONDEPEND}
- java? ( >=virtual/jdk-1.3 )"
-RDEPEND="${COMMONDEPEND}
- java? ( >=virtual/jre-1.3 )"
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
-}
-
-src_unpack() {
- default
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
- if use java; then
- sed \
- -e 's/$(JAVAC)/$(JAVAC) $(JAVACFLAGS)/' \
- -i java{/,/org/xapian/errors/,/org/xapian/}Makefile.in || die "sed failed"
- fi
-
- if use python; then
- sed \
- -e 's:\(^pkgpylib_DATA = xapian/__init__.py\).*:\1:' \
- -e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian.so|' \
- -i python/Makefile.in || die "sed failed"
- fi
-}
-
-src_configure() {
- if use java; then
- CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
- fi
-
- if use perl; then
- export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
- export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
- fi
-
- if use lua; then
- export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
- fi
-
- econf \
- $(use_with java) \
- $(use_with lua) \
- $(use_with perl) \
- $(use_with php) \
- $(use_with python) \
- $(use_with ruby) \
- $(use_with tcl)
-# $(use_with mono csharp) \
-
- # PHP and Python bindings are built/tested/installed manually.
- sed -e "/SUBDIRS =/s/ php//" -i Makefile || die "sed Makefile"
- sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile"
-}
-
-src_compile() {
- default
-
- if use php; then
- local php_slot
- for php_slot in $(php_get_slots); do
- cp -r php php-${php_slot}
- emake -C php-${php_slot} \
- PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
- PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
- PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
- PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)"
- done
- fi
-
- if use python; then
- python_copy_sources
-# building() {
-# emake -C python \
-# PYTHON="$(PYTHON)" \
-# PYTHON_INC="$(python_get_includedir)" \
-# PYTHON_LIB="$(python_get_libdir)" \
-# PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
-# pkgpylibdir="$(python_get_sitedir)/xapian"
-# }
- building() {
- emake -C python \
- PYTHON_INC="$(python_get_includedir)" \
- pkgpylibdir="$(python_get_sitedir)/xapian"
- VERBOSE="1"
- }
- python_foreach_impl building
- fi
-}
-
-src_test() {
- default
-
- if use php; then
- local php_slot
- for php_slot in $(php_get_slots); do
- emake -C php-${php_slot} \
- PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
- PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
- PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
- PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \
- check
- done
- fi
-
- if use python; then
- testing() {
- emake -C python \
- PYTHON_INC="$(python_get_includedir)" \
- pkgpylibdir="$(python_get_sitedir)/xapian" \
- VERBOSE="1" \
- check
- }
- python_foreach_impl testing
- fi
-}
-
-src_install () {
- emake DESTDIR="${D}" install
-
- if use java; then
- java-pkg_dojar java/built/xapian_jni.jar
- # TODO: make the build system not install this...
- java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
- rm "${D}/${S}/java/built/libxapian_jni.so"
- rmdir -p "${D}/${S}/java/built"
- rmdir -p "${D}/${S}/java/native"
- fi
-
- if use php; then
- local php_slot
- for php_slot in $(php_get_slots); do
- emake DESTDIR="${D}" -C php-${php_slot} \
- PHP="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php" \
- PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" \
- PHP_EXTENSION_DIR="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --extension-dir)" \
- PHP_INC="$("${EPREFIX}/usr/$(get_libdir)/${php_slot}/bin/php-config" --includes)" \
- install
- done
-
- php-ext-source-r2_createinifiles
- fi
-
- if use python; then
- installation() {
- emake -C python \
- DESTDIR="${D}" \
- PYTHON_INC="$(python_get_includedir)" \
- pkgpylibdir="$(python_get_sitedir)/xapian" \
- VERBOSE="1" \
- install
- }
- python_foreach_impl installation
- fi
-
- # For some USE combinations this directory is not created
- if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
- mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
- fi
-
- dodoc AUTHORS HACKING NEWS TODO README
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.2.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.3.2.ebuild
deleted file mode 100644
index ffe2da3c8855..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.3.2.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-USE_PHP="php5-4"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-inherit java-pkg-opt-2 mono-env php-ext-source-r2 python
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
-
-COMMONDEPEND="=dev-libs/xapian-${PV}*
- lua? ( dev-lang/lua:= )
- mono? ( >=dev-lang/mono-1.0.8 )
- perl? ( dev-lang/perl:= )
- ruby? ( dev-lang/ruby:= )
- tcl? ( >=dev-lang/tcl-8.1:0= )"
-DEPEND="${COMMONDEPEND}
- java? ( >=virtual/jdk-1.3 )"
-RDEPEND="${COMMONDEPEND}
- java? ( >=virtual/jre-1.3 )"
-
-pkg_setup() {
- mono-env_pkg_setup
- java-pkg-opt-2_pkg_setup
-
- if use python; then
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
-
- if use python; then
- sed \
- -e 's|\(^pkgpylib_DATA = xapian/__init__.py\).*|\1|' \
- -e '/\s\sxapian\/__init__.pyc/d' \
- -e '/\s\sxapian\/__init__.pyo/d' \
- -e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian$(PYTHON_SO)|' \
- -i python/Makefile.in || die "sed failed"
- fi
-}
-
-src_configure() {
- if use java; then
- CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
- fi
-
- if use perl; then
- export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
- export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
- fi
-
- if use lua; then
- export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
- fi
-
- econf \
- $(use_with java) \
- $(use_with lua) \
- $(use_with mono csharp) \
- $(use_with perl) \
- $(use_with php) \
- $(use_with python) \
- $(use_with ruby) \
- $(use_with tcl)
-
- # Python bindings are built/tested/installed manually.
- sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile"
-}
-
-src_compile() {
- default
-
- if use python; then
- python_copy_sources python
- building() {
- emake \
- PYTHON="$(PYTHON)" \
- PYTHON_INC="$(python_get_includedir)" \
- PYTHON_LIB="$(python_get_libdir)" \
- PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
- pkgpylibdir="$(python_get_sitedir)/xapian"
- }
- python_execute_function -s --source-dir python building
- fi
-}
-
-src_test() {
- default
-
- if use python; then
- testing() {
- emake \
- PYTHON="$(PYTHON)" \
- PYTHON_INC="$(python_get_includedir)" \
- PYTHON_LIB="$(python_get_libdir)" \
- PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
- pkgpylibdir="$(python_get_sitedir)/xapian" \
- VERBOSE="1" \
- check
- }
- python_execute_function -s --source-dir python testing
- fi
-}
-
-src_install () {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- if use java; then
- java-pkg_dojar java/built/xapian_jni.jar
- # TODO: make the build system not install this...
- java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
- rm "${D}/${S}/java/built/libxapian_jni.so"
- rmdir -p "${D}/${S}/java/built"
- rmdir -p "${D}/${S}/java/native"
- fi
-
- if use python; then
- installation() {
- emake \
- DESTDIR="${D}" \
- PYTHON="$(PYTHON)" \
- PYTHON_INC="$(python_get_includedir)" \
- PYTHON_LIB="$(python_get_libdir)" \
- PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
- pkgpylibdir="$(python_get_sitedir)/xapian" \
- install
- }
- python_execute_function -s --source-dir python installation
- fi
-
- if use php; then
- php-ext-source-r2_createinifiles
- fi
-
- # For some USE combinations this directory is not created
- if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
- mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
- fi
-
- dodoc AUTHORS HACKING NEWS TODO README || die "dodoc failed"
-}
-
-pkg_postinst() {
- if use python; then
- python_mod_optimize xapian
- fi
-
- if use php_targets_php5-4; then
- ewarn "Note: subclassing Xapian classes in PHP currently doesn't work with PHP 5.4"
- fi
-}
-
-pkg_postrm() {
- if use python; then
- python_mod_cleanup xapian
- fi
-}
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.3-r1.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.3.3-r2.ebuild
index 0590f279fa4d..6a8881433d07 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.3.3-r1.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.3.3-r2.ebuild
@@ -6,6 +6,9 @@ EAPI="5"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE=threads
+DISTUTILS_SINGLE_IMPL=yesplz
+DISTUTILS_OPTIONAL=yesplz
+DISTUTILS_IN_SOURCE_BUILD=yesplz
USE_PHP="php5-4"
@@ -13,7 +16,7 @@ PHP_EXT_NAME="xapian"
PHP_EXT_INI="yes"
PHP_EXT_OPTIONAL_USE="php"
-inherit java-pkg-opt-2 mono-env php-ext-source-r2 python-single-r1
+inherit autotools distutils-r1 libtool java-pkg-opt-2 mono-env php-ext-source-r2
DESCRIPTION="SWIG and JNI bindings for Xapian"
HOMEPAGE="http://www.xapian.org/"
@@ -37,7 +40,7 @@ DEPEND="${COMMONDEPEND}
RDEPEND="${COMMONDEPEND}
java? ( >=virtual/jre-1.3 )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
pkg_setup() {
mono-env_pkg_setup
@@ -53,6 +56,8 @@ src_prepare() {
-e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian$(PYTHON_SO)|' \
-i python/Makefile.in || die "sed failed"
fi
+
+ eautoreconf
}
src_configure() {
@@ -81,7 +86,7 @@ src_configure() {
}
src_compile() {
- local -x PYTHONDONTWRITEBYTECODE
+ local -x PYTHONDONTWRITEBYTECODE=
default
}
@@ -91,10 +96,8 @@ src_install() {
if use java; then
java-pkg_dojar java/built/xapian_jni.jar
# TODO: make the build system not install this...
- java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
- rm "${D}/${S}/java/built/libxapian_jni.so"
- rmdir -p "${D}/${S}/java/built"
- rmdir -p "${D}/${S}/java/native"
+ java-pkg_doso java/.libs/libxapian_jni.so
+ rm -rf "${D}var" || die "could not remove java cruft!"
fi
if use php; then
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.3.3.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.3.3.ebuild
deleted file mode 100644
index ffe2da3c8855..000000000000
--- a/dev-libs/xapian-bindings/xapian-bindings-1.3.3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_DEPEND="python? 2"
-PYTHON_USE_WITH="threads"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
-
-USE_PHP="php5-4"
-
-PHP_EXT_NAME="xapian"
-PHP_EXT_INI="yes"
-PHP_EXT_OPTIONAL_USE="php"
-
-inherit java-pkg-opt-2 mono-env php-ext-source-r2 python
-
-DESCRIPTION="SWIG and JNI bindings for Xapian"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="java lua mono perl php python ruby tcl"
-REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )"
-
-COMMONDEPEND="=dev-libs/xapian-${PV}*
- lua? ( dev-lang/lua:= )
- mono? ( >=dev-lang/mono-1.0.8 )
- perl? ( dev-lang/perl:= )
- ruby? ( dev-lang/ruby:= )
- tcl? ( >=dev-lang/tcl-8.1:0= )"
-DEPEND="${COMMONDEPEND}
- java? ( >=virtual/jdk-1.3 )"
-RDEPEND="${COMMONDEPEND}
- java? ( >=virtual/jre-1.3 )"
-
-pkg_setup() {
- mono-env_pkg_setup
- java-pkg-opt-2_pkg_setup
-
- if use python; then
- python_pkg_setup
- fi
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
-
- if use python; then
- sed \
- -e 's|\(^pkgpylib_DATA = xapian/__init__.py\).*|\1|' \
- -e '/\s\sxapian\/__init__.pyc/d' \
- -e '/\s\sxapian\/__init__.pyo/d' \
- -e 's|\(^xapian/__init__.py: modern/xapian.py\)|\1 xapian/_xapian$(PYTHON_SO)|' \
- -i python/Makefile.in || die "sed failed"
- fi
-}
-
-src_configure() {
- if use java; then
- CXXFLAGS="${CXXFLAGS} $(java-pkg_get-jni-cflags)"
- fi
-
- if use perl; then
- export PERL_ARCH="$(perl -MConfig -e 'print $Config{installvendorarch}')"
- export PERL_LIB="$(perl -MConfig -e 'print $Config{installvendorlib}')"
- fi
-
- if use lua; then
- export LUA_LIB="$(pkg-config --variable=INSTALL_CMOD lua)"
- fi
-
- econf \
- $(use_with java) \
- $(use_with lua) \
- $(use_with mono csharp) \
- $(use_with perl) \
- $(use_with php) \
- $(use_with python) \
- $(use_with ruby) \
- $(use_with tcl)
-
- # Python bindings are built/tested/installed manually.
- sed -e "/SUBDIRS =/s/ python//" -i Makefile || die "sed Makefile"
-}
-
-src_compile() {
- default
-
- if use python; then
- python_copy_sources python
- building() {
- emake \
- PYTHON="$(PYTHON)" \
- PYTHON_INC="$(python_get_includedir)" \
- PYTHON_LIB="$(python_get_libdir)" \
- PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
- pkgpylibdir="$(python_get_sitedir)/xapian"
- }
- python_execute_function -s --source-dir python building
- fi
-}
-
-src_test() {
- default
-
- if use python; then
- testing() {
- emake \
- PYTHON="$(PYTHON)" \
- PYTHON_INC="$(python_get_includedir)" \
- PYTHON_LIB="$(python_get_libdir)" \
- PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
- pkgpylibdir="$(python_get_sitedir)/xapian" \
- VERBOSE="1" \
- check
- }
- python_execute_function -s --source-dir python testing
- fi
-}
-
-src_install () {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- if use java; then
- java-pkg_dojar java/built/xapian_jni.jar
- # TODO: make the build system not install this...
- java-pkg_doso "${D}/${S}/java/built/libxapian_jni.so"
- rm "${D}/${S}/java/built/libxapian_jni.so"
- rmdir -p "${D}/${S}/java/built"
- rmdir -p "${D}/${S}/java/native"
- fi
-
- if use python; then
- installation() {
- emake \
- DESTDIR="${D}" \
- PYTHON="$(PYTHON)" \
- PYTHON_INC="$(python_get_includedir)" \
- PYTHON_LIB="$(python_get_libdir)" \
- PYTHON_SO="$("$(PYTHON)" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_config_vars("SO")[0])')" \
- pkgpylibdir="$(python_get_sitedir)/xapian" \
- install
- }
- python_execute_function -s --source-dir python installation
- fi
-
- if use php; then
- php-ext-source-r2_createinifiles
- fi
-
- # For some USE combinations this directory is not created
- if [[ -d "${D}/usr/share/doc/xapian-bindings" ]]; then
- mv "${D}/usr/share/doc/xapian-bindings" "${D}/usr/share/doc/${PF}"
- fi
-
- dodoc AUTHORS HACKING NEWS TODO README || die "dodoc failed"
-}
-
-pkg_postinst() {
- if use python; then
- python_mod_optimize xapian
- fi
-
- if use php_targets_php5-4; then
- ewarn "Note: subclassing Xapian classes in PHP currently doesn't work with PHP 5.4"
- fi
-}
-
-pkg_postrm() {
- if use python; then
- python_mod_cleanup xapian
- fi
-}
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 84df3bdf2963..5c584a2cfd41 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -1,5 +1,3 @@
DIST xapian-core-1.2.19.tar.xz 3175384 SHA256 4a78260388ff1b042f0ab5d18afdd524a530ae609690d0339990ddc147a54785 SHA512 5cd29b8c278b4fa652f947cd6689945bbe239c95425344d0fedb445bf1534198333844d91e6e59cf870043066f4dc511cd0268071916002e96bd38b59aa91c1b WHIRLPOOL 5d65982d47145addc6585b72a99494bf6d14277df2c796925fbe6284ddd08b89fbc147c1a29575d573afebb2e2f6eb6dc73d58161260404be7e5ceefe1371ffb
-DIST xapian-core-1.2.20.tar.xz 3181788 SHA256 c4f8d5b9e393ea32912955a17e6b6ea3f6c052ae9133ded6fe48582c25b1aa8f SHA512 89b2b4dabd4ef5946a2fab95c0bc3786fe36172f4dc750713aa4f3fa5d9e1716ee598faca1385209c1a669f5b7fed1a88c038d1f9cc47522fa956d04ea86560a WHIRLPOOL ec5145306208ba2fa7b458033573ff526bc2ee12a89dfd8fb81e43d836c2d6ac44a573ccd0c336c358fc55e17c73452929ecef6eb8d8edc1eef2a6f3050008f5
DIST xapian-core-1.2.21.tar.xz 3202560 SHA256 63f48758fbd13fa8456dd4cf9bf3ec35a096e4290f14a51ac7df23f78c162d3f SHA512 a821043ea1686a09178bb91b14ed6a8cf00c50dfb0f066e420a40395edd3be085d7f89abb8f6a1151c847272c13601274e645055ede3548b07d5e912f0a70f81 WHIRLPOOL 9de8b2b70252b87da16a2502a831b46857f48cca8623a6ac411291bb6607bd61968ddd64a77c8685f300818abcbf91149a3f43af849a7843f67a5ebcc5130963
-DIST xapian-core-1.3.2.tar.xz 2490944 SHA256 203624f292fd9a023d51cdba53b01c7132210866a34bdca79ba721a7dd3745e6 SHA512 712c19aa2416d1493dfb601e1abe7242bf8f893197a3d0c229e5cabaac446950dd4c71c23200ce8a568e3bfae60e0d987c0c2d9938b1d185af2d44df3627c1cf WHIRLPOOL a1e4d8840d2d62cc524d287110de2e4370b2f60c614b91bc4cc624f96a73cc6397d5125cdae877b6781df1cc8d4ac9b34ffdeb4892c20aac0099afd5ef28c46c
DIST xapian-core-1.3.3.tar.xz 2543260 SHA256 2d273ca0df6af208c4b6904542a9dffed8a9520376522d650e1a2885b476a280 SHA512 8b0d0fce532748efc1c2705e3f6f45ff83ec97be7c1f5b54846a9ff94b9d416b67491262a157afdc40497c52e1c4aa94bd11a78b4494db4a1fb45ba6d18f7099 WHIRLPOOL bf9c2f1606ba72469f2306cc6edfff63834c58831ee75063e39445392460b85478c9c44ef7d2ec1fdfd63bad113544f8c1ba3eb01ee178abf63da3a7ae2d5b3b
diff --git a/dev-libs/xapian/xapian-1.2.20.ebuild b/dev-libs/xapian/xapian-1.2.20.ebuild
deleted file mode 100644
index 9d8afd537991..000000000000
--- a/dev-libs/xapian/xapian-1.2.20.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local myconf=""
-
- ewarn
- if use cpu_flags_x86_sse2; then
- ewarn "Using sse2"
- myconf="${myconf} --enable-sse=sse2"
- else
- if use cpu_flags_x86_sse; then
- ewarn "Using sse"
- myconf="${myconf} --enable-sse=sse"
- else
- ewarn "Disabling sse and sse2"
- myconf="${myconf} --disable-sse"
- fi
- fi
- ewarn
-
- myconf="${myconf} $(use_enable static-libs static)"
-
- use brass || myconf="${myconf} --disable-backend-brass"
- use chert || myconf="${myconf} --disable-backend-chert"
- use inmemory || myconf="${myconf} --disable-backend-inmemory"
-
- myconf="${myconf} --enable-backend-flint --enable-backend-remote"
-
- econf $myconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}"
- use doc || rm -rf "${D}usr/share/doc/${PF}"
-
- dodoc AUTHORS HACKING PLATFORMS README NEWS
-}
-
-src_test() {
- emake check VALGRIND=
-}
diff --git a/dev-libs/xapian/xapian-1.3.2.ebuild b/dev-libs/xapian/xapian-1.3.2.ebuild
deleted file mode 100644
index 72c6720be03a..000000000000
--- a/dev-libs/xapian/xapian-1.3.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MY_P="${PN}-core-${PV}"
-
-DESCRIPTION="Xapian Probabilistic Information Retrieval library"
-HOMEPAGE="http://www.xapian.org/"
-SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- local myconf=""
-
- ewarn
- if use cpu_flags_x86_sse2; then
- ewarn "Using sse2"
- myconf="${myconf} --enable-sse=sse2"
- else
- if use cpu_flags_x86_sse; then
- ewarn "Using sse"
- myconf="${myconf} --enable-sse=sse"
- else
- ewarn "Disabling sse and sse2"
- myconf="${myconf} --disable-sse"
- fi
- fi
- ewarn
-
- myconf="${myconf} $(use_enable static-libs static)"
-
- use brass || myconf="${myconf} --disable-backend-brass"
- use chert || myconf="${myconf} --disable-backend-chert"
- use inmemory || myconf="${myconf} --disable-backend-inmemory"
-
- myconf="${myconf} --enable-backend-remote --program-suffix="
-
- econf $myconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- mv "${D}usr/share/doc/xapian-core" "${D}usr/share/doc/${PF}"
- use doc || rm -rf "${D}usr/share/doc/${PF}"
-
- dodoc AUTHORS HACKING PLATFORMS README NEWS
-}
-
-src_test() {
- emake check VALGRIND=
-}
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index bcc475139780..e52a23a9abab 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -8,6 +8,7 @@ DIST sbcl-1.1.18-source.tar.bz2 4272315 SHA256 933238392a2a3533b4088b86c4fbd0704
DIST sbcl-1.1.18-x86-64-linux-binary.tar.bz2 9196684 SHA256 c945406f9421736982efc4eaaeb376b19331422f5b5a349382ed53c742d6cb0a SHA512 d63a33532ae6390c00d789c22c4a504b621e707b8aa5f72d12b497be8a590a75604a18f384fa2d27df3a4a0ef3ecd4c27e7bfc4f74fde3a014df1aad5dd8ff0c WHIRLPOOL 980726e0dd182c2b29c5ac4deab994d028e0003a3e2ac3e38a0c052f6607fc75f6b298fb60c99ff9f373c9ba1f243d6bd97de2cb765aad559867598affd510ab
DIST sbcl-1.1.6-x86-darwin-binary.tar.bz2 9091955 SHA256 5801c60e2a875d263fccde446308b613c0253a84a61ab63569be62eb086718b3 SHA512 5b9d58ba1a7bcf3aa5011ac5ba1c8dba65e44b2c3f8a31b15db54de6b34ea0f7482c45f1cc4e1323e154ce79fbba030112df3795cb323bca46bac50f15d2a138 WHIRLPOOL 673e84bbf685e07568530ccb2c3822dbfffd6226d3de90bfef13078466ae245f63dd2fc4ac48b4d64ca1453cc831ad6913af21540bd3b35fe51700161ca26086
DIST sbcl-1.1.8-x86-64-darwin-binary.tar.bz2 9045228 SHA256 729054dc27d6b53bd734eac4dffeaa9e231e97bdbe4927d7a68c8f0210cad700 SHA512 d29cf032dd52b014fcc5c48fc5dd0a1f8065838cd9078d129742302c64263b7d630232d1f9c051b56b8b2b34f1bef338aeaf81ff827799032e44ca6165483e34 WHIRLPOOL f44112707f000a46d26a6af65e651868639beddab4be9c84c8f2bc8488f198ab661cb6aa62f1d38fbcbe48f259c0c2e54d255ae45db22f648b56aaaa4f104984
+DIST sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 10038928 SHA256 057d3a1c033fb53deee994c0135110636a04f92d2f88919679864214f77d0452 SHA512 c271796f854fe884e0d8aa6504bbe2e6c078de1555fc9a823463640cfd8c793dbddcb3f32932788d84a41e2b8a085b95c97c13a15c43fc909dcaad18ce25f215 WHIRLPOOL 2c39d1ac1490693b758b54b473970deaa9078f00bc579745fbbed169e696846fda888f105bc77d610a8cb1c0f995c6e6ad572b9163d55b3701db02f7f68824b8
DIST sbcl-1.2.13-source.tar.bz2 5567609 SHA256 e6d93a94cbf821b2c500a9440ca640588e9ac6914dba2f6b5445a5e14eeb1205 SHA512 f5f7bfb9e8c6a3dcf8c1bac62dba9ca1385b9689141c24951bec95ee5383f53e4279dd5c3fb382a79b06ef113d3d4aaa3b05fff69f8a819a0988ba03983c0c48 WHIRLPOOL 260de2f717544f4e9678b3e40bf59b16d83e3cdfad681c4a9e94fba9ec312a7647243a41076a9e64caa9ebfe33515561c854b939561019f14a3d07faf2425197
DIST sbcl-1.2.13-x86-64-linux-binary.tar.bz2 10154344 SHA256 900e58adb9a449e3b5177207908a361de71be1e3aec712aff731ba9a9903f3ab SHA512 483aafc9b38cf317ea764d66e1faf70560cca4c04355ae0a0669692c985034335ec155fc9557acab8cc5f2ee668615985950b2fa96d0acc900b74aceeeafb64c WHIRLPOOL bc9218f7a32194a19b12cd218b2ebfb1dbce01717289241ba62a1b39a424fc2d0620c80b536d1c0a605322e99c52ae0f01d943bd93b7e4c1388ae9b7ab7464bc
DIST sbcl-1.2.14-source.tar.bz2 5565538 SHA256 b9146dd6460c05bca508f6dda83003580911833eedd51dbc09d8eca80b0f5c06 SHA512 471b215419f9303e010cbfb99866e09a43cc68a63680b5267662a12585b145b9f520592c37c81eabfe81b102255cd82fabb74cca731d8c3eed50747df34a6e2c WHIRLPOOL e89cd4c2ff1b2716c0ba62aed6d2107f05094c053c91db8a14638a80a5b63f83102fc1c125164edf251ed2ca507e00c298a9278efe83ad5f3b27ab53ddd48131
diff --git a/dev-lisp/sbcl/sbcl-1.2.16.ebuild b/dev-lisp/sbcl/sbcl-1.2.16.ebuild
index a4a2469ffa30..3ff88d6ebc17 100644
--- a/dev-lisp/sbcl/sbcl-1.2.16.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.2.16.ebuild
@@ -14,7 +14,7 @@ BV_ALPHA=1.0.28
BV_ARM=1.2.7
BV_PPC_MACOS=1.0.47
BV_X86_MACOS=1.1.6
-BV_X64_MACOS=1.1.8
+BV_X64_MACOS=1.2.11
BV_SPARC_SOLARIS=1.0.23
BV_X86_SOLARIS=1.2.7
BV_X64_SOLARIS=1.2.7
diff --git a/dev-ml/cmdliner/Manifest b/dev-ml/cmdliner/Manifest
index 1dc6fe4b6bdb..9ca91d58954d 100644
--- a/dev-ml/cmdliner/Manifest
+++ b/dev-ml/cmdliner/Manifest
@@ -1 +1,2 @@
DIST cmdliner-0.9.7.tbz 50343 SHA256 9c19893cffb5d3c3469ee0cce85e3eeeba17d309b33b9ace31aba06f68f0bf7a SHA512 ea1ee186f6072dc836e23a7fcc0756d016c61d4d34ef2416842d1e6e73707b2bbd6aaccd8f57472560dbeab75d3d26159ad8276813882726a11e4530dc6f45e6 WHIRLPOOL 79acdf4807cc5befad01fa1f22a214bc2c6a66dbba4b2b2c041ba72c0b2982d7ca61c632766bfe498987f61d6636a818fae1c96df1bf02e87073c9247b6babf0
+DIST cmdliner-0.9.8.tbz 53249 SHA256 7dfaafdd88ec9d96abf8ded4c0ea7111948194400220a56e4bb44a1edfa4bd41 SHA512 6c71c360eaba7f7127e422a71a00a830a086f1d6750897bea0ebc1cc10f8fdaf9e9532d354abd84dbc6c5fcc1878f19d3f424fd9335e7226b625b63b51c89cab WHIRLPOOL 25739c09f78cc8ade6d0e5805f48eb14a6c42f0891832747caef44fc6135c81feaa0055b2874256bde2270753106c60accd50c24771333c2cb16913d9bd38c3d
diff --git a/dev-ml/cmdliner/cmdliner-0.9.8.ebuild b/dev-ml/cmdliner/cmdliner-0.9.8.ebuild
new file mode 100644
index 000000000000..87faba390088
--- /dev/null
+++ b/dev-ml/cmdliner/cmdliner-0.9.8.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="Declarative definition of command line interfaces for OCaml"
+HOMEPAGE="http://erratique.ch/software/cmdliner"
+SRC_URI="http://erratique.ch/software/${PN}/releases/${P}.tbz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="doc +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ ocaml pkg/build.ml \
+ native=$(usex ocamlopt true false) \
+ native-dynlink=$(usex ocamlopt true false) \
+ || die
+}
+
+src_install() {
+ # Can't use opam-installer here as it is an opam dep...
+ findlib_src_preinst
+ local nativelibs=""
+ use ocamlopt && nativelibs="$(echo _build/src/cmdliner.cm{x,xa,xs} _build/src/cmdliner.a)"
+ ocamlfind install cmdliner _build/pkg/META \
+ _build/src/cmdliner.mli _build/src/cmdliner.cm{a,i} ${nativelibs} || die
+ dodoc README.md TODO.md CHANGES.md
+ use doc && dohtml -r doc/
+}
diff --git a/dev-perl/Alien-SDL/Alien-SDL-1.440.0.ebuild b/dev-perl/Alien-SDL/Alien-SDL-1.440.0.ebuild
deleted file mode 100644
index aac029c20707..000000000000
--- a/dev-perl/Alien-SDL/Alien-SDL-1.440.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=FROGGS
-MODULE_VERSION=1.440
-inherit perl-module toolchain-funcs
-
-DESCRIPTION="building, finding and using SDL binaries"
-
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-
-# File::Fetch, File::Find, Test::More -> dev-lang/perl
-RDEPEND="dev-perl/Archive-Extract
- dev-perl/Archive-Zip
- dev-perl/Capture-Tiny
- dev-perl/File-ShareDir
- dev-perl/File-Which
- dev-perl/Text-Patch
- media-libs/libsdl
- virtual/perl-Archive-Tar
- virtual/perl-Digest-SHA
- virtual/perl-ExtUtils-CBuilder
- virtual/perl-ExtUtils-MakeMaker
- dev-perl/Module-Build
- virtual/perl-File-Spec
- virtual/perl-File-Temp"
-DEPEND=${RDEPEND}
-
-SRC_TEST=do
-myconf='--with-sdl-config'
-
-src_prepare() {
- tc-export CC
- perl-module_src_prepare
-}
diff --git a/dev-perl/Alien-SDL/Alien-SDL-1.444.0.ebuild b/dev-perl/Alien-SDL/Alien-SDL-1.444.0.ebuild
deleted file mode 100644
index c5c8b6675c41..000000000000
--- a/dev-perl/Alien-SDL/Alien-SDL-1.444.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=FROGGS
-MODULE_VERSION=1.444
-inherit perl-module toolchain-funcs
-
-DESCRIPTION="building, finding and using SDL binaries"
-
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-# File::Fetch, File::Find, Test::More -> dev-lang/perl
-RDEPEND="dev-perl/Archive-Extract
- dev-perl/Archive-Zip
- dev-perl/Capture-Tiny
- dev-perl/File-ShareDir
- dev-perl/File-Which
- dev-perl/Text-Patch
- media-libs/libsdl
- virtual/perl-Archive-Tar
- virtual/perl-Digest-SHA
- virtual/perl-ExtUtils-CBuilder
- virtual/perl-ExtUtils-MakeMaker
- dev-perl/Module-Build
- virtual/perl-File-Spec
- virtual/perl-File-Temp"
-DEPEND=${RDEPEND}
-
-src_prepare() {
- tc-export CC
- epatch "${FILESDIR}"/${P}-fix-build-option.patch
- perl-module_src_prepare
-}
-
-SRC_TEST=do
-myconf='--with-sdl-config'
diff --git a/dev-perl/Alien-SDL/Manifest b/dev-perl/Alien-SDL/Manifest
index 88f29a80cd4a..16f4a699d418 100644
--- a/dev-perl/Alien-SDL/Manifest
+++ b/dev-perl/Alien-SDL/Manifest
@@ -1,3 +1 @@
-DIST Alien-SDL-1.440.tar.gz 346309 SHA256 cc25c9319d2db984b049eed5559582b2a6e0072af9b48d621a7772a1dcd18961 SHA512 3af6f80f376927d031a5ff1dfefb2b24d6824657424010970a4ae11d539893ac09ebfe0c2555da1600d5d9a4f830f7d5ab51593991eb8d239eaacff9f7328987 WHIRLPOOL 1cef55c0dbf33e7ebcc2d9200dce49603d1a9e55e8f7a5192fd8d29cbc8d624410490e53e5998206b66ea5cfb078cef5ff974bb821c57f1ab028fdd7a40c0d2a
-DIST Alien-SDL-1.444.tar.gz 349527 SHA256 66cc4f1f4d55a3fd34869838f21bc0ed4a1a0c1f07158f85a0edd12fc35dbc74 SHA512 0c638351a22efcb83eb24b1c28a7db4a05c1f685717fcd735cd03692e11589649e1f7fed4b6c52c0b8f48c208b5daf301432bd986375f966f02c61d922f2cd79 WHIRLPOOL 87c0bb3a827265206332a63d29ba3fed4b1dd31546a601f78ed23e4dc5693b8784a7e47771823bd488bb6c19348f09da6c46d2cc254c272d82c4b1e5a840fdfc
DIST Alien-SDL-1.446.tar.gz 350448 SHA256 c9aa2c9dc3c63d89773c7d7203f2a46d1b924d0c72d9f801af147a3dc8bc512a SHA512 dfb5f104f449857b9567ca93a0c3b15aed2618e27019569c95c4b7469e1f7d5cc390fe2dda9c6add41e9648c1f6efe053d08a4bd0fcc5bc546a217721bea824c WHIRLPOOL d449168885362a7533eb167ae3d4655b1bdb0a3188c8cbd44c6aa4b38c68d816117954434d51b711d7cf5fc54d511b2dd53952ae1c6e44e106918b0960b6bd0f
diff --git a/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild b/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild
index 8c9cf724a2f1..fa91a2556d0e 100644
--- a/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild
+++ b/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Canary to check perl compatibility for schmorp's modules"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild
index d33942bb058a..f54f766eb7a7 100644
--- a/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild
+++ b/dev-perl/Convert-UUlib/Convert-UUlib-1.500.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A Perl interface to the uulib library"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
PATCHES=( "${FILESDIR}/${P}-unbundle.patch" )
diff --git a/dev-perl/Expect/Expect-1.320.0-r1.ebuild b/dev-perl/Expect/Expect-1.320.0-r1.ebuild
index acae7e9d16f3..929308eeae96 100644
--- a/dev-perl/Expect/Expect-1.320.0-r1.ebuild
+++ b/dev-perl/Expect/Expect-1.320.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Expect for Perl"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
IUSE="test minimal"
RDEPEND="
diff --git a/dev-perl/Expect/Expect-1.320.0.ebuild b/dev-perl/Expect/Expect-1.320.0.ebuild
deleted file mode 100644
index d7be088dacbf..000000000000
--- a/dev-perl/Expect/Expect-1.320.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SZABGAB
-MODULE_VERSION=1.32
-inherit perl-module
-
-DESCRIPTION="Expect for Perl"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-RDEPEND="
- virtual/perl-Carp
- virtual/perl-Exporter
- virtual/perl-IO
- >=dev-perl/IO-Tty-1.110.0
-"
-DEPEND="${RDEPEND}
- >=virtual/perl-ExtUtils-MakeMaker-6.640.0
- test? (
- virtual/perl-File-Temp
- >=dev-perl/Test-Exception-0.320.0
- virtual/perl-Test-Simple
- )
-"
-
-SRC_TEST="do parallel"
diff --git a/dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild b/dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild
index e9cd89e60c4a..0424cb2ee1a6 100644
--- a/dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild
+++ b/dev-perl/IO-Stty/IO-Stty-0.30.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Change and print terminal line settings"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
RDEPEND=""
diff --git a/dev-perl/Search-Xapian/Manifest b/dev-perl/Search-Xapian/Manifest
index dc5e0664cdea..60ceca5e8e1c 100644
--- a/dev-perl/Search-Xapian/Manifest
+++ b/dev-perl/Search-Xapian/Manifest
@@ -1,3 +1,2 @@
DIST Search-Xapian-1.2.19.0.tar.gz 63667 SHA256 d9ff745bb3ace7c1c2dbcf4ad65f3e50b3744d16c0a9ee3a51fe7c6541f639c2 SHA512 78ba36f3b8157ef872330b88992012d3f553abc3f2322bbb1d0f3111681dd530e5b57e4989fef645401d19cb4d95f5d284a305c5470efc2911051d1765551a3f WHIRLPOOL 9f81480e6341f3bd65bfd243d95d5b8ecce30cb4b9c531a3dffac48f1d787259988e51a19a32af73693dbbbbba8e08865e1a116a49f9fe4f0b2fa2e78a22c0e8
-DIST Search-Xapian-1.2.20.0.tar.gz 67128 SHA256 1be6dc77680ba5597bbb3f1cf7ac9fa61de77e9266be2e6a45a7f913b274c139 SHA512 734ed63dc86f904f5b68c7c8e62780d82c27414625c54d4d14e974aa1b2f0b1f0022f0176da072ff4e6fd2a218586dbfc0f85481df60bb0d231ad978c3ec969b WHIRLPOOL 7b8b5a2e9b572e5dbe7671368c31e6ac0052b8c9cbb3052548ed816e75c55696414c1ef57b9c8040c2c5faf4371afd0272cf57b8557cc028f7f4ca4cdcb825ef
DIST Search-Xapian-1.2.21.0.tar.gz 67726 SHA256 34cb6279c3394b763e16ff9ae6b48942bdddb494312548366156cfdb4d8c70b5 SHA512 e2ffbf1a880fbda000020f7d9310b71690b26267d9324dd4ee05268b348ac5e5974c1c1feb097cf6bb3c267e5b440422a0153167b916cd2215749df236c2e883 WHIRLPOOL f34ba0070fb41e0efeb2aff4852ef8717b216184c79878196c50650f009d6e48d216b8dd1f9cd07031fb2be713faf5a3e9c8e1184469fed69fa745f69bb5572a
diff --git a/dev-perl/Search-Xapian/Search-Xapian-1.2.20.0.ebuild b/dev-perl/Search-Xapian/Search-Xapian-1.2.20.0.ebuild
deleted file mode 100644
index 61608f072686..000000000000
--- a/dev-perl/Search-Xapian/Search-Xapian-1.2.20.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-MODULE_AUTHOR=OLLY
-inherit perl-module toolchain-funcs versionator
-
-VERSION=$(get_version_component_range 1-3)
-
-SRC_URI+=" http://oligarchy.co.uk/xapian/${VERSION}/${P}.tar.gz"
-DESCRIPTION="Perl XS frontend to the Xapian C++ search library"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="~dev-libs/xapian-${VERSION}
- !dev-libs/xapian-bindings[perl]"
-DEPEND="${RDEPEND}
- dev-perl/Module-Build"
-
-SRC_TEST="do"
-
-myconf="CXX=$(tc-getCXX) CXXFLAGS=${CXXFLAGS}"
-
-src_install() {
- perl-module_src_install
-
- use examples && {
- docinto examples
- dodoc "${S}"/examples/*
- }
-}
diff --git a/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.3.ebuild b/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.3.ebuild
index 87a50caf641e..d1bc479f486e 100644
--- a/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.3.ebuild
+++ b/dev-php/PEAR-DB_DataObject/PEAR-DB_DataObject-1.11.3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit php-pear-r1
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
DESCRIPTION="A SQL Builder, Object Interface to Database Tables"
LICENSE="PHP-2.02 PHP-3"
diff --git a/dev-python/Babel/Babel-2.1.1-r1.ebuild b/dev-python/Babel/Babel-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..ba579d6977db
--- /dev/null
+++ b/dev-python/Babel/Babel-2.1.1-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A collection of tools for internationalizing Python applications"
+HOMEPAGE="http://babel.edgewall.org/ https://pypi.python.org/pypi/Babel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( >=dev-python/pytest-2.3.5[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # Make the tests use implementation-specific datadir,
+ # because they try to write in it.
+ sed -e '/datadir =/s:os\.path\.dirname(__file__):os.environ["BUILD_DIR"]:' \
+ -i tests/messages/test_frontend.py || die
+ sed -e '/^intersphinx_mapping/,+3d' -i docs/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # Create implementation-specific datadir for tests.
+ cp -R -l tests/messages/data "${BUILD_DIR}"/ || die
+ export BUILD_DIR
+ py.test || die
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/CacheControl/CacheControl-0.11.5-r1.ebuild b/dev-python/CacheControl/CacheControl-0.11.5-r1.ebuild
new file mode 100644
index 000000000000..62ca021b2653
--- /dev/null
+++ b/dev-python/CacheControl/CacheControl-0.11.5-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The httplib2 caching algorithms packaged up for use with requests"
+HOMEPAGE="https://github.com/ionrock/cachecontrol https://pypi.python.org/pypi/cachecontrol/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="redis test"
+
+RDEPEND="
+ dev-python/requests[${PYTHON_USEDEP}]
+ >=dev-python/lockfile-0.9[${PYTHON_USEDEP}]
+ redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )"
+DEPENDS="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+ py.test -v || die
+}
diff --git a/dev-python/CacheControl/CacheControl-0.11.5.ebuild b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
index 1cfcbb419002..260be47e8ff1 100644
--- a/dev-python/CacheControl/CacheControl-0.11.5.ebuild
+++ b/dev-python/CacheControl/CacheControl-0.11.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86"
IUSE="redis test"
RDEPEND="
diff --git a/dev-python/alabaster/alabaster-0.7.6-r1.ebuild b/dev-python/alabaster/alabaster-0.7.6-r1.ebuild
new file mode 100644
index 000000000000..54702d66d9c9
--- /dev/null
+++ b/dev-python/alabaster/alabaster-0.7.6-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
+HOMEPAGE="https://github.com/bitprophet/alabaster"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/ansi2html/ansi2html-1.1.0.ebuild b/dev-python/ansi2html/ansi2html-1.1.0.ebuild
index 94229ddcd027..33968f3ef5d2 100644
--- a/dev-python/ansi2html/ansi2html-1.1.0.ebuild
+++ b/dev-python/ansi2html/ansi2html-1.1.0.ebuild
@@ -17,14 +17,17 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="test"
-RDEPEND=">=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
DEPEND="
test? (
${RDEPEND}
dev-python/nose[${PYTHON_USEDEP}]
$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
)
- dev-python/setuptools[${PYTHON_USEDEP}]"
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ "
python_test() {
chmod -x "${S}"/tests/* || die
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index 895ad447b199..229de1b39307 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -2,3 +2,4 @@ DIST bandit-0.12.0.tar.gz 65558 SHA256 3c147b507696f3a74a5cf3581cc3bb65a63df454f
DIST bandit-0.13.0.tar.gz 73142 SHA256 4593957b236564599dec7c8b2da5b084f9b257213688a3a97b2643c04721eb66 SHA512 1605fb2e3e43a85ccf89a0b18c517082543d20b55149383d3704d71854817cfef3fd5e1095dd58e24efe0324ca9430fc8d7ab9f3e4f1db1ca0ffe7c4f8e17577 WHIRLPOOL 3becc739b966c2ff550988f04b1dbb03b285b120ff1f2bf4822a0b2277bdd2dc23f7e5c4d5ce6ea98dc45211d9ee7ed52f37e602f2d18558eacce356b81f79a5
DIST bandit-0.13.1.tar.gz 68706 SHA256 e8383d751d0eacd0491e6821c6a176e317316ba3afd7005d11690467a091dd0c SHA512 c3d439f17c02b3ef24c52aa8044c414ffccb2e5e60b7d744d1ec20ff9aff40e6254626c032230da59ec2bf4d923bc16ef9f777b34a09b73cccb782b4f536d869 WHIRLPOOL c9f5ff8410f28fb361d50854b5e8750f3f71ce951e91d50570438282559c9fb92aadc38efb5b87b8d262a589ca5bcb2d8f410443a7d431c51729f310e64d217d
DIST bandit-0.13.2.tar.gz 68888 SHA256 ef78c4dda20f758f95aca467fbb6609a696b6df13104d324b329b1bca963e30d SHA512 0809b7bca2f88e579760c7dcd3fedd1bdd394930eb0cd203ec24d75a18cc8007fa0db304a378f2d99d9cfd5e8b1f34a4ebe427a4bcb5daadf3d29acf0a26da42 WHIRLPOOL c91c140a79816d55f46b4b81e8554e2e36ff47b217da0258cc8ca220b59fd1b0622bd938956280ee111ee994cee81a442da3148fc1be9f0ff8c7d1ea2cdc305d
+DIST bandit-0.14.0.tar.gz 93482 SHA256 b5adb05564c96cc08dbecce80a36632ed6d601e0b68d73ba9de12682d4b57fd8 SHA512 b10514ac00e9f0d4392d34b6479e7818e6d4e37215c8351a5c1562f675f4329eb356d9a0c53c4e87f0fdbc6731c8e21de83c91aa9901620974da54ba84c72846 WHIRLPOOL acab078de2a83a6dce0c93f69d8fa25833fa8bd02810a9e6b96c5c3af0cf7138b4204089896f117e3f96fd6c194e190d53edc4819c6e177f1c718ef05968ce40
diff --git a/dev-python/bandit/bandit-0.14.0.ebuild b/dev-python/bandit/bandit-0.14.0.ebuild
new file mode 100644
index 000000000000..f0a8639d075f
--- /dev/null
+++ b/dev-python/bandit/bandit-0.14.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="A security linter from OpenStack Security"
+HOMEPAGE="https://openstack.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND="
+ >=dev-python/pbr-1.3.0[${PYTHON_USEDEP}]
+ <dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ test? (
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+ <dev-python/hacking-0.10[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.2[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ )"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/appdirs-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}]"
+
+python_test() {
+ testr init
+ testr run || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ mv "${D}/usr/etc" "${D}/" || die
+}
diff --git a/dev-python/bcolz/Manifest b/dev-python/bcolz/Manifest
index 2688c475545c..ed766961b5d6 100644
--- a/dev-python/bcolz/Manifest
+++ b/dev-python/bcolz/Manifest
@@ -1,3 +1,2 @@
DIST bcolz-0.10.0.tar.gz 541803 SHA256 cbe1c18440325058d764b3997fbf988af0257c2a4f7d64ec7150735191fdcc81 SHA512 ac6b30c3a1f1cd32563fcec670bd7b3639173547e8f6d319295358a38d4e39439bb26d7c908b30378d9a384b8667bc75023ebcf35f797a1250bdba1a25cbeebd WHIRLPOOL 5827303b5a8c356e183a88411a466276b9e3fe3e9d0f7999d5cb2923f34a6031816f0b829c7826dc956be312bccbcd4d24820ce4b861e940f2f9b0399cc3ff31
-DIST bcolz-0.8.1.tar.gz 533475 SHA256 c70f986a919842909ae96ff18994e3011d237c9fd0bbc0ee9f3588db736c4296 SHA512 022546f0908130f4af26be79ab9b10fb3d2951a1fe5e953201b249cbd4bcbd3003279c0b71009f29046bdf4b660a6e2d87672c7f47054a03f1df4d9dab83cb0a WHIRLPOOL dff6b600a36bc760a65d3271068d9ea19854eca3b3fe08248bf22d41da0b71315eb254ad175c78f54eb5170397c4d587c48ec3eefc74e5903214adde057f3f76
-DIST bcolz-0.9.0.tar.gz 530950 SHA256 086b1ad62accf6b45e9386edfa23ccc9f8a1feaec5803e7f39753139eb016a50 SHA512 0b71d670a42baa49e7ba3b856cad11cd163142054b0330f469de5ab30e456b58ebae5bffced4214b1988094fd92c7784cc7d7af026f28632abe26e3954850087 WHIRLPOOL 6edfd8b9addbdbe5d7d4bc2f6df77e8a3e61b94d62cb2b091fafabc4f749b1e8333819a607293a3c3d1cea9c7345d250e0e2e38ef6f5e636c65330a6c1be9fb6
+DIST bcolz-0.11.3.tar.gz 582564 SHA256 8750785f52e39f7b117784ed2909a0a702bb11d3f67c49d781df55618bfead07 SHA512 c47d7d4065ed413a28da84486044fd0d9fe83ab09f0112251d4bb46e5d5b5fdd56bab59a8fea7466bd46d62219fe77b12d1a9e8acb17c503f80b42c16cb60e53 WHIRLPOOL 8544d41086182d2a2e4f00a85c58b32716900f047651cce3fc3e9ff7b7993ae4d98c4b363ec10cd70ee9f23a46cb092ea51430eac4a6fdb6697aeecedee90095
diff --git a/dev-python/bcolz/bcolz-0.10.0.ebuild b/dev-python/bcolz/bcolz-0.10.0.ebuild
index 7193031a69ce..c1551f654a2b 100644
--- a/dev-python/bcolz/bcolz-0.10.0.ebuild
+++ b/dev-python/bcolz/bcolz-0.10.0.ebuild
@@ -18,9 +18,12 @@ KEYWORDS="~amd64 ~x86"
IUSE="doc test"
# numexpr is optional but set hard rdepend
-RDEPEND=">=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+RDEPEND="
+ >=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+ <dev-python/numpy-1.10[${PYTHON_USEDEP}]
>=dev-python/numexpr-1.4.1[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/cython-0.22[${PYTHON_USEDEP}]
+DEPEND="
+ >=dev-python/cython-0.22[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-python/bcolz/bcolz-0.9.0.ebuild b/dev-python/bcolz/bcolz-0.11.3.ebuild
index 7193031a69ce..b178b4080d61 100644
--- a/dev-python/bcolz/bcolz-0.9.0.ebuild
+++ b/dev-python/bcolz/bcolz-0.11.3.ebuild
@@ -18,11 +18,17 @@ KEYWORDS="~amd64 ~x86"
IUSE="doc test"
# numexpr is optional but set hard rdepend
-RDEPEND=">=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+RDEPEND="
+ >=dev-python/numpy-1.7[${PYTHON_USEDEP}]
>=dev-python/numexpr-1.4.1[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/cython-0.22[${PYTHON_USEDEP}]
+DEPEND="
+ >=dev-python/setuptools-0.18[${PYTHON_USEDEP}]
+ >=dev-python/cython-0.22[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+ test? (
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+ $(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' python2_7)
+ )"
python_prepare_all() {
if use doc; then
diff --git a/dev-python/bcolz/bcolz-0.8.1.ebuild b/dev-python/bcolz/bcolz-0.8.1.ebuild
deleted file mode 100644
index b379bbcd720f..000000000000
--- a/dev-python/bcolz/bcolz-0.8.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides columnar and compressed data containers"
-HOMEPAGE=" https://github.com/Blosc/bcolz"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-# numexpr is optional but set hard rdeoend
-RDEPEND=">=dev-python/numpy-1.7[${PYTHON_USEDEP}]
- >=dev-python/numexpr-1.4.1[${PYTHON_USEDEP}]"
-DEPEND=">=dev-python/cython-0.22[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
- if use doc; then
- mkdir doc/_static || die
- fi
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
- distutils-r1_python_compile
-}
-
-python_compile_all() {
- use doc && sphinx-build -b html -c doc/ doc/ doc/html
-}
-
-python_test() {
- pushd "${BUILD_DIR}"/lib > /dev/null
- "${PYTHON}" -m unittest discover || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 7b385899824a..825e611efa8e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,3 +1,3 @@
DIST 1.1.11.tar.gz 1975224 SHA256 b4e6edc12177dd4f720259aa7027bab00fb9db2029e40e77e67c552ef9f41132 SHA512 b0b10299d93314de582cfd21511987fe210df1618c49f6c706c4341a3a635a85cd48d8848a69f83391a227ab5dc3881509a02b4cc47b1e27d18cf353d4de850b WHIRLPOOL 21e662fe7f713a98e5e16225e3860585f0abb8e4a47b5f0ae52262a929a32ce563e1108c80602c9c2136180957c1b8bb4b89d8b9fc84415c155212d326f08b90
-DIST botocore-1.2.1.tar.gz 2002263 SHA256 3e3f75a52355d0d6feda98d2dd3345605227104174b45bc028507f055a90dd28 SHA512 fcdc2d655e717599a39d40775e276c51367c057f5558b2daffc376d6283faf617d85efe5f8258186dacf0e062f9d22eff3ba7b74c595833a93b8b638cf0d2f31 WHIRLPOOL e8d53c3585c2a764b52dbef9d0d2309e039de25c3ba286703fc3785f69af99bd54e149075fe0a9faadb81fa875df19b3dd6c4ffc9559c6c525f5429371dd6517
+DIST botocore-1.2.10.tar.gz 2202147 SHA256 8541895aa2abe2183fa15efe33794db7428fec3302e0c9bf1db13fa1668e2b66 SHA512 5395776f50c5302d2fa75af702ced17da66a4c0435d62aed907f1ceaa93d38acc2d91a250d2153d852239a08d9f7f0bf361523cc89168a6cb81ef6f8a6ec5124 WHIRLPOOL aa4ff7a2aa1a900642782783b85479943bcce85c7df0c056d989d329c0693424110859a1d9d358e0cc5af94be174c96786c2f339e78934c114011606dfce11ec
DIST botocore-1.2.4.tar.gz 2007943 SHA256 6330dec53831e4f961e2503a4d9bfe9e790e1e7ac716f8edc07f1b37ff2765da SHA512 c2d0ee934a0b0a25a617a100528daa2951e6cb5139bd7dc5d550bcffcb777119f141b96e0a60dda1277dc8199acfd33e80d002bd3cc730c011e5dadfc52c6f33 WHIRLPOOL f2ff39099b08808e4684abf0d800c05593d66ae68a68f112abab97a715a4c6248ef6f193816faf481e8bc5a3814b22978c0e06a29e5a4cdfb39e24d112b5ef21
diff --git a/dev-python/botocore/botocore-1.2.1.ebuild b/dev-python/botocore/botocore-1.2.10.ebuild
index 5908e96eca5c..6927baa78bfe 100644
--- a/dev-python/botocore/botocore-1.2.1.ebuild
+++ b/dev-python/botocore/botocore-1.2.10.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_4 )
inherit distutils-r1 vcs-snapshot
@@ -18,7 +18,8 @@ IUSE="doc test"
CDEPEND="
>=dev-python/docutils-0.10[${PYTHON_USEDEP}]
- ~dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ <dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
<dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
"
diff --git a/dev-python/certifi/certifi-2015.9.6.2-r1.ebuild b/dev-python/certifi/certifi-2015.9.6.2-r1.ebuild
new file mode 100644
index 000000000000..00427b5192ce
--- /dev/null
+++ b/dev-python/certifi/certifi-2015.9.6.2-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for providing Mozilla's CA Bundle"
+HOMEPAGE="http://certifi.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/certifi/certifi-2015.9.6.2.ebuild b/dev-python/certifi/certifi-2015.9.6.2.ebuild
index e2beeae67e5a..cebbac086d2b 100644
--- a/dev-python/certifi/certifi-2015.9.6.2.ebuild
+++ b/dev-python/certifi/certifi-2015.9.6.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-python/cffi/cffi-1.2.1-r1.ebuild b/dev-python/cffi/cffi-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..e4240734ea85
--- /dev/null
+++ b/dev-python/cffi/cffi-1.2.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# DO NOT ADD pypy to PYTHON_COMPAT
+# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Foreign Function Interface for Python calling C code"
+HOMEPAGE="http://cffi.readthedocs.org/ https://pypi.python.org/pypi/cffi"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc"
+
+RDEPEND="
+ virtual/libffi
+ dev-python/pycparser[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ py.test -x -v --ignore testing/test_zintegration.py c/ testing/ || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/characteristic/characteristic-14.3.0-r1.ebuild b/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
new file mode 100644
index 000000000000..32358868a9dd
--- /dev/null
+++ b/dev-python/characteristic/characteristic-14.3.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python attributes without the boilerplate"
+HOMEPAGE="https://characteristic.readthedocs.org/ https://github.com/hynek/characteristic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # Prevent un-needed download during build
+ sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/chardet/chardet-2.3.0-r1.ebuild b/dev-python/chardet/chardet-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..f83a2341f7db
--- /dev/null
+++ b/dev-python/chardet/chardet-2.3.0-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Universal encoding detector"
+HOMEPAGE="https://github.com/chardet/chardet https://pypi.python.org/pypi/chardet"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/chardet/chardet-2.3.0.ebuild b/dev-python/chardet/chardet-2.3.0.ebuild
index 8a7ce64a4b68..d6e8951aa1ea 100644
--- a/dev-python/chardet/chardet-2.3.0.ebuild
+++ b/dev-python/chardet/chardet-2.3.0.ebuild
@@ -3,6 +3,7 @@
# $Id$
EAPI=5
+
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
inherit distutils-r1
diff --git a/dev-python/click/click-5.1-r1.ebuild b/dev-python/click/click-5.1-r1.ebuild
new file mode 100644
index 000000000000..71da8775a2a5
--- /dev/null
+++ b/dev-python/click/click-5.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # Prevent un-needed d'loading
+ sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ emake test
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/colorama/colorama-0.3.3-r1.ebuild b/dev-python/colorama/colorama-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..7f861fa6464f
--- /dev/null
+++ b/dev-python/colorama/colorama-0.3.3-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Makes ANSI escape character sequences for producing colored terminal text & cursor positioning"
+HOMEPAGE="https://code.google.com/p/colorama/ https://pypi.python.org/pypi/colorama https://github.com/tartley/colorama"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+python_install_all() {
+ use examples && local EXAMPLES=( demos/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/colorama/colorama-0.3.3.ebuild b/dev-python/colorama/colorama-0.3.3.ebuild
index a5b8c2d51017..eae1e355cc42 100644
--- a/dev-python/colorama/colorama-0.3.3.ebuild
+++ b/dev-python/colorama/colorama-0.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="examples"
python_install_all() {
diff --git a/dev-python/coverage/coverage-4.0-r1.ebuild b/dev-python/coverage/coverage-4.0-r1.ebuild
new file mode 100644
index 000000000000..40187ee1e0cf
--- /dev/null
+++ b/dev-python/coverage/coverage-4.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="http://nedbatchelder.com/code/coverage/ https://pypi.python.org/pypi/coverage"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_compile() {
+ if [[ ${EPYTHON} == python2.7 ]]; then
+ local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ export CFLAGS
+ fi
+
+ distutils-r1_python_compile
+}
diff --git a/dev-python/cryptography-vectors/cryptography-vectors-1.0.2-r1.ebuild b/dev-python/cryptography-vectors/cryptography-vectors-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..f09f5655dbcc
--- /dev/null
+++ b/dev-python/cryptography-vectors/cryptography-vectors-1.0.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Test vectors for the cryptography package"
+HOMEPAGE="https://pypi.python.org/pypi/cryptography-vectors/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cryptography/cryptography-1.0.2-r1.ebuild b/dev-python/cryptography/cryptography-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..c8cd8f4a594c
--- /dev/null
+++ b/dev-python/cryptography/cryptography-1.0.2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# only works with >=pypy-2.6
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="libressl test"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ $(python_gen_cond_dep '>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]' 'python*')
+ $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
+ >=dev-python/idna-2.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' python2_7 pypy)
+ >=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=virtual/pypy-2.6.0' pypy )
+ "
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+ dev-python/iso8601[${PYTHON_USEDEP}]
+ dev-python/pretend[${PYTHON_USEDEP}]
+ >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
+ <dev-python/pytest-2.8[${PYTHON_USEDEP}]
+ )"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_test() {
+ py.test -v -v -x || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 29077287b6c7..f4cbc00dbd58 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,3 +1,4 @@
DIST Cython-0.22.tar.gz 1584483 SHA256 14307e7a69af9a0d0e0024d446af7e51cc0e3e4d0dfb10d36ba837e5e5844015 SHA512 856220fa579e272ac38dcef091760f527431ff3b98df9af6e68416fcf77d9659ac5abe5c7dee41331f359614637a4ff452033085335ee499830ed126ab584267 WHIRLPOOL d9919e1fe33f7ea02833c485e10667d8470d7c69901b2419c6c4c1d464f9ef2444795e14903cc66b6fee40ec5a4c20308c331ad93fd8818f207d0a21cccf9b2b
DIST Cython-0.23.2.tar.gz 1627642 SHA256 85a8713db65d9ad3e7e2f01e6ac424d4ae2a40349f1391b2b0f494ccb7e0fda7 SHA512 ae1d20f3efc2ae9eeb73d1d536895992280b4b3222bd6911bae886971cb222c98a581a770c48d65ec1fa40cfa7b7639580fe86e4986b5fba5c9257d351dfc1a3 WHIRLPOOL c019b43508104f0ce9375b1eed740d9bf4ba9bdff66fccbc4b272f61a9899327d1e3a1026215f4014db89aefb0f69caafd4e055271cd67500b95ad3fb3ab5263
DIST Cython-0.23.3.tar.gz 1628634 SHA256 590274ac8dbd1e62cc79d94eb2e2f4ae60cea91a9f8d50b8697d39aba451e82e SHA512 93d02fb7009fe005a91ccf83a3428c449e46c4ff913993e71affdee5a4155d932dcf93238fb85194f44c8b5dd7acd3e3dd83e86b407e4c41e6895abf1f3499ae WHIRLPOOL aa3a289f10608628991b368e9a6bda0821c5f957d1536963e7336ee81e04f554bb7fcce8c2bab429bde1ef7d1490a75770a45caec83d809aaf41f60b36f37924
+DIST Cython-0.23.4.tar.gz 1628326 SHA256 fec42fecee35d6cc02887f1eef4e4952c97402ed2800bfe41bbd9ed1a0730d8e SHA512 67f4d2be22def78318e8d3edc99b944c50291dc812064b0c8829dd453881bb288037087ee8472b161b9624ac13a50ece71a0d7560c9f2f7d94cc6fcad107e749 WHIRLPOOL f92dfc40080bb005bfdf220d8dc65c40b9ffa1e29b7c0c3e5c4e165f653f9b443af70191a3f7498777db07b9353147334d542e5e46109d4452f548d411d979dc
diff --git a/dev-python/cython/cython-0.23.3-r1.ebuild b/dev-python/cython/cython-0.23.3-r1.ebuild
new file mode 100644
index 000000000000..1a85940f4a7f
--- /dev/null
+++ b/dev-python/cython/cython-0.23.3-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1 flag-o-matic toolchain-funcs
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="http://www.cython.org/ https://pypi.python.org/pypi/Cython"
+SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+RDEPEND=""
+# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
+# spanning several packages. This bug has been fixed in the recent release of version 9.1
+DEPEND="${RDEPEND}
+ >=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_compile() {
+ if ! python_is_python3; then
+ local CFLAGS="${CFLAGS}"
+ local CXXFLAGS="${CXXFLAGS}"
+ append-flags -fno-strict-aliasing
+ fi
+
+ # Python gets confused when it is in sys.path before build.
+ local PYTHONPATH=
+ export PYTHONPATH
+
+ distutils-r1_python_compile
+}
+
+python_compile_all() {
+ use doc && unset XDG_CONFIG_HOME && emake -C docs html
+}
+
+python_test() {
+ tc-export CC
+ "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ use examples && local EXAMPLES=( Demos/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/cython/cython-0.23.4.ebuild b/dev-python/cython/cython-0.23.4.ebuild
new file mode 100644
index 000000000000..1a85940f4a7f
--- /dev/null
+++ b/dev-python/cython/cython-0.23.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1 flag-o-matic toolchain-funcs
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="http://www.cython.org/ https://pypi.python.org/pypi/Cython"
+SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+RDEPEND=""
+# On testing, setuptools invokes an error in running the testsuite cited in a number of recent bugs
+# spanning several packages. This bug has been fixed in the recent release of version 9.1
+DEPEND="${RDEPEND}
+ >=dev-python/setuptools-9.1[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/numpy[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_compile() {
+ if ! python_is_python3; then
+ local CFLAGS="${CFLAGS}"
+ local CXXFLAGS="${CXXFLAGS}"
+ append-flags -fno-strict-aliasing
+ fi
+
+ # Python gets confused when it is in sys.path before build.
+ local PYTHONPATH=
+ export PYTHONPATH
+
+ distutils-r1_python_compile
+}
+
+python_compile_all() {
+ use doc && unset XDG_CONFIG_HOME && emake -C docs html
+}
+
+python_test() {
+ tc-export CC
+ "${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ use examples && local EXAMPLES=( Demos/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/distlib/distlib-0.2.1-r1.ebuild b/dev-python/distlib/distlib-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..7df0c549df73
--- /dev/null
+++ b/dev-python/distlib/distlib-0.2.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Distribution utilities"
+HOMEPAGE="https://pypi.python.org/pypi/distlib https://bitbucket.org/vinay.sajip/distlib https://github.com/vsajip/distlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+python_test() {
+ sed \
+ -e '/PIP_AVAILABLE/s:True:False:g' \
+ -i tests/*py || die
+ PYTHONHASHSEED=0 esetup.py test
+}
diff --git a/dev-python/distlib/distlib-0.2.1.ebuild b/dev-python/distlib/distlib-0.2.1.ebuild
index 1feab56b9b6f..77daeeeaf502 100644
--- a/dev-python/distlib/distlib-0.2.1.ebuild
+++ b/dev-python/distlib/distlib-0.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
python_test() {
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 3f4d2d9d143b..da9a215c5a9e 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -3,3 +3,4 @@ DIST Django-1.5.12.tar.gz 8202839 SHA256 b3de77beb6e59b72071ca66f20c2ad34e1b90d3
DIST Django-1.6.11.tar.gz 6764000 SHA256 7e50e573e484435873b3515d7982d80093b2695aba17fd0ff024307454dc3a56 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829 WHIRLPOOL 5de086952bda9449f85798e8fe3bac82f11e1b856c1d39e340399e71ca6bf183318eebf1f536714567036485637166a929082a1ba9d6c1816f07c53dcc12c72a
DIST Django-1.7.10.tar.gz 7584312 SHA256 b9357d2cebe61997055d417d607f9c650e817cd1a383b9a1b88bf1edad797c75 SHA512 ef9c8f3f5db17474970805bd5a3956c65766362d883013c19d32cb0fcc795de74a831758d66d18103255e5c510b2ee384099f08e12d75c567caad2d80404cc20 WHIRLPOOL 380f05ff7f51dfc50f578f946b5b83ae36ab8a96a10ccce9c62642f5b2434c2ba9de2d1d9bc57859db003e4569fa0c3e118cf51cd80a9fe40c04c49fdf213999
DIST Django-1.8.4.tar.gz 7265101 SHA256 826996c81e1cc773500124d5c19212e4a7681a55ee169fab9085f2b3015a70d8 SHA512 34dee1d004f4b149bd8b0405bcad66c0b4ad68b3c0069b1631af2c457cbcc165d6a730d221777110525be74cf9369b695d4fc8d752317d0819fd338250222351 WHIRLPOOL 504f0271b74b9e93b74255922360fddcff3f6875297fcbd464e27212679b2275c98773088feab97fe8d0c0de664789653c72d614ed2d5fb9c648655685f895aa
+DIST Django-1.8.5.tar.gz 7270297 SHA256 2d174e4a3f54708d0d5b6ff1bf54ae71652e83bb06d7576b3b20d916b29c3653 SHA512 91a8788ec6a9f3592615da55948d080719425a2135e241e7b5014c6b9c354daa53c2caeadd9ac3d991730c8ef8fba579a0aa4f3094a1e83b0600811e9a3bd20b WHIRLPOOL af7037d853f6d9ea67df412589aab22113a8f4fb41c79d9f42e9b8fa0184b273a75815a558dddfeb8650f14532f77fc9585fc3c72912beaa152a932e667fcb06
diff --git a/dev-python/django/django-1.8.5.ebuild b/dev-python/django/django-1.8.5.ebuild
new file mode 100644
index 000000000000..d1795ee5749b
--- /dev/null
+++ b/dev-python/django/django-1.8.5.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+PYTHON_REQ_USE='sqlite?'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
+SRC_URI="
+ https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz
+ mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+ "
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+ test? (
+ ${PYTHON_DEPS//sqlite?/sqlite}
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/numpy[$(python_gen_usedep 'python*')]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
+)
+
+pkg_setup() {
+ webapp_pkg_setup
+}
+
+python_prepare_all() {
+ # Prevent d'loading in the doc build
+ sed -e '/^ "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ # Tests have non-standard assumptions about PYTHONPATH,
+ # and don't work with ${BUILD_DIR}/lib.
+ PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ newbashcomp extras/django_bash_completion ${PN}-admin
+ bashcomp_alias ${PN}-admin django-admin.py
+
+ if use doc; then
+ rm -fr docs/_build/html/_sources || die
+ local HTML_DOCS=( docs/_build/html/. )
+ fi
+
+ insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+ doins -r django/contrib/admin/static/admin/.
+ distutils-r1_python_install_all
+}
+
+src_install() {
+ distutils-r1_src_install
+ webapp_src_install
+}
+
+pkg_postinst() {
+ elog "Additional Backend support can be enabled via"
+ optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
+ optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
+ optfeature "PostgreSQL backend support" dev-python/psycopg:2
+ echo ""
+ elog "Other features can be enhanced by"
+ optfeature "GEO Django" sci-libs/gdal[geos]
+ optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+ optfeature "ImageField Support" virtual/python-imaging
+ optfeature "Password encryption" dev-python/bcrypt
+ optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+ echo ""
+ elog "A copy of the admin media is available to webapp-config for installation in a"
+ elog "webroot, as well as the traditional location in python's site-packages dir"
+ elog "for easy development."
+ webapp_pkg_postinst
+}
diff --git a/dev-python/docutils/docutils-0.12-r1.ebuild b/dev-python/docutils/docutils-0.12-r1.ebuild
new file mode 100644
index 000000000000..470ac18e3148
--- /dev/null
+++ b/dev-python/docutils/docutils-0.12-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Documentation Utilities"
+HOMEPAGE="http://docutils.sourceforge.net/ https://pypi.python.org/pypi/docutils"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2 GPL-3 public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DISTUTILS_NO_PARALLEL_BUILD=1
+
+python_compile_all() {
+ # Generate html docs from reStructured text sources.
+
+ # Place html4css1.css in base directory to ensure that the generated reference to it is correct.
+ cp docutils/writers/html4css1/html4css1.css . || die
+
+ cd tools || die
+ "${PYTHON}" buildhtml.py --input-encoding=utf-8 \
+ --stylesheet-path=../html4css1.css, --traceback ../docs || die
+}
+
+python_test() {
+ if python_is_python3; then
+ pushd test3 > /dev/null || die
+ else
+ pushd test > /dev/null || die
+ fi
+ "${PYTHON}" alltests.py || die "Testing failed with ${EPYTHON}"
+ popd > /dev/null || die
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ # Install tools.
+ python_doscript tools/{buildhtml,quicktest}.py
+}
+
+install_txt_doc() {
+ local doc="${1}"
+ local dir="txt/$(dirname ${doc})"
+ docinto "${dir}"
+ dodoc "${doc}"
+}
+
+python_install_all() {
+ local DOCS=( *.txt )
+ local HTML_DOCS=( docs tools docutils/writers/html4css1/html4css1.css )
+
+ distutils-r1_python_install_all
+
+ local doc
+ while IFS= read -r -d '' doc; do
+ install_txt_doc "${doc}"
+ done < <(find docs tools -name '*.txt' -print0)
+}
diff --git a/dev-python/enable/enable-4.5.1.ebuild b/dev-python/enable/enable-4.5.1.ebuild
index 31a0a802c754..300c03c337aa 100644
--- a/dev-python/enable/enable-4.5.1.ebuild
+++ b/dev-python/enable/enable-4.5.1.ebuild
@@ -41,7 +41,10 @@ DEPEND="${RDEPEND}
DISTUTILS_IN_SOURCE_BUILD=1
-PATCHES=( "${FILESDIR}"/${PN}-4.4.1-swig.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.4.1-swig.patch
+ "${FILESDIR}"/${P}-gcc-5.patch
+ )
python_prepare_all() {
append-cflags -fno-strict-aliasing
diff --git a/dev-python/enable/files/enable-4.5.1-gcc-5.patch b/dev-python/enable/files/enable-4.5.1-gcc-5.patch
new file mode 100644
index 000000000000..b18b8eae7bb7
--- /dev/null
+++ b/dev-python/enable/files/enable-4.5.1-gcc-5.patch
@@ -0,0 +1,22 @@
+From 55a74ccfc33764499497022dd3649be4bb1091ed Mon Sep 17 00:00:00 2001
+From: Nathan Ringo <tikiking1@users.noreply.github.com>
+Date: Wed, 10 Jun 2015 22:06:57 -0500
+Subject: [PATCH] Fixes #200
+
+---
+ kiva/agg/setup.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kiva/agg/setup.py b/kiva/agg/setup.py
+index 5b4d458..c6e290a 100644
+--- a/kiva/agg/setup.py
++++ b/kiva/agg/setup.py
+@@ -170,7 +170,7 @@ def get_ft2_sources((lib_name, build_info), build_dir):
+ f = os.popen("g++ --version")
+ line0 = f.readline()
+ f.close()
+- m = re.match(r'.+?\s(3|4)\.\d+', line0)
++ m = re.match(r'.+?\s([3-5])\.\d+', line0)
+ if int(m.group(1)) < 4:
+ use_32bit_workaround = True
+
diff --git a/dev-python/enable/metadata.xml b/dev-python/enable/metadata.xml
index de31ed9814dd..aee10049a76c 100644
--- a/dev-python/enable/metadata.xml
+++ b/dev-python/enable/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/expects/Manifest b/dev-python/expects/Manifest
index 1dd12feef6d1..c03a3e32f3a2 100644
--- a/dev-python/expects/Manifest
+++ b/dev-python/expects/Manifest
@@ -1,5 +1,3 @@
-DIST expects-0.2.1.tar.gz 22474 SHA256 0c70230281f68c4c93a4a1ba98da37ccc2529c849a28c555ab93050f2a084321 SHA512 c7a51f35e4c1468df19838b9dd74a9fe214c906b7bbf203f61841d2f0cfe60cffd1388b841a39ce14a59394594e148cbaf1777b08b90879136421186ab757585 WHIRLPOOL 0e62e27c4d96156463c1b8001459c6795a4398b7ec8a23283c3bccba7cbe4feb0a763e6086c2ffda7762d82e2a481812049f6920ccbade9e27e6046cf58601b0
DIST expects-0.4.2.tar.gz 23813 SHA256 b1e0b27141f784fe81a143153f23d3c8220fe8ec1003eb580b3eeb38eb778007 SHA512 6701a1a3099073c70d8f729b7ca72e4b9b3eb6d6f9e7d6d2d654a3b684c5ab101c343b4c3556f45d763ab1479dbc3eb3db209c4d9f5d2254cc4111e74a4a3c1a WHIRLPOOL 44ef85ca96225c22f91468e8b8b6368a26138f0fb9ee22dc89c282fb91adf4425d177ba62891239515affc639053165c6080f972c9435619c50a47fd81a27894
-DIST expects-0.7.2.tar.gz 398201 SHA256 ed72a184c2453b4f244cf887ee4545ac40dc0d88a1a224eabf150980a88877a9 SHA512 55db29e2bbba881933bf5d28e38f2c1e1087b4e43f15359a2af40e91066658973244fac4dcaf7eca79d6006d78d232232acbd1a2fc03ec1df62223e1226fb94a WHIRLPOOL 9eae839eb607f29f57be70e39fc6adb02fa8b9038d070016c090f75dec5ce05528fd3d18ca72e1d2aaa4205df31f20521fc23ad741b1b73b54262ac273e9e14e
-DIST expects-0.8.0_rc1.tar.gz 27424 SHA256 3822d470c3bebe749928e360e7bfdecf0ac6541717040de31cb265f1372dfb43 SHA512 5130b545164fdb8d8306b5d4fc3d83dcfaf9bb56428b9140def434bb1339b479568ba7aab88f5eedf646cadca12ee331163af5be0937633049baf695b309653b WHIRLPOOL 951ab90c1b3c143b3109676207c5f2a5480238555d10662f45c1a1336618c0e38307801aa0e61fc8bc978d333f3f44cd64da811742ebc65008815e635d0536d9
DIST expects-0.8.0_rc2.tar.gz 27307 SHA256 c7959a0b0f76a186b1d3687fbdedaf551f8bbbddbd66e5307c3a52c787a779de SHA512 6ae4553838ce4d27993772cec33f1e1a18d539af4a9b0f62f66ef1fb78464a46f5b76a420096d2d36881f4dc581b69e8f6c8783b89d794df753fdffab275cc33 WHIRLPOOL 04a04534571e8a15bcc2e1d7a9fc2b63bb772a8adaaf0b6239d375f1e5f750be7d7fa9fd10f5d84f017c4e3ad6274a7955e5b70928ee6eec7c199181169e5741
+DIST expects-0.8.0_rc3.tar.gz 27478 SHA256 a2809c6c51cf18b3316102f21e9d14d195edfd34526cfcad7d959d592deacbd4 SHA512 2566ddfcb83bb3d58dbddcc881f2b743cca061057f77a52da49d3eb6c16dc1fafaca900734d7023550c85dfd0b86d433a9328daf5a989ab91757d83e9eaa4d81 WHIRLPOOL 7e6c81a27c2dd01d261731db6deefe0830515731dc485278bbf2d5de84a726cef7cea2a5ecd514ccda169167f7cb0ca32f7b02de95c6bdcbd23f26faf502b87d
diff --git a/dev-python/expects/expects-0.2.1.ebuild b/dev-python/expects/expects-0.2.1.ebuild
deleted file mode 100644
index 51fcf020d5c5..000000000000
--- a/dev-python/expects/expects-0.2.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Expressive and extensible TDD/BDD assertion library for Python"
-HOMEPAGE="https://github.com/jaimegildesagredo/expects"
-SRC_URI="https://github.com/jaimegildesagredo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( ~dev-python/mamba-0.6[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- local DISTUTILS_NO_PARALLEL_BUILD=TRUE
-
- rm -f "${HOME}"/.pydistutils.cfg || die "Couldn't remove pydistutils.cfg"
-
- distutils_install_for_testing
-
- mamba || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/expects/expects-0.7.2.ebuild b/dev-python/expects/expects-0.7.2.ebuild
deleted file mode 100644
index 5021b32a0c24..000000000000
--- a/dev-python/expects/expects-0.7.2.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
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
-
-inherit distutils-r1
-
-DESCRIPTION="Expressive and extensible TDD/BDD assertion library for Python"
-HOMEPAGE="https://github.com/jaimegildesagredo/expects"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? ( dev-python/mamba[${PYTHON_USEDEP}] )
-"
-RDEPEND=""
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- mamba || die "tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/expects/expects-0.8.0_rc1.ebuild b/dev-python/expects/expects-0.8.0_rc3.ebuild
index f96e4611ab67..db3f4ddd2b01 100644
--- a/dev-python/expects/expects-0.8.0_rc1.ebuild
+++ b/dev-python/expects/expects-0.8.0_rc3.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_4 )
inherit distutils-r1 vcs-snapshot
diff --git a/dev-python/extras/extras-0.0.3-r1.ebuild b/dev-python/extras/extras-0.0.3-r1.ebuild
new file mode 100644
index 000000000000..cd914dae022f
--- /dev/null
+++ b/dev-python/extras/extras-0.0.3-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Useful extra bits for Python that should be in the standard library"
+HOMEPAGE="https://github.com/testing-cabal/extras/ https://pypi.python.org/pypi/extras/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/testtools[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+python_test() {
+ "${PYTHON}" ${PN}/tests/test_extras.py || die
+}
diff --git a/dev-python/fixtures/fixtures-1.3.1-r1.ebuild b/dev-python/fixtures/fixtures-1.3.1-r1.ebuild
index ac95e29b2a5b..6772b2c652f2 100644
--- a/dev-python/fixtures/fixtures-1.3.1-r1.ebuild
+++ b/dev-python/fixtures/fixtures-1.3.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="|| ( Apache-2.0 BSD )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
# nose not listed but provides coverage output of tests
diff --git a/dev-python/fixtures/fixtures-1.3.1-r2.ebuild b/dev-python/fixtures/fixtures-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..d3aa1382c442
--- /dev/null
+++ b/dev-python/fixtures/fixtures-1.3.1-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fixtures, reusable state for writing clean tests and more"
+HOMEPAGE="https://launchpad.net/python-fixtures https://pypi.python.org/pypi/fixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# nose not listed but provides coverage output of tests
+# run of test files by python lacks any output except on fail
+RDEPEND="
+ >=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ >=dev-python/testtools-0.9.22[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+#DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+ emake check
+}
diff --git a/dev-python/funcsigs/funcsigs-0.4.ebuild b/dev-python/funcsigs/funcsigs-0.4.ebuild
index 136adb238e2e..2538752d401f 100644
--- a/dev-python/funcsigs/funcsigs-0.4.ebuild
+++ b/dev-python/funcsigs/funcsigs-0.4.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 pypy pypy3 )
inherit distutils-r1
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="
diff --git a/dev-python/html5lib/html5lib-0.9999999-r1.ebuild b/dev-python/html5lib/html5lib-0.9999999-r1.ebuild
new file mode 100644
index 000000000000..3f957765ad28
--- /dev/null
+++ b/dev-python/html5lib/html5lib-0.9999999-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTML parser based on the HTML5 specification"
+HOMEPAGE="https://github.com/html5lib/html5lib-python/ https://html5lib.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_test() {
+ nosetests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/idna/idna-2.0-r1.ebuild b/dev-python/idna/idna-2.0-r1.ebuild
new file mode 100644
index 000000000000..9a53690c762b
--- /dev/null
+++ b/dev-python/idna/idna-2.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Internationalized Domain Names in Applications (IDNA)"
+HOMEPAGE="https://github.com/kjd/idna"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-python/idna/idna-2.0.ebuild b/dev-python/idna/idna-2.0.ebuild
index e9d42efeaaf2..c91b33db2b02 100644
--- a/dev-python/idna/idna-2.0.ebuild
+++ b/dev-python/idna/idna-2.0.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
inherit distutils-r1
diff --git a/dev-python/ipaddress/ipaddress-1.0.14-r1.ebuild b/dev-python/ipaddress/ipaddress-1.0.14-r1.ebuild
new file mode 100644
index 000000000000..74fbeef0c74f
--- /dev/null
+++ b/dev-python/ipaddress/ipaddress-1.0.14-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="IPv4/IPv6 manipulation library, a port of the ipaddress module"
+HOMEPAGE="https://github.com/phihag/ipaddress"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ "${PYTHON}" test_ipaddress.py || die
+}
diff --git a/dev-python/ipaddress/ipaddress-1.0.14.ebuild b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
index 8be6c8d66666..603e385cb263 100644
--- a/dev-python/ipaddress/ipaddress-1.0.14.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="PSF-2"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index a7ca2e24d4c8..49d8b3fe82d9 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,2 +1 @@
-DIST ipython-2.2.0.tar.gz 11912007 SHA256 b7ca77ba54a02f032055b73f5f62b01431f818ae00f63716b78f881c2b2564e2 SHA512 4953bf5e9d6d5c6ad538d07d62b5b100fd86a37f6b861238501581c0059bd4655345ca05cf395e79709c38ce4cb9c6293f5d11ac0252a618ad8272b161140d13 WHIRLPOOL a5e433a3a840b65fd0644f023cc9e93862e48a906e4e9d1596ebbd24290d486be580dca017ef1586da980b6792dcd7ed9aab4af81421bbf083d885927db6fcc8
DIST ipython-3.2.1.tar.gz 10884249 SHA256 c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177 SHA512 de7723e3b859d21a58a24456c76c8d8ec98c019f290f61269f46270e7647d2b49a98671138fecd75cb6f46384fde7e09618eb5c85c175e0e442c7fae7328d8fe WHIRLPOOL 9f020c167559259931dcb177d0c3a5211939632e5775c2627795ba390cf57bd62c378c15b7ee9b9ed2079180f8df8e062eb9673ed9cfc025a56f1da82c9428d1
diff --git a/dev-python/ipython/files/2.1.0-disable-tests.patch b/dev-python/ipython/files/2.1.0-disable-tests.patch
deleted file mode 100644
index bdbb1be4246e..000000000000
--- a/dev-python/ipython/files/2.1.0-disable-tests.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-The extension magics for oct2py and rpy live now in the oct2py and rpy2 package. The tests shipped with ipython are broken. We should disable
-those tests and remove the magics files:
-
-IPython/extensions/rmagic.py -> rpy/ipython/rmagic.py
-IPython/extension/octavemagic.py -> oct2py/ipython/octavemagic.py
-
-deleted: IPython/extensions/octavemagic.py
-deleted: IPython/extensions/rmagic.py
-modified: IPython/testing/iptest.py
-
-diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
-index 45d2c78..db0bdfe 100644
---- a/IPython/testing/iptest.py
-+++ b/IPython/testing/iptest.py
-@@ -250,12 +250,10 @@ sec = test_sections['extensions']
- if not have['cython']:
- sec.exclude('cythonmagic')
- sec.exclude('tests.test_cythonmagic')
--if not have['oct2py']:
-- sec.exclude('octavemagic')
-- sec.exclude('tests.test_octavemagic')
--if not have['rpy2'] or not have['numpy']:
-- sec.exclude('rmagic')
-- sec.exclude('tests.test_rmagic')
-+sec.exclude('octavemagic')
-+sec.exclude('tests.test_octavemagic')
-+sec.exclude('rmagic')
-+sec.exclude('tests.test_rmagic')
- # autoreload does some strange stuff, so move it to its own test section
- sec.exclude('autoreload')
- sec.exclude('tests.test_autoreload')
-
diff --git a/dev-python/ipython/ipython-2.2.0-r1.ebuild b/dev-python/ipython/ipython-2.2.0-r1.ebuild
deleted file mode 100644
index 62c6f8e16c4f..000000000000
--- a/dev-python/ipython/ipython-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,137 +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 python3_{3,4} )
-PYTHON_REQ_USE='readline,sqlite'
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="http://ipython.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
-
-PY2_USEDEP=$(python_gen_usedep python2_7)
-CDEPEND="
- dev-python/decorator[${PYTHON_USEDEP}]
- dev-python/pexpect[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/simplegeneric[${PYTHON_USEDEP}]
- matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
- mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
- octave? ( dev-python/oct2py[${PYTHON_USEDEP}] )
- smp? ( >=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}] )
- wxwidgets? ( $(python_gen_cond_dep 'dev-python/wxpython:*[${PYTHON_USEDEP}]' python2_7) )"
-RDEPEND="${CDEPEND}
- notebook? (
- >=www-servers/tornado-3.1[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- >=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-libs/mathjax
- )
- nbconvert? (
- >=app-text/pandoc-1.12.1
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- )
- qt4? (
- || (
- dev-python/PyQt4[${PYTHON_USEDEP}]
- dev-python/pyside[${PYTHON_USEDEP}]
- )
- dev-python/pygments[${PYTHON_USEDEP}]
- >=dev-python/pyzmq-2.1.11[${PYTHON_USEDEP}] )"
-DEPEND="${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/mock[${PY2_USEDEP}]
- )
- doc? (
- dev-python/cython[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/fabric[${PYTHON_USEDEP}]' python2_7)
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/numpydoc[${PYTHON_USEDEP}]
- dev-python/pymongo[${PYTHON_USEDEP}]
- dev-python/rpy[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- >=www-servers/tornado-3.1[${PYTHON_USEDEP}]
- )"
-
-PATCHES=(
- "${FILESDIR}"/2.1.0-substitute-files.patch
- "${FILESDIR}"/2.1.0-disable-tests.patch
- "${FILESDIR}"/${P}-login-backport.patch
- )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
- # Remove out of date insource files
- rm IPython/extensions/rmagic.py || die
- rm IPython/extensions/octavemagic.py || die
-
- # Prevent un-needed download during build
- if use doc; then
- sed -e "/^ 'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
- fi
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-src_test() {
- # virtualx has trouble with parallel runs.
- local DISTUTILS_NO_PARALLEL_BUILD=1
- distutils-r1_src_test
-}
-
-python_test() {
- distutils_install_for_testing
- local fail
- run_tests() {
- pushd ${TEST_DIR} > /dev/null
- "${PYTHON}" -m IPython.testing.iptestcontroller --all || fail=1
- popd > /dev/null
- }
- VIRTUALX_COMMAND=run_tests virtualmake
- [[ ${fail} ]] && die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
- distutils-r1_python_install
- use notebook && dosym /usr/share/mathjax $(python_get_sitedir)/IPython/html/static/mathjax
-
- # Create ipythonX.Y symlinks.
- # TODO:
- # 1. do we want them for pypy? No. pypy has no numpy
- # 2. handle it in the eclass instead (use _python_ln_rel).
- # With pypy not an option the dosym becomes unconditional
- dosym ../lib/python-exec/${EPYTHON}/ipython \
- /usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/build/html/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- elog "To enable sympyprinting, it's required to emerge sympy"
- elog "To enable cythonmagic, it's required to emerge cython"
-}
diff --git a/dev-python/iso8601/iso8601-0.1.10-r1.ebuild b/dev-python/iso8601/iso8601-0.1.10-r1.ebuild
new file mode 100644
index 000000000000..c4f84eb7eacc
--- /dev/null
+++ b/dev-python/iso8601/iso8601-0.1.10-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple module to parse ISO 8601 dates"
+HOMEPAGE="https://code.google.com/p/pyiso8601/ https://pypi.python.org/pypi/iso8601"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )"
+
+python_test() {
+ "${PYTHON}" -m pytest --verbose ${PN} || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/jinja/jinja-2.8-r1.ebuild b/dev-python/jinja/jinja-2.8-r1.ebuild
new file mode 100644
index 000000000000..06c864ce38e3
--- /dev/null
+++ b/dev-python/jinja/jinja-2.8-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit eutils distutils-r1
+
+MY_PN=Jinja2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A small but fast and easy to use stand-alone template engine written in pure Python"
+HOMEPAGE="http://jinja.pocoo.org/ https://pypi.python.org/pypi/Jinja2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="doc examples"
+
+RDEPEND="
+ dev-python/markupsafe[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ !dev-python/jinja:compat"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# XXX: handle Babel better?
+
+S=${WORKDIR}/${MY_P}
+
+wrap_opts() {
+ local mydistutilsargs=()
+
+ if [[ ${EPYTHON} == python* ]]; then
+ mydistutilargs+=( --with-debugsupport )
+ fi
+
+ "${@}"
+}
+
+python_compile() {
+ wrap_opts distutils-r1_python_compile
+ if [[ ${EPYTHON} == python3.2 ]]; then
+ 2to3 --no-diffs -n -w -f unicode "${BUILD_DIR}/lib" || die
+ fi
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ use examples && local EXAMPLES=( examples/. )
+
+ distutils-r1_python_install_all
+
+ insinto /usr/share/vim/vimfiles/syntax
+ doins ext/Vim/*
+}
+
+pkg_postinst() {
+ if ! has_version dev-python/Babel; then
+ elog "For i18n support, please emerge dev-python/Babel."
+ fi
+}
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 0fb6adbf315b..15460f637b49 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,4 +1,3 @@
-DIST libvirt-python-1.2.15.tar.gz 166128 SHA256 9a6dfbd487d49f887a41aca4bfb1b4e043fd9fbdfc041252cae84023f5c387ba SHA512 5687308c2f16199ecc4ec935719da1e2d34d0fb3752437a4c662d7c83d972f49ee5e852daf7233fa9aa29f25bbaed1c26d17740faf56c1771bbc2134bcb8958b WHIRLPOOL d2173060d5d3763ba367fbf3140800d6534c27f36b91d7a944ff2f5ce36f9ac54bd86fb6df1399cfa8610ef62c0b0b87427fc68dc1e0be77b0c7b3f94f7d9e30
DIST libvirt-python-1.2.18.tar.gz 171009 SHA256 204535ef160c9d10600b5fc3417f00f382e74b137a85b33774b97eb36d8a3638 SHA512 bf9f246d8bc2e55dc0cdeb22901b2dd2858b058c0616a2d5db3ca4a700c3430c9cd1f904ec3090cab7c3db1d40195a6365fed3b7b18fbd1d975fdca5fa57ce29 WHIRLPOOL a1e684360341b896bd96d6a313320ddb7ad455c64e4d1577076713e4913c95d2bd6f9222a6ac45b735a33d8e7fff06b40327e298d21e214857db17c859fb4849
DIST libvirt-python-1.2.19.tar.gz 172149 SHA256 88ab63b0c53e435bd2c6e8551805fe273353708efd4dfab908257dc5f37bec49 SHA512 670cc7af3fc5e67fa8daa8312278ecf81608ceddd34c40fc799e0c2836a5a8c3489186dee5ffcd806bf70840c1aa7b64178eef334f35c4bbe5fe21413b473d3b WHIRLPOOL 74e73e1dcabd0ed67988f34cd12c7ecc3d71e5dbfc4a5f81f22e3aeed37ee3fa343b780bbafa7941a79abffdb4d7a566e65b73c185c695567d6558e18ef58b32
DIST libvirt-python-1.2.20.tar.gz 170437 SHA256 e1ea097546edc7cb0e7fd01e2ca9906ac12cc4f16d07f15f8f0f5154626ba446 SHA512 2fd642b1f7efee46331636098e8bc9d1194f399bb93e9d445103a70264332bb6b216bb42846432707e1538f73f96c4c141dde84779d3b36cc93f6f7914466ef9 WHIRLPOOL 19c56d69a8c61814b8312e5b0920efae6433bffe3cd33237a34efb6847abd4bafa686481cd40c72cc0f92290d0c70efc53d83c42d2b6a2f20928608321c41351
diff --git a/dev-python/libvirt-python/libvirt-python-1.2.15.ebuild b/dev-python/libvirt-python/libvirt-python-1.2.15.ebuild
deleted file mode 100644
index 1f38cff44f52..000000000000
--- a/dev-python/libvirt-python/libvirt-python-1.2.15.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-AUTOTOOLIZE=yes
-
-MY_P="${P/_rc/-rc}"
-
-inherit eutils distutils-r1
-
-if [[ ${PV} = *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="git://libvirt.org/libvirt-python.git"
- SRC_URI=""
- KEYWORDS=""
- RDEPEND="app-emulation/libvirt:=[-python(-)]"
-else
- SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
- KEYWORDS="amd64 x86"
- RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="http://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="test"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}] )"
-
-# testsuite is currently not included in upstream tarball
-RESTRICT="test"
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..6fc65336bb52
--- /dev/null
+++ b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backports of the linecache module"
+HOMEPAGE="https://github.com/testing-cabal/linecache2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+ dev-python/pbr[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/fixtures[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND=""
+
+python_test() {
+ "${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/linecache2/linecache2-1.0.0.ebuild b/dev-python/linecache2/linecache2-1.0.0.ebuild
index 0893a5857090..eaac72004065 100644
--- a/dev-python/linecache2/linecache2-1.0.0.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
IUSE="test"
DEPEND="
diff --git a/dev-python/lockfile/lockfile-0.10.2-r1.ebuild b/dev-python/lockfile/lockfile-0.10.2-r1.ebuild
new file mode 100644
index 000000000000..4de50b189c20
--- /dev/null
+++ b/dev-python/lockfile/lockfile-0.10.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Platform-independent file locking module"
+HOMEPAGE="https://launchpad.net/pylockfile https://pypi.python.org/pypi/lockfile"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+ dev-python/pbr[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+DOCS=( ACKS README RELEASE-NOTES )
+
+python_compile_all() {
+ if use doc; then
+ einfo "Generation of documentation"
+ emake -C doc/source html || die "Generation of documentation failed"
+ fi
+}
+
+python_test() {
+ # "${PYTHON}" test/test_lockfile.py yeilds no informative coverage output
+ nosetests || die "test_lockfile failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/source/.build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/lockfile/lockfile-0.10.2.ebuild b/dev-python/lockfile/lockfile-0.10.2.ebuild
index dd00ec95525e..a08d2ef6de66 100644
--- a/dev-python/lockfile/lockfile-0.10.2.ebuild
+++ b/dev-python/lockfile/lockfile-0.10.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc test"
DEPEND="
diff --git a/dev-python/lockfile/metadata.xml b/dev-python/lockfile/metadata.xml
index 3caf380cfa94..deb69e0f0f3a 100644
--- a/dev-python/lockfile/metadata.xml
+++ b/dev-python/lockfile/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/lxml/lxml-3.4.4.ebuild b/dev-python/lxml/lxml-3.4.4.ebuild
index c36166cc02f1..efda919003b8 100644
--- a/dev-python/lxml/lxml-3.4.4.ebuild
+++ b/dev-python/lxml/lxml-3.4.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD ElementTree GPL-2 PSF-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples +threads test"
# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
diff --git a/dev-python/lz4/lz4-0.7.0.ebuild b/dev-python/lz4/lz4-0.7.0.ebuild
index 5e4d293b9f0e..c706375fe60e 100644
--- a/dev-python/lz4/lz4-0.7.0.ebuild
+++ b/dev-python/lz4/lz4-0.7.0.ebuild
@@ -20,3 +20,10 @@ RDEPEND=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
# Tests still excluded by upstream
+
+python_prepare_all() {
+ sed \
+ -e '/nose/s:setup_requires:test_requires:g' \
+ -i setup.py || die
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/markupsafe/markupsafe-0.23-r1.ebuild b/dev-python/markupsafe/markupsafe-0.23-r1.ebuild
new file mode 100644
index 000000000000..3732393c8724
--- /dev/null
+++ b/dev-python/markupsafe/markupsafe-0.23-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="MarkupSafe"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
+HOMEPAGE="https://pypi.python.org/pypi/MarkupSafe"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_compile() {
+ distutils-r1_python_compile
+ if [[ ${EPYTHON} == python3.2 ]]; then
+ 2to3 --no-diffs -n -w -f unicode ${PN} || die
+ fi
+}
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild b/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild
new file mode 100644
index 000000000000..c67e7fc5b8d1
--- /dev/null
+++ b/dev-python/mimeparse/mimeparse-0.1.4-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Basic functions for handling mime-types in python"
+HOMEPAGE="
+ https://code.google.com/p/mimeparse
+ https://github.com/dbtsai/python-mimeparse"
+MY_PN="python-${PN}"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+ "${PYTHON}" mimeparse_test.py || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ if [[ ${EPYTHON} == pypy ]]; then
+ local pyver=2.7
+ elif [[ ${EPYTHON} == pypy3 ]]; then
+ local pyver=3.2
+ else
+ local pyver=${EPYTHON#python}
+ fi
+ python_export PYTHON_SITEDIR
+
+ # Previous versions were just called 'mimeparse'
+ cp "${D%/}${PYTHON_SITEDIR}/python_mimeparse-${PV}-py${pyver}.egg-info" \
+ "${D%/}${PYTHON_SITEDIR}/mimeparse-${PV}-py${pyver}.egg-info" || die
+}
diff --git a/dev-python/mock/mock-1.2.0.ebuild b/dev-python/mock/mock-1.2.0.ebuild
index 33ee937e9c14..1c7a20be801a 100644
--- a/dev-python/mock/mock-1.2.0.ebuild
+++ b/dev-python/mock/mock-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~s390 ~sh ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~s390 ~sh ~sparc ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc test"
CDEPEND="$(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' 'python2_7')"
diff --git a/dev-python/mock/mock-1.3.0-r1.ebuild b/dev-python/mock/mock-1.3.0-r1.ebuild
index a3cc778ccabd..2dcbea744541 100644
--- a/dev-python/mock/mock-1.3.0-r1.ebuild
+++ b/dev-python/mock/mock-1.3.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
IUSE="doc test"
CDEPEND="$(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' 'python2_7')
diff --git a/dev-python/mock/mock-1.3.0-r2.ebuild b/dev-python/mock/mock-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..ddcdc19b6a6c
--- /dev/null
+++ b/dev-python/mock/mock-1.3.0-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Rolling backport of unittest.mock for all Pythons"
+HOMEPAGE="https://github.com/testing-cabal/mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc test"
+
+CDEPEND="$(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' 'python2_7')
+ >=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
+DEPEND="
+ >=dev-python/setuptools-17.1[${PYTHON_USEDEP}]
+ test? (
+ ${CDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '>=dev-python/unittest2-1.1.0[${PYTHON_USEDEP}]' python{2_7,3_3} pypy)
+ )"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/six-1.7[${PYTHON_USEDEP}]
+"
+
+python_test() {
+ nosetests || die "tests fail under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local DOCS=( docs/*.txt )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
index 213d31cddd69..248f3a2b7d11 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -1,2 +1,3 @@
DIST monotonic-0.2.tar.gz 6652 SHA256 c5e81e875a43e218135ea2aa4c367523894e1a2d7633ddafbed5292c527644a8 SHA512 0da2f9504aebf1b046a06156e30b8d6b6fde29c642f442ba8e5a43336309fca0fe636488ea69e463fcba5951d990723fddc2b9172211f6d8c57b0ab3ebab1a66 WHIRLPOOL 129f6a170856780d727ff2ef11d4b3688971b7376c9e9f590c7bc85aa20ba35d699751ddd5de58d144d4a3d540a2aac7d3f9fd3a63d010d88d7f93ffa62c836c
DIST monotonic-0.3.tar.gz 6707 SHA256 2825ba5ded67b1a70d44529634d3f4ddfad67a5ed7fdcf026022a3ce175be07b SHA512 772154934ffdd1a12aacc331761ce219980caac1bce243fd0740320a25152cf800142c5787c9423270bf02d18e88973dcd981781e2279b28ce364063102f1099 WHIRLPOOL 83d34eac5ee577ba8c42c6276d1c3a46fc30a63919ffd6f86260c09aaf6720ab171db89dfdaa28fd6d42ebb309725ff2e4e0e6c8306c21f9f12dce3d71436e71
+DIST monotonic-0.4.tar.gz 6702 SHA256 852f656adbf623ee859def6ca2f5498f4cae3256f8320d5c50570ee8a0592ab6 SHA512 604f7d9f2b36e03413a0f9c341b45698440f3b004cd7120d3905e4712ac85daeadc0580ebd471ad9ad699aa2ec625908f13b604b10f656c803f6e885553d7e6c WHIRLPOOL f13cd567de00c24800da8b40ae1018f54b95e98c2ccda194ea2e8cf080c1ee47d0670db59ddaf72df373906d46107ec10a62581544076c7e70379119f3443dfd
diff --git a/dev-python/monotonic/monotonic-0.4.ebuild b/dev-python/monotonic/monotonic-0.4.ebuild
new file mode 100644
index 000000000000..7ca4432a6c5f
--- /dev/null
+++ b/dev-python/monotonic/monotonic-0.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="An implementation of time.monotonic() for Python 2 & < 3.3"
+HOMEPAGE="https://github.com/atdt/monotonic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
diff --git a/dev-python/more-itertools/more-itertools-2.2.ebuild b/dev-python/more-itertools/more-itertools-2.2.ebuild
index 05e57031f569..75773852628d 100644
--- a/dev-python/more-itertools/more-itertools-2.2.ebuild
+++ b/dev-python/more-itertools/more-itertools-2.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit distutils-r1
DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.python.org/pypi/${PN}"
+HOMEPAGE="https://pypi.python.org/pypi/more-itertools"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0-r1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..c2341b1d3094
--- /dev/null
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
+HOMEPAGE="
+ https://github.com/cedadev/ndg_httpsclient/
+ https://pypi.python.org/pypi/ndg-httpsclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${P/-/_}"
+
+# doc build by Makefile in folder documentation is broken
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
index 01ec815e5018..b2a1f73ca755 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
@@ -3,12 +3,14 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
-HOMEPAGE="https://github.com/cedadev/ndg_httpsclient/
+HOMEPAGE="
+ https://github.com/cedadev/ndg_httpsclient/
https://pypi.python.org/pypi/ndg-httpsclient"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
@@ -17,7 +19,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
-RDEPEND="dev-python/pyopenssl[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose/metadata.xml b/dev-python/nose/metadata.xml
index 901728f86b40..467060e4a3fb 100644
--- a/dev-python/nose/metadata.xml
+++ b/dev-python/nose/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/nose/nose-1.3.7-r1.ebuild b/dev-python/nose/nose-1.3.7-r1.ebuild
new file mode 100644
index 000000000000..b8ea30e5b18b
--- /dev/null
+++ b/dev-python/nose/nose-1.3.7-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A unittest extension offering automatic test suite discovery and easy test authoring"
+HOMEPAGE="
+ https://pypi.python.org/pypi/nose
+ http://readthedocs.org/docs/nose/
+ https://bitbucket.org/jpellerin/nose"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples test"
+
+RDEPEND="
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ doc? ( >=dev-python/sphinx-0.6[${PYTHON_USEDEP}] )
+ test? ( $(python_gen_cond_dep 'dev-python/twisted-core[${PYTHON_USEDEP}]' python2_7) )"
+
+python_prepare_all() {
+ # Tests need to be converted, and they don't respect BUILD_DIR.
+ use test && DISTUTILS_IN_SOURCE_BUILD=1
+
+ # Disable tests requiring network connection.
+ sed \
+ -e "s/test_resolve/_&/g" \
+ -e "s/test_raises_bad_return/_&/g" \
+ -e "s/test_raises_twisted_error/_&/g" \
+ -i unit_tests/test_twisted.py || die "sed failed"
+ # Disable versioning of nosetests script to avoid collision with
+ # versioning performed by the eclass.
+ sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
+ -i setup.py || die "sed2 failed"
+
+ # Prevent un-needed d'loading during doc build
+ sed -e "s/, 'sphinx.ext.intersphinx'//" -i doc/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ local add_targets=()
+
+ if use test; then
+ add_targets+=( egg_info )
+ python_is_python3 && add_targets+=( build_tests )
+ fi
+
+ distutils-r1_python_compile ${add_targets[@]}
+}
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+src_test() {
+ # nosetests use heavy multiprocessing during the tests.
+ # this shall make them less likely to kill your system or timeout.
+ local DISTUTILS_NO_PARALLEL_BUILD=1
+
+ distutils-r1_src_test
+}
+
+python_test() {
+ "${PYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install --install-data "${EPREFIX}/usr/share"
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+
+ if use doc; then
+ dohtml -r -A txt doc/.build/html/.
+ fi
+}
diff --git a/dev-python/nose/nose-9999.ebuild b/dev-python/nose/nose-9999.ebuild
index 5af1375a1e4e..fefdcadf0415 100644
--- a/dev-python/nose/nose-9999.ebuild
+++ b/dev-python/nose/nose-9999.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS=""
IUSE="doc examples test"
RDEPEND="dev-python/coverage[${PYTHON_USEDEP}]
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 330b8dd74dc4..888858f52170 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,3 +1,4 @@
+DIST numpy-1.10.0.post2.tar.gz 4082399 SHA256 2ebd29edb2f1a4a19e86cfc27c1b2283314d57509b2bfc6606b4f05d620c230b SHA512 60a4fc0ed07b8944cf7994c2fcf24eae49c659cc387d5dd5c824054fd82d9542bb07afa34a89a71bdb4a52a33b00f6eff845b611b12cf147a52308fa517730b0 WHIRLPOOL 855c6a0026c7d23d212b94beda676d191752ff22ff58305bc7a460513bfa19bc32e561ceb6d38b94065c3e7e315a7341840bf21c5ca7c748befb53af221a969a
DIST numpy-1.8.0.tar.gz 3779617 SHA256 2764d0819acc77e9ff81b060fe7f69530b0d85c26ac9d162639b787cb227d253 SHA512 ec3d002ed786335e8748983261c96f88a9f1520fc345ad5b810dc02a5e126e15fe5afb02bed1f4b43d580a1da39583d86b84f57dc456b0702653e34e5357c857 WHIRLPOOL 8796d90795ddec62e6d72be433ea00917a63ef39cf3fe81e094f653e1863b69ecdce812995877f78e4324434141b03e2ceb3f872ed4e023b19c6bd9bcc294ac2
DIST numpy-1.8.1.tar.gz 3794076 SHA256 3d722fc3ac922a34c50183683e828052cd9bb7e9134a95098441297d7ea1c7a9 SHA512 39ef9e13f8681a2c2ba3d74ab96fd28c5669e653308fd1549f262921814fa7c276ce6d9fb65ef135006584c608bdf3db198d43f66c9286fc7b3c79803dbc1f57 WHIRLPOOL 10615c0c70c153156034447e9c3f2b70b0259173a44af3b5cc641dd31c0af71ef1053a9cc7938deff5edb899ae2666b2b3109491d7394f03d1a81cb19722d398
DIST numpy-1.8.2.tar.gz 3792998 SHA256 6d487fc724780d66746bde264ea71f5cd77d3a39e52ee2b073dcaed63bc669db SHA512 996e6b8e2d42f223e44660f56bf73eb8ab124f400d89218f8f5e4d7c9860ada44a4d7c54526137b0695c7a10f36e8834fbf0d42b7cb20bcdb5d5c245d673385c WHIRLPOOL 0d3a05b1e3c0a1ceb0a7b4818406dbb45506e5f25bc2727d4ff44cc0a0520e6556b3c68ae24dbca37ba9d67ae2defbb3ff9c906d4c2635b29ed44452d70e8311
diff --git a/dev-python/numpy/numpy-1.10.0_p2-r1.ebuild b/dev-python/numpy/numpy-1.10.0_p2-r1.ebuild
new file mode 100644
index 000000000000..dd9c6fd94378
--- /dev/null
+++ b/dev-python/numpy/numpy-1.10.0_p2-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
+
+DOC_PV="1.9.1"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://www.numpy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_p/.post}.tar.gz
+ doc? (
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+ )"
+# It appears the docs haven't been upgraded, still @ 1.8.1
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+ doc? ( app-arch/unzip )
+ lapack? ( virtual/pkgconfig )
+ test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
+)
+
+src_unpack() {
+ default
+ mv "${WORKDIR}"/* "${S}" || die
+
+ if use doc; then
+ unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+ fi
+}
+
+pc_incdir() {
+ $(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+ sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+ $(tc-getPKG_CONFIG) --libs-only-L $@ | \
+ sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+ $(tc-getPKG_CONFIG) --libs-only-l $@ | \
+ sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+ -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+ | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+ if use lapack; then
+ append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+ local libdir="${EPREFIX}"/usr/$(get_libdir)
+ # make sure _dotblas.so gets built
+ sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
+ cat >> site.cfg <<-EOF
+ [blas]
+ include_dirs = $(pc_incdir cblas)
+ library_dirs = $(pc_libdir cblas blas):${libdir}
+ blas_libs = $(pc_libs cblas blas)
+ [lapack]
+ library_dirs = $(pc_libdir lapack):${libdir}
+ lapack_libs = $(pc_libs lapack)
+ EOF
+ else
+ export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+ fi
+
+ export CC="$(tc-getCC) ${CFLAGS}"
+
+ append-flags -fno-strict-aliasing
+
+ # See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+ # with the subtle difference that we don't want to break Darwin where
+ # -shared is not a valid linker argument
+ if [[ ${CHOST} != *-darwin* ]]; then
+ append-ldflags -shared
+ fi
+
+ # only one fortran to link with:
+ # linking with cblas and lapack library will force
+ # autodetecting and linking to all available fortran compilers
+ append-fflags -fPIC
+ if use lapack; then
+ NUMPY_FCONFIG="config_fc --noopt --noarch"
+ # workaround bug 335908
+ [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+ fi
+
+ # don't version f2py, we will handle it.
+ sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+
+ # we don't have f2py-3.3
+ sed \
+ -e "/f2py_cmd/s:'f2py'.*:'f2py':g" \
+ -i numpy/tests/test_scripts.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
+}
+
+python_test() {
+ distutils_install_for_testing ${NUMPY_FCONFIG}
+
+ cd "${TMPDIR}" || die
+ ${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+ if use doc; then
+ dohtml -r "${WORKDIR}"/html/*
+ dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+ fi
+
+ # absent in 1.9
+ #docinto f2py
+ #dodoc numpy/f2py/docs/*.txt
+ #doman numpy/f2py/f2py.1
+}
diff --git a/dev-python/numpy/numpy-1.10.0_p2.ebuild b/dev-python/numpy/numpy-1.10.0_p2.ebuild
new file mode 100644
index 000000000000..f7fdd3dcf5ea
--- /dev/null
+++ b/dev-python/numpy/numpy-1.10.0_p2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 eutils flag-o-matic fortran-2 multilib multiprocessing toolchain-funcs versionator
+
+DOC_PV="1.9.1"
+DOC_P="${PN}-${DOC_PV}"
+
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="http://www.numpy.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_p/.post}.tar.gz
+ doc? (
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
+ http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
+ )"
+# It appears the docs haven't been upgraded, still @ 1.8.1
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack test"
+
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ lapack? ( virtual/cblas virtual/lapack )"
+DEPEND="${RDEPEND}
+ doc? ( app-arch/unzip )
+ lapack? ( virtual/pkgconfig )
+ test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
+
+# Uses distutils.command.config.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.9.2-no-hardcode-blas.patch
+)
+
+src_unpack() {
+ default
+ mv "${WORKDIR}"/* "${S}" || die
+
+ if use doc; then
+ unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.zip -d html || die
+ fi
+}
+
+pc_incdir() {
+ $(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+ sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+ $(tc-getPKG_CONFIG) --libs-only-L $@ | \
+ sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+ $(tc-getPKG_CONFIG) --libs-only-l $@ | \
+ sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+ -e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+ | tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+ if use lapack; then
+ append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
+ local libdir="${EPREFIX}"/usr/$(get_libdir)
+ # make sure _dotblas.so gets built
+ sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
+ cat >> site.cfg <<-EOF
+ [blas]
+ include_dirs = $(pc_incdir cblas)
+ library_dirs = $(pc_libdir cblas blas):${libdir}
+ blas_libs = $(pc_libs cblas blas)
+ [lapack]
+ library_dirs = $(pc_libdir lapack):${libdir}
+ lapack_libs = $(pc_libs lapack)
+ EOF
+ else
+ export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+ fi
+
+ export CC="$(tc-getCC) ${CFLAGS}"
+
+ append-flags -fno-strict-aliasing
+
+ # See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+ # with the subtle difference that we don't want to break Darwin where
+ # -shared is not a valid linker argument
+ if [[ ${CHOST} != *-darwin* ]]; then
+ append-ldflags -shared
+ fi
+
+ # only one fortran to link with:
+ # linking with cblas and lapack library will force
+ # autodetecting and linking to all available fortran compilers
+ append-fflags -fPIC
+ if use lapack; then
+ NUMPY_FCONFIG="config_fc --noopt --noarch"
+ # workaround bug 335908
+ [[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+ fi
+
+ # don't version f2py, we will handle it.
+ sed -i -e '/f2py_exe/s:+os\.path.*$::' numpy/f2py/setup.py || die
+
+ # we don't have f2py-3.3
+ sed \
+ -e "/f2py_cmd/s:'f2py'.*:'f2py':g" \
+ -i numpy/tests/test_scripts.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ distutils-r1_python_compile -j $(makeopts_jobs) ${NUMPY_FCONFIG}
+}
+
+python_test() {
+ distutils_install_for_testing ${NUMPY_FCONFIG}
+
+ cd "${TMPDIR}" || die
+ ${EPYTHON} -c "
+import numpy, sys
+r = numpy.test(label='full', verbose=3)
+sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+ distutils-r1_python_install ${NUMPY_FCONFIG}
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ dodoc COMPATIBILITY DEV_README.txt THANKS.txt
+
+ if use doc; then
+ dohtml -r "${WORKDIR}"/html/*
+ dodoc "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf
+ fi
+
+ # absent in 1.9
+ #docinto f2py
+ #dodoc numpy/f2py/docs/*.txt
+ #doman numpy/f2py/f2py.1
+}
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index cf98eba26bb3..e67768cbfdbe 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,2 +1,3 @@
DIST openpyxl-2.2.3.tar.gz 108576 SHA256 7d46b38960bae1e912eb8161bb4e040d2611f295126703a18865b65c49a49a7c SHA512 aac0fac10611f15b4b006b4c6ca6fd7c854d3c7bc8203fcfcb932898cf599a809f14ee21f42f263bc75cc98b907fcb7dd5953c328aa0a5adeb2c7e5556de5aba WHIRLPOOL ca98df2cc6c5985c1d12c7493403aa6cabe02192d91d1dfadb73e8823eaf94661738afc6cd1e28b4183b34f123e0fcaab4472748de8724abc79683f0119be7f9
DIST openpyxl-2.2.4.tar.gz 108810 SHA256 bd1b795ffc928f8c3f64fc0182e087a5f9afe7df94c78335a8d12eed872d182a SHA512 b33832bf194ef80cb5ce8dc4ee06f5c2f372fcd1074f7a4b0fea94c9528d17a80bfc83bb2a20e40118bd2250d63ade1a772bbc20533b9355472284a186ebe977 WHIRLPOOL 4a799125391a587a027e936a60f3853440ffe754e1078b6e95b3d7077ff89f0b308fd7e431561fdc7bb8707a17cbf39088ef88395e101dd578bcdcf568e9e6e4
+DIST openpyxl-2.2.6.tar.gz 108959 SHA256 0e580133106976da044b5861231283fb4e1b2d439787e0f668f28eb2dfd7468e SHA512 a306b5c646714c32b08d21c513720bbd355920ca457dc9a013b68422be7c6be28ea0558180e20be532b1c8f6c7e032bc981aba0640f171546a80a39acb0219b2 WHIRLPOOL 18fe3526599f247a864762c091284695725895ae206f573e27c4f95e1ed0b49207ff2f8fa4949245dd31a82ae429c51a374bbc5d0152580cf192802690b750b3
diff --git a/dev-python/openpyxl/openpyxl-2.2.6.ebuild b/dev-python/openpyxl/openpyxl-2.2.6.ebuild
new file mode 100644
index 000000000000..b61d84c3082c
--- /dev/null
+++ b/dev-python/openpyxl/openpyxl-2.2.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
+HOMEPAGE="http://openpyxl.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/jdcal[${PYTHON_USEDEP}]"
+DEPEND="
+ test? (
+ ${RDEPEND}
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ )"
+
+# tests aren't contained in tarball
+RESTRICT="test"
+
+python_test() {
+ py.test || die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/packaging/packaging-15.3-r1.ebuild b/dev-python/packaging/packaging-15.3-r1.ebuild
index 50691266a79a..2952aa7e2f10 100644
--- a/dev-python/packaging/packaging-15.3-r1.ebuild
+++ b/dev-python/packaging/packaging-15.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND=""
diff --git a/dev-python/packaging/packaging-15.3-r2.ebuild b/dev-python/packaging/packaging-15.3-r2.ebuild
new file mode 100644
index 000000000000..6d77cb96a087
--- /dev/null
+++ b/dev-python/packaging/packaging-15.3-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Core utilities for Python packages"
+HOMEPAGE="https://github.com/pypa/packaging https://pypi.python.org/pypi/packaging"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/pretend[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=( "${FILESDIR}"/${P}-setuptools.patch )
+
+python_test() {
+ py.test --capture=no --strict -v || die
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index f1eb82bdf474..e05319e3fd65 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1 +1,2 @@
DIST pandas-0.16.2.tar.gz 4931751 SHA256 e01853dfe111f3aea005315573400b7216ddbabbf1f28d482a71217d67ae4f81 SHA512 44874e12a42a01dd7ed88f3f97e954732a534a5e2dc4815ef6203bdb2d88850a607e6631a35ae8fc79f4621a5dfaa34f39bb1c9a0ecfb17da1cf0c10f35ff27b WHIRLPOOL 6f2874ac07b49f4b2aaefdb87375b7c5adb31e3ff60c6b808f3e3467ad82999dd894de884ebbfd64fc7235e875d17ce871b516c96ff71a17310b708597168702
+DIST pandas-0.17.0.tar.gz 6508621 SHA256 320d4fdf734b82adebc8fde9d8ca4b05fe155a72b6f7aa95d76242da8748d6a4 SHA512 bae6964e263c7ff6cac722cdfe23081f23c357d9bc39a670b5627bef4630c236a58aa8c0393eae921721bf7049c8e5266b4dea71dd957da5d89dafc14a04797b WHIRLPOOL d654eb2f9ffbfedbde60e4a6e6ce6f54650a8a68b4d20035744aa55111525d6bba4dae2ccbfce65acf71bb200e2e6029c7f6c9bcc9d0c582d808444738baedb1
diff --git a/dev-python/pandas/pandas-0.17.0.ebuild b/dev-python/pandas/pandas-0.17.0.ebuild
new file mode 100644
index 000000000000..96b90f0cc6e9
--- /dev/null
+++ b/dev-python/pandas/pandas-0.17.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 eutils flag-o-matic virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="http://pandas.pydata.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc excel html test R"
+
+EXTRA_DEPEND="
+ >=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
+ dev-python/openpyxl[${PYTHON_USEDEP}]
+ dev-python/pymysql[${PYTHON_USEDEP}]
+ dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
+ dev-python/psycopg:2[${PYTHON_USEDEP}]
+ dev-python/statsmodels[${PYTHON_USEDEP}]
+ dev-python/sqlalchemy[${PYTHON_USEDEP}]
+ "
+CDEPEND="
+ >dev-python/numpy-1.7[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+ !~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+ >=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ dev-python/ipython[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}]
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+ dev-python/openpyxl[${PYTHON_USEDEP}]
+ >=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/rpy[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
+ dev-python/xlrd[$(python_gen_usedep 'python2_7')]
+ dev-python/xlwt[$(python_gen_usedep 'python2_7')]
+ x11-misc/xclip
+ )
+ test? (
+ ${EXTRA_DEPEND}
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ x11-misc/xclip
+ x11-misc/xsel
+ )"
+# dev-python/statsmodels invokes a circular dep
+# hence rm from doc? ( ), again
+RDEPEND="${CDEPEND}
+ >=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
+ dev-python/bottleneck[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/pytables[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ excel? (
+ dev-python/xlrd[$(python_gen_usedep 'python2_7')]
+ dev-python/xlwt[$(python_gen_usedep 'python2_7')]
+ || (
+ dev-python/xlsxwriter[${PYTHON_USEDEP}]
+ >=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+ )
+ )
+ html? (
+ dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+ || (
+ dev-python/lxml[${PYTHON_USEDEP}]
+ dev-python/html5lib[${PYTHON_USEDEP}] )
+ )
+ R? ( dev-python/rpy[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # Prevent un-needed download during build
+ sed -e "/^ 'sphinx.ext.intersphinx',/d" -i doc/source/conf.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ # To build docs the need be located in $BUILD_DIR,
+ # else PYTHONPATH points to unusable modules.
+ if use doc; then
+ cd "${BUILD_DIR}"/lib || die
+ cp -ar "${S}"/doc . && cd doc || die
+ LANG=C PYTHONPATH=. "${EPYTHON}" make.py html || die
+ fi
+}
+
+python_test() {
+ local test_pandas='not network and not disabled'
+ [[ -n "${FAST_PANDAS}" ]] && test_pandas+=' and not slow'
+ pushd "${BUILD_DIR}"/lib > /dev/null
+ VIRTUALX_COMMAND="nosetests"
+ PYTHONPATH=. MPLCONFIGDIR=. HOME=. \
+ virtualmake --verbosity=3 -A "${test_pandas}" pandas
+ popd > /dev/null
+}
+
+python_install_all() {
+ if use doc; then
+ dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+ einfo "An initial build of docs is absent of references to statsmodels"
+ einfo "due to circular dependency. To have them included, emerge"
+ einfo "statsmodels next and re-emerge pandas with USE doc"
+ fi
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ local x
+ elog "Please install"
+ for x in ${EXTRA_DEPEND}; do
+ optfeature "additional functionality" "${x%%[*}"
+ done
+}
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 3a9ed3e04bab..2b56f3753931 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,5 +1,3 @@
-DIST paramiko-1.10.1.tar.gz 822839 SHA256 5fac0dbb3d7498bf4a7e1b8fac920cb8977a90e260d43d7e30fac2d6dd5fbabc SHA512 89d2333592ceff1bb5de9d9cbc4e6b44d29e470c26eeecfe0f34c3506cbead87934347ccfa5a1ac72a70024ce4961858f01b51990569d99971dc24177eac407f WHIRLPOOL 91873637f22068264033a41da517e5b2504bc779aee0ca0252ea0158b80dad1cc472310d40e1a8dfc33e25d86ce80748935e459a0b2e591da9d279127ee0629f
-DIST paramiko-1.12.2.tar.gz 907747 SHA256 d73bdafd1cb7181f7fd22164b55578f2389487aa50e58fa915b22e2f539b50cb SHA512 a8247c27ef3068b1c73ca39d7ce0da36ea7cbf28bdac805c92fd73bbe57c7f84e38433d330d54ea850ef952c57ff596dfb6627caee8e8b9c4ce69b1958fed094 WHIRLPOOL 13b03cb6fa1ec09451a45cba148b6d9790b75affb74bacfb20ada00ffb4e5cc7db5de6a6eda24433882ad305c76ccb1bb29e1e7170d53420e5b2c055b3b98dc3
-DIST paramiko-1.13.0.tar.gz 1108744 SHA256 920d68fdb549189c7ebff89f432cc242161d76554a91ae38fad94e7ab70349f5 SHA512 b05b93eb27600ac9df178aa4f045ee6b20f0052ea5e3f937d4eb6c6e1940208b02f9d6ddabf3070edaf4a68b86ca817ae77ebfb24a7d1dc725be86f99b071fc6 WHIRLPOOL 47baf72cbc9f51532477cc1f4665c6c7a66eaf47eb5b856d506cc4286d832cdda2881f86ef919837dfe43e6db99c186a127d01dbecf012d4b4d4afbd1a7215df
DIST paramiko-1.15.1.tar.gz 1219256 SHA256 6ed97e2281bb48728692cdc621f6b86a65fdc1d46b178ce250cfec10b977a04c SHA512 146076792e42965aaca08e74630c18422ed767a3da64c63fa63da9a464e1dade5a3f77635a5aae569e5a382d9a31eb4ee738399cd93895e355b4a57119c99f1c WHIRLPOOL 4f4bb6276363130d14c80e55d5c6858712a25404735e9671969d79ff1d1b1399918e24b6c80b275bbf76373a95cb407ca34fba5da8bc92bcd1322e4651ad1354
DIST paramiko-1.15.2.tar.gz 1220578 SHA256 4f56a671a3eecbb76e6143e6e4ca007d503a39aa79aa9e14ade667fa53fd6e55 SHA512 c8fe6c5e4c99ac0922c08f3c006b55852f54c3043eb3ddae5b6e5fba0592bf08b10ec399ec6865bbe84c759c8a15a00722247409b666f42e93b18bfd658158cd WHIRLPOOL 477e9e3d93f4faa9471c2a3e87ac96e7fe0ecdbdfb838b348ba2873e4bc408e78a5840f02002db6bbea18de8b9e2c83240db5a3c16543e4949ea62250de7a26a
+DIST paramiko-1.15.3.tar.gz 1212786 SHA256 7e17ec363c73acb0e77a5fcc6e44a0dd494339a9067e99a997a7d32b4272fef1 SHA512 60e9b55985bf575a2a0f37c63ee183a247652b51b23573ea0ae3a8304418cdb7f91cf661a577cc04d06ea9ef644a24ea0e985a80ee6f7c137e5eee6bd172b332 WHIRLPOOL 329748854b4a97c3f52daa5619a7eee7f33217b524d9baa6f761ee25abc9e578c457599a8385b9813dfb973bcc6ef83c3d10d9527002ac88f4477e384115f860
diff --git a/dev-python/paramiko/paramiko-1.10.1.ebuild b/dev-python/paramiko/paramiko-1.10.1.ebuild
deleted file mode 100644
index 35c3b204c267..000000000000
--- a/dev-python/paramiko/paramiko-1.10.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="doc examples"
-
-RDEPEND=">=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
- "${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/. )
- use examples && local EXAMPLES=( demos/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/paramiko/paramiko-1.12.2.ebuild b/dev-python/paramiko/paramiko-1.12.2.ebuild
deleted file mode 100644
index 73a60387b1eb..000000000000
--- a/dev-python/paramiko/paramiko-1.12.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="SSH2 protocol library"
-HOMEPAGE="https://github.com/paramiko/paramiko/ https://pypi.python.org/pypi/paramiko"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
-IUSE="doc examples"
-
-RDEPEND=">=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]
- dev-python/ecdsa"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
- "${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/. )
- use examples && local EXAMPLES=( demos/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/paramiko/paramiko-1.13.0.ebuild b/dev-python/paramiko/paramiko-1.15.3.ebuild
index 057e546d5d3f..4ca3739cc12c 100644
--- a/dev-python/paramiko/paramiko-1.13.0.ebuild
+++ b/dev-python/paramiko/paramiko-1.15.3.ebuild
@@ -3,7 +3,8 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
inherit distutils-r1
@@ -13,11 +14,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
IUSE="doc examples"
-RDEPEND=">=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]
- >=dev-python/ecdsa-0.9[${PYTHON_USEDEP}]"
+RDEPEND="
+ >=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]
+ !=dev-python/pycrypto-2.4[${PYTHON_USEDEP}]
+ >=dev-python/ecdsa-0.11[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pbr/pbr-1.6.0.ebuild b/dev-python/pbr/pbr-1.6.0.ebuild
index c4044251987e..83c997da7d5d 100644
--- a/dev-python/pbr/pbr-1.6.0.ebuild
+++ b/dev-python/pbr/pbr-1.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~mips ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="
diff --git a/dev-python/pbr/pbr-1.7.0.ebuild b/dev-python/pbr/pbr-1.7.0.ebuild
index f42181a4e6b1..4949503b58d4 100644
--- a/dev-python/pbr/pbr-1.7.0.ebuild
+++ b/dev-python/pbr/pbr-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="
diff --git a/dev-python/pbr/pbr-1.8.0.ebuild b/dev-python/pbr/pbr-1.8.0.ebuild
index 51f3e2a1888b..08b368dc7d4d 100644
--- a/dev-python/pbr/pbr-1.8.0.ebuild
+++ b/dev-python/pbr/pbr-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
diff --git a/dev-python/pbr/pbr-1.8.1-r1.ebuild b/dev-python/pbr/pbr-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..72d38961cbde
--- /dev/null
+++ b/dev-python/pbr/pbr-1.8.1-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Inject some useful and sensible default behaviors into setuptools"
+HOMEPAGE="https://github.com/openstack-dev/pbr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-1.3.1[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.2[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+ dev-python/virtualenv[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+PDEPEND="dev-python/pip[${PYTHON_USEDEP}]"
+
+# This normally actually belongs here.
+python_prepare_all() {
+ # This test passes when run within the source and doesn't represent a failure, but rather
+ # a gentoo sandbox constraint
+ # Rm tests that rely upon the package being already installed and fail
+ sed -e s':test_console_script_develop:_&:' \
+ -e s':test_console_script_install:_&:' \
+ -e s':test_sdist_extra_files:_&:' \
+ -e s':test_command_hooks:_&:' \
+ -e s':test_sdist_git_extra_files:_&:' \
+ -i pbr/tests/test_core.py || die
+ sed -e s':test_command_hooks:_&:' \
+ -e s':test_global_setup_hooks:_&:' \
+ -i pbr/tests/test_hooks.py || die
+ einfo "rogue tests disabled"
+ sed -i '/^hacking/d' test-requirements.txt || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ distutils_install_for_testing
+
+ rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+ testr init || die "testr init failed under ${EPYTHON}"
+ testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/pbr/pbr-1.8.1.ebuild b/dev-python/pbr/pbr-1.8.1.ebuild
index 9b26c1e873eb..3dab5b25767d 100644
--- a/dev-python/pbr/pbr-1.8.1.ebuild
+++ b/dev-python/pbr/pbr-1.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
# git is needed for tests, see https://bugs.launchpad.net/pbr/+bug/1326682 and https://bugs.gentoo.org/show_bug.cgi?id=561038
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 8e1f71c5537b..a8e98a95527b 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,3 +1,2 @@
-DIST pexpect-2.4.tar.gz 113251 SHA256 43c788f59dcf4bed677fd0b16891787dbf747e210ffedb6e90156fbbbd4d3b7b SHA512 0d5db34f3dc0e1a5bf7d8d0ab584897e4142592f35765762e4ca60d112106b91485098c91ad95a3cb3ad1f3d600619fa0ad41d930085e75974d78e0f06280a9f WHIRLPOOL 587a94b785645a950a643bff7bf972af285faea9dcf73064eb40e96d7cb29e87543bb14c65cdc2366573236ec56cc03c4076bc952899e567872628ff5c4d9785
-DIST pexpect-3.0.tar.gz 146662 SHA256 1d6cee0fa5ab212f9ddac9852bab0df5fff11a173ed1bfde9346d5c8aa42d14c SHA512 f84cbc843978baf0ab05bae63dd080d4ca14e8fd51de4e53cf33ddb6219c9e460f68861e44104a59ddb2c1b9dc8568bc87ee778ea52b10e18e365b771ca9aa63 WHIRLPOOL e2def4eb61007d5cbb5370daa82672f6063bf87a2a238237720652f85051bb72383b4d808c8a7148063fafe020ce1253a83f97237594b52a75f8a49689e38171
DIST pexpect-3.3.tar.gz 132330 SHA256 dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba SHA512 66cc501f1c7bb8ba0be4cdc0db840629f51416dc54ae44dc770adb38f1a385116b0a8b9bc7f1cc1447f05ede36ef1b519f5c4e710e6cb736c923ecfc87497cfa WHIRLPOOL e708e722d4e2598958f8d724b84148608e9a53041077b1a1a2af84d5281e11f0c6c050ee88489eebc48bd5556c22e0fe9386680d34b1941ddf21539296629513
+DIST pexpect-4.0.1.tar.gz 143657 SHA256 232795ebcaaf2e120396dbbaa3a129eda51757eeaae1911558f4ef8ee414fc6c SHA512 c2476f977964379faa3ecef1bc4800f3a87bd6cdd9e2d52e4e4f33a4060a97bb54f0770dfb5804d5a863eaf6ddef6b11be1d24f1617cc4837015202868ca7e87 WHIRLPOOL 91bc9e259f547b34d6a8847f3154601487e5f4d0ce1d7698078eb653fc12209c4d708f902e00cfb483f3872ce42063d65d8900dcaf9c727421f5e8b3d730e076
diff --git a/dev-python/pexpect/metadata.xml b/dev-python/pexpect/metadata.xml
index b4c5048d4c24..4342adeb1f1e 100644
--- a/dev-python/pexpect/metadata.xml
+++ b/dev-python/pexpect/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/pexpect/pexpect-2.4-r1.ebuild b/dev-python/pexpect/pexpect-2.4-r1.ebuild
deleted file mode 100644
index 3af10444db0f..000000000000
--- a/dev-python/pexpect/pexpect-2.4-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
-HOMEPAGE="http://pexpect.sourceforge.net/ https://pypi.python.org/pypi/pexpect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pexpect/pexpect-2.4.ebuild b/dev-python/pexpect/pexpect-2.4.ebuild
deleted file mode 100644
index ca9e59374126..000000000000
--- a/dev-python/pexpect/pexpect-2.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2"
-
-inherit distutils
-
-DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
-HOMEPAGE="http://pexpect.sourceforge.net/ https://pypi.python.org/pypi/pexpect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-RESTRICT_PYTHON_ABIS="3.*"
-
-PYTHON_MODNAME="ANSI.py fdpexpect.py FSM.py pexpect.py pxssh.py screen.py"
-
-src_install() {
- distutils_src_install
-
- use doc && dohtml -r doc/*
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/dev-python/pexpect/pexpect-3.0.ebuild b/dev-python/pexpect/pexpect-3.0.ebuild
deleted file mode 100644
index 49e06cd6bb69..000000000000
--- a/dev-python/pexpect/pexpect-3.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
-HOMEPAGE="http://pexpect.sourceforge.net/ https://pypi.python.org/pypi/pexpect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc examples"
-
-DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/_build/html/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pexpect/pexpect-4.0.1-r1.ebuild b/dev-python/pexpect/pexpect-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..8071929a5e9b
--- /dev/null
+++ b/dev-python/pexpect/pexpect-4.0.1-r1.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 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
+HOMEPAGE="
+ http://pexpect.sourceforge.net/
+ https://pypi.python.org/pypi/pexpect/
+ https://github.com/pexpect/pexpect/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
+DEPEND="
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # tests failing
+ # https://github.com/pexpect/pexpect/issues/282
+ # https://github.com/pexpect/pexpect/issues/283
+ # https://github.com/pexpect/pexpect/issues/284
+ rm tests/test_maxcanon.py tests/test_async.py || die
+ touch .coveragerc || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ py.test tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pexpect/pexpect-4.0.1.ebuild b/dev-python/pexpect/pexpect-4.0.1.ebuild
new file mode 100644
index 000000000000..33a957104da2
--- /dev/null
+++ b/dev-python/pexpect/pexpect-4.0.1.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=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for spawning child applications and responding to expected patterns"
+HOMEPAGE="
+ http://pexpect.sourceforge.net/
+ https://pypi.python.org/pypi/pexpect/
+ https://github.com/pexpect/pexpect/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples test"
+
+RDEPEND=">=dev-python/ptyprocess-0.5[${PYTHON_USEDEP}]"
+DEPEND="
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # tests failing
+ # https://github.com/pexpect/pexpect/issues/282
+ # https://github.com/pexpect/pexpect/issues/283
+ # https://github.com/pexpect/pexpect/issues/284
+ rm tests/test_maxcanon.py tests/test_async.py || die
+ touch .coveragerc || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ py.test tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pillow/pillow-3.0.0.ebuild b/dev-python/pillow/pillow-3.0.0.ebuild
index 511398d84fbe..eca59cfff2b2 100644
--- a/dev-python/pillow/pillow-3.0.0.ebuild
+++ b/dev-python/pillow/pillow-3.0.0.ebuild
@@ -66,6 +66,11 @@ python_prepare_all() {
sed -i -e 's:feature.jpeg2000 =:& None #:' setup.py || die
fi
+ sed \
+ -e "/required/s:=.*:= set():g" \
+ -e "/if feature in/s:'jpeg', 'libz'::g" \
+ -i setup.py || die
+
distutils-r1_python_prepare_all
}
diff --git a/dev-python/pip/pip-7.1.2-r1.ebuild b/dev-python/pip/pip-7.1.2-r1.ebuild
new file mode 100644
index 000000000000..cfdac503d9f6
--- /dev/null
+++ b/dev-python/pip/pip-7.1.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.com/pypa/pip/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+# Check pip/_vendor/vendor.txt for this
+VENDOR_DEPEND="
+ >=dev-python/distlib-0.2.1[${PYTHON_USEDEP}]
+ >=dev-python/html5lib-0.999999[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9[${PYTHON_USEDEP}]
+ >=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.7.0[${PYTHON_USEDEP}]
+ >=dev-python/CacheControl-0.11.5[${PYTHON_USEDEP}]
+ >=dev-python/lockfile-0.10.2[${PYTHON_USEDEP}]
+ >=dev-python/progress-1.2[${PYTHON_USEDEP}]
+ >=dev-python/ipaddress-1.0.14[${PYTHON_USEDEP}]
+ >=dev-python/packaging-15.3[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
+"
+RDEPEND="${VENDOR_DEPEND}
+ >=dev-python/setuptools-18.2[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+# required test data isn't bundled with the tarball
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.0.2-disable-version-check.patch
+ "${FILESDIR}"/${P}-unbundle.patch
+ )
+
+python_prepare_all() {
+ mv pip/_vendor/__init__.py "${T}" || die
+ rm -r pip/_vendor/* || die
+ mv "${T}"/__init__.py pip/_vendor/__init__.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ local DOCS=( AUTHORS.txt docs/*.rst )
+ distutils-r1_python_install_all
+
+ COMPLETION="${T}"/completion.tmp
+
+ ${EPYTHON} pip/__init__.py completion --bash > "${COMPLETION}" || die
+ newbashcomp "${COMPLETION}" ${PN}
+
+ ${EPYTHON} pip/__init__.py completion --zsh > "${COMPLETION}" || die
+ insinto /usr/share/zsh/site-functions
+ newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/pip/pip-7.1.2.ebuild b/dev-python/pip/pip-7.1.2.ebuild
index bff3c34ea91e..524cddad339d 100644
--- a/dev-python/pip/pip-7.1.2.ebuild
+++ b/dev-python/pip/pip-7.1.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
SLOT="0"
# Check pip/_vendor/vendor.txt for this
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index 164ee420f947..5543d7801d41 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -1,2 +1,3 @@
DIST ply-3.4.tar.gz 138342 SHA256 af435f11b7bdd69da5ffbc3fecb8d70a7073ec952e101764c88720cdefb2546b SHA512 6f6ee528393ff83eff2530ca468caf12e4c89b817a38302738597f1478dd41758036c8f32f88f60d1a26e70d9cfceab5530ddcfd3f058c1ee722be95c27e6bcc WHIRLPOOL f2f58e2d0c1170d35554999ca643c102d6821a7535b5782ee7317a4100cf56b5648d643c274cefd66a7b484ae3a9e952bcf4b98d50e7fd1ff220853f982a2f4c
DIST ply-3.6.tar.gz 281690 SHA256 61367b9eb2f4b819f69ea116750305270f1df8859992c9e356d6a851f25a4b47 SHA512 1a408d7cd4cdc9d747154623672e6baaf37ad2190cb9d6d6a7c1e1cc3cb40f15547734441b8fc99ecd67d7804d767576bdf0ed219cc669bf3d0df37498c55c55 WHIRLPOOL 2868a0046519750a446b683a85966650407afc1ea32ab6d8209b46b280529ca6aa8c47816782020b4c90f6f92d4733dd07565b6518e20c7a036d743edc629496
+DIST ply-3.8.tar.gz 157286 SHA256 e7d1bdff026beb159c9942f7a17e102c375638d9478a7ecd4cc0c76afd8de0b8 SHA512 2c8cf0ee49ca6dec9ec8d5146e98885e871c26125fb5764988fbefae984ee94b4240f265762aaab26d6ec24989b35a4fd6905c3c0d14aac8a085e89b7d6159ef WHIRLPOOL f4258065a479033d2100c2fe9f725a8fbdfb278dabc71a6aa27d7846352dc11496cf34596a0ca0669ce72238702978f1c8a587313410218aa014b80bc98dec37
diff --git a/dev-python/ply/metadata.xml b/dev-python/ply/metadata.xml
index 57a9a959420f..d643b333a410 100644
--- a/dev-python/ply/metadata.xml
+++ b/dev-python/ply/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>python</herd>
-<longdescription>
+ <herd>python</herd>
+ <longdescription>
PLY is a Python-only implementation of the popular compiler construction
tools lex and yacc. The implementation borrows ideas from a number of
previous efforts; most notably John Aycock's SPARK toolkit. However,
@@ -11,8 +11,8 @@ the C version of lex and yacc. The other significant feature of PLY is
that it provides extensive input validation and error reporting--much
more so than other Python parsing tools.
</longdescription>
-<longdescription lang="ja">
+ <longdescription lang="ja">
PLYはLexとYaccの有名なコンパイラ・コンストラクション・ツールのPython言語実装です
-。この実装は以前の試みから幾つものアイディアを借りています。そのほとんどがJohn AycockのSPARKツールキットからです。しかしながら、実装の全体像はC言語によるLexとYaccにより近いモデルです。PLYの他の重要点は幅広い入力バリデーションとエラー報告を>提供する点です。 -- その二点は他のPython言語パーサーより優れています。
+。この実装は以前の試みから幾つものアイディアを借りています。そのほとんどがJohn AycockのSPARKツールキットからです。しかしながら、実装の全体像はC言語によるLexとYaccにより近いモデルです。PLYの他の重要点は幅広い入力バリデーションとエラー報告を&gt;提供する点です。 -- その二点は他のPython言語パーサーより優れています。
</longdescription>
</pkgmetadata>
diff --git a/dev-python/ply/ply-3.8-r1.ebuild b/dev-python/ply/ply-3.8-r1.ebuild
new file mode 100644
index 000000000000..d32b5aa665b4
--- /dev/null
+++ b/dev-python/ply/ply-3.8-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Lex-Yacc library"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# See bug #458648 for reference
+RESTRICT="test"
+
+DOCS=( ANNOUNCE CHANGES TODO )
+
+PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
+
+python_test() {
+ cp -r -l test "${BUILD_DIR}"/ || die
+ cd "${BUILD_DIR}"/test || die
+
+ local t
+ for t in testlex.py testyacc.py; do
+ "${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
+ done
+}
+
+python_install_all() {
+ local HTML_DOCS=( doc/. )
+ use examples && local EXAMPLES=( example/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/ply/ply-3.8.ebuild b/dev-python/ply/ply-3.8.ebuild
new file mode 100644
index 000000000000..1e5e55f92e4b
--- /dev/null
+++ b/dev-python/ply/ply-3.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python Lex-Yacc library"
+HOMEPAGE="http://www.dabeaz.com/ply/ https://pypi.python.org/pypi/ply"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# See bug #458648 for reference
+RESTRICT="test"
+
+DOCS=( ANNOUNCE CHANGES TODO )
+
+PATCHES=( "${FILESDIR}/3.6-picklefile-IOError.patch" )
+
+python_test() {
+ cp -r -l test "${BUILD_DIR}"/ || die
+ cd "${BUILD_DIR}"/test || die
+
+ local t
+ for t in testlex.py testyacc.py; do
+ "${PYTHON}" "${t}" || die "${t} fails with ${EPYTHON}"
+ done
+}
+
+python_install_all() {
+ local HTML_DOCS=( doc/. )
+ use examples && local EXAMPLES=( example/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pretend/pretend-1.0.8-r1.ebuild b/dev-python/pretend/pretend-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..fa1f8d0c1030
--- /dev/null
+++ b/dev-python/pretend/pretend-1.0.8-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for stubbing in Python"
+HOMEPAGE="https://github.com/alex/pretend/ https://pypi.python.org/pypi/pretend/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/progress/progress-1.2-r1.ebuild b/dev-python/progress/progress-1.2-r1.ebuild
new file mode 100644
index 000000000000..ac4092c9ca9e
--- /dev/null
+++ b/dev-python/progress/progress-1.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Easy to use progress bars"
+HOMEPAGE="https://pypi.python.org/pypi/progress https://github.com/verigak/progress/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="ISC"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+# Not bundled
+RESTRICT="test"
+
+python_test() {
+ "${PYTHON}" test_progress.py || die
+}
diff --git a/dev-python/progress/progress-1.2.ebuild b/dev-python/progress/progress-1.2.ebuild
index 0bb4b47483d5..58659f46917d 100644
--- a/dev-python/progress/progress-1.2.ebuild
+++ b/dev-python/progress/progress-1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="ISC"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-python/ptyprocess/ptyprocess-0.5-r1.ebuild b/dev-python/ptyprocess/ptyprocess-0.5-r1.ebuild
new file mode 100644
index 000000000000..1c1b3c9f50c6
--- /dev/null
+++ b/dev-python/ptyprocess/ptyprocess-0.5-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Run a subprocess in a pseudo terminal"
+HOMEPAGE="https://github.com/pexpect/ptyprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+ py.test --verbose --verbose || die
+}
diff --git a/dev-python/ptyprocess/ptyprocess-0.5.ebuild b/dev-python/ptyprocess/ptyprocess-0.5.ebuild
index 80ca5d5cb021..1a1280eff6b8 100644
--- a/dev-python/ptyprocess/ptyprocess-0.5.ebuild
+++ b/dev-python/ptyprocess/ptyprocess-0.5.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
inherit distutils-r1
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild b/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild
index ef80909180ca..5b93a728c9c4 100644
--- a/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild
+++ b/dev-python/py-bcrypt/py-bcrypt-0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
LICENSE="BSD-4"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc64 x86"
+KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
IUSE=""
RDEPEND="!dev-python/bcrypt"
diff --git a/dev-python/py/py-1.4.30-r1.ebuild b/dev-python/py/py-1.4.30-r1.ebuild
new file mode 100644
index 000000000000..a4de0a1ecbca
--- /dev/null
+++ b/dev-python/py/py-1.4.30-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="http://pylib.readthedocs.org/ https://pypi.python.org/pypi/py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ # 1 failure, test_comments, under both pypy only.
+ # Also appears the home repo has no issue tracker.
+ [[ "${EPYTHON}" == pypy ]] && return
+ py.test || die "testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pyasn1-modules/metadata.xml b/dev-python/pyasn1-modules/metadata.xml
index f95ded46068f..a9d9baa85472 100644
--- a/dev-python/pyasn1-modules/metadata.xml
+++ b/dev-python/pyasn1-modules/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/pyasn1-modules/pyasn1-modules-0.0.8-r1.ebuild b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8-r1.ebuild
new file mode 100644
index 000000000000..a34c654789e4
--- /dev/null
+++ b/dev-python/pyasn1-modules/pyasn1-modules-0.0.8-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="pyasn1 modules"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1-modules"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/pyasn1-0.1.8[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ echoit() { echo "$@"; "$@"; }
+ local exit_status=0 test
+ for test in test/*.sh; do
+ PATH="${S}/tools:${PATH}" \
+ echoit sh "${test}" || exit_status=1
+ done
+ return ${exit_status}
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ insinto /usr/share/${P}
+ doins -r tools
+}
diff --git a/dev-python/pyasn1/metadata.xml b/dev-python/pyasn1/metadata.xml
index fb9d9230bc76..96fdefbafe70 100644
--- a/dev-python/pyasn1/metadata.xml
+++ b/dev-python/pyasn1/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/pyasn1/pyasn1-0.1.9-r1.ebuild b/dev-python/pyasn1/pyasn1-0.1.9-r1.ebuild
new file mode 100644
index 000000000000..671c341be6a4
--- /dev/null
+++ b/dev-python/pyasn1/pyasn1-0.1.9-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ASN.1 library for Python"
+HOMEPAGE="http://pyasn1.sourceforge.net/ https://pypi.python.org/pypi/pyasn1"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ "${PYTHON}" test/suite.py || die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+ local HTML_DOCS=( doc/pyasn1-tutorial.html )
+ use doc && HTML_DOCS=( doc/. )
+
+ distutils-r1_src_install
+}
diff --git a/dev-python/pycparser/pycparser-2.14-r1.ebuild b/dev-python/pycparser/pycparser-2.14-r1.ebuild
new file mode 100644
index 000000000000..d479b06b7667
--- /dev/null
+++ b/dev-python/pycparser/pycparser-2.14-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="C parser and AST generator written in Python"
+HOMEPAGE="https://github.com/eliben/pycparser"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_compile() {
+ distutils-r1_python_compile
+ pushd "${BUILD_DIR}/lib/pycparser" > /dev/null || die
+ "${PYTHON}" _build_tables.py || die
+ popd > /dev/null || die
+}
+
+python_test() {
+ nosetests || die
+}
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index 0e400e2416ea..a058caa8f9d7 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,3 +1 @@
-DIST pyftpdlib-1.0.1.tar.gz 116428 SHA256 bec5c2af5942c3970d53b1a9fa27286eba40c2089e3e0ef653ff6f5ed0c4865b SHA512 478f04cb156a6178f03aee40190f17b65e42f04c60311936bf068d11f9ffbd8ae9a118fea456386ccf5184e3fed6270b40b4dfec6523902e310f78ec73785be8 WHIRLPOOL 71b34ef1031b402b2be0d7aac64f796820a20e022fc71fb451777cc4dc50b28ba48dca20608958cd670d90a9baf839c8e4933ddb63b0484fff425faaa5e5e3b1
-DIST pyftpdlib-1.3.0.tar.gz 120206 SHA256 5dec22e691bd75ee0097f2e623df6c7b81a7cc373118f1550a16079dbddc701f SHA512 eacd617aa136c2a9a8836d25c632f30fbc9ad14650d34e0a8f6562c1a5af8e2e3ae0592d7f5456b88818142d63a08c140e75ce2e0a73811c29a7dd5e08700b87 WHIRLPOOL e4ee34587e60f9a41b5332a62a5e4d4914822ffa1bd4cc700ebb03a31fdca50ffa15a55d6d5afb73177d20bbbb30123ca6756629eef936d6bbb8a5d959535d74
DIST pyftpdlib-1.4.0.tar.gz 116280 SHA256 5fdd1492efe478f4c354f7d65d9308359751c8fb1d0376466b74a76721c5fcf3 SHA512 61cf28d72a3a99bdc9bddcf434275e4edaeff60bf6481c1e854d81a4ea23ae97b73c8da9d0629a705a003ae8a941c529f9b9ed7cfa25759bd5cd6517f9958ff9 WHIRLPOOL 676f58061e07aa8a9dcce9c7076962875866cebca8eacdd624053cab32de3a7bdb0b17337105839b6c997bf2b4263e759c962362930afddaedc1e9a151b855fa
diff --git a/dev-python/pyftpdlib/files/pyftpdlib-1-pypy-test.patch b/dev-python/pyftpdlib/files/pyftpdlib-1-pypy-test.patch
deleted file mode 100644
index e1b30553fcbe..000000000000
--- a/dev-python/pyftpdlib/files/pyftpdlib-1-pypy-test.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -ur pyftpdlib-1.0.1.orig/test/test_ftpd.py pyftpdlib-1.0.1/test/test_ftpd.py
---- test/test_ftpd.py 2013-02-23 03:07:13.000000000 +0800
-+++ test/test_ftpd.py 2013-03-13 23:05:48.392965468 +0800
-@@ -33,7 +33,7 @@
- import threading
- import unittest
- import socket
--import os
-+import os, sys
- import shutil
- import time
- import re
-@@ -1358,6 +1358,7 @@
- self.assertEqual(getmode(), '0555')
-
-
-+@unittest.skipIf(hasattr(sys, 'pypy_version_info'), "temp. disabling of pypy")
- class TestFtpStoreData(TestCase):
- """Test STOR, STOU, APPE, REST, TYPE."""
- server_class = FTPd
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
deleted file mode 100644
index 1ecfe3fcdbdc..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="ssl(+)"
-# pypy has no spwd.so
-
-inherit distutils-r1
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="https://code.google.com/p/pyftpdlib/ https://pypi.python.org/pypi/pyftpdlib"
-SRC_URI="https://pyftpdlib.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="examples ssl"
-
-DEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-DOCS="CREDITS HISTORY"
-
-#PATCHES=( "${FILESDIR}"/${PN}-1-pypy-test.patch )
-
-python_test() {
- cd "${BUILD_DIR}" || die
- for test in "${S}"/test/test_*.py; do
- "${PYTHON}" "${test}" || die "Testing failed with ${EPYTHON}"
- done
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r demo test
- fi
-}
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.3.0.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.3.0.ebuild
deleted file mode 100644
index bae34f1d4dbe..000000000000
--- a/dev-python/pyftpdlib/pyftpdlib-1.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} pypy )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python FTP server library"
-HOMEPAGE="https://code.google.com/p/pyftpdlib/ https://pypi.python.org/pypi/pyftpdlib"
-SRC_URI="https://pyftpdlib.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="examples ssl"
-
-DEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-# Usual; requ'd for a sane testsuite run
-DISTUTILS_NO_PARALLEL_BUILD=1
-
-python_prepare_all() {
- # https://code.google.com/p/pyftpdlib/issues/detail?id=292&thanks=292&ts=1400308829
- # Disable failing test
- sed -e 's:test_on_incomplete_file_received:_&:' -i test/test_ftpd.py || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- "${PYTHON}" test/test_ftpd.py || die
-}
-
-python_install_all() {
- use examples && local EXAMPLES=( demo/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pygments/pygments-2.0.2-r1.ebuild b/dev-python/pygments/pygments-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..33077c71e6c8
--- /dev/null
+++ b/dev-python/pygments/pygments-2.0.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 bash-completion-r1 vcs-snapshot
+
+MY_PN="Pygments"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ virtual/ttf-fonts )"
+# dev-texlive/texlive-latexrecommended
+# Removing / commenting out this dep. I can find no mention of it in tests other than
+# importing pygment's own tex module. If it's there and I missed it just uncomment and re-add
+# Tests pass without it
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ cp -r -l tests "${BUILD_DIR}"/ || die
+ # With pypy3 there is 1 error out of 1556 tests when run as is and
+ # (SKIP=8, errors=1, failures=1) when run with 2to3; meh
+ nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+
+ distutils-r1_python_install_all
+ newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pyopenssl/metadata.xml b/dev-python/pyopenssl/metadata.xml
index 894e4e9e1b92..a50845d4626a 100644
--- a/dev-python/pyopenssl/metadata.xml
+++ b/dev-python/pyopenssl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
new file mode 100644
index 000000000000..679861855e3c
--- /dev/null
+++ b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN=pyOpenSSL
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python interface to the OpenSSL library"
+HOMEPAGE="
+ http://pyopenssl.sourceforge.net/
+ https://launchpad.net/pyopenssl
+ https://pypi.python.org/pypi/pyOpenSSL
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="doc examples"
+
+RDEPEND="
+ >=dev-python/six-1.5.2[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-0.7[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+S=${WORKDIR}/${MY_P}
+
+python_prepare_all() {
+ # https://github.com/pyca/pyopenssl/issues/41
+ sed -e "s/test_digest/_&/" -i OpenSSL/test/test_crypto.py
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ esetup.py test
+
+ # https://bugs.launchpad.net/pyopenssl/+bug/1237953
+ rm -rf tmp* *.key *.pem || die
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pyopenssl/pyopenssl-0.15.1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1.ebuild
index f9e19d9f0990..51f0a602c591 100644
--- a/dev-python/pyopenssl/pyopenssl-0.15.1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.15.1.ebuild
@@ -3,6 +3,7 @@
# $Id$
EAPI=5
+
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
inherit distutils-r1 flag-o-matic
@@ -11,7 +12,11 @@ MY_PN=pyOpenSSL
MY_P=${MY_PN}-${PV}
DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="http://pyopenssl.sourceforge.net/ https://launchpad.net/pyopenssl https://pypi.python.org/pypi/pyOpenSSL"
+HOMEPAGE="
+ http://pyopenssl.sourceforge.net/
+ https://launchpad.net/pyopenssl
+ https://pypi.python.org/pypi/pyOpenSSL
+"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
@@ -42,7 +47,7 @@ python_test() {
esetup.py test
# https://bugs.launchpad.net/pyopenssl/+bug/1237953
- rm -rf tmp* *.key *.pem
+ rm -rf tmp* *.key *.pem || die
}
python_install_all() {
diff --git a/dev-python/pypy3/files/pypy3-2.4.0-libressl.patch b/dev-python/pypy3/files/pypy3-2.4.0-libressl.patch
new file mode 100644
index 000000000000..5852939c5075
--- /dev/null
+++ b/dev-python/pypy3/files/pypy3-2.4.0-libressl.patch
@@ -0,0 +1,187 @@
+From 66bef80988c9efe60b61c6bc05f3206b4c3df7e8 Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Mon, 12 Oct 2015 20:43:50 +0200
+Subject: [PATCH] Add LibreSSL support, patches backported from upstream
+
+https://bitbucket.org/pypy/pypy/pull-requests/333/deal-with-platforms-without-rand_egd-take/diff
+---
+ pypy/module/_ssl/interp_ssl.py | 34 +++++++++++++++-----------
+ pypy/module/_ssl/test/test_ssl.py | 8 +++---
+ rpython/rlib/ropenssl.py | 6 ++++-
+ rpython/rtyper/tool/rffi_platform.py | 12 ++++++---
+ rpython/rtyper/tool/test/test_rffi_platform.py | 24 +++++++++++++++++-
+ 5 files changed, 61 insertions(+), 23 deletions(-)
+
+diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py
+index 0cac165..f210167 100644
+--- a/pypy/module/_ssl/interp_ssl.py
++++ b/pypy/module/_ssl/interp_ssl.py
+@@ -310,20 +310,26 @@ if HAVE_OPENSSL_RAND:
+ res = libssl_RAND_status()
+ return space.wrap(res)
+
+- @unwrap_spec(path=str)
+- def RAND_egd(space, path):
+- """RAND_egd(path) -> bytes
+-
+- Queries the entropy gather daemon (EGD) on socket path. Returns number
+- of bytes read. Raises socket.sslerror if connection to EGD fails or
+- if it does provide enough data to seed PRNG."""
+- with rffi.scoped_str2charp(path) as socket_path:
+- bytes = libssl_RAND_egd(socket_path)
+- if bytes == -1:
+- raise ssl_error(space,
+- "EGD connection failed or EGD did not return "
+- "enough data to seed the PRNG")
+- return space.wrap(bytes)
++ if HAVE_OPENSSL_RAND_EGD:
++ @unwrap_spec(path=str)
++ def RAND_egd(space, path):
++ """RAND_egd(path) -> bytes
++
++ Queries the entropy gather daemon (EGD) on socket path. Returns number
++ of bytes read. Raises socket.sslerror if connection to EGD fails or
++ if it does provide enough data to seed PRNG."""
++ with rffi.scoped_str2charp(path) as socket_path:
++ bytes = libssl_RAND_egd(socket_path)
++ if bytes == -1:
++ raise ssl_error(space,
++ "EGD connection failed or EGD did not return "
++ "enough data to seed the PRNG")
++ return space.wrap(bytes)
++ else:
++ # Dummy func for platforms missing RAND_egd(). Most likely LibreSSL.
++ @unwrap_spec(path=str)
++ def RAND_egd(space, path):
++ raise ssl_error(space, "RAND_egd unavailable")
+
+
+ class SSLSocket(W_Root):
+diff --git a/pypy/module/_ssl/test/test_ssl.py b/pypy/module/_ssl/test/test_ssl.py
+index 3204610..9722fd5 100644
+--- a/pypy/module/_ssl/test/test_ssl.py
++++ b/pypy/module/_ssl/test/test_ssl.py
+@@ -33,7 +33,8 @@ class AppTestSSL:
+ assert isinstance(_ssl.OPENSSL_VERSION_INFO, tuple)
+ assert len(_ssl.OPENSSL_VERSION_INFO) == 5
+ assert isinstance(_ssl.OPENSSL_VERSION, str)
+- assert 'openssl' in _ssl.OPENSSL_VERSION.lower()
++ lower_version = _ssl.OPENSSL_VERSION.lower()
++ assert 'openssl' in lower_version or "libressl" in lower_version
+
+ def test_RAND_add(self):
+ import _ssl
+@@ -64,8 +65,9 @@ class AppTestSSL:
+
+ def test_sslwrap(self):
+ import ssl, _socket, sys, gc
+- if sys.platform == 'darwin' or 'freebsd' in sys.platform:
+- skip("hangs indefinitely on OSX & FreeBSD (also on CPython)")
++ if sys.platform == 'darwin' or 'freebsd' in sys.platform or \
++ 'openbsd' in sys.platform:
++ skip("hangs indefinitely on OSX & BSD (also on CPython)")
+ s = _socket.socket()
+ ss = ssl.wrap_socket(s)
+
+diff --git a/rpython/rlib/ropenssl.py b/rpython/rlib/ropenssl.py
+index c36779d..6fe45d0 100644
+--- a/rpython/rlib/ropenssl.py
++++ b/rpython/rlib/ropenssl.py
+@@ -168,6 +168,9 @@ OBJ_NAME = rffi.CArrayPtr(OBJ_NAME_st)
+
+ HAVE_OPENSSL_RAND = OPENSSL_VERSION_NUMBER >= 0x0090500f
+ HAVE_SSL_CTX_CLEAR_OPTIONS = OPENSSL_VERSION_NUMBER >= 0x009080df
++HAVE_OPENSSL_RAND_EGD = rffi_platform.has('RAND_egd("/")',
++ '#include <openssl/rand.h>',
++ libraries=['ssl', 'crypto'])
+
+ def external(name, argtypes, restype, **kw):
+ kw['compilation_info'] = eci
+@@ -194,7 +197,8 @@ ssl_external('CRYPTO_set_id_callback',
+ if HAVE_OPENSSL_RAND:
+ ssl_external('RAND_add', [rffi.CCHARP, rffi.INT, rffi.DOUBLE], lltype.Void)
+ ssl_external('RAND_status', [], rffi.INT)
+- ssl_external('RAND_egd', [rffi.CCHARP], rffi.INT)
++ if HAVE_OPENSSL_RAND_EGD:
++ ssl_external('RAND_egd', [rffi.CCHARP], rffi.INT)
+ ssl_external('SSL_CTX_new', [SSL_METHOD], SSL_CTX)
+ ssl_external('SSL_get_SSL_CTX', [SSL], SSL_CTX)
+ ssl_external('TLSv1_method', [], SSL_METHOD)
+diff --git a/rpython/rtyper/tool/rffi_platform.py b/rpython/rtyper/tool/rffi_platform.py
+index 1760877..1d56c20 100755
+--- a/rpython/rtyper/tool/rffi_platform.py
++++ b/rpython/rtyper/tool/rffi_platform.py
+@@ -17,12 +17,15 @@ from rpython.rlib.rarithmetic import r_uint, r_longlong, r_ulonglong, intmask
+ #
+ # Helpers for simple cases
+
+-def eci_from_header(c_header_source, include_dirs=None):
++def eci_from_header(c_header_source, include_dirs=None, libraries=None):
+ if include_dirs is None:
+ include_dirs = []
++ if libraries is None:
++ libraries = []
+ return ExternalCompilationInfo(
+ post_include_bits=[c_header_source],
+- include_dirs=include_dirs
++ include_dirs=include_dirs,
++ libraries=libraries,
+ )
+
+ def getstruct(name, c_header_source, interesting_fields):
+@@ -75,9 +78,10 @@ def getintegerfunctionresult(function, args=None, c_header_source='', includes=[
+ CConfig._compilation_info_.includes = includes
+ return configure(CConfig)['RESULT']
+
+-def has(name, c_header_source, include_dirs=None):
++def has(name, c_header_source, include_dirs=None, libraries=None):
+ class CConfig:
+- _compilation_info_ = eci_from_header(c_header_source, include_dirs)
++ _compilation_info_ = \
++ eci_from_header(c_header_source, include_dirs, libraries)
+ HAS = Has(name)
+ return configure(CConfig)['HAS']
+
+diff --git a/rpython/rtyper/tool/test/test_rffi_platform.py b/rpython/rtyper/tool/test/test_rffi_platform.py
+index bfa069e..4feae87 100644
+--- a/rpython/rtyper/tool/test/test_rffi_platform.py
++++ b/rpython/rtyper/tool/test/test_rffi_platform.py
+@@ -271,12 +271,34 @@ def test_array():
+ [("d_name", lltype.FixedSizeArray(rffi.CHAR, 1))])
+ assert dirent.c_d_name.length == 32
+
+-def test_has():
++def test_has_0001():
+ assert rffi_platform.has("x", "int x = 3;")
+ assert not rffi_platform.has("x", "")
+ # has() should also not crash if it is given an invalid #include
+ assert not rffi_platform.has("x", "#include <some/path/which/cannot/exist>")
+
++def test_has_0002():
++ assert rffi_platform.has("pow", "#include <math.h>", libraries=["m"])
++
++def test_has_0003():
++ """multiple libraries"""
++ assert rffi_platform.has("pow", "#include <math.h>", libraries=["m", "c"])
++
++def test_has_0004():
++ """bogus symbol name"""
++ assert not rffi_platform.has("pow", "#include <math.h>",
++ libraries=["boguslibname"])
++
++def test_has_0005():
++ """bogus symbol name and lib name"""
++ assert not rffi_platform.has("bogus_symbol_name", "#include <math.h>",
++ libraries=["boguslibname"])
++
++def test_has_0006():
++ """missing include"""
++ assert not rffi_platform.has("pow", "", libraries=["m"])
++
++
+ def test_verify_eci():
+ eci = ExternalCompilationInfo()
+ rffi_platform.verify_eci(eci)
+--
+2.6.1
+
diff --git a/dev-python/pypy3/pypy3-2.4.0.ebuild b/dev-python/pypy3/pypy3-2.4.0.ebuild
index 1c66a024bcb9..47a824e12292 100644
--- a/dev-python/pypy3/pypy3-2.4.0.ebuild
+++ b/dev-python/pypy3/pypy3-2.4.0.ebuild
@@ -16,13 +16,14 @@ SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2"
LICENSE="MIT"
SLOT="0/$(get_version_component_range 1-2 ${PV})"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 tk"
+IUSE="bzip2 gdbm +jit libressl low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 tk"
RDEPEND=">=sys-libs/zlib-1.1.3:0=
virtual/libffi:0=
virtual/libintl:0=
dev-libs/expat:0=
- dev-libs/openssl:0=
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
bzip2? ( app-arch/bzip2:0= )
gdbm? ( sys-libs/gdbm:0= )
ncurses? ( =sys-libs/ncurses-5*:0= )
@@ -79,6 +80,7 @@ src_prepare() {
"${FILESDIR}/1.9-scripts-location.patch" \
"${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \
"${FILESDIR}"/2.3.1-shared-lib.patch # 517002
+ epatch "${FILESDIR}"/${PN}-2.4.0-libressl.patch
epatch_user
}
diff --git a/dev-python/pyspf/Manifest b/dev-python/pyspf/Manifest
index cb15e9a9b28e..738d0cc6d7d4 100644
--- a/dev-python/pyspf/Manifest
+++ b/dev-python/pyspf/Manifest
@@ -1,2 +1 @@
-DIST pyspf-2.0.10.tar.gz 62890 SHA256 0a3be1cc1915649ed8960a1b8add4110379c3c348e98e642a53f69d028709de8 SHA512 8a10a82fe5226ffee6376ea19f1fe075bb8676cd7eeadbfec1de95326fb8e6f08ad466e84129c016b62452f26f0552f1a463fc6a53d992c67ae1d8b1a18b3a46 WHIRLPOOL 5cceeda27c6a84f827c1505f7808e371f5eecc95737a98cd77d0b06dcccd58fe0d0971b9ecfadc7c23c69ee921eefe56cbb98974c47ea3b57d1b0bcfae5e050f
DIST pyspf-2.0.11.tar.gz 63594 SHA256 693e80df3d61d69daaa2590e0f2bc8167d5fa36ce373d43987984cb00ae23928 SHA512 cababa82d1b6c206033a6583a67502d982a2c34baec0ccc08513a2bc9beb4cfc84dd5d615ac852fd25885c4abd43d9e8704f517c70fadb4a600d3b8a6254d755 WHIRLPOOL f1f97b8d0c6207a01d5d48aa3f63948749d3ceca590c146ec846638e263ba8155616e9d34af0bdfde3c1438869a3727a98154c054e0e33632c8cccd23d3f2e3d
diff --git a/dev-python/pyspf/pyspf-2.0.10.ebuild b/dev-python/pyspf/pyspf-2.0.10.ebuild
deleted file mode 100644
index 834057103c4e..000000000000
--- a/dev-python/pyspf/pyspf-2.0.10.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="ipv6?"
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the Sender Policy Framework (SPF) protocol"
-HOMEPAGE="https://pypi.python.org/pypi/pyspf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ipv6 test"
-
-# >=python-3.3 comes with the built-in ipaddress module
-RDEPEND="dev-python/authres[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/ipaddr-2.1.10[${PYTHON_USEDEP}]' python2_7)
- $(python_gen_cond_dep 'dev-python/pydns:2[${PYTHON_USEDEP}]' python2_7)
- $(python_gen_cond_dep 'dev-python/pydns:3[${PYTHON_USEDEP}]' 'python3*')"
-
-DEPEND="test? ( ${RDEPEND}
- dev-python/pyyaml[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="test? ( ipv6 )"
-
-python_test() {
- pushd test &> /dev/null
- "${PYTHON}" testspf.py || die
- popd &> /dev/null
-}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 5633c36cf77c..761f698323ea 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -2,3 +2,4 @@ DIST pytest-2.7.2.tar.gz 532836 SHA256 b30457f735420d0000d10a44bbd478cf03f8bf20e
DIST pytest-2.7.3.tar.gz 548235 SHA256 d5a9c3db3515ab95902ba08c09d1e941a21a440dc2d65f31bac02667508a9efc SHA512 ad9b57f202c60c247dd4753fb8391e3e88b390e34de678ea12384d81d76693dd37e04f11f6da19a6eda2c74a73db23789856ccaa325d32b4beb6bff86d9e4173 WHIRLPOOL 4aecd53142e503083abe2631bf403509c515d52176c430b7ab1e0becdf404e0fce4bad4343a4ab62525a6e008de0c35b4fac4a352d06938288dbf8deb8a4a250
DIST pytest-2.8.0.zip 8189680 SHA256 29ed6fdb7b287f5353620494e950aba652c593c40556aece95a4d23d403ae2cb SHA512 98f7131c3396848ef7dbcf67e21e0329f8a3b771b3f8b832c1894758b34a2f852209f809001da856cfe8ea3773b257405ae2d5f8a04152242b8692e1511289ed WHIRLPOOL 3fd7f6ec73f11f29fd9b67bbb0c28dd73605604053160111212bd43d2c85c0b6cec5a25a979fecabb83a097c5621d5460747df5cb08796866349b7ba71b12005
DIST pytest-2.8.1.tar.gz 580991 SHA256 2b58662d356ee953bc40f7a73857d05f0bd07f0a8507c929de3006dd6b14c918 SHA512 b73237810b69ecd504c2bdeeee51af62d7ed23091b7bcc74cd1fcc8683dc582cadfd68b9eaed3259165bac6ddca5fb960b8dc295e82cfb9120f4b732d07843fe WHIRLPOOL 16b27620bd0edde16d28dc247352c0a1b6042ac79bcb7a76b67fc4917ef6a42462767343a5e86acfe6880ba0372a124fb11491e670abde6ffdb48e03963243db
+DIST pytest-2.8.2.tar.gz 563955 SHA256 da2fc57320dd11f621d166634c52b989aa2291af1296c32a27a11777aa4128b9 SHA512 0df6e0421d1575e1efc0bb0550c5993f802777cb616ab1514bf12ed11eb5ec35a142dd837ff65659989268c36e441e18108369991cd3d458d357aac6ba433991 WHIRLPOOL ea917f4aaec444d6edc830b4ec66f7adb305031f11328e47d12a609ec92368a5c56e9cf8e24bd1a9a4a6a0746b43133f0d9821cf27d74c15ed2a83a705ee6030
diff --git a/dev-python/pytest/pytest-2.7.3-r1.ebuild b/dev-python/pytest/pytest-2.7.3-r1.ebuild
new file mode 100644
index 000000000000..e44499416983
--- /dev/null
+++ b/dev-python/pytest/pytest-2.7.3-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.29"
+RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
+
+#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pexpect[${PYTHON_USEDEP}] )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # Disable versioning of py.test script to avoid collision with
+ # versioning performed by the eclass.
+ sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+ grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+ # Prevent un-needed d'loading
+ sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ if use doc; then
+ mkdir doc/en/.build || die
+ emake -C doc/en html
+ fi
+}
+
+python_test() {
+ # test_nose.py not written to suit py3.2 in pypy3
+ if [[ "${EPYTHON}" == pypy3 ]]; then
+ "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
+ --ignore=testing/test_nose.py \
+ || die "tests failed with ${EPYTHON}"
+ else
+ "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py \
+ || die "tests failed with ${EPYTHON}"
+ fi
+}
+
+python_install_all() {
+ use doc && dohtml -r doc/en/_build/html/
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest/pytest-2.8.2-r1.ebuild b/dev-python/pytest/pytest-2.8.2-r1.ebuild
new file mode 100644
index 000000000000..0b5e1898b1e4
--- /dev/null
+++ b/dev-python/pytest/pytest-2.8.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.29"
+RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
+
+# dev-python/pluggy
+# https://github.com/hpk42/pluggy
+# See https://github.com/pytest-dev/pytest/issues/944
+# for why not now
+
+#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pexpect[${PYTHON_USEDEP}] )
+ doc? (
+ >=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/regendoc[${PYTHON_USEDEP}]
+ )"
+
+python_prepare_all() {
+ chmod o-w *egg*/* || die
+ # Disable versioning of py.test script to avoid collision with
+ # versioning performed by the eclass.
+ sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+ grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+ # Prevent un-needed d'loading
+ sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ if use doc; then
+ mkdir doc/en/.build || die
+ emake -C doc/en html
+ fi
+}
+
+python_test() {
+ # test_nose.py not written to suit py3.2 in pypy3
+ if [[ "${EPYTHON}" == pypy3 ]]; then
+ "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \
+ --ignore=testing/BUILD_nose.py \
+ || die "tests failed with ${EPYTHON}"
+ else
+ "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \
+ || die "tests failed with ${EPYTHON}"
+ fi
+}
+
+python_install_all() {
+ use doc && HTML_DOCS=( doc/en/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest/pytest-2.8.2.ebuild b/dev-python/pytest/pytest-2.8.2.ebuild
new file mode 100644
index 000000000000..6a87be6eb7fa
--- /dev/null
+++ b/dev-python/pytest/pytest-2.8.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="simple powerful testing with Python"
+HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# When bumping, please check setup.py for the proper py version
+PY_VER="1.4.29"
+RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]"
+
+# dev-python/pluggy
+# https://github.com/hpk42/pluggy
+# See https://github.com/pytest-dev/pytest/issues/944
+# for why not now
+
+#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pexpect[${PYTHON_USEDEP}] )
+ doc? (
+ >=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/regendoc[${PYTHON_USEDEP}]
+ )"
+
+python_prepare_all() {
+ chmod o-w *egg*/* || die
+ # Disable versioning of py.test script to avoid collision with
+ # versioning performed by the eclass.
+ sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed"
+ grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency"
+
+ # Prevent un-needed d'loading
+ sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ if use doc; then
+ mkdir doc/en/.build || die
+ emake -C doc/en html
+ fi
+}
+
+python_test() {
+ # test_nose.py not written to suit py3.2 in pypy3
+ if [[ "${EPYTHON}" == pypy3 ]]; then
+ "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \
+ --ignore=testing/BUILD_nose.py \
+ || die "tests failed with ${EPYTHON}"
+ else
+ "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \
+ || die "tests failed with ${EPYTHON}"
+ fi
+}
+
+python_install_all() {
+ use doc && HTML_DOCS=( doc/en/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index 6325d4b9ed9d..3ff54901b125 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,3 +1,2 @@
DIST python-ldap-2.4.19.tar.gz 138503 SHA256 02fddb3accbfb54e40ff47a59457e422b253f9fb6cd64bb3851b349295fab048 SHA512 bfa8b87449f03d70d78bf890d1190ef5a153e1b84db97ca4b40465bfba9faedace2a69f4ae1279ef6323c01255f52993cf0e4374bc32d9660a5286dfc7c17b85 WHIRLPOOL 708c6744b41fc4c9dc4473a9ab088016aa722f5b196c080973fedbb07a08dd57f859ddb5d193665349f44d2d08ff9e2f797cfa6af23e34624f1d0a9e21d62d4d
-DIST python-ldap-2.4.20.tar.gz 142355 SHA256 4b8891539a3171d993cf7896b632ff088a4c707ae85ac3c77db1454f7949f3e2 SHA512 d8afe217c18d49b70089bc47bac7c48f57774b78b1dd44ae3a60e669a3df59058d8579b9de64a2349af612db8e3c1ea5bfa5a47148c651cbfa4038dbc58b9ff2 WHIRLPOOL 562993e84f5c41b3aefd808a047d6cf8ea6c4284171f7f0d858d3a7417a67e31b06f283ed557fbad3fde25a4a9d2c049cbce52c0759b94850ea19848e4192f64
DIST python-ldap-2.4.21.tar.gz 121176 SHA256 2a3ce606465d2d5fbd0a620516b6648ffd85c343d9305d49a2a1f7d338b8bbd4 SHA512 38f879bd70e5a31b2ec0f89c7a9aab6bdfe86285976300358828cdb83995edaaa960d29c8fcd9f333bda88a2015f306460de7bb24b2d514944d9dc83650acb75 WHIRLPOOL 8cc7526356e63642430804370ffd41cd1e74b74654d4302f90fe87a6471639848ae6ecff160a26daa39763718625b4bcdf3e2b6aaa58e98b00854e1692b30db5
diff --git a/dev-python/python-ldap/python-ldap-2.4.20.ebuild b/dev-python/python-ldap/python-ldap-2.4.20.ebuild
deleted file mode 100644
index 3309a2b3783c..000000000000
--- a/dev-python/python-ldap/python-ldap-2.4.20.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# setup.py is written only for py2, which suits pypy
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Various LDAP-related Python modules"
-HOMEPAGE="http://www.python-ldap.org https://pypi.python.org/pypi/python-ldap"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
-IUSE="doc examples sasl ssl"
-
-# If you need support for openldap-2.3.x, please use python-ldap-2.3.9.
-# python team: Please do not remove python-ldap-2.3.9 from the tree.
-# OpenSSL is an optional runtime dep.
-# setup.py sets setuptools and misses pyasn1 and pyasn1-modules in install_requires
-RDEPEND=">net-nds/openldap-2.4.11
- dev-python/pyasn1[${PYTHON_USEDEP}]
- dev-python/pyasn1-modules[${PYTHON_USEDEP}]
- sasl? ( >=dev-libs/cyrus-sasl-2.1 )"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
- sed -e "s:^library_dirs =.*:library_dirs = /usr/$(get_libdir) /usr/$(get_libdir)/sasl2:" \
- -e "s:^include_dirs =.*:include_dirs = ${EPREFIX}/usr/include ${EPREFIX}/usr/include/sasl:" \
- -i setup.cfg || die "error fixing setup.cfg"
-
- local mylibs="ldap"
- if use sasl; then
- use ssl && mylibs="ldap_r"
- mylibs="${mylibs} sasl2"
- else
- sed -e 's/HAVE_SASL//g' -i setup.cfg || die
- fi
- use ssl && mylibs="${mylibs} ssl crypto"
- use elibc_glibc && mylibs="${mylibs} resolv"
-
- sed -e "s:^libs = .*:libs = lber ${mylibs}:" \
- -i setup.cfg || die "error setting up libs in setup.cfg"
-
- # set test expected to fail to expectedFailure
- sed -e "s:^ def test_bad_urls: @unittest.expectedFailure\n def test_bad_urls:" \
- -i Tests/t_ldapurl.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C Doc html
-}
-
-python_test() {
- # XXX: the tests supposedly can start local slapd
- # but it requires some manual config, it seems.
-
- "${PYTHON}" Tests/t_ldapurl.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use examples && local EXAMPLES=( Demo/. )
- use doc && local HTML_DOCS=( Doc/.build/html/. )
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild
index fde6cf7db03c..ac8b29a3ccf7 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-0.5.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://python-nbxmpp.gajim.org/downloads/${TAG} -> ${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
S="${WORKDIR}"/nbxmpp-${PV}
diff --git a/dev-python/pytz/pytz-2015.6-r1.ebuild b/dev-python/pytz/pytz-2015.6-r1.ebuild
new file mode 100644
index 000000000000..5913f36bc8b9
--- /dev/null
+++ b/dev-python/pytz/pytz-2015.6-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="http://pythonhosted.org/pytz/ https://pypi.python.org/pypi/pytz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=sys-libs/timezone-data-2014i"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ # Use timezone-data zoneinfo.
+ "${FILESDIR}"/${PN}-2009j-zoneinfo.patch
+ # ...and do not install a copy of it.
+ "${FILESDIR}"/${PN}-2009h-zoneinfo-noinstall.patch
+)
+
+python_test() {
+ "${PYTHON}" pytz/tests/test_tzinfo.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pyyaml/pyyaml-3.11-r1.ebuild b/dev-python/pyyaml/pyyaml-3.11-r1.ebuild
new file mode 100644
index 000000000000..364e467d29cc
--- /dev/null
+++ b/dev-python/pyyaml/pyyaml-3.11-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_P="PyYAML-${PV}"
+
+DESCRIPTION="YAML parser and emitter for Python"
+HOMEPAGE="http://pyyaml.org/wiki/PyYAML https://pypi.python.org/pypi/PyYAML"
+SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="examples libyaml"
+
+RDEPEND="libyaml? ( dev-libs/libyaml )"
+DEPEND="${RDEPEND}
+ libyaml? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*') )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_configure_all() {
+ mydistutilsargs=( $(use_with libyaml) )
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}
+ fi
+}
diff --git a/dev-python/redis-py/redis-py-2.10.3-r1.ebuild b/dev-python/redis-py/redis-py-2.10.3-r1.ebuild
new file mode 100644
index 000000000000..3a78bd4533cc
--- /dev/null
+++ b/dev-python/redis-py/redis-py-2.10.3-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="redis"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client for Redis key-value store"
+HOMEPAGE="https://github.com/andymccurdy/redis-py"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-db/redis
+ >=dev-python/pytest-2.5.0[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+ # Make sure that tests will be used from BUILD_DIR rather than cwd.
+ mv tests tests-hidden || die
+
+ # Correct local import patch syntax
+ sed -e 's:from .conftest:from conftest:' \
+ -i tests-hidden/{test_connection_pool.py,test_commands.py,test_encoding.py,test_pubsub.py} \
+ || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ distutils-r1_python_compile
+
+ if use test; then
+ cp -r tests-hidden "${BUILD_DIR}"/tests || die
+ fi
+}
+
+python_test() {
+ local sock="${T}/redis.sock"
+
+ "${EPREFIX}/usr/sbin/redis-server" - <<- EOF
+ daemonize yes
+ pidfile "${T}"/redis.pid
+ unixsocket ${sock}
+ EOF
+
+ PYTHONPATH="${S}:${S}/tests-hidden"
+ esetup.py test
+ kill "$(<"${T}/redis.pid")"
+}
diff --git a/dev-python/redis-py/redis-py-2.10.3.ebuild b/dev-python/redis-py/redis-py-2.10.3.ebuild
index 0c5d14b6207a..b94bf89e9aa0 100644
--- a/dev-python/redis-py/redis-py-2.10.3.ebuild
+++ b/dev-python/redis-py/redis-py-2.10.3.ebuild
@@ -59,7 +59,7 @@ python_test() {
"${EPREFIX}/usr/sbin/redis-server" - <<- EOF
daemonize yes
- pidfile ${T}/redis.pid
+ pidfile "${T}"/redis.pid
unixsocket ${sock}
EOF
diff --git a/dev-python/regendoc/regendoc-0.5-r1.ebuild b/dev-python/regendoc/regendoc-0.5-r1.ebuild
new file mode 100644
index 000000000000..6a59d680a8fd
--- /dev/null
+++ b/dev-python/regendoc/regendoc-0.5-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+MY_PN="RegenDoc"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Check/update simple file/shell examples in documentation"
+HOMEPAGE="https://pypi.python.org/pypi/RegenDoc http://bitbucket.org/pytest-dev/regendoc/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index adcb5a1637d5..afdda2f207f3 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,3 +1,4 @@
DIST requests-2.6.0.tar.gz 450389 SHA256 1cdbed1f0e236f35ef54e919982c7a338e4fea3786310933d3a7887a04b74d75 SHA512 703728e04f4ae5f083892e1ad0cb54777ebcc0120fca9cd3c170e33233fccbb64a635e141e6d7b9c1f1f9d62dc00aa7c66ea890ae62cd6581c881c071a707510 WHIRLPOOL 3e65c251e164937092f349c943472b7e625b0fd963beb53a2b0f7b3b94063b833929b38082ec97298c26145b867334c38b9987c29cbeed5f4d59119f12c53a20
DIST requests-2.6.1.tar.gz 450975 SHA256 490b111c824d64b84797a899a4c22618bbc45323ac24a0a0bb4b73a8758e943c SHA512 8f88a52f1c10fb909a8e1d17e55be8878c032877e6cb61ffadcb3d1ad1e293d763ea0f7627308ac9df75e17661b4ff8c92464e77d41b05b1b7856b22a3423e49 WHIRLPOOL cb5168f41119fd76a30db511961ba6e852c1eec3941d79e287b782201632f1fc7206004c38a34474014a1463e902ded88056438ccaa7d4107e27c40300dbe0a1
DIST requests-2.7.0.tar.gz 451723 SHA256 398a3db6d61899d25fd4a06c6ca12051b0ce171d705decd7ed5511517b4bb93d SHA512 a93223c3fd21c58f7c0c901b17be17c23dba4efeed8c4347da9d4e04d96a6698e08e01482205661cb7757cc7560d9ae2e62b18f2b422af0cb90fd998fe963ff2 WHIRLPOOL b805d76ad747fc8a754fb0ca0439e8f303df057c2b256ed7f57533b311322e4e28b0d8f22111a3c5ad283823c1256cd24c93fec2aeabc6946013c17ab3540dd9
+DIST requests-2.8.0.tar.gz 457879 SHA256 b2f003589b60924909c0acde472590c5ea83906986a7a25b6f7929eb20923b7b SHA512 cf41db4b1a4639e940c2b5c1e0edaf2c4dedf0a8ead8381e211fd9e350f491e252f10cfba09bb64b4a062be98ee43e133957f489649db15116a1811e06958bb3 WHIRLPOOL 5e7e889bc016f403e221af05d01aebbec4c96175c983e240128d288884768dc0c119d76c022fd3ae5d2222cfda5415c866052fa5c5f325ee22cebb33c780df16
diff --git a/dev-python/requests/requests-2.8.0-r1.ebuild b/dev-python/requests/requests-2.8.0-r1.ebuild
new file mode 100644
index 000000000000..07eb12ba8f9d
--- /dev/null
+++ b/dev-python/requests/requests-2.8.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+# bundles dev-python/urllib3 snapshot
+RDEPEND="
+ app-misc/ca-certificates
+ >=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
+ dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
+ >=dev-python/py-1.4.30[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]
+ "
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+ )
+ "
+
+# tests connect to various remote sites
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.0-system-chardet.patch
+ "${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
+)
+
+python_prepare_all() {
+ # use system chardet
+ rm -r requests/packages/chardet || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ "${PYTHON}" test_requests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/requests/requests-2.8.0.ebuild b/dev-python/requests/requests-2.8.0.ebuild
new file mode 100644
index 000000000000..e52bb4808329
--- /dev/null
+++ b/dev-python/requests/requests-2.8.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/ https://pypi.python.org/pypi/requests"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="test"
+
+# bundles dev-python/urllib3 snapshot
+RDEPEND="
+ app-misc/ca-certificates
+ >=dev-python/chardet-2.2.1[${PYTHON_USEDEP}]
+ dev-python/ndg-httpsclient[${PYTHON_USEDEP}]
+ >=dev-python/py-1.4.30[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]
+ "
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
+ )
+ "
+
+# tests connect to various remote sites
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.0-system-chardet.patch
+ "${FILESDIR}"/${PN}-2.5.0-system-cacerts.patch
+)
+
+python_prepare_all() {
+ # use system chardet
+ rm -r requests/packages/chardet || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ "${PYTHON}" test_requests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/retrying/retrying-1.3.2.ebuild b/dev-python/retrying/retrying-1.3.2.ebuild
index 29f677cb591f..232be29be872 100644
--- a/dev-python/retrying/retrying-1.3.2.ebuild
+++ b/dev-python/retrying/retrying-1.3.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
inherit distutils-r1
-DESCRIPTION="Retrying is a general-purpose retrying library."
+DESCRIPTION="General-purpose retrying library"
HOMEPAGE="https://github.com/rholder/retrying"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
diff --git a/dev-python/retrying/retrying-1.3.3-r1.ebuild b/dev-python/retrying/retrying-1.3.3-r1.ebuild
new file mode 100644
index 000000000000..777574062811
--- /dev/null
+++ b/dev-python/retrying/retrying-1.3.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="General-purpose retrying library"
+HOMEPAGE="https://github.com/rholder/retrying"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+RDEPEND="
+ >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
index 2a8b56d8c8ed..ab990eee69a0 100644
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ b/dev-python/retrying/retrying-1.3.3.ebuild
@@ -8,13 +8,13 @@ PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
inherit distutils-r1
-DESCRIPTION="Retrying is a general-purpose retrying library."
+DESCRIPTION="General-purpose retrying library"
HOMEPAGE="https://github.com/rholder/retrying"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND="
diff --git a/dev-python/rootpy/Manifest b/dev-python/rootpy/Manifest
index de21adb36231..099aa4632957 100644
--- a/dev-python/rootpy/Manifest
+++ b/dev-python/rootpy/Manifest
@@ -1 +1,2 @@
DIST rootpy-0.7.1.tar.gz 305412 SHA256 d36399125ed8540b9a651e7b5c7ddeba686ef3107830d3d6d840cdae4834751c SHA512 460e5d79da08c141c762a5a92cf50694fe1fee8677a2439b5525b67e7d6a1a6af18a4e6dc91d379b394a97dc973da8f6baa534d46e506e0a7a4d0ee632de1a2a WHIRLPOOL d9663274a36c490bb4c872be83527d3dd414d9cca989cf20a2aca1ac5441532c9b29571d0ff885458fd2e820dc7905a679e1c9873305848ccd1fafa7820a84be
+DIST rootpy-0.8.0.tar.gz 415826 SHA256 ec0fc969101b6208e722bb9ae11dfe4a02ea53f8f91f591a5c2ea46f26581948 SHA512 0b9dc9c5bee263a2eb33b464bd96f4f9d0820a03722ca2fe3ccfaf11786caf7ccd6d25ffe4ffd42c4a5481bd3b33576cfbf68c01f2af7a981f6a2c1bedc514e2 WHIRLPOOL 7036db8d78c543259801557ebfd940cec7a3083c21757374cf5464a420643cd95cbadc898fe644181cbaa072587a0e49bd56f74f76a8670636604a32da14ddb4
diff --git a/dev-python/rootpy/rootpy-0.8.0.ebuild b/dev-python/rootpy/rootpy-0.8.0.ebuild
new file mode 100644
index 000000000000..e221456ea09d
--- /dev/null
+++ b/dev-python/rootpy/rootpy-0.8.0.ebuild
@@ -0,0 +1,47 @@
+# 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="readline"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Pythonic layer on top of the ROOT framework's PyROOT bindings"
+HOMEPAGE="http://rootpy.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples test"
+
+RDEPEND="
+ sci-physics/root[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/pytables[${PYTHON_USEDEP}]
+ dev-python/root_numpy[${PYTHON_USEDEP}]
+ dev-python/termcolor[${PYTHON_USEDEP}]"
+
+DEPEND="
+ sci-physics/root[${PYTHON_USEDEP}]
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+# TOFIX: tests go in an infinite loop error
+RESTRICT=test
+
+python_test() {
+ cd "${BUILD_DIR}" || die
+ nosetests -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index c0522ad1bd02..640078156236 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1 +1,2 @@
DIST rospkg-1.0.35.tar.gz 88589 SHA256 9ce13cb1d0f470f24cdb7f665d53948fcd0db19be7c8946ad998cbcf3998da30 SHA512 01e59dc3eb8290af661dc54902da950649a81b3caa0b65ad7dba18c0c6d0ba1ed08bec802edbced49f65515f20f1b8db719bfb576eb38c87982386aac22a2e31 WHIRLPOOL 20ebafd588c6cf8598d155cdd6ec76a9f1b7ce1bb9f1a545159a75d4fe5c3621005ea5abb5b15080716439bdec91a943855a564014eee295999126caed5c34e3
+DIST rospkg-1.0.37.tar.gz 89332 SHA256 733e9e30d30a1f293f2d2b07060d231746ce88f7cfecb076d466d9aece5a0a8a SHA512 5e8e938831aac0c14b18d0f5063c8c8d50a2f13a4a15ce15955d854a840a8b46bab42d854b6d61d1e4e6bdef95f90e10008838d16b31e7d5b0d963b1c3c246d6 WHIRLPOOL 3d50c070197019b607e23a430affec8950539e0b32dd88f14e85027acea87435abebd8f58c4aeadd11cafee00d2faa26a3d9d88a0afb6efdc42dc0797642ef39
diff --git a/dev-python/rospkg/files/py3.patch b/dev-python/rospkg/files/py3.patch
new file mode 100644
index 000000000000..268ff895be4e
--- /dev/null
+++ b/dev-python/rospkg/files/py3.patch
@@ -0,0 +1,21 @@
+https://github.com/ros-infrastructure/rospkg/pull/90
+
+commit 7be8d9e5ec3c6bffd970e93053078b707879c7b9
+Author: Alexis Ballier <aballier@gentoo.org>
+Date: Tue Oct 13 10:08:42 2015 +0200
+
+ src/rospkg/os_detect.py: Use "string in dict" instead of "dict.has_key(string)" for python3 compatibility.
+
+diff --git a/src/rospkg/os_detect.py b/src/rospkg/os_detect.py
+index 14b57c2..554b607 100644
+--- a/src/rospkg/os_detect.py
++++ b/src/rospkg/os_detect.py
+@@ -150,7 +150,7 @@ class FdoDetect(OsDetector):
+ """
+ def __init__(self, fdo_id):
+ release_info = read_os_release()
+- if release_info is not None and release_info.has_key("ID") and release_info["ID"] == fdo_id:
++ if release_info is not None and "ID" in release_info and release_info["ID"] == fdo_id:
+ self.release_info = release_info
+ else:
+ self.release_info = None
diff --git a/dev-python/rospkg/rospkg-1.0.37-r1.ebuild b/dev-python/rospkg/rospkg-1.0.37-r1.ebuild
new file mode 100644
index 000000000000..526c071695f8
--- /dev/null
+++ b/dev-python/rospkg/rospkg-1.0.37-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="http://github.com/ros-infrastructure/rospkg"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Standalone Python library for the ROS package system"
+HOMEPAGE="http://wiki.ros.org/rospkg"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SRC_URI=""
+ KEYWORDS=""
+ # Needed for tests
+ S="${WORKDIR}/${PN}"
+ EGIT_CHECKOUT_DIR="${S}"
+else
+ SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+ http://github.com/ros-infrastructure/rospkg/archive/${PV}.tar.gz -> ${P}.tar.gz
+ "
+ KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ )
+"
+PATCHES=(
+ "${FILESDIR}/norecurse.patch"
+ "${FILESDIR}/py3.patch"
+)
+
+python_test() {
+ nosetests --with-coverage --cover-package=rospkg --with-xunit test || die
+}
+
+src_install() {
+ distutils-r1_src_install
+
+ # Avoid recursing into /usr/share when looking for packages.
+ dodir /usr/share
+ touch "${ED}/usr/share/rospack_norecurse"
+}
diff --git a/dev-python/rply/Manifest b/dev-python/rply/Manifest
index 66cd92cfe6d4..d10c4ea0c13c 100644
--- a/dev-python/rply/Manifest
+++ b/dev-python/rply/Manifest
@@ -1 +1,2 @@
DIST rply-0.7.3.tar.gz 27346 SHA256 708f94da2cf5df72b0d0fe73a44a6f2310dd74004b0e7ef6bf812f941dac582a SHA512 45f8b2b9fb84940c1149b43ffda070d7ded47a5b8d8e86cf030603cb0fae78df954e629d9e6722e8f4d5ff2a7a2d516a92cf320d438cb6b1595d110e06dfc351 WHIRLPOOL b1c55fc76f0f6c7afae5dbce336a6a7510ed38ecd3c81ab22f19d9657c9f3547c8297028c35a60931db0197fdc0fee7cb1e7c50bad6769bba413247d759508da
+DIST rply-0.7.4.tar.gz 27392 SHA256 5fe9fc7c24dc3cfcaf443ef84fddcf420132746e64eced79b6735e7927e80329 SHA512 e3c3a828eb4b3cb20751ecb2d91efaabddbe3702d52b9adefe1748c07c843da1899e3944bcf0ab79f627ae428b8879cf99739ea7e0c6fd1acffc4ac4dee1b652 WHIRLPOOL 5d1cf3abf224a03a6210254577f388367b41c645fe4464e27e6c3537f933c79d6d004c33765c76a307973b5afde8954266da6d9bb6e850e841b9a987cc7f2e6c
diff --git a/dev-python/rply/rply-0.7.4.ebuild b/dev-python/rply/rply-0.7.4.ebuild
new file mode 100644
index 000000000000..0d09e28f604d
--- /dev/null
+++ b/dev-python/rply/rply-0.7.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python parser generator that also works with RPython"
+HOMEPAGE="https://github.com/alex/rply"
+SRC_URI="https://github.com/alex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/appdirs[${PYTHON_USEDEP}]
+ test? (
+ dev-python/py[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_prepare() {
+ # https://github.com/alex/rply/issues/26; fail under py[3-4]
+ if python_is_python3; then
+ sed -e s':test_simple:_&:' -e s':test_empty_production:_&:' \
+ -i tests/test_parsergenerator.py
+ fi
+ distutils-r1_python_prepare
+}
+
+python_test() {
+ py.test || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/service_identity/service_identity-14.0.0.ebuild b/dev-python/service_identity/service_identity-14.0.0.ebuild
index 8857b7b8a506..316b2a52f743 100644
--- a/dev-python/service_identity/service_identity-14.0.0.ebuild
+++ b/dev-python/service_identity/service_identity-14.0.0.ebuild
@@ -3,6 +3,7 @@
# $Id$
EAPI=5
+
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
inherit distutils-r1
@@ -16,13 +17,14 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh x86"
IUSE="doc test"
-RDEPEND="dev-python/pyasn1[${PYTHON_USEDEP}]
- dev-python/pyasn1-modules[${PYTHON_USEDEP}]
- >=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]
- >=dev-python/characteristic-14.0.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-cov[${PYTHON_USEDEP}] )"
+RDEPEND="
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+ >=dev-python/pyopenssl-0.12[${PYTHON_USEDEP}]
+ >=dev-python/characteristic-14.0.0[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
python_prepare_all() {
# Prevent un-needed download during build
@@ -35,10 +37,7 @@ python_compile_all() {
}
python_test() {
- # testsuite not supported by py3.2 which is about to become deprecated
- if ! [[ "${EPYTHON}" == python3.2 ]]; then
- py.test --cov service_identity --cov-report term-missing || die "tests failed under ${EPYTHON}"
- fi
+ py.test -v -v -x || die "tests failed under ${EPYTHON}"
}
python_install_all() {
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index d79324bdc855..128a22cf66bf 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -10,6 +10,7 @@ DIST setuptools-18.0.1.tar.gz 630585 SHA256 4d49c99fd51edf22baa997fb6105b07482fe
DIST setuptools-18.1.tar.gz 630700 SHA256 ad52a9d5b3a6f39c2a1c2deb96cc4f6aff29d6511bdea2994322c40b60c9c36a SHA512 1367f3a10c1fef2f8061e430585f1927f6bd7c416e764d65cea1f4255824d549efa77beef8ff784bbd62c307b4b1123502e7b3fd01a243c0cc5b433a841cc8b5 WHIRLPOOL bbd3c540ff4233052be9b46f6b389900513f06aa1f79ad09495aa2c7fbdfa7bdf0e0766257a13fb9be01ce5288fdc1b3573d6411f71beb614fecc8fa72dd9e94
DIST setuptools-18.2.tar.gz 630990 SHA256 0994a58df27ea5dc523782a601357a2198b7493dcc99a30d51827a23585b5b1d SHA512 964449faecce8b039343ea4364e73e035b7a99ba425939c07ee86c2db75b3b34ddbfc5d03b468ee11266eed74208b2038b3785332ff90d74087ee1d45620912e WHIRLPOOL d05c8a6f06e33efbe007a9ab1bdc9fa867f9b761510134b3580b1cedde16ae17b01ef43942d5c7e0a86e1deb605fb0f6cb08eafa43f853b0cfcb3482365bae1e
DIST setuptools-18.3.2.tar.gz 626607 SHA256 8c4ab0c4f227730519dc1e020f875b3ef97e643c8f43a98a4fa0c46fbad12450 SHA512 0af522af1dc783e4d6b84c44d3cf4205aed75815bfc050ea89c4976434f08edd662501c4063b1618c0ce7a7120bcbd5331818d3f06912aa9136736018ec4b6a1 WHIRLPOOL 0b5275bbe6b595ebc88ba33bd0a344d3b7a9a63a81677449f862b51f10e16a1be4d4c97ff8f287299f1e0573e058c3f8fb5a0fc6e5643ac7137c2aa401397492
+DIST setuptools-18.4.tar.gz 626632 SHA256 cdea5098e60b4ad83453d58723a61dc481ca8e2df251fe4ccbea9afa5a7d111f SHA512 f45f0bdec365642d1648c502a964bafeb518e8f0ed63091a50b278629cf1e17df7f66769b0ddaab1e7c5ae2574673435ccab72886a2d5eb311eaac451c485854 WHIRLPOOL e0c5d69f57ce234b0e002a50c882df0bf1e908224c045baa8b5a62e91148d654f048cfbb64375b59f61f0845a5e850ec03594606933fdfaa9cce9b357bb45aa7
DIST setuptools-2.2.tar.gz 786831 SHA256 6fb1f21dea64e323e7ad2531a6795eeb6f5e17a85189dee61a86baca60b18984 SHA512 b5472e20f13c62ddc06513a964d8d85230a6cb8f4b0a6bc05c57d42aa3e682a850418246b5c1d769dba0cea18d7b262817f743b49a73383157a6b76d5637c296 WHIRLPOOL 6377efcf56082fdbea79cba7ae7c7d125d2368ea2309c9d655e4a568d40c8a6c9673dc1db63a2cb1f143436da411e664281ba239a058b5dff91b99cd2b5b332d
DIST setuptools-7.0.tar.gz 793737 SHA256 dd9c1a2a0fdf37a7b142626700e0a0b7a3a0657b735c50d367fca932803be061 SHA512 0c52bf2d22f7bbd7560e8bb3184406426cf759980add0e60a864f15d9bcf10f01a2bfe0eb598c8c965b2e89df8c4159c2b43028b560f04192bba47e67d9cda18 WHIRLPOOL 70c0076960af3c00d49f79d5a0c3e3ec47a0b5009a20377cb7eca1e0747d6249d433ae14a0b86e5ac1f3bcc1efd99b68e48bd741458389c27ea05406af64e55f
DIST setuptools-8.0.1.tar.gz 801353 SHA256 ab8eb279ca9062efc7e70f74a35f3dd9315835139ecaf3ae5bfdf4a7dc768e30 SHA512 c86a2c6ae5ed8205b9b37911002a8f551f2607ecab8b74b9eae6a7b92713c0d0a3d6aa54c4428df48765c1a2c9e21f53128bb1f138f7753e1f45188b0e357ff2 WHIRLPOOL 0ee70ee0a00118cb41005f77614bade6d5198a9164718bd7bb595b5cea0456ff829ac48cc8113c91d2f7830c4b4e9f4bd73245393621ae87e581b1e9b497f95d
diff --git a/dev-python/setuptools/setuptools-18.3.2-r1.ebuild b/dev-python/setuptools/setuptools-18.3.2-r1.ebuild
new file mode 100644
index 000000000000..a2d5b1b6f25e
--- /dev/null
+++ b/dev-python/setuptools/setuptools-18.3.2-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://pypi.python.org/pypi/setuptools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+PDEPEND=">=dev-python/certifi-2015.04.28[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+ rm -r ./pkg_resources/_vendor || die
+ # disable tests requiring a network connection
+ rm setuptools/tests/test_packageindex.py || die
+
+ # don't run integration tests
+ rm setuptools/tests/test_integration.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+ # It tries to sandbox the test in a tempdir
+ HOME="${PWD}" py.test ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+ export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+ distutils-r1_python_install
+}
diff --git a/dev-python/setuptools/setuptools-18.4.ebuild b/dev-python/setuptools/setuptools-18.4.ebuild
new file mode 100644
index 000000000000..a2d5b1b6f25e
--- /dev/null
+++ b/dev-python/setuptools/setuptools-18.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://pypi.python.org/pypi/setuptools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+PDEPEND=">=dev-python/certifi-2015.04.28[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+ rm -r ./pkg_resources/_vendor || die
+ # disable tests requiring a network connection
+ rm setuptools/tests/test_packageindex.py || die
+
+ # don't run integration tests
+ rm setuptools/tests/test_integration.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+ # It tries to sandbox the test in a tempdir
+ HOME="${PWD}" py.test ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+ export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+ distutils-r1_python_install
+}
diff --git a/dev-python/setuptools_scm/setuptools_scm-1.8.0-r1.ebuild b/dev-python/setuptools_scm/setuptools_scm-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..aa939b2a6604
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-1.8.0-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="package to manage versions by scm tags via setuptools"
+HOMEPAGE="https://github.com/pypa/setuptools_scm https://pypi.python.org/pypi/setuptools_scm"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+ py.test -v -v -x || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/simpleeval/Manifest b/dev-python/simpleeval/Manifest
index 59a820c68612..7e817ad35ac6 100644
--- a/dev-python/simpleeval/Manifest
+++ b/dev-python/simpleeval/Manifest
@@ -1,2 +1 @@
-DIST simpleeval-0.8.2.tar.gz 8282 SHA256 828e79056ae2083ff6091dd8d33855974300241c3dd7d4a173faf901a17c7b09 SHA512 288d597c646ee0c70e3a6e04fd8db112b7b7a00ad53101114cc1724110c2f71d7b5f382f9052ebdb8dbc6b48c1391c870966b72df368701548d513d3053c1759 WHIRLPOOL 88edf67da8cda1bc1ab0c66a908fc12b2e5a4b14db9f6f0e8dc771c53a4c731c38d2dbad3a8d2c2f2d8efc3b3f86ed7be1eceffa5c3d5b8cd5a096ee99c87d5c
-DIST simpleeval-0.8.5.tar.gz 13858 SHA256 76fb692abfc45c57a25540b976ddb4b3029162015e4f13735ac783bc4437a99b SHA512 da913e7dba3af05488e3bfa105c42ecc8d7ee74d3e520e32c362051b8c123b9357876cd23e400e34171042538297f32b1903f40f2b854759c856abd89548093f WHIRLPOOL c28f5e12e2032f4b0c65acefbaf2100d25124c8425c0018d0a1f9160ac082fd6c1f171f2a11b530c7c8aaaa512f21d61f222ce292d792384fd0930b4c9af769b
+DIST simpleeval-0.8.6.tar.gz 11378 SHA256 914194aec141d560e149f55749796e4556e3360919def7a09be90a27c06ee0d4 SHA512 99d2fce78cc15696eca7d3305092b2fec224b4b1cb48e06a4245bcb4fddff50224578d25bcaf0a99a4e322152eb74c78e82fb9d4dc2b2cf759d228b07153c887 WHIRLPOOL 4ac49dcaa87de3e2497a6d816a76a55be5b428ab6e4f5180be8d3312888bd2087dd200dec4671ff15e865a44fa71fc2383ce4d74d0927095d2f2a24512782ddb
diff --git a/dev-python/simpleeval/simpleeval-0.8.2.ebuild b/dev-python/simpleeval/simpleeval-0.8.2.ebuild
deleted file mode 100644
index 24e4ee1c70b8..000000000000
--- a/dev-python/simpleeval/simpleeval-0.8.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="A simple, safe single expression evaluator library"
-HOMEPAGE="https://github.com/danthedeckie/simpleeval"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS="README.rst"
diff --git a/dev-python/simpleeval/simpleeval-0.8.5.ebuild b/dev-python/simpleeval/simpleeval-0.8.6.ebuild
index daeac387cd27..daeac387cd27 100644
--- a/dev-python/simpleeval/simpleeval-0.8.5.ebuild
+++ b/dev-python/simpleeval/simpleeval-0.8.6.ebuild
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index db42ca028902..e8a200a4e3d0 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,3 +1,4 @@
+DIST six-1.10.0.tar.gz 29630 SHA256 105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a SHA512 9a53b7bc8f7e8b358c930eaecf91cc5639176a699830153f586780c3e6d637f1bd31349a69c383574f99da19cb3a36524e7733a318f3572b27aefb69c6409c2e WHIRLPOOL aad2fc7438b0df029bf477a783161dc169795c355be1281f1fe7aa4eb959eae5abf3bc96d097a221e0e5ad0b0494c29025bbe99bc28ff0c29ae1776e8691a70a
DIST six-1.3.0.tar.gz 17701 SHA256 d59793f9b255bd00de800b97f9a50cce4fc8a44c205f7defa5bb7d691d13b852 SHA512 e8974d4bf62325f98e301e68c237489ca39cfa9ed1066f1cdfa34e18d20d0baf788cb515e44f00f1c823f9f923d2b30f63443dbc5df8c934b1a69b8c68210130 WHIRLPOOL bd259a4e2cd0ae2629a8998a01641874266928d6fe3e65669198a9706cd4f90579902196680932b5c9207db1005376ae8b4cbc7b63f30afabe8993e719df9a5e
DIST six-1.6.1.tar.gz 24792 SHA256 d4392a7c8d91b005c002568a85faf617c67241c8cd8399cc395e8f1005aff80d SHA512 bd925295964696dc8632eb0b9d6632f25d4b461fefceb470d2bb537e98b0db9dddf9c2abb363657451b950572e91f1ab5973d12739781823f9b845abe5061057 WHIRLPOOL 54ee9309a0433231530962e64f19246cda75b36c191f6b567ccef4bb4c4cd631785d0641bc958b1cf360bc3eedcbc5bb268bc9ddf645b68c5c54bc80e184b3bc
DIST six-1.8.0.tar.gz 26925 SHA256 047bbbba41bac37c444c75ddfdf0573dd6e2f1fbd824e6247bb26fa7d8fa3830 SHA512 e705c0213396d1220f02f2c6f724ddb9d95eefc38459b6d9bc547be859303bd404969965416f7d1614d2eab416d647d0b53502414cdc46bcb597675cf509b9ff WHIRLPOOL 1a84ecd8635e93f104447b78a6beb577639a5eebef79af40fd8c8e9796ae35c1f49dea64546f46ec31e5589c86c4b36c9fc2e28226e0c9540aabd49ebcf7bf07
diff --git a/dev-python/six/six-1.10.0-r1.ebuild b/dev-python/six/six-1.10.0-r1.ebuild
new file mode 100644
index 000000000000..f5c53b6ef577
--- /dev/null
+++ b/dev-python/six/six-1.10.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 2 and 3 compatibility library"
+HOMEPAGE="https://bitbucket.org/gutworth/six https://pypi.python.org/pypi/six"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx )
+ test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}"/1.9.0-mapping.patch
+ )
+
+python_compile_all() {
+ use doc && emake -C documentation html
+}
+
+python_test() {
+ py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( documentation/_build/html/ )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/six/six-1.10.0.ebuild b/dev-python/six/six-1.10.0.ebuild
new file mode 100644
index 000000000000..079a08116b39
--- /dev/null
+++ b/dev-python/six/six-1.10.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 2 and 3 compatibility library"
+HOMEPAGE="https://bitbucket.org/gutworth/six https://pypi.python.org/pypi/six"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx )
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}"/1.9.0-mapping.patch
+ )
+
+python_compile_all() {
+ use doc && emake -C documentation html
+}
+
+python_test() {
+ py.test -v || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( documentation/_build/html/ )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/six/six-9999.ebuild b/dev-python/six/six-9999.ebuild
index 19dd7371ad99..1807e5e4f34e 100644
--- a/dev-python/six/six-9999.ebuild
+++ b/dev-python/six/six-9999.ebuild
@@ -21,7 +21,7 @@ IUSE="doc test"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx )
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+ test? ( >=dev-python/pytest-2.2.0[${PYTHON_USEDEP}] )"
python_compile_all() {
use doc && emake -C documentation html
diff --git a/dev-python/snowballstemmer/snowballstemmer-1.2.0-r1.ebuild b/dev-python/snowballstemmer/snowballstemmer-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..268fdd39df96
--- /dev/null
+++ b/dev-python/snowballstemmer/snowballstemmer-1.2.0-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
+HOMEPAGE="https://github.com/shibukawa/snowball_py https://pypi.python.org/pypi/snowballstemmer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-python/soya/metadata.xml b/dev-python/soya/metadata.xml
index de483c53568f..301d2207cc29 100644
--- a/dev-python/soya/metadata.xml
+++ b/dev-python/soya/metadata.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>python</herd>
+ <herd>python</herd>
</pkgmetadata>
diff --git a/dev-python/soya/soya-0.14-r1.ebuild b/dev-python/soya/soya-0.14-r1.ebuild
index 8191ec0f4265..d8f3224526b1 100644
--- a/dev-python/soya/soya-0.14-r1.ebuild
+++ b/dev-python/soya/soya-0.14-r1.ebuild
@@ -3,6 +3,7 @@
# $Id$
EAPI="5"
+
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 flag-o-matic
@@ -13,7 +14,8 @@ TUT_P="SoyaTutorial-${MY_PV}"
DESCRIPTION="A high-level 3D engine for Python, designed with games in mind"
HOMEPAGE="http://oomadness.nekeme.net/Soya/FrontPage"
-SRC_URI="http://download.gna.org/soya/${MY_P}.tar.bz2
+SRC_URI="
+ http://download.gna.org/soya/${MY_P}.tar.bz2
doc? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )
examples? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )"
@@ -22,18 +24,21 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="doc examples"
-DEPEND="=dev-games/ode-0.11.1
+DEPEND="
+ =dev-games/ode-0.11.1
dev-python/editobj
- virtual/python-imaging[${PYTHON_USEDEP}]
>=dev-python/pyopenal-0.1.6[${PYTHON_USEDEP}]
media-fonts/freefonts
+ media-libs/freetype:2
>=media-libs/cal3d-0.10
media-libs/freeglut
>=media-libs/freetype-2.5
>=media-libs/glew-1.3.3
>=media-libs/libsdl-1.2.8[opengl]
media-libs/openal
- virtual/opengl"
+ virtual/opengl
+ virtual/python-imaging[${PYTHON_USEDEP}]
+"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
@@ -51,15 +56,8 @@ python_compile() {
}
python_install_all() {
- distutils-r1_python_install_all
+ use doc && DOCS=( "${WORKDIR}/${TUT_P}/doc"/{soya_guide,pudding/pudding}.pdf )
+ use examples && EXAMPLES=( "${WORKDIR}/${TUT_P}"/tutorial )
- insinto /usr/share/${PF}
- if use doc; then
- cd "${WORKDIR}/${TUT_P}/doc"
- doins soya_guide.pdf pudding/pudding.pdf || die "doins failed"
- fi
- if use examples; then
- cd "${WORKDIR}/${TUT_P}"
- doins -r tutorial || die "doins failed"
- fi
+ distutils-r1_python_install_all
}
diff --git a/dev-python/sparql-wrapper/Manifest b/dev-python/sparql-wrapper/Manifest
index c7ed13b50b24..1c954b8a2093 100644
--- a/dev-python/sparql-wrapper/Manifest
+++ b/dev-python/sparql-wrapper/Manifest
@@ -1,5 +1,2 @@
-DIST SPARQLWrapper-1.5.2.tar.gz 24953 SHA256 65254c7c3cae093fbd5e6b65e2c725db3ad80ab7402c4aa59d18a9cb8f5695b4 SHA512 adb70599d5c67c4cbd5277de30325a993057ff50c72eba89cea6b5ba8daea9bd7717fef4cd62e250b77c818498580d7f26e359fc4a9e344b2ba82c71912fcee3 WHIRLPOOL a8231a0745e798240620f46af625ff325a770f97f100fbfa5cda4f2e8e1dd1f8b8900fae13a8ade9ba0f71a3fc714be14d83e34848479e7a4e93c7993a1b207c
DIST SPARQLWrapper-1.6.0.tar.gz 20698 SHA256 dadcbf190dd090d90325ca4126e96f262d620c45c4693ee9f168cf39af2fa373 SHA512 e70a003807329602360e0c1ffc4091668e5a7bbce84305ecee5a381759500282abc57f39879a8372a35f7edd36bf7d4f2dc8efad717bb620e430d207c52a4754 WHIRLPOOL f76f9ebc20daac75f0cdbddccd7bb48695289829ab08d9e013ab2e9c0220a7bd770afd5dc1431d520369dd8a1c6cd96034c4452537fb50b58d41b36fa0eb7b20
-DIST SPARQLWrapper-1.6.1.tar.gz 25894 SHA256 809ecc29ca6d3dcfdfd75163173d00b45405ddf5e848edc648b8aec553c765d0 SHA512 2500133ea235c1c91ef0f9479f570ec9376704e2ba39ec9d044bb24dfa56dd8613d4677d473d0694edd7095874c17f2277ccb2ef3c07ffff9c50b5b814f26812 WHIRLPOOL a460d9d82c0b0854a9eadefd242b7cac4daaa870e42ae6b9d5eed94cfc0fe76c914bd68517bec6449c1b614e40a684231b70982f95f2f39e8f8c01f5d56cc579
-DIST SPARQLWrapper-1.6.2.tar.gz 25939 SHA256 1af3dcccf5cfbc0c078f95109138a8be221d29e158a2ae81b239d857f7c3224d SHA512 a75cb881b34fd8963c35b9fb7bb3fb1662257c9a36a03d22227968fc8f23c7813b73d29d3bdc26f362023a871960ce6326d70f8fdfb911ceec88212ed3737831 WHIRLPOOL fe2a29206f0f8730e3046ee67649370f866043dfcaf42416753ec6f3e1795fa4372ef48db9a95b87e116e6f007d3c4d8d7b357622dc40d52448cb5dc8d73848f
DIST SPARQLWrapper-1.6.4.tar.gz 27467 SHA256 2899dae6baa88d5c3209408e70a1a9de04f0f4dd25f4e9480eb6707a398d1693 SHA512 49e4eea8cf6e0625ee3a259b4314b630eddb30475a786525f94f827353898c6d90b88e6b7b2bb65270cf8baec781b9bafa98df3cdbbb65a722d6f0af07906ce5 WHIRLPOOL 6e8f64a76d24fd864ab830bc86cbf4e97191ca19b3495f5446bd56f76e8cb4d4a8315d7ac38693776f8c063e58c873db3249cbe44aa7822daebc6c85a0893477
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.5.2.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.5.2.ebuild
deleted file mode 100644
index 4f786733f8ad..000000000000
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.5.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-MY_PN=SPARQLWrapper
-DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.python.org/pypi/${MY_PN}"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/rdflib[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.6.0.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.6.0.ebuild
index 4f786733f8ad..8c202a0fd1df 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.6.0.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.6.0.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_PN=SPARQLWrapper
DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.python.org/pypi/${MY_PN}"
+HOMEPAGE="https://pypi.python.org/pypi/SPARQLWrapper"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="W3C"
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.6.1.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.6.1.ebuild
deleted file mode 100644
index b0d607894a3c..000000000000
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.6.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-MY_PN=SPARQLWrapper
-DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.python.org/pypi/${MY_PN}"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/rdflib[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.6.2.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.6.2.ebuild
deleted file mode 100644
index 709d5b582c96..000000000000
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.6.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-MY_PN=SPARQLWrapper
-DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.python.org/pypi/${MY_PN}"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="W3C"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/rdflib[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild b/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild
index 9500f9ecf13e..5a0debbc9ce9 100644
--- a/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild
+++ b/dev-python/sparql-wrapper/sparql-wrapper-1.6.4.ebuild
@@ -10,7 +10,7 @@ inherit distutils-r1
MY_PN=SPARQLWrapper
DESCRIPTION="Wrapper around a SPARQL service"
-HOMEPAGE="https://pypi.python.org/pypi/${MY_PN}"
+HOMEPAGE="https://pypi.python.org/pypi/SPARQLWrapper"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
LICENSE="W3C"
diff --git a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..171dd36ca1f2
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Sphinx"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc latex test"
+
+# Portage has only >= minimum required versions of all rdeps making
+# setting of version borders unnecessary
+RDEPEND="
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ latex? (
+ dev-texlive/texlive-latexextra
+ app-text/dvipng
+ )"
+DEPEND="${DEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+ distutils-r1_python_compile
+
+ # Generate the grammar. It will be caught by install somehow.
+ # Note that the tests usually do it for us. However, I don't want
+ # to trust USE=test really running all the tests, especially
+ # with FEATURES=test-fail-continue.
+ pushd "${BUILD_DIR}"/lib > /dev/null || die
+ "${PYTHON}" -m sphinx.pycode.__init__ \
+ || die "Grammar generation failed."
+ popd > /dev/null || die
+}
+
+python_compile_all() {
+ use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html
+}
+
+python_test() {
+ cp -r -l tests "${BUILD_DIR}"/ || die
+
+ if $(python_is_python3); then
+ 2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
+ fi
+
+ nosetests -w "${BUILD_DIR}"/tests -v \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+
+ distutils-r1_python_install_all
+}
+
+replacing_python_eclass() {
+ local pv
+ for pv in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 1.1.3-r4 ${pv}; then
+ return 0
+ fi
+ done
+
+ return 1
+}
+
+pkg_preinst() {
+ if replacing_python_eclass; then
+ # the old python.eclass ebuild will want to remove our pickles...
+ backup_pickle() {
+ # array to enable filename expansion
+ local pickle_name=(
+ "${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
+ )
+
+ local dest=${ROOT}${pickle_name[0]#${D}}.backup
+
+ eumask_push 022
+ mkdir -p "${dest%/*}" || die
+ eumask_pop
+
+ cp -p -v "${pickle_name[0]}" "${dest}" \
+ || die "Unable to backup grammar pickle from overwriting"
+ }
+
+ python_foreach_impl backup_pickle
+ fi
+}
+
+pkg_postinst() {
+ if replacing_python_eclass; then
+ local warned
+
+ restore_pickle() {
+ local backup_name=(
+ "${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
+ )
+ local dest=${backup_name[0]%.backup}
+
+ mv -v "${backup_name[0]}" "${dest}" \
+ || die "Unable to restore grammar pickle backup"
+ }
+
+ python_foreach_impl restore_pickle
+
+ [[ ${warned} ]] && ewarn "Please try rebuilding the package."
+ fi
+}
diff --git a/dev-python/sphinx/sphinx-1.3.1-r1.ebuild b/dev-python/sphinx/sphinx-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..1d8298687dca
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.3.1-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy)
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Sphinx"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://sphinx.pocoo.org/ https://pypi.python.org/pypi/Sphinx"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc latex test"
+
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+ >=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
+ >=dev-python/six-1.4[${PYTHON_USEDEP}]
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ =dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
+ >=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+ latex? (
+ dev-texlive/texlive-latexextra
+ app-text/dvipng
+ )"
+DEPEND="${DEPEND}
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+ )"
+PDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+python_compile() {
+ distutils-r1_python_compile
+
+ # Generate the grammar. It will be caught by install somehow.
+ # Note that the tests usually do it for us. However, I don't want
+ # to trust USE=test really running all the tests, especially
+ # with FEATURES=test-fail-continue.
+ pushd "${BUILD_DIR}"/lib > /dev/null || die
+ "${PYTHON}" -m sphinx.pycode.__init__ \
+ || die "Grammar generation failed."
+ popd > /dev/null || die
+}
+
+python_compile_all() {
+ use doc && emake -C doc SPHINXBUILD='"${PYTHON}" "${S}/sphinx-build.py"' html
+}
+
+python_test() {
+ mkdir -p "${BUILD_DIR}/sphinx_tempdir"
+ export SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+ cp -r -l tests "${BUILD_DIR}"/ || die
+
+ if $(python_is_python3); then
+ 2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
+ fi
+
+ nosetests -w "${BUILD_DIR}"/tests -v \
+ || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+
+ distutils-r1_python_install_all
+}
+
+replacing_python_eclass() {
+ local pv
+ for pv in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 1.1.3-r4 ${pv}; then
+ return 0
+ fi
+ done
+
+ return 1
+}
+
+pkg_preinst() {
+ if replacing_python_eclass; then
+ # the old python.eclass ebuild will want to remove our pickles...
+ backup_pickle() {
+ # array to enable filename expansion
+ local pickle_name=(
+ "${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
+ )
+
+ local dest=${ROOT}${pickle_name[0]#${D}}.backup
+
+ eumask_push 022
+ mkdir -p "${dest%/*}" || die
+ eumask_pop
+
+ cp -p -v "${pickle_name[0]}" "${dest}" \
+ || die "Unable to backup grammar pickle from overwriting"
+ }
+
+ python_foreach_impl backup_pickle
+ fi
+}
+
+pkg_postinst() {
+ if replacing_python_eclass; then
+ local warned
+
+ restore_pickle() {
+ local backup_name=(
+ "${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
+ )
+ local dest=${backup_name[0]%.backup}
+
+ mv -v "${backup_name[0]}" "${dest}" \
+ || die "Unable to restore grammar pickle backup"
+ }
+
+ python_foreach_impl restore_pickle
+
+ [[ ${warned} ]] && ewarn "Please try rebuilding the package."
+ fi
+}
diff --git a/dev-python/sphinx/sphinx-1.3.1.ebuild b/dev-python/sphinx/sphinx-1.3.1.ebuild
index 3c4d93923c45..48c79764279e 100644
--- a/dev-python/sphinx/sphinx-1.3.1.ebuild
+++ b/dev-python/sphinx/sphinx-1.3.1.ebuild
@@ -20,22 +20,25 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc64 ~x86"
IUSE="doc latex test"
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
>=dev-python/six-1.4[${PYTHON_USEDEP}]
>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
=dev-python/alabaster-0.7*[${PYTHON_USEDEP}]
- =dev-python/sphinx_rtd_theme-0.1*[${PYTHON_USEDEP}]
>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
latex? (
dev-texlive/texlive-latexextra
app-text/dvipng
)"
DEPEND="${DEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}]
- $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy) )"
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+ )"
+PDEPEND="dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9-r1.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9-r1.ebuild
new file mode 100644
index 000000000000..8bacdf21c947
--- /dev/null
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="ReadTheDocs.org theme for Sphinx"
+HOMEPAGE="https://github.com/snide/sphinx_rtd_theme/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]"
+
+# dev-python/sphinx previously set in PDEPEND which broke some doc builds.
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
index c0c496b20577..1b3504ea2b5f 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.1.9.ebuild
@@ -3,6 +3,7 @@
# $Id$
EAPI=5
+
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
inherit distutils-r1
diff --git a/dev-python/subunit/subunit-1.1.0-r1.ebuild b/dev-python/subunit/subunit-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..96db9ac6c7d0
--- /dev/null
+++ b/dev-python/subunit/subunit-1.1.0-r1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 eutils multilib-minimal
+
+DESCRIPTION="A streaming protocol for test results"
+HOMEPAGE="https://launchpad.net/subunit https://pypi.python.org/pypi/python-subunit"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="static-libs test"
+
+RDEPEND="
+ >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+ dev-python/extras[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-lang/perl:=
+ >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}]
+ >=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}]
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ test? ( dev-python/testscenarios[${PYTHON_USEDEP}] )"
+
+# Take out rogue & trivial failing tests that exit the suite before it even gets started
+# The removed class in fact works fine in py3 and fails with py2.7 & pupu
+# The setu to restrict this patch is just those 2 is not worth it.
+PATCHES=( "${FILESDIR}"/1.0.0-tests.patch )
+
+src_prepare() {
+ sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
+
+ # Install perl modules in vendor_perl, bug 534654.
+ export INSTALLDIRS=vendor
+
+ # needed for perl modules
+ distutils-r1_src_prepare
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ --enable-shared \
+ $(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+ default
+ multilib_is_native_abi && distutils-r1_src_compile
+}
+
+python_test() {
+ local -x PATH="${PWD}/shell/share:${PATH}"
+ local -x PYTHONPATH=python
+ # Following tests are known to fail in py2.7 & pypy. They pass under py3.
+ # DO NOT re-file
+ # test_add_error test_add_error_details test_add_expected_failure
+ # test_add_expected_failure_details test_add_failure test_add_failure
+ # https://bugs.launchpad.net/subunit/+bug/1436686
+
+ "${PYTHON}" -m testtools.run all_tests.test_suite || die "Testing failed with ${EPYTHON}"
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && distutils-r1_src_test
+}
+
+multilib_src_install() {
+ local targets=(
+ install-include_subunitHEADERS
+ install-pcdataDATA
+ install-exec-local
+ install-libLTLIBRARIES
+ )
+ emake DESTDIR="${D}" "${targets[@]}"
+
+ multilib_is_native_abi && distutils-r1_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/dev-python/subunit/subunit-1.1.0.ebuild b/dev-python/subunit/subunit-1.1.0.ebuild
index 2f42e1b7852c..22bac6e196d1 100644
--- a/dev-python/subunit/subunit-1.1.0.ebuild
+++ b/dev-python/subunit/subunit-1.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
LICENSE="Apache-2.0 BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="static-libs test"
RDEPEND="
diff --git a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
index a5d520941b04..8cdff6bef49b 100644
--- a/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.18-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/testrepository/testrepository-0.0.18-r2.ebuild b/dev-python/testrepository/testrepository-0.0.18-r2.ebuild
new file mode 100644
index 000000000000..6cac0137838f
--- /dev/null
+++ b/dev-python/testrepository/testrepository-0.0.18-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A repository of test results"
+HOMEPAGE="https://launchpad.net/testscenarios"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+ >=dev-python/subunit-0.0.10[${PYTHON_USEDEP}]
+ >=dev-python/testtools-0.9.30[${PYTHON_USEDEP}]
+ dev-python/fixtures[${PYTHON_USEDEP}]"
+#bzr is listed but presumably req'd for a live repo test run
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( ${RDEPEND}
+ dev-python/testresources[${PYTHON_USEDEP}]
+ dev-python/testscenarios[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ )"
+
+# Required for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_test() {
+ # some errors appear to have crept in the suite undert py3 since addition.
+ # Python2.7 now passes all.
+
+ esetup.py testr --coverage
+}
diff --git a/dev-python/testresources/testresources-0.2.7-r2.ebuild b/dev-python/testresources/testresources-0.2.7-r2.ebuild
index cb77788f9f89..8190811f037c 100644
--- a/dev-python/testresources/testresources-0.2.7-r2.ebuild
+++ b/dev-python/testresources/testresources-0.2.7-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="test"
DEPEND="
diff --git a/dev-python/testresources/testresources-0.2.7-r3.ebuild b/dev-python/testresources/testresources-0.2.7-r3.ebuild
new file mode 100644
index 000000000000..c5333a451354
--- /dev/null
+++ b/dev-python/testresources/testresources-0.2.7-r3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pyunit extension for managing expensive test resources"
+HOMEPAGE="https://launchpad.net/testresources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/testtools[${PYTHON_USEDEP}]
+ dev-python/fixtures[${PYTHON_USEDEP}]
+ )"
+RDEPEND=""
+
+python_test() {
+ nosetests || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..f7be22fe65b8
--- /dev/null
+++ b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A pyunit extension for dependency injection"
+HOMEPAGE="https://launchpad.net/testscenarios"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+ # Remove a faulty file from tests, missing a required attribute
+ rm ${PN}/tests/test_testcase.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ "${PYTHON}" -m unittest discover
+}
diff --git a/dev-python/testscenarios/testscenarios-0.5.0.ebuild b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
index 82002ed23187..38fef5d3fae3 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
RDEPEND="dev-python/testtools[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
diff --git a/dev-python/testtools/metadata.xml b/dev-python/testtools/metadata.xml
index a8d7eada5bca..248ba18d1bfd 100644
--- a/dev-python/testtools/metadata.xml
+++ b/dev-python/testtools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>bazaar</herd>
diff --git a/dev-python/testtools/testtools-1.7.1.ebuild b/dev-python/testtools/testtools-1.7.1.ebuild
index 44d5c42f1941..d4d3773005a1 100644
--- a/dev-python/testtools/testtools-1.7.1.ebuild
+++ b/dev-python/testtools/testtools-1.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc"
IUSE="doc"
CDEPEND="
diff --git a/dev-python/testtools/testtools-1.8.0-r1.ebuild b/dev-python/testtools/testtools-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..6243aebf7d9d
--- /dev/null
+++ b/dev-python/testtools/testtools-1.8.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Extensions to the Python standard library unit testing framework"
+HOMEPAGE="https://github.com/testing-cabal/testtools"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+ dev-python/extras[${PYTHON_USEDEP}]
+ dev-python/mimeparse[${PYTHON_USEDEP}]
+ >=dev-python/pbr-0.11[${PYTHON_USEDEP}]
+ >=dev-python/unittest2-1.0.0[${PYTHON_USEDEP}]
+ dev-python/traceback2[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ "${PYTHON}" -m testtools.run testtools.tests.test_suite || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && HTML_DOCS=( doc/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/testtools/testtools-1.8.0.ebuild b/dev-python/testtools/testtools-1.8.0.ebuild
index 50bca347b3e8..d2f5d2046439 100644
--- a/dev-python/testtools/testtools-1.8.0.ebuild
+++ b/dev-python/testtools/testtools-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc"
IUSE="doc test"
CDEPEND="
diff --git a/dev-python/torment/Manifest b/dev-python/torment/Manifest
index b14cbbc18d16..f29ff74a16ce 100644
--- a/dev-python/torment/Manifest
+++ b/dev-python/torment/Manifest
@@ -1,3 +1,3 @@
-DIST torment-2.0.3.tar.gz 23457 SHA256 577fb8227087100ec1e3c29fc422dfab8813f77881f74b7f68b41a7a9abde9ca SHA512 a112fdd20da24ecf2ac0d8acb50e226bdc60cd78ce2b903333cde20fa78c593e31ff5ef9922c0b9f5cd32ac5c910ee287f2534ff5669cd21b12a66a485d0f409 WHIRLPOOL 060fa7ec2200b7fddddd1fd128ca09ad0f30314707da7cf393e30c614f894169f3724c51ab4e2c2627ba51a1345a6079b804c5ce0f02f2dae54090bbd2b20cb9
DIST torment-2.0.4.tar.gz 27980 SHA256 1968ffe76f4e759c0857828eff30074fbdcff72c2ff23ef13023c1cdd7608037 SHA512 aa6689387648b0c659487c99dbdfac14e2bdb9dfdaf5d1b777ccb50755bbf5ce0c576ed4682bb9ebcd55ed8babc4c5727e01b9843206bee26561b0b930a0d4c4 WHIRLPOOL 27c50a9dc61108ddc2feaa5c88fbde8a4eb6032b2fdbdf9eb7aaa1b2ad6d7a8c5700e48bba1e5aaa5b2fd679e150881827e4622ce3f65cc601093691a7a2aca0
DIST torment-2.1.0.tar.gz 30608 SHA256 d8d21efd1a30c0bb964b43e47b41cc261d4b2417b09fd3945090bf48fd3d0248 SHA512 502a61372f61d653f98ed20e0d074d1c411cc33be08ae91fec4e7606b1d3d3b78fd4fee8b1908b4fc721e7fe6029400063e9a94830a589e572baf824e7e0a261 WHIRLPOOL 7fe54b057ea89823b1b861c61e771f02a8a66a755f5667c89728bfab8e52006524cc960fece75f77d00b1aa894e0f3853df59a79cddf70a28b27b08d31de856b
+DIST torment-3.0.0.tar.gz 33898 SHA256 ad3ead69f1c9e5ec1dc92a83bceca186f0d6a4544f983222c32c4d0a5e7f3b45 SHA512 1fac30a0e97a6505c7e9cbbfaa141e2378cf26345fd4679d6eff75a4472054771b2421b044f9ff0daa8671e1b27989508e7a9885dfb98e3a07bd3e842d4bbb77 WHIRLPOOL 353cd7a8b66f2936c5476e8e50e2f6428bdc6f4e0bdbb2ea99c93018ebe6587ad4d3c6310fd55fe21cbdefc3174425a34d10aa072cbc27ebcbe3f5f114f4c913
diff --git a/dev-python/torment/torment-2.0.3.ebuild b/dev-python/torment/torment-3.0.0.ebuild
index f890bde9a256..bafdaac857ea 100644
--- a/dev-python/torment/torment-2.0.3.ebuild
+++ b/dev-python/torment/torment-3.0.0.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-PYTHON_COMPAT=( python3_3 python3_4 )
+PYTHON_COMPAT=( python3_4 )
inherit distutils-r1
diff --git a/dev-python/traceback2/traceback2-1.4.0-r1.ebuild b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
new file mode 100644
index 000000000000..4e790e70509c
--- /dev/null
+++ b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backports of the traceback module"
+HOMEPAGE="https://github.com/testing-cabal/traceback2"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/pbr[${PYTHON_USEDEP}]
+"
+RDEPEND="dev-python/linecache2[${PYTHON_USEDEP}]"
diff --git a/dev-python/traceback2/traceback2-1.4.0.ebuild b/dev-python/traceback2/traceback2-1.4.0.ebuild
index 8fd8069b8155..db883f2d8d72 100644
--- a/dev-python/traceback2/traceback2-1.4.0.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="PSF-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND="
diff --git a/dev-python/unittest2/unittest2-1.0.1-r1.ebuild b/dev-python/unittest2/unittest2-1.0.1-r1.ebuild
index 8726fab4f573..ed801ee20095 100644
--- a/dev-python/unittest2/unittest2-1.0.1-r1.ebuild
+++ b/dev-python/unittest2/unittest2-1.0.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc"
IUSE=""
CDEPEND="
diff --git a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..502d2ed886e8
--- /dev/null
+++ b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="The new features in unittest backported to Python 2.4+"
+HOMEPAGE="https://pypi.python.org/pypi/unittest2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/linecache2[${PYTHON_USEDEP}]
+ >=dev-python/six-1.4[${PYTHON_USEDEP}]
+ dev-python/traceback2[${PYTHON_USEDEP}]
+"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}"
+
+PATCHES=( "${FILESDIR}"/remove-argparse-dependence.patch )
+
+python_test() {
+ "${PYTHON}" -m unittest2 discover || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/unittest2/unittest2-1.1.0.ebuild b/dev-python/unittest2/unittest2-1.1.0.ebuild
index 1e081426ae89..04eabeebd773 100644
--- a/dev-python/unittest2/unittest2-1.1.0.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~sparc ~x86"
IUSE=""
CDEPEND="
diff --git a/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild b/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild
new file mode 100644
index 000000000000..77713a1002f8
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-13.1.2-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+ http://www.virtualenv.org/
+ https://pypi.python.org/pypi/virtualenv
+ https://github.com/pypa/virtualenv/
+"
+SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="doc test"
+
+RDEPEND="
+ >=dev-python/pip-7.1.2[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ "
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )"
+
+DOCS=( docs/index.rst docs/changes.rst )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.2-no-versioned-script.patch
+ "${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch
+)
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ py.test -vvx || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/virtualenv/virtualenv-13.1.2.ebuild b/dev-python/virtualenv/virtualenv-13.1.2.ebuild
index d60c6d96902c..c67a30fafa66 100644
--- a/dev-python/virtualenv/virtualenv-13.1.2.ebuild
+++ b/dev-python/virtualenv/virtualenv-13.1.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.virtualenv.org/ https://pypi.python.org/pypi/virtualenv htt
SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~mips ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="doc test"
diff --git a/dev-ros/calibration_estimation/Manifest b/dev-ros/calibration_estimation/Manifest
new file mode 100644
index 000000000000..389070489594
--- /dev/null
+++ b/dev-ros/calibration_estimation/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/calibration_estimation/calibration_estimation-0.10.13.ebuild b/dev-ros/calibration_estimation/calibration_estimation-0.10.13.ebuild
new file mode 100644
index 000000000000..b6c1e6fcd36f
--- /dev/null
+++ b/dev-ros/calibration_estimation/calibration_estimation-0.10.13.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Runs an optimization to estimate the a robot's kinematic parameters"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ dev-libs/urdfdom[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
new file mode 100644
index 000000000000..b6c1e6fcd36f
--- /dev/null
+++ b/dev-ros/calibration_estimation/calibration_estimation-9999.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Runs an optimization to estimate the a robot's kinematic parameters"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+ dev-libs/urdfdom[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/calibration_estimation/metadata.xml b/dev-ros/calibration_estimation/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/calibration_estimation/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/calibration_launch/Manifest b/dev-ros/calibration_launch/Manifest
new file mode 100644
index 000000000000..389070489594
--- /dev/null
+++ b/dev-ros/calibration_launch/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/calibration_launch/calibration_launch-0.10.13.ebuild b/dev-ros/calibration_launch/calibration_launch-0.10.13.ebuild
new file mode 100644
index 000000000000..8a487961d653
--- /dev/null
+++ b/dev-ros/calibration_launch/calibration_launch-0.10.13.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files that can be helpful in configuring the calibration stack to run on your robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ dev-ros/interval_intersection
+ dev-ros/joint_states_settler
+ dev-ros/laser_cb_detector
+ dev-ros/monocam_settler
+ dev-ros/roslaunch
+ dev-libs/urdfdom
+"
diff --git a/dev-ros/calibration_launch/calibration_launch-9999.ebuild b/dev-ros/calibration_launch/calibration_launch-9999.ebuild
new file mode 100644
index 000000000000..8a487961d653
--- /dev/null
+++ b/dev-ros/calibration_launch/calibration_launch-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Launch files that can be helpful in configuring the calibration stack to run on your robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ dev-ros/interval_intersection
+ dev-ros/joint_states_settler
+ dev-ros/laser_cb_detector
+ dev-ros/monocam_settler
+ dev-ros/roslaunch
+ dev-libs/urdfdom
+"
diff --git a/dev-ros/calibration_launch/metadata.xml b/dev-ros/calibration_launch/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/calibration_launch/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/calibration_msgs/Manifest b/dev-ros/calibration_msgs/Manifest
new file mode 100644
index 000000000000..389070489594
--- /dev/null
+++ b/dev-ros/calibration_msgs/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/calibration_msgs/calibration_msgs-0.10.13.ebuild b/dev-ros/calibration_msgs/calibration_msgs-0.10.13.ebuild
new file mode 100644
index 000000000000..fe21a990a2be
--- /dev/null
+++ b/dev-ros/calibration_msgs/calibration_msgs-0.10.13.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for storing calibration samples to be used in full robot calibration procedures"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild b/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild
new file mode 100644
index 000000000000..fe21a990a2be
--- /dev/null
+++ b/dev-ros/calibration_msgs/calibration_msgs-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for storing calibration samples to be used in full robot calibration procedures"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/calibration_msgs/metadata.xml b/dev-ros/calibration_msgs/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/calibration_msgs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/calibration_setup_helper/Manifest b/dev-ros/calibration_setup_helper/Manifest
new file mode 100644
index 000000000000..389070489594
--- /dev/null
+++ b/dev-ros/calibration_setup_helper/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.13.ebuild b/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.13.ebuild
new file mode 100644
index 000000000000..80e38150a399
--- /dev/null
+++ b/dev-ros/calibration_setup_helper/calibration_setup_helper-0.10.13.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Script to generate calibration launch and configurationfiles for your robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-ros/calibration_launch"
diff --git a/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild b/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild
new file mode 100644
index 000000000000..80e38150a399
--- /dev/null
+++ b/dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Script to generate calibration launch and configurationfiles for your robot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-ros/calibration_launch"
diff --git a/dev-ros/calibration_setup_helper/metadata.xml b/dev-ros/calibration_setup_helper/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/calibration_setup_helper/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/image_cb_detector/Manifest b/dev-ros/image_cb_detector/Manifest
new file mode 100644
index 000000000000..389070489594
--- /dev/null
+++ b/dev-ros/image_cb_detector/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.13.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.13.ebuild
new file mode 100644
index 000000000000..5c19021411e3
--- /dev/null
+++ b/dev-ros/image_cb_detector/image_cb_detector-0.10.13.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Extracts checkerboard corners from ROS images"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/cv_bridge[${PYTHON_USEDEP}]
+ dev-ros/image_transport
+ dev-ros/message_filters
+ dev-ros/roscpp
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
new file mode 100644
index 000000000000..5c19021411e3
--- /dev/null
+++ b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Extracts checkerboard corners from ROS images"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/cv_bridge[${PYTHON_USEDEP}]
+ dev-ros/image_transport
+ dev-ros/message_filters
+ dev-ros/roscpp
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_cb_detector/metadata.xml b/dev-ros/image_cb_detector/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/image_cb_detector/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/imu_processors/Manifest b/dev-ros/imu_processors/Manifest
new file mode 100644
index 000000000000..dc8ff723c39d
--- /dev/null
+++ b/dev-ros/imu_processors/Manifest
@@ -0,0 +1 @@
+DIST imu_pipeline-0.2.1.tar.gz 7962 SHA256 91e0d491bd08dce8629876bf6005a1aaabcb130413ed749c4ab168e17f0118fa SHA512 43c990e3b5a813661111f15bbaf6101794480de0f5bd9af663ce48ebbcf75ee79fa388cf228216427e7ffcbc575a317f3b0ee3ae5b8e6cca2cc0cab736c139e4 WHIRLPOOL 189279d535c11add08df686ca84598f4e1c5a6a9835416b4f10bef2a85c192359da1795d52171d083d19cfee7e43ef011a676304046893d7f75d4a33a72c204c
diff --git a/dev-ros/imu_processors/imu_processors-0.2.1.ebuild b/dev-ros/imu_processors/imu_processors-0.2.1.ebuild
new file mode 100644
index 000000000000..4a7411597144
--- /dev/null
+++ b/dev-ros/imu_processors/imu_processors-0.2.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Processors for sensor_msgs::Imu data"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/tf
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_processors/imu_processors-9999.ebuild b/dev-ros/imu_processors/imu_processors-9999.ebuild
new file mode 100644
index 000000000000..4a7411597144
--- /dev/null
+++ b/dev-ros/imu_processors/imu_processors-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Processors for sensor_msgs::Imu data"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/tf
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_processors/metadata.xml b/dev-ros/imu_processors/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/imu_processors/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/imu_transformer/Manifest b/dev-ros/imu_transformer/Manifest
new file mode 100644
index 000000000000..dc8ff723c39d
--- /dev/null
+++ b/dev-ros/imu_transformer/Manifest
@@ -0,0 +1 @@
+DIST imu_pipeline-0.2.1.tar.gz 7962 SHA256 91e0d491bd08dce8629876bf6005a1aaabcb130413ed749c4ab168e17f0118fa SHA512 43c990e3b5a813661111f15bbaf6101794480de0f5bd9af663ce48ebbcf75ee79fa388cf228216427e7ffcbc575a317f3b0ee3ae5b8e6cca2cc0cab736c139e4 WHIRLPOOL 189279d535c11add08df686ca84598f4e1c5a6a9835416b4f10bef2a85c192359da1795d52171d083d19cfee7e43ef011a676304046893d7f75d4a33a72c204c
diff --git a/dev-ros/imu_transformer/imu_transformer-0.2.1.ebuild b/dev-ros/imu_transformer/imu_transformer-0.2.1.ebuild
new file mode 100644
index 000000000000..bfb09b7fac11
--- /dev/null
+++ b/dev-ros/imu_transformer/imu_transformer-0.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/message_filters
+ dev-ros/nodelet
+ dev-ros/roscpp
+ dev-ros/roslaunch
+ dev-ros/tf2
+ dev-ros/tf2_ros
+ dev-ros/topic_tools
+ dev-ros/tf2_sensor_msgs
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_transformer/imu_transformer-9999.ebuild b/dev-ros/imu_transformer/imu_transformer-9999.ebuild
new file mode 100644
index 000000000000..bfb09b7fac11
--- /dev/null
+++ b/dev-ros/imu_transformer/imu_transformer-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/message_filters
+ dev-ros/nodelet
+ dev-ros/roscpp
+ dev-ros/roslaunch
+ dev-ros/tf2
+ dev-ros/tf2_ros
+ dev-ros/topic_tools
+ dev-ros/tf2_sensor_msgs
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_transformer/metadata.xml b/dev-ros/imu_transformer/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/imu_transformer/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/interval_intersection/Manifest b/dev-ros/interval_intersection/Manifest
new file mode 100644
index 000000000000..389070489594
--- /dev/null
+++ b/dev-ros/interval_intersection/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/interval_intersection/interval_intersection-0.10.13.ebuild b/dev-ros/interval_intersection/interval_intersection-0.10.13.ebuild
new file mode 100644
index 000000000000..273edb7e86b3
--- /dev/null
+++ b/dev-ros/interval_intersection/interval_intersection-0.10.13.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for calculating the intersection of interval messages coming in on several topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/actionlib
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-ros/roscpp_serialization
+ dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/interval_intersection/interval_intersection-9999.ebuild b/dev-ros/interval_intersection/interval_intersection-9999.ebuild
new file mode 100644
index 000000000000..273edb7e86b3
--- /dev/null
+++ b/dev-ros/interval_intersection/interval_intersection-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for calculating the intersection of interval messages coming in on several topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/actionlib
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-ros/roscpp_serialization
+ dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/interval_intersection/metadata.xml b/dev-ros/interval_intersection/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/interval_intersection/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/joint_states_settler/Manifest b/dev-ros/joint_states_settler/Manifest
new file mode 100644
index 000000000000..389070489594
--- /dev/null
+++ b/dev-ros/joint_states_settler/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/joint_states_settler/joint_states_settler-0.10.13.ebuild b/dev-ros/joint_states_settler/joint_states_settler-0.10.13.ebuild
new file mode 100644
index 000000000000..f7d4e773b86a
--- /dev/null
+++ b/dev-ros/joint_states_settler/joint_states_settler-0.10.13.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Reports how long a subset of joints has been settled"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/actionlib
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-ros/roscpp_serialization
+ dev-ros/settlerlib
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/joint_states_settler/joint_states_settler-9999.ebuild b/dev-ros/joint_states_settler/joint_states_settler-9999.ebuild
new file mode 100644
index 000000000000..f7d4e773b86a
--- /dev/null
+++ b/dev-ros/joint_states_settler/joint_states_settler-9999.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Reports how long a subset of joints has been settled"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/actionlib
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-ros/roscpp_serialization
+ dev-ros/settlerlib
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/actionlib_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/joint_states_settler/metadata.xml b/dev-ros/joint_states_settler/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/joint_states_settler/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/laser_cb_detector/Manifest b/dev-ros/laser_cb_detector/Manifest
new file mode 100644
index 000000000000..389070489594
--- /dev/null
+++ b/dev-ros/laser_cb_detector/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-0.10.13.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.13.ebuild
new file mode 100644
index 000000000000..6cecd2724ce3
--- /dev/null
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-0.10.13.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Extracts checkerboard corners from a dense laser snapshot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/cv_bridge
+ dev-ros/image_cb_detector
+ dev-ros/message_filters
+ dev-ros/roscpp
+ dev-ros/settlerlib
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
new file mode 100644
index 000000000000..6cecd2724ce3
--- /dev/null
+++ b/dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Extracts checkerboard corners from a dense laser snapshot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/cv_bridge
+ dev-ros/image_cb_detector
+ dev-ros/message_filters
+ dev-ros/roscpp
+ dev-ros/settlerlib
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/laser_cb_detector/metadata.xml b/dev-ros/laser_cb_detector/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/laser_cb_detector/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/monocam_settler/Manifest b/dev-ros/monocam_settler/Manifest
new file mode 100644
index 000000000000..389070489594
--- /dev/null
+++ b/dev-ros/monocam_settler/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/monocam_settler/metadata.xml b/dev-ros/monocam_settler/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/monocam_settler/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild b/dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild
new file mode 100644
index 000000000000..b413582608f7
--- /dev/null
+++ b/dev-ros/monocam_settler/monocam_settler-0.10.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Listens on a ImageFeatures topic, and waits for the data to settle"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/rosconsole
+ dev-ros/roscpp_serialization
+ dev-ros/settlerlib
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/monocam_settler/monocam_settler-9999.ebuild b/dev-ros/monocam_settler/monocam_settler-9999.ebuild
new file mode 100644
index 000000000000..b413582608f7
--- /dev/null
+++ b/dev-ros/monocam_settler/monocam_settler-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Listens on a ImageFeatures topic, and waits for the data to settle"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/rosconsole
+ dev-ros/roscpp_serialization
+ dev-ros/settlerlib
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/octomap_ros/Manifest b/dev-ros/octomap_ros/Manifest
new file mode 100644
index 000000000000..6483a2146c45
--- /dev/null
+++ b/dev-ros/octomap_ros/Manifest
@@ -0,0 +1 @@
+DIST octomap_ros-0.4.0.tar.gz 5076 SHA256 6f4f90bbfe88c8314a406cfe70f0c4388d4d2d85a461d90911b2e6bf738ed153 SHA512 41910879d042dcbd969544e89fe40c1da8be75118ef1b813e3cb0319b83529a9c759fe99ed430b275d10d5df987bed7e2b4d7300ed561d159b6007de306bc8ce WHIRLPOOL 0840264e55bbcf9298e4d18ed0d39e8bfb7bbde7b42998ecdb28fa4b26e8184caa762747896a9e0da9f7028691836c508d22f74a61a8a20c7b562e2ec34892c1
diff --git a/dev-ros/octomap_ros/metadata.xml b/dev-ros/octomap_ros/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/octomap_ros/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/octomap_ros/octomap_ros-0.4.0.ebuild b/dev-ros/octomap_ros/octomap_ros-0.4.0.ebuild
new file mode 100644
index 000000000000..36b7f89cdac5
--- /dev/null
+++ b/dev-ros/octomap_ros/octomap_ros-0.4.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/OctoMap/octomap_ros"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions between ROS / PCL and OctoMap's native types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf
+ dev-ros/pcl_ros
+ dev-ros/octomap_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/octomap_ros/octomap_ros-9999.ebuild b/dev-ros/octomap_ros/octomap_ros-9999.ebuild
new file mode 100644
index 000000000000..36b7f89cdac5
--- /dev/null
+++ b/dev-ros/octomap_ros/octomap_ros-9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/OctoMap/octomap_ros"
+KEYWORDS="~amd64 ~arm"
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions between ROS / PCL and OctoMap's native types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf
+ dev-ros/pcl_ros
+ dev-ros/octomap_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/Manifest b/dev-ros/rosapi/Manifest
new file mode 100644
index 000000000000..901d1ece339e
--- /dev/null
+++ b/dev-ros/rosapi/Manifest
@@ -0,0 +1 @@
+DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
diff --git a/dev-ros/rosapi/metadata.xml b/dev-ros/rosapi/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/rosapi/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosapi/rosapi-0.7.13.ebuild b/dev-ros/rosapi/rosapi-0.7.13.ebuild
new file mode 100644
index 000000000000..b84f396a3fc7
--- /dev/null
+++ b/dev-ros/rosapi/rosapi-0.7.13.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosnode[${PYTHON_USEDEP}]
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-ros/rosbridge_library[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosapi/rosapi-9999.ebuild b/dev-ros/rosapi/rosapi-9999.ebuild
new file mode 100644
index 000000000000..b84f396a3fc7
--- /dev/null
+++ b/dev-ros/rosapi/rosapi-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Provides service calls for getting ros meta-information, like list of topics, services, params, etc."
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosnode[${PYTHON_USEDEP}]
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-ros/rosbridge_library[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosauth/Manifest b/dev-ros/rosauth/Manifest
new file mode 100644
index 000000000000..d6853764c6ec
--- /dev/null
+++ b/dev-ros/rosauth/Manifest
@@ -0,0 +1 @@
+DIST rosauth-0.1.7.tar.gz 6060 SHA256 c85c4163c94d20bce9864180785210bfe3dfd110114f18212bd711d1be87c48e SHA512 c52317cd173ec655b779f96ffe324cd136a54168484f26fff2a0d9fe2da6e25cc5109f1905d7528a9f6a433287873b63c53f96ec425ca6af740d4eea0b3250b5 WHIRLPOOL 9a21f936bea44735f3dbaf413cb9fbd93f7d673e186f99f7c7eff284d3187c44d096c1635a094cd35ce04a0909558ae174b16bb3a5d3ffe19022f655a8bc9238
diff --git a/dev-ros/rosauth/metadata.xml b/dev-ros/rosauth/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/rosauth/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosauth/rosauth-0.1.7.ebuild b/dev-ros/rosauth/rosauth-0.1.7.ebuild
new file mode 100644
index 000000000000..ff0731f53943
--- /dev/null
+++ b/dev-ros/rosauth/rosauth-0.1.7.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/WPI-RAIL/rosauth"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Server Side tools for Authorization and Authentication of ROS Clients"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosauth/rosauth-9999.ebuild b/dev-ros/rosauth/rosauth-9999.ebuild
new file mode 100644
index 000000000000..ff0731f53943
--- /dev/null
+++ b/dev-ros/rosauth/rosauth-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/WPI-RAIL/rosauth"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Server Side tools for Authorization and Authentication of ROS Clients"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-libs/openssl:0="
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosbridge_library/Manifest b/dev-ros/rosbridge_library/Manifest
new file mode 100644
index 000000000000..901d1ece339e
--- /dev/null
+++ b/dev-ros/rosbridge_library/Manifest
@@ -0,0 +1 @@
+DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
diff --git a/dev-ros/rosbridge_library/metadata.xml b/dev-ros/rosbridge_library/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/rosbridge_library/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosbridge_library/rosbridge_library-0.7.13.ebuild b/dev-ros/rosbridge_library/rosbridge_library-0.7.13.ebuild
new file mode 100644
index 000000000000..869e633fccd7
--- /dev/null
+++ b/dev-ros/rosbridge_library/rosbridge_library-0.7.13.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Core rosbridge package repsonsible for interpreting JSON and performing the appropriate ROS action"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosservice[${PYTHON_USEDEP}]
+ dev-ros/rostopic[${PYTHON_USEDEP}]
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-python/pymongo[${PYTHON_USEDEP}]
+ || ( dev-python/imaging[${PYTHON_USEDEP}] virtual/python-imaging[${PYTHON_USEDEP}] )
+ "
+DEPEND="${RDEPEND}
+ test? (
+ dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ )
+"
diff --git a/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild b/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild
new file mode 100644
index 000000000000..869e633fccd7
--- /dev/null
+++ b/dev-ros/rosbridge_library/rosbridge_library-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Core rosbridge package repsonsible for interpreting JSON and performing the appropriate ROS action"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosservice[${PYTHON_USEDEP}]
+ dev-ros/rostopic[${PYTHON_USEDEP}]
+ dev-ros/rosgraph[${PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-python/pymongo[${PYTHON_USEDEP}]
+ || ( dev-python/imaging[${PYTHON_USEDEP}] virtual/python-imaging[${PYTHON_USEDEP}] )
+ "
+DEPEND="${RDEPEND}
+ test? (
+ dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rospy_tutorials[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/stereo_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/trajectory_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ )
+"
diff --git a/dev-ros/rosbridge_server/Manifest b/dev-ros/rosbridge_server/Manifest
new file mode 100644
index 000000000000..901d1ece339e
--- /dev/null
+++ b/dev-ros/rosbridge_server/Manifest
@@ -0,0 +1 @@
+DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
diff --git a/dev-ros/rosbridge_server/metadata.xml b/dev-ros/rosbridge_server/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/rosbridge_server/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild
new file mode 100644
index 000000000000..997490d73c41
--- /dev/null
+++ b/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A WebSocket interface to rosbridge"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosauth[${PYTHON_USEDEP}]
+ "
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
new file mode 100644
index 000000000000..997490d73c41
--- /dev/null
+++ b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A WebSocket interface to rosbridge"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosapi[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosauth[${PYTHON_USEDEP}]
+ "
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_arduino/Manifest b/dev-ros/rosserial_arduino/Manifest
new file mode 100644
index 000000000000..2af16836775c
--- /dev/null
+++ b/dev-ros/rosserial_arduino/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_arduino/metadata.xml b/dev-ros/rosserial_arduino/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/rosserial_arduino/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-0.7.1.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-0.7.1.ebuild
new file mode 100644
index 000000000000..4cc0fc89dc3f
--- /dev/null
+++ b/dev-ros/rosserial_arduino/rosserial_arduino-0.7.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Arduino/AVR Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_client[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_arduino/rosserial_arduino-9999.ebuild b/dev-ros/rosserial_arduino/rosserial_arduino-9999.ebuild
new file mode 100644
index 000000000000..4cc0fc89dc3f
--- /dev/null
+++ b/dev-ros/rosserial_arduino/rosserial_arduino-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Arduino/AVR Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_client[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_client/Manifest b/dev-ros/rosserial_client/Manifest
new file mode 100644
index 000000000000..2af16836775c
--- /dev/null
+++ b/dev-ros/rosserial_client/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_client/metadata.xml b/dev-ros/rosserial_client/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/rosserial_client/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_client/rosserial_client-0.7.1.ebuild b/dev-ros/rosserial_client/rosserial_client-0.7.1.ebuild
new file mode 100644
index 000000000000..8ce5721b871b
--- /dev/null
+++ b/dev-ros/rosserial_client/rosserial_client-0.7.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Generalized client side source for rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_client/rosserial_client-9999.ebuild b/dev-ros/rosserial_client/rosserial_client-9999.ebuild
new file mode 100644
index 000000000000..8ce5721b871b
--- /dev/null
+++ b/dev-ros/rosserial_client/rosserial_client-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Generalized client side source for rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/Manifest b/dev-ros/rosserial_embeddedlinux/Manifest
new file mode 100644
index 000000000000..2af16836775c
--- /dev/null
+++ b/dev-ros/rosserial_embeddedlinux/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_embeddedlinux/metadata.xml b/dev-ros/rosserial_embeddedlinux/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/rosserial_embeddedlinux/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.1.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.1.ebuild
new file mode 100644
index 000000000000..666dc82264b2
--- /dev/null
+++ b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-0.7.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Embedded Linux Enviroments"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_client[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-9999.ebuild b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-9999.ebuild
new file mode 100644
index 000000000000..666dc82264b2
--- /dev/null
+++ b/dev-ros/rosserial_embeddedlinux/rosserial_embeddedlinux-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Embedded Linux Enviroments"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_client[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_msgs/Manifest b/dev-ros/rosserial_msgs/Manifest
new file mode 100644
index 000000000000..2af16836775c
--- /dev/null
+++ b/dev-ros/rosserial_msgs/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_msgs/metadata.xml b/dev-ros/rosserial_msgs/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/rosserial_msgs/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_msgs/rosserial_msgs-0.7.1.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-0.7.1.ebuild
new file mode 100644
index 000000000000..82b79301720f
--- /dev/null
+++ b/dev-ros/rosserial_msgs/rosserial_msgs-0.7.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for automatic topic configuration using rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_msgs/rosserial_msgs-9999.ebuild b/dev-ros/rosserial_msgs/rosserial_msgs-9999.ebuild
new file mode 100644
index 000000000000..82b79301720f
--- /dev/null
+++ b/dev-ros/rosserial_msgs/rosserial_msgs-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for automatic topic configuration using rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_python/Manifest b/dev-ros/rosserial_python/Manifest
new file mode 100644
index 000000000000..2af16836775c
--- /dev/null
+++ b/dev-ros/rosserial_python/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_python/metadata.xml b/dev-ros/rosserial_python/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/rosserial_python/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_python/rosserial_python-0.7.1.ebuild b/dev-ros/rosserial_python/rosserial_python-0.7.1.ebuild
new file mode 100644
index 000000000000..21d484d242b5
--- /dev/null
+++ b/dev-ros/rosserial_python/rosserial_python-0.7.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A Python-based implementation of the ROS serial protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-python/pyserial[${PYTHON_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_python/rosserial_python-9999.ebuild b/dev-ros/rosserial_python/rosserial_python-9999.ebuild
new file mode 100644
index 000000000000..21d484d242b5
--- /dev/null
+++ b/dev-ros/rosserial_python/rosserial_python-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="A Python-based implementation of the ROS serial protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-python/pyserial[${PYTHON_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/Manifest b/dev-ros/rosserial_server/Manifest
new file mode 100644
index 000000000000..2af16836775c
--- /dev/null
+++ b/dev-ros/rosserial_server/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_server/metadata.xml b/dev-ros/rosserial_server/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/rosserial_server/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_server/rosserial_server-0.7.1.ebuild b/dev-ros/rosserial_server/rosserial_server-0.7.1.ebuild
new file mode 100644
index 000000000000..8ba454b0ddb2
--- /dev/null
+++ b/dev-ros/rosserial_server/rosserial_server-0.7.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of the rosserial server side"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/topic_tools
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_server/rosserial_server-9999.ebuild b/dev-ros/rosserial_server/rosserial_server-9999.ebuild
new file mode 100644
index 000000000000..8ba454b0ddb2
--- /dev/null
+++ b/dev-ros/rosserial_server/rosserial_server-9999.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of the rosserial server side"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/topic_tools
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/Manifest b/dev-ros/rosserial_windows/Manifest
new file mode 100644
index 000000000000..2af16836775c
--- /dev/null
+++ b/dev-ros/rosserial_windows/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_windows/metadata.xml b/dev-ros/rosserial_windows/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/rosserial_windows/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_windows/rosserial_windows-0.7.1.ebuild b/dev-ros/rosserial_windows/rosserial_windows-0.7.1.ebuild
new file mode 100644
index 000000000000..fc6f58436e8a
--- /dev/null
+++ b/dev-ros/rosserial_windows/rosserial_windows-0.7.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Windows Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosserial_client[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_windows/rosserial_windows-9999.ebuild b/dev-ros/rosserial_windows/rosserial_windows-9999.ebuild
new file mode 100644
index 000000000000..fc6f58436e8a
--- /dev/null
+++ b/dev-ros/rosserial_windows/rosserial_windows-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Libraries and examples for ROSserial usage on Windows Platforms"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/rosserial_client[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/Manifest b/dev-ros/rosserial_xbee/Manifest
new file mode 100644
index 000000000000..2af16836775c
--- /dev/null
+++ b/dev-ros/rosserial_xbee/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/dev-ros/rosserial_xbee/metadata.xml b/dev-ros/rosserial_xbee/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/rosserial_xbee/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-0.7.1.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-0.7.1.ebuild
new file mode 100644
index 000000000000..4e1c019f473e
--- /dev/null
+++ b/dev-ros/rosserial_xbee/rosserial_xbee-0.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools to do point to multipoint communication between rosserial nodes connected to an xbee"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-python/pyserial[${PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_python[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosserial_xbee/rosserial_xbee-9999.ebuild b/dev-ros/rosserial_xbee/rosserial_xbee-9999.ebuild
new file mode 100644
index 000000000000..4e1c019f473e
--- /dev/null
+++ b/dev-ros/rosserial_xbee/rosserial_xbee-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools to do point to multipoint communication between rosserial nodes connected to an xbee"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-python/pyserial[${PYTHON_USEDEP}]
+ dev-ros/rosserial_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rosserial_python[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/settlerlib/Manifest b/dev-ros/settlerlib/Manifest
new file mode 100644
index 000000000000..389070489594
--- /dev/null
+++ b/dev-ros/settlerlib/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/dev-ros/settlerlib/metadata.xml b/dev-ros/settlerlib/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/settlerlib/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/settlerlib/settlerlib-0.10.13.ebuild b/dev-ros/settlerlib/settlerlib-0.10.13.ebuild
new file mode 100644
index 000000000000..e00b3046a233
--- /dev/null
+++ b/dev-ros/settlerlib/settlerlib-0.10.13.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Helper functions and routines to help creating a settler for a specific sensor channel"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/rosconsole
+ dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/settlerlib/settlerlib-9999.ebuild b/dev-ros/settlerlib/settlerlib-9999.ebuild
new file mode 100644
index 000000000000..e00b3046a233
--- /dev/null
+++ b/dev-ros/settlerlib/settlerlib-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Helper functions and routines to help creating a settler for a specific sensor channel"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/rosconsole
+ dev-ros/rostime
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )"
diff --git a/dev-ros/turtle_tf/Manifest b/dev-ros/turtle_tf/Manifest
new file mode 100644
index 000000000000..9605317b0592
--- /dev/null
+++ b/dev-ros/turtle_tf/Manifest
@@ -0,0 +1 @@
+DIST geometry_tutorials-0.2.2.tar.gz 15148 SHA256 4b3fdc98bf4cb97ba2f1c40666901fa7d08eb3dfed0d3323de4841de2e3a22cc SHA512 5a6fe2e26d11d3fe8c1fc6979d1d76b13b01df23ef1f0d5e5df094aa0441e1ded33d2402b88be1143a88002ecde2a6bddc3b03efca713bd5521c68de2e054548 WHIRLPOOL b9ce88950911e87d008a19de08fb829e59f0c6e81711859125b3bf377fff907e6054d2229d8dd13c39baf395c3da3d749fcf62144c88caf9eab0d7d76026e518
diff --git a/dev-ros/turtle_tf/metadata.xml b/dev-ros/turtle_tf/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/turtle_tf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/turtle_tf/turtle_tf-0.2.2.ebuild b/dev-ros/turtle_tf/turtle_tf-0.2.2.ebuild
new file mode 100644
index 000000000000..5f862139da48
--- /dev/null
+++ b/dev-ros/turtle_tf/turtle_tf-0.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Demonstrates how to write a tf broadcaster and listener with the turtlesim"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf[${PYTHON_USEDEP}]
+ dev-ros/turtlesim[${PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf/turtle_tf-9999.ebuild b/dev-ros/turtle_tf/turtle_tf-9999.ebuild
new file mode 100644
index 000000000000..5f862139da48
--- /dev/null
+++ b/dev-ros/turtle_tf/turtle_tf-9999.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Demonstrates how to write a tf broadcaster and listener with the turtlesim"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf[${PYTHON_USEDEP}]
+ dev-ros/turtlesim[${PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf2/Manifest b/dev-ros/turtle_tf2/Manifest
new file mode 100644
index 000000000000..9605317b0592
--- /dev/null
+++ b/dev-ros/turtle_tf2/Manifest
@@ -0,0 +1 @@
+DIST geometry_tutorials-0.2.2.tar.gz 15148 SHA256 4b3fdc98bf4cb97ba2f1c40666901fa7d08eb3dfed0d3323de4841de2e3a22cc SHA512 5a6fe2e26d11d3fe8c1fc6979d1d76b13b01df23ef1f0d5e5df094aa0441e1ded33d2402b88be1143a88002ecde2a6bddc3b03efca713bd5521c68de2e054548 WHIRLPOOL b9ce88950911e87d008a19de08fb829e59f0c6e81711859125b3bf377fff907e6054d2229d8dd13c39baf395c3da3d749fcf62144c88caf9eab0d7d76026e518
diff --git a/dev-ros/turtle_tf2/metadata.xml b/dev-ros/turtle_tf2/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/dev-ros/turtle_tf2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/dev-ros/turtle_tf2/turtle_tf2-0.2.2.ebuild b/dev-ros/turtle_tf2/turtle_tf2-0.2.2.ebuild
new file mode 100644
index 000000000000..64d8a70429e6
--- /dev/null
+++ b/dev-ros/turtle_tf2/turtle_tf2-0.2.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Demonstrates how to write a tf2 broadcaster and listener with the turtlesim"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf2
+ dev-ros/tf2_ros[${PYTHON_USEDEP}]
+ dev-ros/turtlesim[${PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild b/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild
new file mode 100644
index 000000000000..64d8a70429e6
--- /dev/null
+++ b/dev-ros/turtle_tf2/turtle_tf2-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Demonstrates how to write a tf2 broadcaster and listener with the turtlesim"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf2
+ dev-ros/tf2_ros[${PYTHON_USEDEP}]
+ dev-ros/turtlesim[${PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ruby/bluecloth/bluecloth-2.2.0-r1.ebuild b/dev-ruby/bluecloth/bluecloth-2.2.0-r1.ebuild
index 5e25756366be..c9c1391057ab 100644
--- a/dev-ruby/bluecloth/bluecloth-2.2.0-r1.ebuild
+++ b/dev-ruby/bluecloth/bluecloth-2.2.0-r1.ebuild
@@ -27,6 +27,7 @@ ruby_add_bdepend "
dev-ruby/hoe
dev-ruby/rake-compiler
test? (
+ dev-ruby/rspec:2
dev-ruby/diff-lcs
dev-ruby/tidy-ext
)"
diff --git a/dev-ruby/gettext_i18n_rails/Manifest b/dev-ruby/gettext_i18n_rails/Manifest
index 8458a74ed249..2e9770e2d7fb 100644
--- a/dev-ruby/gettext_i18n_rails/Manifest
+++ b/dev-ruby/gettext_i18n_rails/Manifest
@@ -1,2 +1,3 @@
DIST gettext_i18n_rails-1.2.2.tar.gz 20254 SHA256 4bdaff360864211ee8739155f881cbe505d36ae8ec0d592c8180779f6f84a35e SHA512 c2a02a2aaa118581e81b3ff375ebfb8b4e58fc2313e8d7f321d881370b546d906eec51f848d27f2996ca16938bc7580ed6c27d780d1531a251578ce9260bcb40 WHIRLPOOL c674993506104a8475b7a2be422f11558aa001f362cdc7786fc27cf3b44368ce5855a0ecdc555e28345ad81cd14c70d785c5952cd8bbf6506a0720534c658d38
DIST gettext_i18n_rails-1.2.3.tar.gz 20252 SHA256 48af9946c8165ece5c1c94c01045596e25f00bc679e3eb835e45992663444fd7 SHA512 b28bea0100ca5dd307ead1b77f4e71b491eb12899d772394c6e3ea73150ef4277c7305de0dfd2429ccc635af462f0b0f4f42280cdb666ebc7cee2cf9a43a04a2 WHIRLPOOL f54222b9940b58e16a2e1e27eb36d044ae42fe4b9ed1e06edeb57f5ea1e1ebc727de1cd564cd3679f0851b47fc5ebe93d3913a2ef90de8ebd56917a08ba19913
+DIST gettext_i18n_rails-1.3.0.tar.gz 20218 SHA256 b52a90e45d6bcdfac828cebbf52892ccadb320d148bb14a8267f8545b4347877 SHA512 90136a441aad8c5b26fe39454b675b444ff5cdfa87c4d6ec1738583ea5b6db793b1d05db94e9084905249a75f19239acf5812e6e8350d3ee2537aed76387c2d2 WHIRLPOOL b8503ad978faeeaff0a966be62392bbc0ef4361f28575e50afb799431fb311368b656a4c702749d4dd12f2e342f4c79abe5fe1cd56f64aa41441c073e53449e6
diff --git a/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.0.ebuild b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.0.ebuild
new file mode 100644
index 000000000000..d424d4a558ab
--- /dev/null
+++ b/dev-ruby/gettext_i18n_rails/gettext_i18n_rails-1.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="FastGettext / Rails integration"
+HOMEPAGE="https://github.com/grosser/gettext_i18n_rails"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rails:4.0 dev-ruby/activerecord:4.0[sqlite] dev-ruby/temple )"
+ruby_add_rdepend ">=dev-ruby/fast_gettext-0.9.0"
+
+all_ruby_prepare() {
+ rm Gemfile Gemfile.lock || die
+
+ # Remove specs for slim and hamlet, template engines we don't package.
+ rm spec/gettext_i18n_rails/slim_parser_spec.rb spec/gettext_i18n_rails/haml_parser_spec.rb || die
+
+ # Test against Rails 4.0 (newer versions don't work and we don't use
+ # appraisals for now).
+ sed -e '1igem "rails", "~>4.2.0"' -i spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/metasm/metasm-1.0.2-r2.ebuild b/dev-ruby/metasm/metasm-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..71d88884fff6
--- /dev/null
+++ b/dev-ruby/metasm/metasm-1.0.2-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="BUGS README TODO"
+
+RUBY_FAKEGEM_EXTRAINSTALL="metasm metasm.rb misc samples"
+
+inherit ruby-fakegem
+
+DESCRIPTION="cross-architecture assembler, disassembler, linker, and debugger"
+HOMEPAGE="http://metasm.cr0.org/"
+
+LICENSE="BSD"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~x86"
+#IUSE="development test"
+IUSE=""
+
+RDEPEND="${RDEPEND} !dev-ruby/metasploit-model:0"
+
+ruby_add_rdepend ">=dev-ruby/railties-4.0.9:4.0
+ >=dev-ruby/activesupport-4.0.9:4.0
+ >=dev-ruby/activemodel-4.0.9:4.0"
+ruby_add_bdepend "dev-ruby/bundler"
+
+all_ruby_prepare() {
+ [ -f Gemfile.lock ] && rm Gemfile.lock
+ #For now, we don't support development or testing at all
+ #if ! use development; then
+ sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+ sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
+ sed -i -e "/spec.add_development_dependency/d" "${PN}".gemspec || die
+ #fi
+ #if ! use test; then
+ sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
+ #fi
+ #if ! use test && ! use development; then
+ sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
+ #fi
+}
+
+each_ruby_prepare() {
+ if [ -f Gemfile ]
+ then
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
+ BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
+ fi
+}
+
+each_ruby_test() {
+ ${RUBY} -Ilib:. -e "Dir['tests/*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/ruby-atk/Manifest b/dev-ruby/ruby-atk/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-atk/Manifest
+++ b/dev-ruby/ruby-atk/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-atk/ruby-atk-3.0.7.ebuild b/dev-ruby/ruby-atk/ruby-atk-3.0.7.ebuild
new file mode 100644
index 000000000000..3199fc37a009
--- /dev/null
+++ b/dev-ruby/ruby-atk/ruby-atk-3.0.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Atk bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND+=" dev-libs/atk"
+RDEPEND+=" dev-libs/atk"
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' test/atk-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-cairo-gobject/Manifest b/dev-ruby/ruby-cairo-gobject/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-cairo-gobject/Manifest
+++ b/dev-ruby/ruby-cairo-gobject/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.0.7.ebuild b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.0.7.ebuild
new file mode 100644
index 000000000000..4a6f539074c2
--- /dev/null
+++ b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.0.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+RUBY_S="ruby-gnome2-all-${PV}/cairo-gobject"
+
+DESCRIPTION="Ruby cairo-gobject bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/cairo"
+RDEPEND+=" x11-libs/cairo"
+
+ruby_add_rdepend "dev-ruby/rcairo
+ >=dev-ruby/ruby-glib2-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ ../gobject-introspection/test/gobject-introspection-test-utils.rb \
+ test/cairo-gobject-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-clutter-gstreamer/Manifest b/dev-ruby/ruby-clutter-gstreamer/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-clutter-gstreamer/Manifest
+++ b/dev-ruby/ruby-clutter-gstreamer/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.0.7.ebuild b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.0.7.ebuild
new file mode 100644
index 000000000000..db9b1be35a15
--- /dev/null
+++ b/dev-ruby/ruby-clutter-gstreamer/ruby-clutter-gstreamer-3.0.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Clutter bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RUBY_S=ruby-gnome2-all-${PV}/clutter-gstreamer
+
+DEPEND+=" media-libs/clutter-gst"
+RDEPEND+=" media-libs/clutter-gst:*"
+
+ruby_add_rdepend ">=dev-ruby/ruby-clutter-${PV}
+ >=dev-ruby/ruby-gstreamer-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ ../gobject-introspection/test/gobject-introspection-test-utils.rb \
+ ../clutter/test/clutter-test-utils.rb \
+ test/clutter-gstreamer-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/and have_make/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/ruby-clutter-gtk/Manifest b/dev-ruby/ruby-clutter-gtk/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-clutter-gtk/Manifest
+++ b/dev-ruby/ruby-clutter-gtk/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.0.7.ebuild b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.0.7.ebuild
new file mode 100644
index 000000000000..03d17abf609f
--- /dev/null
+++ b/dev-ruby/ruby-clutter-gtk/ruby-clutter-gtk-3.0.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Clutter bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RUBY_S=ruby-gnome2-all-${PV}/clutter-gtk
+
+DEPEND+=" media-libs/clutter-gtk"
+RDEPEND+=" media-libs/clutter-gtk"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-clutter-${PV}
+ >=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ ../gobject-introspection/test/gobject-introspection-test-utils.rb \
+ ../clutter/test/clutter-test-utils.rb \
+ test/clutter-gtk-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/and have_make/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/ruby-clutter/Manifest b/dev-ruby/ruby-clutter/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-clutter/Manifest
+++ b/dev-ruby/ruby-clutter/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-clutter/ruby-clutter-3.0.7.ebuild b/dev-ruby/ruby-clutter/ruby-clutter-3.0.7.ebuild
new file mode 100644
index 000000000000..3cb049b1fcc7
--- /dev/null
+++ b/dev-ruby/ruby-clutter/ruby-clutter-3.0.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Clutter bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RUBY_S=ruby-gnome2-all-${PV}/clutter
+
+DEPEND+=" media-libs/clutter"
+RDEPEND+=" media-libs/clutter"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-cairo-gobject-${PV}
+ >=dev-ruby/ruby-gobject-introspection-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ ../gobject-introspection/test/gobject-introspection-test-utils.rb \
+ ../cairo-gobject/test/cairo-gobject-test-utils.rb \
+ test/clutter-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/ruby-gdk3/Manifest b/dev-ruby/ruby-gdk3/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-gdk3/Manifest
+++ b/dev-ruby/ruby-gdk3/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gdk3/ruby-gdk3-3.0.7.ebuild b/dev-ruby/ruby-gdk3/ruby-gdk3-3.0.7.ebuild
new file mode 100644
index 000000000000..0e601a4be97a
--- /dev/null
+++ b/dev-ruby/ruby-gdk3/ruby-gdk3-3.0.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby GDK-3.x bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtk+:3"
+RDEPEND+=" x11-libs/gtk+:3"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gdkpixbuf2-${PV}
+ >=dev-ruby/ruby-atk-${PV}
+ >=dev-ruby/ruby-cairo-gobject-${PV}
+ >=dev-ruby/ruby-pango-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ test/gdk-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/ruby-gdkpixbuf2/Manifest b/dev-ruby/ruby-gdkpixbuf2/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-gdkpixbuf2/Manifest
+++ b/dev-ruby/ruby-gdkpixbuf2/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.0.7.ebuild b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.0.7.ebuild
new file mode 100644
index 000000000000..9f1b62983576
--- /dev/null
+++ b/dev-ruby/ruby-gdkpixbuf2/ruby-gdkpixbuf2-3.0.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_NAME="gdk_pixbuf2"
+
+inherit ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/${RUBY_FAKEGEM_NAME}
+
+DESCRIPTION="Ruby GdkPixbuf2 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" x11-libs/gtk+:2"
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}"
diff --git a/dev-ruby/ruby-gio2/Manifest b/dev-ruby/ruby-gio2/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-gio2/Manifest
+++ b/dev-ruby/ruby-gio2/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gio2/ruby-gio2-3.0.7.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-3.0.7.ebuild
new file mode 100644
index 000000000000..bf174201a3e9
--- /dev/null
+++ b/dev-ruby/ruby-gio2/ruby-gio2-3.0.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby binding of GooCanvas"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}
+ >=dev-ruby/ruby-gobject-introspection-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ test/gio2-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/which make/,/^ end/ s:^:#:' test/run-test.rb || die
+
+ # Make sure Makefile is generated fresh for each target
+ rm -f ext/gio2/Makefile || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-glib2/Manifest b/dev-ruby/ruby-glib2/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.0.7.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.0.7.ebuild
new file mode 100644
index 000000000000..fda9b603e554
--- /dev/null
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.0.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Glib2 bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+RDEPEND+=" >=dev-libs/glib-2"
+DEPEND+=" >=dev-libs/glib-2"
+
+ruby_add_bdepend "dev-ruby/pkg-config
+ test? ( >=dev-ruby/test-unit-2 )"
+
+all_ruby_prepare() {
+ # Our sandbox always provides LD_PRELOAD in the environment.
+ sed -i -e 's/unless ENV.empty?/unless (ENV.keys - ["LD_PRELOAD"]).empty?/' test/test_spawn.rb || die
+
+ # Remove pregenerated Makefile since it will otherwise be shared by all targets.
+ rm -f Makefile Makefile.lib ext/glib2/Makefile || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gnome2/ruby-gnome2-3.0.7.ebuild b/dev-ruby/ruby-gnome2/ruby-gnome2-3.0.7.ebuild
new file mode 100644
index 000000000000..ffd5c7f164c9
--- /dev/null
+++ b/dev-ruby/ruby-gnome2/ruby-gnome2-3.0.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng
+
+DESCRIPTION="Ruby Gnome2 bindings"
+HOMEPAGE="http://ruby-gnome2.sourceforge.jp/"
+SRC_URI=""
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+ >=dev-ruby/ruby-atk-${PV}
+ >=dev-ruby/ruby-clutter-${PV}
+ >=dev-ruby/ruby-clutter-gstreamer-${PV}
+ >=dev-ruby/ruby-clutter-gtk-${PV}
+ >=dev-ruby/ruby-gdkpixbuf2-${PV}
+ >=dev-ruby/ruby-gdk3-${PV}
+ >=dev-ruby/ruby-gio2-${PV}
+ >=dev-ruby/ruby-gstreamer-${PV}
+ >=dev-ruby/ruby-gtk2-${PV}
+ >=dev-ruby/ruby-gtk3-${PV}
+ >=dev-ruby/ruby-gtksourceview-${PV}
+ >=dev-ruby/ruby-gtksourceview3-${PV}
+ >=dev-ruby/ruby-pango-${PV}
+ >=dev-ruby/ruby-poppler-${PV}
+ >=dev-ruby/ruby-rsvg-${PV}
+ >=dev-ruby/ruby-vte-${PV}
+ >=dev-ruby/ruby-vte3-${PV}
+ >=dev-ruby/ruby-webkit-gtk2-${PV}
+ >=dev-ruby/ruby-webkit-gtk-${PV}"
diff --git a/dev-ruby/ruby-gobject-introspection/Manifest b/dev-ruby/ruby-gobject-introspection/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-gobject-introspection/Manifest
+++ b/dev-ruby/ruby-gobject-introspection/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.0.7.ebuild b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.0.7.ebuild
new file mode 100644
index 000000000000..0f03ada174d1
--- /dev/null
+++ b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.0.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/gobject-introspection
+
+DESCRIPTION="Ruby GObjectIntrospection bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/gobject-introspection"
+RDEPEND+=" dev-libs/gobject-introspection"
+
+ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}"
+
+all_ruby_prepare() {
+ # Remove pregenerated Makefile since it will otherwise be shared by all targets.
+ rm -f Makefile Makefile.lib ext/gobject-introspection/Makefile || die
+
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' test/gobject-introspection-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_prepare() {
+ case ${RUBY} in
+ *ruby19)
+ # Avoid test with ruby20+ code.
+ rm -f test/test-repository.rb || die
+ ;;
+ esac
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gstreamer/Manifest b/dev-ruby/ruby-gstreamer/Manifest
index 1342718c3ac2..de9954c921c6 100644
--- a/dev-ruby/ruby-gstreamer/Manifest
+++ b/dev-ruby/ruby-gstreamer/Manifest
@@ -1,3 +1,4 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.4.tar.gz 1699429 SHA256 9274e21b2613ec9ef8b73dd27d180b3fa8b8214a442d742121b0d1cc7f313670 SHA512 33e79109e3acdb1fae07a2b4c867d9b83508ed275dd8fc6148bc976a9fefa2ea0cede01a6762570bdaf1d53173df40b978366837363b4d956b864c6a5f08bf39 WHIRLPOOL bb6a57ee7e4822d807d4506b8c78da1711b222d636d01a55792c5ba37b747997e3288afea3afeb71c96f75f2d58931d283a639632d7fcb1d8b1bc36c294a32af
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.0.7.ebuild b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.0.7.ebuild
new file mode 100644
index 000000000000..b16ed87d1c40
--- /dev/null
+++ b/dev-ruby/ruby-gstreamer/ruby-gstreamer-3.0.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby GStreamer bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0"
+DEPEND="${DEPEND}
+ dev-libs/gobject-introspection
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0"
+
+ruby_add_rdepend "
+ ~dev-ruby/ruby-glib2-${PV}
+ ~dev-ruby/ruby-gobject-introspection-${PV}
+"
+
+all_ruby_prepare() {
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
diff --git a/dev-ruby/ruby-gtk2/Manifest b/dev-ruby/ruby-gtk2/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-gtk2/Manifest
+++ b/dev-ruby/ruby-gtk2/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gtk2/ruby-gtk2-3.0.7.ebuild b/dev-ruby/ruby-gtk2/ruby-gtk2-3.0.7.ebuild
new file mode 100644
index 000000000000..5660e5fc4584
--- /dev/null
+++ b/dev-ruby/ruby-gtk2/ruby-gtk2-3.0.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk2 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtk+:2
+ x11-themes/hicolor-icon-theme"
+RDEPEND+=" x11-libs/gtk+:2"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}
+ >=dev-ruby/ruby-pango-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gdkpixbuf2-${PV}
+ >=dev-ruby/ruby-atk-${PV}
+ >=dev-ruby/ruby-pango-${PV}"
+
+all_ruby_prepare() {
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
diff --git a/dev-ruby/ruby-gtk3/Manifest b/dev-ruby/ruby-gtk3/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-gtk3/Manifest
+++ b/dev-ruby/ruby-gtk3/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7.ebuild b/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7.ebuild
new file mode 100644
index 000000000000..492bd3e15b6e
--- /dev/null
+++ b/dev-ruby/ruby-gtk3/ruby-gtk3-3.0.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk3 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtk+:3"
+RDEPEND+=" x11-libs/gtk+:3"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}
+ >=dev-ruby/ruby-pango-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gdkpixbuf2-${PV}
+ >=dev-ruby/ruby-atk-${PV}
+ >=dev-ruby/ruby-gdk3-${PV}
+ >=dev-ruby/ruby-gio2-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+# sed -i -e '/notify/ s:^:#:' \
+# test/clutter-gtk-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/which make/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
diff --git a/dev-ruby/ruby-gtksourceview/Manifest b/dev-ruby/ruby-gtksourceview/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-gtksourceview/Manifest
+++ b/dev-ruby/ruby-gtksourceview/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.0.7.ebuild b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.0.7.ebuild
new file mode 100644
index 000000000000..23d8e06c07ee
--- /dev/null
+++ b/dev-ruby/ruby-gtksourceview/ruby-gtksourceview-3.0.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_NAME="gtksourceview2"
+
+inherit virtualx ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/gtksourceview2
+
+DESCRIPTION="Ruby bindings for gtksourceview"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" x11-libs/gtksourceview:2.0"
+DEPEND+=" x11-libs/gtksourceview:2.0"
+
+ruby_add_rdepend ">=dev-ruby/ruby-gtk2-${PV}"
+
+all_ruby_prepare() {
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
diff --git a/dev-ruby/ruby-gtksourceview3/Manifest b/dev-ruby/ruby-gtksourceview3/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-gtksourceview3/Manifest
+++ b/dev-ruby/ruby-gtksourceview3/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.0.7.ebuild b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.0.7.ebuild
new file mode 100644
index 000000000000..f63087ca7bcf
--- /dev/null
+++ b/dev-ruby/ruby-gtksourceview3/ruby-gtksourceview3-3.0.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk3 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtksourceview:3.0"
+RDEPEND+=" x11-libs/gtksourceview:3.0"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/ruby-pango/Manifest b/dev-ruby/ruby-pango/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-pango/Manifest
+++ b/dev-ruby/ruby-pango/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-pango/ruby-pango-3.0.7.ebuild b/dev-ruby/ruby-pango/ruby-pango-3.0.7.ebuild
new file mode 100644
index 000000000000..c8cd37ca26b6
--- /dev/null
+++ b/dev-ruby/ruby-pango/ruby-pango-3.0.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Pango bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND+=" >=x11-libs/pango-1.2.1"
+RDEPEND+=" >=x11-libs/pango-1.2.1"
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}
+ >=dev-ruby/rcairo-1.14.0"
+ruby_add_bdepend ">=dev-ruby/rcairo-1.14.0"
+
+all_ruby_prepare() {
+ # Remove test depending on specific locales to be set up: bug 526248
+ rm -f test/test-language.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-poppler/Manifest b/dev-ruby/ruby-poppler/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-poppler/Manifest
+++ b/dev-ruby/ruby-poppler/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-poppler/ruby-poppler-3.0.7.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-3.0.7.ebuild
new file mode 100644
index 000000000000..f08b6bdd08ec
--- /dev/null
+++ b/dev-ruby/ruby-poppler/ruby-poppler-3.0.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby poppler-glib bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" app-text/poppler[cairo]"
+DEPEND+=" app-text/poppler[cairo]"
+
+ruby_add_rdepend "dev-ruby/ruby-gdkpixbuf2
+ >=dev-ruby/ruby-glib2-${PV}
+ >=dev-ruby/ruby-gtk2-${PV}"
+
+all_ruby_prepare() {
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/if have_make/,/^ end/ s:^:#:' test/run-test.rb || die
+
+ # Avoid tests downloading a test PDF directly.
+ rm -f test/test_{annotation,document,page}.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-rsvg/Manifest b/dev-ruby/ruby-rsvg/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-rsvg/Manifest
+++ b/dev-ruby/ruby-rsvg/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-rsvg/ruby-rsvg-3.0.7.ebuild b/dev-ruby/ruby-rsvg/ruby-rsvg-3.0.7.ebuild
new file mode 100644
index 000000000000..60beba1ea0e4
--- /dev/null
+++ b/dev-ruby/ruby-rsvg/ruby-rsvg-3.0.7.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_NAME=rsvg2
+
+inherit ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/rsvg2
+
+DESCRIPTION="Ruby bindings for librsvg"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND+=" >=gnome-base/librsvg-2.8"
+DEPEND+=" >=gnome-base/librsvg-2.8"
+
+ruby_add_rdepend "
+ >=dev-ruby/ruby-gdkpixbuf2-${PV}
+ >=dev-ruby/rcairo-1.12.8"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' test/rsvg2-test-utils.rb || die
+
+ # Avoid compilation of dependencies during test.
+ sed -i -e '/and have_make/,/^ end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-shadow/Manifest b/dev-ruby/ruby-shadow/Manifest
index 405e2cc1fa40..e4fcffc90b0f 100644
--- a/dev-ruby/ruby-shadow/Manifest
+++ b/dev-ruby/ruby-shadow/Manifest
@@ -1,2 +1,3 @@
DIST ruby-shadow-2.3.4.gem 10752 SHA256 3742a3dbe1100276bde815e8ad8d54eb041d4085f3013a31deb5e038d12e93e8 SHA512 30a626638d09da34273ac414c1716ebecc6112328a72adabaf3f31c99717630f7499a33d3ddf106c533a90775604a8038ea270ec6afccbf88adb3a8be7f6025b WHIRLPOOL 3449a1206aa39f76a5021afbea1f94fe11a585e16f9a7a89e74da7bdba6dafc63f8d8874f239cb8d14399d01a4819e074930b647e4d9bcbf812cec37d4d458cd
DIST ruby-shadow-2.4.1.gem 10752 SHA256 b335c8de1ac85e67e6d9013a0fa2d2f2a890e0b75fb38cf18ffa4cf62197f1af SHA512 a59006b17b290dccd33e33089f2cc9e714e119b867370cf0fb448e659a769e958897f24e2068a7a3699156ad580f2222b63b281a94221c57874b42836f075907 WHIRLPOOL da8c2d78d2a98c5fb24c1c018915e3aee7ecdef967da85595e4a675affe47508b80f110255ad2496921fe7439f9fcd234b971fc35be1e20c1f6d28b415e40dab
+DIST ruby-shadow-2.5.0.gem 11264 SHA256 c5e82fefb03169197a653ffeae533f81e99462d13b90ee7e5786287a2e2194a1 SHA512 1abd54df1bd4f29e135093df9b22886a726824f8b72b742017fd31bdc3fa39e3d79410a747cf2ebe4117f75e665fb89c904375b5c44a674bec91a4cc37646520 WHIRLPOOL f5f610cc4bbbe39c6a457d309436a054fe0300b7e8be13b269582e8328dde80f7f50eaf78a19af7da78a611063cc2d377e2c085a06f6d1a08b847ab08bef6b3e
diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild b/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild
new file mode 100644
index 000000000000..1f17a97a47e2
--- /dev/null
+++ b/dev-ruby/ruby-shadow/ruby-shadow-2.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="HISTORY README README.euc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="ruby shadow bindings"
+HOMEPAGE="https://github.com/apalmblad/ruby-shadow http://ttsky.net"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+each_ruby_configure() {
+ ${RUBY} extconf.rb || die "Configuration failed."
+ sed -i -e "/^ldflags =/s/$/ \$(LDFLAGS)/" Makefile || die
+}
+
+each_ruby_compile() {
+ emake V=1
+ mkdir -p lib
+ cp shadow$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/ruby-vte/Manifest b/dev-ruby/ruby-vte/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-vte/Manifest
+++ b/dev-ruby/ruby-vte/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-vte/ruby-vte-3.0.7.ebuild b/dev-ruby/ruby-vte/ruby-vte-3.0.7.ebuild
new file mode 100644
index 000000000000..ddc2f728b607
--- /dev/null
+++ b/dev-ruby/ruby-vte/ruby-vte-3.0.7.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby vte bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" >=x11-libs/vte-0.12.1:0"
+DEPEND+=" >=x11-libs/vte-0.12.1:0"
+
+ruby_add_rdepend ">=dev-ruby/ruby-gtk2-${PV}"
diff --git a/dev-ruby/ruby-vte3/Manifest b/dev-ruby/ruby-vte3/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-vte3/Manifest
+++ b/dev-ruby/ruby-vte3/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-vte3/ruby-vte3-3.0.7.ebuild b/dev-ruby/ruby-vte3/ruby-vte3-3.0.7.ebuild
new file mode 100644
index 000000000000..46ed99c4bcb5
--- /dev/null
+++ b/dev-ruby/ruby-vte3/ruby-vte3-3.0.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby VTE bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/vte:2.90"
+RDEPEND+=" x11-libs/vte:2.90"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+ sed -i -e '/system/,/^ end/ s:^:#:' test/run-test.rb || die
+
+ # Avoid tests that require a real pty.
+ rm -f test/test-pty.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/ruby-webkit-gtk/Manifest b/dev-ruby/ruby-webkit-gtk/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-webkit-gtk/Manifest
+++ b/dev-ruby/ruby-webkit-gtk/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-webkit-gtk/ruby-webkit-gtk-3.0.7.ebuild b/dev-ruby/ruby-webkit-gtk/ruby-webkit-gtk-3.0.7.ebuild
new file mode 100644
index 000000000000..57743450a1fa
--- /dev/null
+++ b/dev-ruby/ruby-webkit-gtk/ruby-webkit-gtk-3.0.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby WebKitGtk bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" net-libs/webkit-gtk:3"
+RDEPEND+=" net-libs/webkit-gtk:3"
+
+RUBY_S="ruby-gnome2-all-${PV}/webkit-gtk"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gobject-introspection-${PV}
+ >=dev-ruby/ruby-gtk3-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ ../gobject-introspection/test/gobject-introspection-test-utils.rb \
+ test/webkit-gtk-test-utils.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/ruby-webkit-gtk2/Manifest b/dev-ruby/ruby-webkit-gtk2/Manifest
index eeb791e8efbc..f88b5cee3791 100644
--- a/dev-ruby/ruby-webkit-gtk2/Manifest
+++ b/dev-ruby/ruby-webkit-gtk2/Manifest
@@ -1,2 +1,3 @@
DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
+DIST ruby-gnome2-all-3.0.7.tar.gz 1692752 SHA256 4b65da24a5fdd4a774d6f238abcce8a3aca2bad093211bb824fb6a06e5430375 SHA512 0cfd5dd13ef0e0986ddd2235f88ffb21d15e6cb709b47252bb34e587fef88c0234e65f178eccec7dbfd45759ba37f1bbdcee6c7908d3f9daaf3369453b2478ee WHIRLPOOL 0a0e2749f6642485bada7ab22d69a3ed0e4d170a2d0dec6db88e62179264c6093a51c05cca87c64a4a3e9d1bdedb05a92fba81f6098872c06c8cbfa451ccedf2
diff --git a/dev-ruby/ruby-webkit-gtk2/ruby-webkit-gtk2-3.0.7.ebuild b/dev-ruby/ruby-webkit-gtk2/ruby-webkit-gtk2-3.0.7.ebuild
new file mode 100644
index 000000000000..12f974261437
--- /dev/null
+++ b/dev-ruby/ruby-webkit-gtk2/ruby-webkit-gtk2-3.0.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby WebKitGtk+ for Gtk 2.0 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" net-libs/webkit-gtk:2"
+RDEPEND+=" net-libs/webkit-gtk:2"
+
+RUBY_S="ruby-gnome2-all-${PV}/webkit-gtk2"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gobject-introspection-${PV}
+ >=dev-ruby/ruby-gtk2-${PV}"
+
+all_ruby_prepare() {
+ # Avoid unneeded dependency on test-unit-notify.
+ sed -i -e '/notify/ s:^:#:' \
+ ../gobject-introspection/test/gobject-introspection-test-utils.rb \
+ test/webkit-gtk-test-utils.rb || die
+}
+
+each_ruby_configure() {
+ :
+}
+
+each_ruby_compile() {
+ :
+}
+
+each_ruby_test() {
+ VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+ virtualmake || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+}
diff --git a/dev-ruby/sass/Manifest b/dev-ruby/sass/Manifest
index 60c513c64e72..3d88b6956e25 100644
--- a/dev-ruby/sass/Manifest
+++ b/dev-ruby/sass/Manifest
@@ -3,3 +3,4 @@ DIST sass-3.3.14.gem 315392 SHA256 95435ddef3aee817ef727e3576852e9cb12f7020027c9
DIST sass-3.4.15.gem 336896 SHA256 6b461a469d29ec80b52b1401b5e5d58c48762a8f3e00f3b0b2d37b6791a87a59 SHA512 9a6db0d6bdcb788b850e47fb61c5b803e156178eecce7b0c7d0edd2a3578405fa6dc88d397051d738b8bf52c70b6457618afbaf14b5b6fb4bf5f43f057229d0b WHIRLPOOL c3691b0eae97f5b7f4ef1398b99e3702ac32d1894308f9c0ccd2c81a2d30c812e9b775b96d8898ea1941ad11de7f378cf988d38cac6fd8c4e32e678ddedcbaef
DIST sass-3.4.17.gem 339456 SHA256 2d0fda87240e0133e04f2fd30d0184c0cb13f9b5235fbf3fc4efc038f1b3da58 SHA512 905633b0dd09dbae396bbf0ee4527b079e37cad7b93215fcf37dd475b8cb18ed18fd40ec5ee1db76155c5890cb8ea495739ad34e3420f5058d784303469cb122 WHIRLPOOL 298c8416ad0d29f1ad74412d99f99ee4873804c4a90be5d340b5fb56f2fe07114e139d9100796d8ff25026a95938922e82dd1b08250cf9c91b5b9c972720807c
DIST sass-3.4.18.gem 339456 SHA256 1dbc7edeef048ae9d7e48089c8d77841d97a6cbed1b6bc894dc126f94c43b0ea SHA512 16e0360e130cdbd0e0e19d8198ac0d3d50debc49c950062e276be69613a99d539e23ab4b40887baed369034c5724acfe238920658dd586ff17c97dafb173dba2 WHIRLPOOL e3cff8cd416f2ed943fc17ef8c1c5a76d94f0680210685344506d1504daea09db24244151a43bf2f345b773850363148f503c10484a00d7faef1e0bef591bbdf
+DIST sass-3.4.19.gem 338944 SHA256 2faca8aa3b76beb0bc59dccabc5114eb4118af9d613121fbaa120e1c8b7f0290 SHA512 7ef5d6887784b98c19d389beb6f7d9d423f72e42c8f8da4b720482ba13a11273dc1ad86021e43e3e9325f57a8ca55b4b68504a21a9652eac96d23d871810aa83 WHIRLPOOL 3e9f2e3b1afdf4a65f820a9d63578572284e8ca64b2cdf40f2c67ae04fa554c4bf8ab847cf22d86ddaacb93068fcb38e4dc958cf1b29d7bec2a96531ee1865f0
diff --git a/dev-ruby/sass/sass-3.4.19.ebuild b/dev-ruby/sass/sass-3.4.19.ebuild
new file mode 100644
index 000000000000..2e6adb8a9c21
--- /dev/null
+++ b/dev-ruby/sass/sass-3.4.19.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="rails init.rb VERSION VERSION_NAME"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="An extension of CSS3, adding nested rules, variables, mixins, selector inheritance, and more"
+HOMEPAGE="http://sass-lang.com/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+SLOT="$(get_version_component_range 1-2)"
+IUSE=""
+
+ruby_add_bdepend "doc? ( >=dev-ruby/yard-0.5.3 )"
+
+ruby_add_rdepend ">=dev-ruby/listen-1.3.1:1 !!<dev-ruby/haml-3.1 !!<dev-ruby/sass-3.2.19-r1:0 !!<dev-ruby/sass-3.3.14-r1:3.3"
+
+# tests could use `less` if we had it
+
+all_ruby_prepare() {
+ rm -rf vendor/listen || die
+
+ # Don't require maruku as markdown provider but let yard decide.
+ sed -i -e '/maruku/d' .yardopts || die
+}
+
+each_ruby_test() {
+ RUBOCOP=false ${RUBY} -S rake test || die
+}
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 90449f57c152..ef1154893134 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -2,3 +2,4 @@ DIST selenium-webdriver-2.45.0.gem 2918912 SHA256 907efd8f8605fe5947ca21c58e13e9
DIST selenium-webdriver-2.46.2.gem 2919424 SHA256 cb6575396f62f86f015c4905970d48da546c59109ed0aa318af061468d19a85c SHA512 b19bd428090381a12b577d82678ea8dfd2eec64c41e7c070c066ad8e9f106c3821a476038132f49862e1e01a5e940fa4e7a15f3655493753303dcedcccc55943 WHIRLPOOL e2413479641c6a4e687a824016af023f76286a0b89af3733e421d103d38e4dd73c8fcbc30b72135699c178060bfa2978ad15941864715c90f5a65311ae10b016
DIST selenium-webdriver-2.47.0.gem 2871808 SHA256 78dd73ab91fbaec770aec43e2366f8c8afeb4536367f8fd06de665fae722d09b SHA512 386f6485e346e570588fe533f8a2dd6927268fa5a438fd2fac6ec8ac064ba8f4b43a085acccbe8a94ed09c2bed52e0b799ea5eb7fb080d4a139dd5622a46e301 WHIRLPOOL b05364e972821eac7bc4bc498508457b6343e2a666f33420faf058b920a74c33c6d0cbe6d1b620ca1c4a2d77de05a7f59bbb77c2ec0498b02b9ed4f3edfcb1de
DIST selenium-webdriver-2.47.1.gem 2872832 SHA256 0140306e064fc40eb2dc632a88fd47dabe786ec2b29f7c59ee425d58113f7b86 SHA512 2973983dfca3ae1c97f55edc9db9480a7595676439c57ae58ec8af18ae6c5e210e2a2efcab630036079c4fed0513ce2e961b36dec3501b41e787a92ebf8cca98 WHIRLPOOL 137327e3066f9cdd52fc41ef1a36ee7a1ebb669b0a5dcbb9aafe7f49d180d2b41850b60089592b2ae9db8c9127764db2108543a173853b1ba4edf16131e8858c
+DIST selenium-webdriver-2.48.0.gem 884736 SHA256 8a67d2ca76bd20a6b2b3d63923756fad04c60bd86d95ca276cc256d12996ebef SHA512 1c270c7ab4176f38a776c000be57366b7143ca33b4ac34e3406710a5f5fb787fd70c77e4bca4d586be855ee7248a0b1d14fa7e0cab8b43f81f497468451d52a4 WHIRLPOOL b677111b1c0e2bcf823b186165d9c93aa3fe2d73e4be462053cd03a0757b1c6eb8d4006423266b95ea558c8d02a9a08d41e495640d0ee7e5bd9f1c78a5ce8a55
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-2.48.0.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-2.48.0.ebuild
new file mode 100644
index 000000000000..6c67ddbfd8c3
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-2.48.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at https://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+QA_PREBUILT="*/x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver"
+HOMEPAGE="http://gemcutter.org/gems/selenium-webdriver"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/childprocess-0.5.0
+ >=dev-ruby/multi_json-1.0.4
+ dev-ruby/rubyzip:1"
+
+all_ruby_prepare() {
+ # Make websocket a development dependency since it is only needed
+ # for the safari driver which we don't support on Gentoo.
+ sed -i -e '/websocket/,/version_requirements/ s/runtime/development/' ../metadata || die
+}
diff --git a/dev-ruby/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index 658d3b221a48..244cba3e03dd 100644
--- a/dev-ruby/sqlite3/Manifest
+++ b/dev-ruby/sqlite3/Manifest
@@ -1 +1,2 @@
DIST sqlite3-1.3.10.gem 60416 SHA256 70d815be84bd9630a0b68b236fd2811eef4297a8e4b53e3df89dd39f2d39efe3 SHA512 0a35896a4b9ce4f1e0f29ef9385f13b418b089d9bad467290e21eb12a4d09ce755231f5844c5009013ac9c73a27f7050ce899660d93d6ecc9e919f048a073cfe WHIRLPOOL 95f5f6d2944012cd4778f5d29e63ae43208e247ff5a9d184409dec4756beb14b90878c5ae6b337bf3f3d1fb9049de0cf65625a8544a429c735d5d9b66f90cd1d
+DIST sqlite3-1.3.11.gem 60928 SHA256 de8ecdcc00a7af0cda98661ed94ce442964b9403b425e95c3ac4544b1f3720a7 SHA512 02bef5f8f61d1f04c79d9032d62c9d708dddc2446dd256ad13f932ed4cae256d6c60f742a285bc4015ef5b1fb13e9541738f31fd270fe22320fc176525fe37bb WHIRLPOOL 2fb319f159e50d372ae374a6656b7452a746f6a85d94c7b15745feea73dc9c107dd4c51af54c76115ebe184ef906e41e53f2a72b9beffdada5a533cc5f142494
diff --git a/dev-ruby/sqlite3/sqlite3-1.3.11.ebuild b/dev-ruby/sqlite3/sqlite3-1.3.11.ebuild
new file mode 100644
index 000000000000..6b5326e33320
--- /dev/null
+++ b/dev-ruby/sqlite3/sqlite3-1.3.11.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC="faq"
+RUBY_FAKEGEM_DOCDIR="doc faq"
+RUBY_FAKEGEM_EXTRADOC="API_CHANGES.rdoc README.rdoc ChangeLog.cvs CHANGELOG.rdoc"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="An extension library to access a SQLite database from Ruby"
+HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND+=" >=dev-db/sqlite-3.6.16:3"
+DEPEND+=" >=dev-db/sqlite-3.6.16:3"
+
+ruby_add_bdepend "
+ dev-ruby/rake-compiler
+ dev-ruby/hoe
+ doc? ( dev-ruby/redcloth )
+ test? ( dev-ruby/minitest:5 )"
+
+all_ruby_prepare() {
+ # We remove the vendor_sqlite3 rake task because it's used to
+ # bundle SQlite3 which we definitely don't want.
+ rm tasks/vendor_sqlite3.rake || die
+
+ # Remove license line from hoe to avoid depending on a newer
+ # version.
+ sed -i -e '/license/d' tasks/gem.rake || die
+
+ sed -i -e 's:, HOE.spec::' -e '/task :test/d' tasks/native.rake || die
+}
+
+each_ruby_configure() {
+ ${RUBY} -Cext/sqlite3 extconf.rb || die
+}
+
+all_ruby_compile() {
+ all_fakegem_compile
+
+ rdoc --title "${P} Dcoumentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
+}
+
+each_ruby_compile() {
+ # TODO: not sure what happens with jruby
+
+ emake -Cext/sqlite3 V=1
+ mv ext/sqlite3/sqlite3_native$(get_modname) lib/sqlite3/ || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+
+ # sqlite3 was called sqlite3-ruby before, so add a spec file that
+ # simply loads sqlite3 to make sure that old projects load correctly
+ # we don't even need to create a file to load this: the `require
+ # sqlite3` was already part of sqlite3-ruby requirements.
+ cat - <<EOF > "${T}/sqlite3-ruby.gemspec"
+# generated by ebuild
+# $Id$
+Gem::Specification.new do |s|
+ s.name = "sqlite3-ruby"
+ s.version = "${RUBY_FAKEGEM_VERSION}"
+ s.summary = "Fake gem to load sqlite3"
+ s.homepage = "${HOMEPAGE}"
+ s.specification_version = 3
+ s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
+end
+EOF
+ RUBY_FAKEGEM_NAME=sqlite3-ruby \
+ RUBY_FAKEGEM_GEMSPEC="${T}/sqlite3-ruby.gemspec" \
+ ruby_fakegem_install_gemspec
+}
diff --git a/dev-ruby/syntax/syntax-1.2.0-r1.ebuild b/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
index 0573540ffab9..6d5d5b102dfe 100644
--- a/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/dblock/syntax/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test doc"
RUBY_PATCHES=( "${P}-require-set.patch" )
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index d53cbe36cf1b..b11840473ee2 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -2,3 +2,4 @@ DIST test-unit-1.2.3.gem 40960 SHA256 a7551459c53b0d73ac8e3ad3624b88d211bc80bc41
DIST test-unit-2.5.5.gem 111104 SHA256 3216d6584293964c438e0573fa8f0273d12df2abb1c32d7a6aa427d6e0779d47 SHA512 4f710997d187011bc240ef869f5c86c11e01d9c7c8bee5fd938f194155137d7164e69bae6d63e41b90de8f7f6ab813a62131f2f9518d57b3913777923b491142 WHIRLPOOL 8bcdd17b02162e73afe6a306fc34e7687db7c6abb38cd94c3e558c25d30db3dda1893a923d217d887af55ff64f88e6c14861de5c30786798d3c4cf99f2c26ce3
DIST test-unit-3.1.3.gem 121856 SHA256 b34ed36148329b1f4df9b3385259172c5435457f0da3d5494e3fcd0ae1f33d79 SHA512 3b2ab5e74940c9e02ca345212858ace4fec2266137da896efed50d87f53fb6076be11dcc05603b294bfe48a68ac2458c2b6bd437ddcf45ea7b0b1959b3c7fb89 WHIRLPOOL baba9eba099c6a599c8237dccef9749075b32a187041080c5230ad36f9354f175d9c96d7d2a02f7fcc4b18bb21cf628f0e3f06bc530914fd68cd4565e6a369ab
DIST test-unit-3.1.4.gem 122368 SHA256 9af970e9106b57672cccf917af6bc252e18ceef500d026eac360559f4560c4af SHA512 9e7b3d1a83b5d296d082281cf0f177ce6ab4347351cb358c199924bfc6bc2c56ed2c9a0701aac7dc056bede29087b91389a3e51c04e7f31852bfa6d90bac6b16 WHIRLPOOL 84911bbf8427d7575456257f4ac0f2fe6cb1862a4c9e68507e185529a65c4cca6fc1980b795a813bd886c3c7a4d389ca2435393539a13eb447d4515b45e72410
+DIST test-unit-3.1.5.gem 122368 SHA256 9c38357eb0342e7971b6e6c37691b1ceb5161736a0e92e314797e6cabfb4bf4b SHA512 46840108402ef6319e76fd9b5270e88aaf45d6cf99fa84f28e8a01ce2bc2d5e0e79d1fdf660807fcc5b2434540f4240bd4799ecbb7fa6231af1cd96a7c89f994 WHIRLPOOL fbec655035463fd0b10f4c514444c2448feb37dd4f072ad536fc3f834afd5f9059409da87b23f4c7b7d73f7150815b26a91cdb80a9365211d2280a5ec102b97b
diff --git a/dev-ruby/test-unit/test-unit-3.1.5.ebuild b/dev-ruby/test-unit/test-unit-3.1.5.ebuild
new file mode 100644
index 000000000000..85d1f67e8902
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.1.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+inherit ruby-fakegem
+
+# Assume for now that ruby22 is not eselected yet and only depend on
+# yard for the other ruby implementations. Without this assumption
+# bootstrapping ruby22 won't be possible due to the yard dependency
+# tree.
+#USE_RUBY="${USE_RUBY/ruby22/}" ruby_add_bdepend "doc? ( dev-ruby/yard )"
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+DESCRIPTION="An xUnit family unit testing framework for Ruby"
+HOMEPAGE="https://rubygems.org/gems/test-unit"
+
+LICENSE="|| ( Ruby GPL-2 ) PSF-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+# power_assert does not work with ruby19 but is not needed for backward
+# compatibility:
+# https://github.com/k-tsj/power_assert/issues/8#issuecomment-71363455
+USE_RUBY="${USE_RUBY/ruby19/}" ruby_add_rdepend "dev-ruby/power_assert"
+
+each_ruby_prepare() {
+ case ${RUBY} in
+ *ruby19)
+ # Remove metadata to avoid registering the unsupported
+ # power_assert dependency.
+ rm -f ../metadata || die
+ ;;
+ esac
+}
+
+all_ruby_compile() {
+ all_fakegem_compile
+
+ if use doc; then
+ yard doc --title ${PN} || die
+ fi
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die "testsuite failed"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ newbin "${FILESDIR}"/testrb-3 testrb-2
+}
diff --git a/dev-scheme/guile/files/guile-1.8.8-gcc5.patch b/dev-scheme/guile/files/guile-1.8.8-gcc5.patch
new file mode 100644
index 000000000000..742ea0ba9de2
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-gcc5.patch
@@ -0,0 +1,15 @@
+Preprocessor changes in GCC 5 cause guile-snarf to output garbage.
+
+https://bugs.gentoo.org/560736
+
+--- a/libguile/guile-snarf.in
++++ b/libguile/guile-snarf.in
+@@ -50,7 +50,7 @@
+ ## Apparently, AIX's preprocessor is unhappy if you try to #include an
+ ## empty file.
+ echo "/* cpp arguments: $@ */" ;
+- ${cpp} -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
++ ${cpp} -P -DSCM_MAGIC_SNARF_INITS -DSCM_MAGIC_SNARFER "$@" > ${temp} && cpp_ok_p=true
+ grep "^ *\^ *\^" ${temp} | sed -e "s/^ *\^ *\^//" -e "s/\^\ *:\ *\^.*/;/"
+ }
+
diff --git a/dev-scheme/guile/files/guile-1.8.8-readline.patch b/dev-scheme/guile/files/guile-1.8.8-readline.patch
new file mode 100644
index 000000000000..68f64c528a4b
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-readline.patch
@@ -0,0 +1,34 @@
+Make guile-readline optional
+
+https://bugs.gentoo.org/392553
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -24,7 +24,7 @@
+ #
+ AUTOMAKE_OPTIONS = 1.10
+
+-SUBDIRS = oop libguile ice-9 guile-config guile-readline emacs \
++SUBDIRS = oop libguile ice-9 guile-config @GUILE_READLINE@ emacs \
+ scripts srfi doc examples test-suite benchmark-suite lang am
+
+ bin_SCRIPTS = guile-tools
+--- a/configure.in
++++ b/configure.in
+@@ -57,7 +57,15 @@ AH_TOP(/*GUILE_CONFIGURE_COPYRIGHT*/)
+ #
+ #--------------------------------------------------------------------
+
+-AC_CONFIG_SUBDIRS(guile-readline)
++GUILE_READLINE=
++AC_ARG_ENABLE([readline],
++ [AS_HELP_STRING([--disable-readline],
++ [disable building guile-readline])],
++ if test "x$enable_readline" != xno; then
++ AC_CONFIG_SUBDIRS([guile-readline])
++ GUILE_READLINE="guile-readline"
++ fi)
++AC_SUBST([GUILE_READLINE])
+
+ #--------------------------------------------------------------------
+
diff --git a/dev-scheme/guile/files/guile-1.8.8-sandbox.patch b/dev-scheme/guile/files/guile-1.8.8-sandbox.patch
new file mode 100644
index 000000000000..70d752fdae97
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-sandbox.patch
@@ -0,0 +1,15 @@
+Prevent sandbox violation when installing
+
+https://bugs.gentoo.org/521546
+
+--- a/guile-config/Makefile.am
++++ b/guile-config/Makefile.am
+@@ -39,8 +39,3 @@ guile-config: guile-config.in ${top_builddir}/libguile/libpath.h
+ -e s:@-GUILE_VERSION-@:${GUILE_VERSION}:
+ chmod +x guile-config.tmp
+ mv guile-config.tmp guile-config
+-
+-## Get rid of any copies of the configuration script under the old
+-## name, so people don't end up running ancient copies of it.
+-install-exec-local:
+- rm -f ${bindir}/build-guile
diff --git a/dev-scheme/guile/files/guile-1.8.8-tinfo.patch b/dev-scheme/guile/files/guile-1.8.8-tinfo.patch
new file mode 100644
index 000000000000..6c4d0116246e
--- /dev/null
+++ b/dev-scheme/guile/files/guile-1.8.8-tinfo.patch
@@ -0,0 +1,15 @@
+With ncurses[tinfo] tgoto will be in libtinfo
+
+https://bugs.gentoo.org/539316
+
+--- a/guile-readline/configure.in
++++ b/guile-readline/configure.in
+@@ -33,7 +33,7 @@ if test "$MINGW32" = "yes" ; then
+ fi
+ AC_SUBST(EXTRA_DEFS)
+
+-for termlib in ncurses curses termcap terminfo termlib ; do
++for termlib in ncurses curses termcap terminfo termlib tinfo ; do
+ AC_CHECK_LIB(${termlib}, tgoto,
+ [LIBS="-l${termlib} $LIBS"; break])
+ done
diff --git a/dev-scheme/guile/guile-1.8.8-r2.ebuild b/dev-scheme/guile/guile-1.8.8-r2.ebuild
new file mode 100644
index 000000000000..b6381265a652
--- /dev/null
+++ b/dev-scheme/guile/guile-1.8.8-r2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools flag-o-matic elisp-common
+
+DESCRIPTION="Scheme interpreter"
+HOMEPAGE="https://www.gnu.org/software/guile/"
+SRC_URI="mirror://gnu/guile/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="debug debug-freelist debug-malloc +deprecated discouraged emacs networking nls readline +regex +threads"
+
+RESTRICT="!regex? ( test )"
+
+RDEPEND="
+ >=dev-libs/gmp-4.1:0=
+ dev-libs/libltdl:0=
+ sys-devel/gettext
+ sys-libs/ncurses:0=
+ emacs? ( virtual/emacs )
+ readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}
+ sys-apps/texinfo
+ sys-devel/libtool"
+
+# Guile seems to contain some slotting support, /usr/share/guile/ is slotted,
+# but there are lots of collisions. Most in /usr/share/libguile. Therefore
+# I'm slotting this in the same slot as guile-1.6* for now.
+SLOT="12"
+MAJOR="1.8"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-fix_guile-config.patch" \
+ "${FILESDIR}/${P}-gcc46.patch" \
+ "${FILESDIR}/${P}-gcc5.patch" \
+ "${FILESDIR}/${P}-makeinfo-5.patch" \
+ "${FILESDIR}/${P}-gtexinfo-5.patch" \
+ "${FILESDIR}/${P}-readline.patch" \
+ "${FILESDIR}/${P}-tinfo.patch" \
+ "${FILESDIR}/${P}-sandbox.patch"
+
+ sed \
+ -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" \
+ -e "/AM_PROG_CC_STDC/d" \
+ -i guile-readline/configure.in
+
+ epatch_user
+
+ mv "${S}"/configure.{in,ac} || die
+ mv "${S}"/guile-readline/configure.{in,ac} || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # see bug #178499
+ filter-flags -ftree-vectorize
+
+ #will fail for me if posix is disabled or without modules -- hkBst
+ econf \
+ --disable-error-on-warning \
+ --disable-static \
+ --enable-posix \
+ $(use_enable networking) \
+ $(use_enable readline) \
+ $(use_enable regex) \
+ $(use deprecated || use_enable discouraged) \
+ $(use_enable deprecated) \
+ $(use_enable emacs elisp) \
+ $(use_enable nls) \
+ --disable-rpath \
+ $(use_enable debug-freelist) \
+ $(use_enable debug-malloc) \
+ $(use_enable debug guile-debug) \
+ $(use_with threads) \
+ --with-modules \
+ EMACS=no
+}
+
+src_compile() {
+ emake
+
+ # Above we have disabled the build system's Emacs support;
+ # for USE=emacs we compile (and install) the files manually
+ if use emacs; then
+ cd emacs
+ elisp-compile *.el || die
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc AUTHORS ChangeLog GUILE-VERSION HACKING NEWS README THANKS
+
+ # texmacs needs this, closing bug #23493
+ dodir /etc/env.d
+ echo "GUILE_LOAD_PATH=\"${EPREFIX}/usr/share/guile/${MAJOR}\"" > "${ED}"/etc/env.d/50guile
+
+ # necessary for registering slib, see bug 206896
+ keepdir /usr/share/guile/site
+
+ if use emacs; then
+ elisp-install ${PN} emacs/*.{el,elc} || die
+ elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" || die
+ fi
+}
+
+pkg_postinst() {
+ [ "${EROOT}" == "/" ] && pkg_config
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
+
+pkg_config() {
+ if has_version dev-scheme/slib; then
+ einfo "Registering slib with guile"
+ install_slib_for_guile
+ fi
+}
+
+_pkg_prerm() {
+ rm -f "${EROOT}"/usr/share/guile/site/slibcat
+}
diff --git a/dev-scheme/slib/slib-3.2.2.ebuild b/dev-scheme/slib/slib-3.2.2.ebuild
index a418aa1a7b91..6e6c6be70488 100644
--- a/dev-scheme/slib/slib-3.2.2.ebuild
+++ b/dev-scheme/slib/slib-3.2.2.ebuild
@@ -31,7 +31,7 @@ INSTALL_DIR="/usr/share/slib/"
_fix_txi_file() {
local inplace_filename="${1}"
- local tempfile="$(mktemp)"
+ local tempfile="$(emktemp)"
awk -f "${FILESDIR}"/slib-3.2.2-fix-texinfo.awk < "${inplace_filename}" > "${tempfile}"
mv "${tempfile}" "${inplace_filename}" || die
}
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index d7654b41fdda..822c3d4e4906 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,3 +1 @@
-DIST catalyst-2.0.16.tar.bz2 878929 SHA256 4578cbbc36a5d913b51967faad6feb9b8bb10a04794fe44e73b71790fa389142 SHA512 460ee4c996a7197f2d3e2504ef5ff205c74c0e7ca763a67dc57932a8df6199334fef3b234d90da1717d3f59b36081a29c768a864efa82129cd4f6e2de34ac3a8 WHIRLPOOL e43861bcb7286f85e8d0857d32f4e0ba9f39eea5bae2eac05e0b9e782ee2edad2a8171e1a0ea451c7ee67b21f2210f8ff3f2a9e37c16d16552c6c46e74637233
-DIST catalyst-2.0.17.tar.bz2 861341 SHA256 5f4142598d921e5174ff06f9571856760a324e79db5f3b63caf0d1a16adc813c SHA512 9d7b9ad383dcc5d4ba058596c0b607eb9601b28025d9300f63e68d78cbd5bca8fa3f3e03a81dc6b233021e773ba4301df0bf5cec51ca4368eb3577a68d33a92c WHIRLPOOL e97fc120141cc4f9f5c297652d8b43313780f615429c0eb3d9b85cba40aeca01dcbc6efb0f8d388cc5e7debabb2563cfc9b5a5aa00e3d00d306aed0f799fc642
DIST catalyst-2.0.18.tar.bz2 861398 SHA256 f3c2583fb8da425a9c57d3a00aac559e6bfde5951f1c7ef30ddf4fa00d6bedbd SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a WHIRLPOOL 73abb541bd9984e26e43dbeee3156ca84104aedfe16a027b97790274aaffa8678a29677da4ada908fe9c2184268eb9c266a8961a5e0681fccc463c47a6d83542
diff --git a/dev-util/catalyst/catalyst-2.0.16.ebuild b/dev-util/catalyst/catalyst-2.0.16.ebuild
deleted file mode 100644
index 0bd3e47ff8b5..000000000000
--- a/dev-util/catalyst/catalyst-2.0.16.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
- SRC_ECLASS="git-2"
- EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
- EGIT_MASTER="master"
- SRC_URI=""
- KEYWORDS=""
- S="${WORKDIR}/${PN}"
-else
- SRC_URI="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://www.gentoo.org/proj/en/releng/catalyst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache kernel_linux"
-
-DEPEND="
- app-text/asciidoc
- ${PYTHON_DEPS}
-"
-RDEPEND="
- app-arch/lbzip2
- app-crypt/shash
- virtual/cdrtools
- amd64? ( >=sys-boot/syslinux-3.72 )
- ia64? ( sys-fs/dosfstools )
- x86? ( >=sys-boot/syslinux-3.72 )
- ccache? ( dev-util/ccache )
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
- ${PYTHON_DEPS}
-"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
- if use ccache ; then
- einfo "Enabling ccache support for catalyst."
- else
- ewarn "By default, ccache support for catalyst is disabled."
- ewarn "If this is not what you intended,"
- ewarn "then you should add ccache to your USE."
- fi
-
- echo
- einfo "The template spec files are now installed by default. You can find"
- einfo "them under /usr/share/doc/${PF}/examples"
- einfo "and they are considered to be the authorative source of information"
- einfo "on catalyst."
- echo
-
- python-single-r1_pkg_setup
-}
-
-src_install() {
- insinto /usr/$(get_libdir)/${PN}
- exeinto /usr/$(get_libdir)/${PN}
- doexe catalyst || die "copying catalyst"
-
- if [[ ${PV} == 3.9999* ]]; then
- doins -r modules files || die "copying files"
- else
- doins -r arch modules livecd || die "copying files"
- fi
-
- for x in targets/*; do
- exeinto /usr/$(get_libdir)/${PN}/$x
- doexe $x/* || die "copying ${x}"
- done
-
- # Here is where we actually enable ccache
- use ccache && \
- sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
- files/catalyst.conf
-
- sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
- files/catalyst.conf
-
- make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
- insinto /etc/catalyst
- doins files/catalyst.conf files/catalystrc || die "copying configuration"
- insinto /usr/share/doc/${PF}/examples
- doins examples/* || die
- dodoc README AUTHORS
- doman files/catalyst.1 files/catalyst-spec.5
-
- python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
- python_optimize "${ED}"
-}
-
-pkg_postinst() {
- einfo "You can find more information about catalyst by checking out the"
- einfo "catalyst project page at:"
- einfo "https://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-}
diff --git a/dev-util/catalyst/catalyst-2.0.17.ebuild b/dev-util/catalyst/catalyst-2.0.17.ebuild
deleted file mode 100644
index 0bd3e47ff8b5..000000000000
--- a/dev-util/catalyst/catalyst-2.0.17.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
- SRC_ECLASS="git-2"
- EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
- EGIT_MASTER="master"
- SRC_URI=""
- KEYWORDS=""
- S="${WORKDIR}/${PN}"
-else
- SRC_URI="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://www.gentoo.org/proj/en/releng/catalyst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache kernel_linux"
-
-DEPEND="
- app-text/asciidoc
- ${PYTHON_DEPS}
-"
-RDEPEND="
- app-arch/lbzip2
- app-crypt/shash
- virtual/cdrtools
- amd64? ( >=sys-boot/syslinux-3.72 )
- ia64? ( sys-fs/dosfstools )
- x86? ( >=sys-boot/syslinux-3.72 )
- ccache? ( dev-util/ccache )
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
- ${PYTHON_DEPS}
-"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
- if use ccache ; then
- einfo "Enabling ccache support for catalyst."
- else
- ewarn "By default, ccache support for catalyst is disabled."
- ewarn "If this is not what you intended,"
- ewarn "then you should add ccache to your USE."
- fi
-
- echo
- einfo "The template spec files are now installed by default. You can find"
- einfo "them under /usr/share/doc/${PF}/examples"
- einfo "and they are considered to be the authorative source of information"
- einfo "on catalyst."
- echo
-
- python-single-r1_pkg_setup
-}
-
-src_install() {
- insinto /usr/$(get_libdir)/${PN}
- exeinto /usr/$(get_libdir)/${PN}
- doexe catalyst || die "copying catalyst"
-
- if [[ ${PV} == 3.9999* ]]; then
- doins -r modules files || die "copying files"
- else
- doins -r arch modules livecd || die "copying files"
- fi
-
- for x in targets/*; do
- exeinto /usr/$(get_libdir)/${PN}/$x
- doexe $x/* || die "copying ${x}"
- done
-
- # Here is where we actually enable ccache
- use ccache && \
- sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
- files/catalyst.conf
-
- sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
- files/catalyst.conf
-
- make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
- insinto /etc/catalyst
- doins files/catalyst.conf files/catalystrc || die "copying configuration"
- insinto /usr/share/doc/${PF}/examples
- doins examples/* || die
- dodoc README AUTHORS
- doman files/catalyst.1 files/catalyst-spec.5
-
- python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
- python_optimize "${ED}"
-}
-
-pkg_postinst() {
- einfo "You can find more information about catalyst by checking out the"
- einfo "catalyst project page at:"
- einfo "https://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-}
diff --git a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
index 7f7203d721eb..8521851e8ea5 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
@@ -8,8 +8,6 @@ if [[ ${PV} == *9999* ]]; then
SRC_ECLASS="git-2"
EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
EGIT_MASTER="master"
- SRC_URI=""
- KEYWORDS=""
S="${WORKDIR}/${PN}"
else
SRC_URI="mirror://gentoo/${P}.tar.bz2
@@ -38,6 +36,7 @@ DEPEND="
RDEPEND="
app-arch/lbzip2
app-crypt/shash
+ app-arch/tar[xattr]
virtual/cdrtools
amd64? ( >=sys-boot/syslinux-3.72 )
ia64? ( sys-fs/dosfstools )
diff --git a/dev-util/catalyst/catalyst-2.0.18.ebuild b/dev-util/catalyst/catalyst-2.0.18.ebuild
deleted file mode 100644
index 0bd3e47ff8b5..000000000000
--- a/dev-util/catalyst/catalyst-2.0.18.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
- SRC_ECLASS="git-2"
- EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
- EGIT_MASTER="master"
- SRC_URI=""
- KEYWORDS=""
- S="${WORKDIR}/${PN}"
-else
- SRC_URI="mirror://gentoo/${P}.tar.bz2
- https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
- https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://www.gentoo.org/proj/en/releng/catalyst/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache kernel_linux"
-
-DEPEND="
- app-text/asciidoc
- ${PYTHON_DEPS}
-"
-RDEPEND="
- app-arch/lbzip2
- app-crypt/shash
- virtual/cdrtools
- amd64? ( >=sys-boot/syslinux-3.72 )
- ia64? ( sys-fs/dosfstools )
- x86? ( >=sys-boot/syslinux-3.72 )
- ccache? ( dev-util/ccache )
- kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
- ${PYTHON_DEPS}
-"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
- if use ccache ; then
- einfo "Enabling ccache support for catalyst."
- else
- ewarn "By default, ccache support for catalyst is disabled."
- ewarn "If this is not what you intended,"
- ewarn "then you should add ccache to your USE."
- fi
-
- echo
- einfo "The template spec files are now installed by default. You can find"
- einfo "them under /usr/share/doc/${PF}/examples"
- einfo "and they are considered to be the authorative source of information"
- einfo "on catalyst."
- echo
-
- python-single-r1_pkg_setup
-}
-
-src_install() {
- insinto /usr/$(get_libdir)/${PN}
- exeinto /usr/$(get_libdir)/${PN}
- doexe catalyst || die "copying catalyst"
-
- if [[ ${PV} == 3.9999* ]]; then
- doins -r modules files || die "copying files"
- else
- doins -r arch modules livecd || die "copying files"
- fi
-
- for x in targets/*; do
- exeinto /usr/$(get_libdir)/${PN}/$x
- doexe $x/* || die "copying ${x}"
- done
-
- # Here is where we actually enable ccache
- use ccache && \
- sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
- files/catalyst.conf
-
- sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
- files/catalyst.conf
-
- make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
- insinto /etc/catalyst
- doins files/catalyst.conf files/catalystrc || die "copying configuration"
- insinto /usr/share/doc/${PF}/examples
- doins examples/* || die
- dodoc README AUTHORS
- doman files/catalyst.1 files/catalyst-spec.5
-
- python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
- python_optimize "${ED}"
-}
-
-pkg_postinst() {
- einfo "You can find more information about catalyst by checking out the"
- einfo "catalyst project page at:"
- einfo "https://www.gentoo.org/proj/en/releng/catalyst/index.xml"
-}
diff --git a/dev-util/catalyst/catalyst-2.0.9999.ebuild b/dev-util/catalyst/catalyst-2.0.9999.ebuild
index f67796ddf8c9..89cb7b0ce523 100644
--- a/dev-util/catalyst/catalyst-2.0.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.9999.ebuild
@@ -9,8 +9,6 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
EGIT_MASTER="master"
EGIT_BRANCH="2.X"
- SRC_URI=""
- KEYWORDS=""
S="${WORKDIR}/${PN}"
else
SRC_URI="mirror://gentoo/${P}.tar.bz2
@@ -37,6 +35,7 @@ DEPEND="
RDEPEND="
app-arch/lbzip2
app-crypt/shash
+ app-arch/tar[xattr]
virtual/cdrtools
amd64? ( >=sys-boot/syslinux-3.72 )
ia64? ( sys-fs/dosfstools )
diff --git a/dev-util/catalyst/catalyst-2.9999.ebuild b/dev-util/catalyst/catalyst-2.9999.ebuild
index 0c6f8e386c24..37247625997e 100644
--- a/dev-util/catalyst/catalyst-2.9999.ebuild
+++ b/dev-util/catalyst/catalyst-2.9999.ebuild
@@ -9,8 +9,6 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
EGIT_MASTER="master"
EGIT_BRANCH="pending"
- SRC_URI=""
- KEYWORDS=""
S="${WORKDIR}/${PN}"
else
SRC_URI="mirror://gentoo/${P}.tar.bz2
@@ -38,6 +36,7 @@ RDEPEND="
=dev-python/pydecomp-9999
app-arch/lbzip2
app-crypt/shash
+ app-arch/tar[xattr]
virtual/cdrtools
amd64? ( >=sys-boot/syslinux-3.72 )
ia64? ( sys-fs/dosfstools )
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 525a3b1cef70..116a80352d5a 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -8,8 +8,6 @@ if [[ ${PV} == *9999* ]]; then
SRC_ECLASS="git-2"
EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
EGIT_BRANCH="master"
- SRC_URI=""
- KEYWORDS=""
S="${WORKDIR}/${PN}"
else
SRC_URI="mirror://gentoo/${P}.tar.bz2
@@ -37,6 +35,7 @@ RDEPEND="
=dev-python/pydecomp-9999
app-arch/lbzip2
app-crypt/shash
+ app-arch/tar[xattr]
virtual/cdrtools
amd64? ( >=sys-boot/syslinux-3.72 )
ia64? ( sys-fs/dosfstools )
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 816cc848d482..c8f6deddb189 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,8 +1,5 @@
DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e SHA512 a0fe8f6305052ba7894a7d58aa30f97b4be1f52eb7de650273a704929a6fbe81c7cebfa6e68a18c9e7d62f7ed02c944f74c2974da9aacc70e2cb186e0a1be44d WHIRLPOOL 3635651a59a93c661db4df8c248e35bfd8a9869eb74faa33fa6d56c12039ef7bb37756fd4c55fb107a9b7c38d2616dc43eb41acc0c565cfad4a24db99c361c29
-DIST cmake-3.0.2.tar.gz 5490501 SHA256 6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a24777805693e SHA512 de267bd6c5b318e48fae64c28947de009fb2413bdc6b4454b5e4bbb7d50b78aaef5d7e9d9655cfb9299aa5704fd3e4bbabc6816d3f378f76856f56ab161efe02 WHIRLPOOL 4c2aa1c72edb700689a8a91bfdfe22977e46a87851d66eb0e187e1e35a1a928be12b477fc39455b877d55420bcb149be6430d6835e01e20f61b84d8d83c752d6
-DIST cmake-3.1.0.tar.gz 5955836 SHA256 8bdc3fa3f2da81bc10c772a6b64cc9052acc2901d42e1e1b2588b40df224aad9 SHA512 9e3288c793c01e0ce48af91c618dc7638623010dfb440fb293393d407b7882c181c9a0f4e3b0a14645b556007e69264e94488e832a421b5cfa96338e0808b030 WHIRLPOOL 99df3f9052fee303d02ef9f27ee0ce22a1db57c0963dc7177837dea95a114da7b5d2ea8fd7155df1c7c513dbfb469bba2e638fc84fc1f1a9783fa49cd0e1a061
DIST cmake-3.2.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b WHIRLPOOL 7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2
-DIST cmake-3.2.3.tar.gz 6438938 SHA256 a1ebcaf6d288eb4c966714ea457e3b9677cdfde78820d0f088712d7320850297 SHA512 1fddea23c8e28cd6893879bd3bb349564ece815eaa5c68c3519dd62f0baa05eabbfc38168458ab91594cb0feeefd2ea761b6d292b679f8b9aa33e08a0b9d5b4c WHIRLPOOL 5268cc735cbd523a2027e479ab43499589b8653972a5bed7425c451a9b5ecc5d27c867cd218144a1eb6df2d3126301d7d494cafa7b1ac7455dbb40e66bad30c6
DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655 WHIRLPOOL 1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f
DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
DIST cmake-3.3.2.tar.gz 6578184 SHA256 e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22 SHA512 01bc0e6ca52a6836ef57360fb38dd92a4575bfa37bfe9625645db77fefd0c170383cfb07b61c6283bde96738ce1a5e18cb7569e7e0b7c98d4b99e86305c50180 WHIRLPOOL 7951dc18d695ca4554b287f91becd8ecb05324e10f9e2c9e34427d26db0d664ee7ab8a226eabed87d93087e41635059f96b1aaea503480f46a555cf3baae3ce7
diff --git a/dev-util/cmake/cmake-2.8.12.2-r2.ebuild b/dev-util/cmake/cmake-2.8.12.2-r2.ebuild
deleted file mode 100644
index 95b4f8f488de..000000000000
--- a/dev-util/cmake/cmake-2.8.12.2-r2.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 qt5"
-
-REQUIRED_USE="?? ( qt4 qt5 )"
-
-DEPEND="
- >=app-arch/libarchive-2.8.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- ncurses? ( sys-libs/ncurses:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-RDEPEND="${DEPEND}
- emacs? ( virtual/emacs )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
- "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
- "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
- "${FILESDIR}"/${PN}-2.8.10-desktop.patch
- "${FILESDIR}"/${PN}-2.8.10-libform.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
- "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
- "${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch
- "${FILESDIR}"/${PN}-2.8.12.2-FindBoost-python.patch
- "${FILESDIR}"/${PN}-2.8.12.2-FindCurses.patch
- "${FILESDIR}"/${PN}-2.8.12.2-fbsd.patch
- "${FILESDIR}"/${PN}-2.8.12.2-python34.patch
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # CTest.updatecvs, which fails to commit as root
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-pkg_setup() {
- # bug 387227
- addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- # make things work with gentoo java setup
- # in case java-config cannot be run, the variable just becomes unset
- # per bug #315229
- export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- $(cmake-utils_use_build ncurses CursesDialog)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
- if use emacs; then
- elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Docs/bash-completion/{${PN},ctest,cpack}
- rm -rf "${D}/usr/share/cmake/completions" || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-2.8.12.2.ebuild b/dev-util/cmake/cmake-2.8.12.2.ebuild
deleted file mode 100644
index c10fe925c0cf..000000000000
--- a/dev-util/cmake/cmake-2.8.12.2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 qt5"
-
-REQUIRED_USE="?? ( qt4 qt5 )"
-
-DEPEND="
- >=app-arch/libarchive-2.8.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- ncurses? ( sys-libs/ncurses:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-RDEPEND="${DEPEND}
- emacs? ( virtual/emacs )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
- "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
- "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
- "${FILESDIR}"/${PN}-2.8.10-desktop.patch
- "${FILESDIR}"/${PN}-2.8.10-libform.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch
- "${FILESDIR}"/${PN}-2.8.11-FindBoost-python.patch
- "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
- "${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # CTest.updatecvs, which fails to commit as root
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-pkg_setup() {
- # bug 387227
- addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- # make things work with gentoo java setup
- # in case java-config cannot be run, the variable just becomes unset
- # per bug #315229
- export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null)
-
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- $(cmake-utils_use_build ncurses CursesDialog)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Docs/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
- if use emacs; then
- elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Docs/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Docs/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Docs/bash-completion/{${PN},ctest,cpack}
- rm -rf "${D}/usr/share/cmake/completions" || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-3.0.2.ebuild b/dev-util/cmake/cmake-3.0.2.ebuild
deleted file mode 100644
index f16a8b6915fc..000000000000
--- a/dev-util/cmake/cmake-3.0.2.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt4 qt5"
-
-REQUIRED_USE="?? ( qt4 qt5 )"
-
-RDEPEND="
- >=app-arch/libarchive-2.8.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( virtual/emacs )
- ncurses? ( sys-libs/ncurses:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
- "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch
- "${FILESDIR}"/${PN}-2.8.10-libform.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
- "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # CTest.updatecvs, which fails to commit as root
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- $(cmake-utils_use_build ncurses CursesDialog)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -rf "${D}/usr/share/cmake/{completions,editors}" || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-3.1.0.ebuild b/dev-util/cmake/cmake-3.1.0.ebuild
deleted file mode 100644
index f06a68684c4f..000000000000
--- a/dev-util/cmake/cmake-3.1.0.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt4 qt5"
-
-REQUIRED_USE="?? ( qt4 qt5 )"
-
-RDEPEND="
- >=app-arch/libarchive-2.8.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( virtual/emacs )
- ncurses? ( sys-libs/ncurses:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
-"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-2.8.10-libform.patch
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
- "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
- "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
- "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # CTest.updatecvs, which fails to commit as root
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- $(cmake-utils_use_build ncurses CursesDialog)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -rf "${D}/usr/share/cmake/{completions,editors}" || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-3.2.3-r1.ebuild b/dev-util/cmake/cmake-3.2.3-r1.ebuild
deleted file mode 100644
index 3159e64d7794..000000000000
--- a/dev-util/cmake/cmake-3.2.3-r1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz
- http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
-
-RDEPEND="
- >=app-arch/libarchive-3.0.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( virtual/emacs )
- ncurses? ( sys-libs/ncurses:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- # prefix
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
- "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
- # handle gentoo packaging in find modules
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
- "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-
- # respect python eclasses
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
-
- # upstream backports
- "${FILESDIR}"/${PN}-3.2.3-musl-missing-include.patch
- "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # BundleUtilities: bundle creation broken
- # CTest.updatecvs: which fails to commit as root
- # Fortran: requires fortran
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- $(cmake-utils_use_build ncurses CursesDialog)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-3.2.3.ebuild b/dev-util/cmake/cmake-3.2.3.ebuild
deleted file mode 100644
index 8760d4a49907..000000000000
--- a/dev-util/cmake/cmake-3.2.3.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
-
-RDEPEND="
- >=app-arch/libarchive-3.0.0:=
- >=dev-libs/expat-2.0.1
- >=net-misc/curl-7.20.0-r1[ssl]
- sys-libs/zlib
- virtual/pkgconfig
- emacs? ( virtual/emacs )
- ncurses? ( sys-libs/ncurses:0= )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
- # prefix
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
- "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
- # handle gentoo packaging in find modules
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
- "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-
- # respect python eclasses
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
- "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
-
- # upstream backports
- "${FILESDIR}"/${PN}-3.2.3-musl-missing-include.patch
-)
-
-cmake_src_bootstrap() {
- # Cleanup args to extract only JOBS.
- # Because bootstrap does not know anything else.
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
- if [ $? -eq 0 ]; then
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
- par_arg="--parallel=${par_arg}"
- else
- par_arg="--parallel=1"
- fi
-
- # execinfo.h on Solaris isn't quite what it is on Darwin
- if [[ ${CHOST} == *-solaris* ]] ; then
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
- fi
-
- tc-export CC CXX LD
-
- # bootstrap script isn't exactly /bin/sh compatible
- ${CONFIG_SHELL:-sh} ./bootstrap \
- --prefix="${T}/cmakestrap/" \
- ${par_arg} \
- || die "Bootstrap failed"
-}
-
-cmake_src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
- # these are altered thanks to our eclass
- sed -i -e 's:#IGNORE ::g' \
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
- || die
-
- pushd "${BUILD_DIR}" > /dev/null
-
- local ctestargs
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
-
- # Excluded tests:
- # BootstrapTest: we actualy bootstrap it every time so why test it.
- # BundleUtilities: bundle creation broken
- # CTest.updatecvs: which fails to commit as root
- # Fortran: requires fortran
- # Qt4Deploy, which tries to break sandbox and ignores prefix
- # TestUpload, which requires network access
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \
- -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
- || die "Tests failed"
-
- popd > /dev/null
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # disable running of cmake in boostrap command
- sed -i \
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
- bootstrap || die "sed failed"
-
- # Add gcc libs to the default link paths
- sed -i \
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
- cmake_src_bootstrap
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
- -DCMAKE_DOC_DIR=/share/doc/${PF}
- -DCMAKE_MAN_DIR=/share/man
- -DCMAKE_DATA_DIR=/share/${PN}
- -DSPHINX_MAN=$(usex doc)
- -DSPHINX_HTML=$(usex doc)
- $(cmake-utils_use_build ncurses CursesDialog)
- )
-
- if use qt4 || use qt5 ; then
- mycmakeargs+=(
- -DBUILD_QtDialog=ON
- $(cmake-utils_use_find_package qt5 Qt5Widgets)
- )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
- VIRTUALX_COMMAND="cmake_src_test" virtualmake
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use emacs; then
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- insinto /usr/share/vim/vimfiles/syntax
- doins Auxiliary/cmake-syntax.vim
-
- insinto /usr/share/vim/vimfiles/indent
- doins Auxiliary/cmake-indent.vim
-
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${FILESDIR}/${PN}.vim"
-
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
- rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/cmake-3.3.1-r1.ebuild b/dev-util/cmake/cmake-3.3.1-r1.ebuild
index 44dc2a2a38f7..0ce39409b076 100644
--- a/dev-util/cmake/cmake-3.3.1-r1.ebuild
+++ b/dev-util/cmake/cmake-3.3.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.
LICENSE="CMake"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
RDEPEND="
diff --git a/dev-util/cmake/cmake-3.3.2.ebuild b/dev-util/cmake/cmake-3.3.2-r1.ebuild
index a1bdf0004b1c..417385cc22d0 100644
--- a/dev-util/cmake/cmake-3.3.2.ebuild
+++ b/dev-util/cmake/cmake-3.3.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.
LICENSE="CMake"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
RDEPEND="
@@ -59,6 +59,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+ "${FILESDIR}"/${PN}-3.3.2-FindQt4.patch
# respect python eclasses
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
diff --git a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch b/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
deleted file mode 100644
index b00b4f75219b..000000000000
--- a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch
+++ /dev/null
@@ -1,73 +0,0 @@
---- Modules/FindBoost.cmake
-+++ Modules/FindBoost.cmake
-@@ -903,6 +903,11 @@
-
- set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
- set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ # Get version of Python.
-+ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
-+ endif()
-+
-
- #
- # Find RELEASE libraries
-@@ -913,6 +918,14 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_RELEASE_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
-+ endif()
- if(_boost_STATIC_RUNTIME_WORKAROUND)
- set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
- list(APPEND _boost_RELEASE_NAMES
-@@ -920,6 +933,13 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_RELEASE_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
-+ endif()
- endif()
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
-@@ -945,6 +965,15 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
- ${Boost_LIB_PREFIX}boost_${COMPONENT} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_DEBUG_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
-+ endif()
- if(_boost_STATIC_RUNTIME_WORKAROUND)
- set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
- list(APPEND _boost_DEBUG_NAMES
-@@ -952,6 +981,13 @@
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
- ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-+ if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
-+ list(APPEND _boost_DEBUG_NAMES
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
-+ ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
-+ endif()
- endif()
- if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
- _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch b/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch
deleted file mode 100644
index ab27af2ec8ca..000000000000
--- a/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: KWSys Robot <kwrobot@kitware.com>
-Date: Tue, 15 Oct 2013 12:43:32 +0000 (-0400)
-Subject: KWSys 2013-10-15 (6eab64c3)
-X-Git-Tag: v3.0.0-rc1~178^2^2~5
-X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=c01e7445
-
-KWSys 2013-10-15 (6eab64c3)
-
-Extract upstream KWSys using the following shell commands.
-
-$ git archive --prefix=upstream-kwsys/ 6eab64c3 | tar x
-$ git shortlog --no-merges --abbrev=8 --format='%h %s' 96b2f6f4..6eab64c3
-Raphael Kubo da Costa (1):
- 6eab64c3 SystemInformation: Include backtrace-related headers on FreeBSD
-
-Change-Id: Ib0447aab3d6555ce278f0c1417af2c53e6f181a5
----
-
-diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
-index 7c31f3a..2672730 100644
---- a/Source/kwsys/SystemInformation.cxx
-+++ b/Source/kwsys/SystemInformation.cxx
-@@ -88,6 +88,15 @@ typedef int siginfo_t;
- # include <ifaddrs.h>
- # define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
- # endif
-+# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
-+# include <execinfo.h>
-+# if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
-+# include <cxxabi.h>
-+# endif
-+# if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
-+# include <dlfcn.h>
-+# endif
-+# endif
- #endif
-
- #if defined(__OpenBSD__) || defined(__NetBSD__)
diff --git a/dev-util/cmake/files/cmake-2.8.12.2-python34.patch b/dev-util/cmake/files/cmake-2.8.12.2-python34.patch
deleted file mode 100644
index f64e40cc51ef..000000000000
--- a/dev-util/cmake/files/cmake-2.8.12.2-python34.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit ab6201ab647c13fee44c44822b8502e9848faaaf
-Author: Matt McCormick <matt.mccormick@kitware.com>
-Date: Wed Mar 5 17:41:47 2014 -0500
-
- FindPython{Interp,Libs}: Search for Python 3.4.
-
- Python 3.4.0rnc1 was released on 2014-02-20.
-
-diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
-index 8da848c..e23a58b 100644
---- a/Modules/FindPythonInterp.cmake
-+++ b/Modules/FindPythonInterp.cmake
-@@ -47,7 +47,7 @@ unset(_Python_NAMES)
-
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
-
- if(PythonInterp_FIND_VERSION)
- if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index 0749efc..1dbc967 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -51,7 +51,7 @@ CMAKE_FIND_FRAMEWORKS(Python)
-
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
-
- if(PythonLibs_FIND_VERSION)
- if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
diff --git a/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch b/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch
deleted file mode 100644
index 5e0efa902679..000000000000
--- a/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c775072ad5a93306183f83f4396268b1690bb392 Mon Sep 17 00:00:00 2001
-From: Brad King <brad.king@kitware.com>
-Date: Wed, 22 Apr 2015 09:58:46 -0400
-Subject: [PATCH] cmGeneratorExpressionEvaluationFile: Add missing sys/types.h
- include
-
-This is needed for 'mode_t', and on mingw-w64 in particular. We added
-use of 'mode_t' in commit v3.2.0-rc1~421^2 (file(GENERATE): Use
-permissions of input file if present, 2014-07-22).
----
- Source/cmGeneratorExpressionEvaluationFile.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h
-index 4424bec..5d8b54c 100644
---- a/Source/cmGeneratorExpressionEvaluationFile.h
-+++ b/Source/cmGeneratorExpressionEvaluationFile.h
-@@ -13,6 +13,7 @@
- #define cmGeneratorExpressionEvaluationFile_h
-
- #include "cmStandardIncludes.h"
-+#include <sys/types.h>
- #include <cmsys/auto_ptr.hxx>
-
- #include "cmGeneratorExpression.h"
---
-1.7.10.4
-
diff --git a/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch b/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch
new file mode 100644
index 000000000000..665c3304111f
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch
@@ -0,0 +1,45 @@
+Ensure that the correct version of Qt is always used.
+
+With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
+/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
+
+There is no guarantee to which version of Qt these symlinks might point, so it
+is necessary to find the correct version explicitly.
+
+Once qmake is found, it is queried for the correct location of all other items.
+
+Gentoo-bug: 547222
+
+--- Modules/FindQt4.cmake
++++ Modules/FindQt4.cmake
+@@ -482,13 +482,23 @@
+
+ get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
+
+- find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
+- PATHS
+- ENV QTDIR
+- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
+- PATH_SUFFIXES bin
+- DOC "The qmake executable for the Qt installation to use"
+- )
++ if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
++ find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
++ PATHS
++ /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
++ /usr/bin
++ NO_DEFAULT_PATH
++ DOC "The qmake executable for the Qt installation to use"
++ )
++ else()
++ find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
++ PATHS
++ ENV QTDIR
++ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
++ PATH_SUFFIXES bin
++ DOC "The qmake executable for the Qt installation to use"
++ )
++ endif()
+
+ set(major 0)
+ if (QT_QMAKE_EXECUTABLE)
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index 449f1cb1b814..bedc8b38dec0 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,2 +1 @@
-DIST howdoi-1.1.6.tar.gz 6769 SHA256 29b06c588825fb007f111106cfd475fc88dbf4e1329758dcf42e903097872c83 SHA512 369bdbb30fc97b094fe8c1cb49b3dd696f16b1120cb980e6785dcf6c2da56698f3d103a983174d6e4a3cfa7b0bbb3d4109760f5cadaaa365480af9fae8323232 WHIRLPOOL db543d7f93c6bcb5ea3e44d5a8cc3ae15b7f180f2aac59d89b1beffbd1cf192b684d938fe8cad1cb0f1c642c7c894026f53880d79c8214422eac83b0a7fe27b6
DIST howdoi-1.1.7.tar.gz 7378 SHA256 df4e49a219872324875d588e7699a1a82174a267e8487505e86bfcb180aea9b7 SHA512 5f08a0ee341813ab8dde0528bb6d04e02965dddd30851b8cfa7f92900f60f6d83ff74aaa565e2fc5b7a336ec7cd35ed932bbfecc09064010268a4bdbc521902b WHIRLPOOL 93bf26d7553e05d99f6efbecbdc747301ee628d192c74369b492d5c2fb0def737d83b89baf80b8254701f8923927948610fd4f58c27c698f55843d416b00bf91
diff --git a/dev-util/howdoi/howdoi-1.1.6.ebuild b/dev-util/howdoi/howdoi-1.1.6.ebuild
deleted file mode 100644
index 4ae621c84180..000000000000
--- a/dev-util/howdoi/howdoi-1.1.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3} )
-
-inherit distutils-r1
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.python.org/pypi/howdoi"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/pyquery[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/requests-cache[${PYTHON_USEDEP}]"
diff --git a/dev-util/nvidia-cuda-sdk/Manifest b/dev-util/nvidia-cuda-sdk/Manifest
index 98d73d6b8ada..c9fc55c9c93e 100644
--- a/dev-util/nvidia-cuda-sdk/Manifest
+++ b/dev-util/nvidia-cuda-sdk/Manifest
@@ -1,3 +1,3 @@
DIST cuda_6.5.14_linux_32.run 76788277 SHA256 63fa1fe5d013e9944d6c1a3a71768fa4dcb35d6a157c1b06765bb56198c205c5 SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc WHIRLPOOL c1094dd84883ef08d91c6eec3634a285496418db1e76b70f449f833dcb01069a620af504b6df7fe2752559688ed1f60f4adda8c97d849d648cba1be0f8196954
DIST cuda_6.5.14_linux_64.run 972320904 SHA256 f3e527f34f317314fe8fcd8c85f10560729069298c0f73105ba89225db69da48 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e WHIRLPOOL 0b890771dcca352168fed1b1df9b29504b03f8c29da59cec29914c541283998edf65f5ca6a41362143a2d5d7359822b036894f563c56b39583b1ac4c64e35180
-DIST cuda_7.5.18_linux.run 1195431560 SHA256 245ffb6c1e2b69d323f8ae3a1b63d3384fec3934222e56e9d801ecc0d6e919c5 SHA512 cb933512fde09376b1d6040c72d24c4f91dc44f73322ca87aa7d1f34156c9c87feea41f9a00f1a403cfb89645b5e7a6a5f2bfe4933703ba81f0cf94968d430fd WHIRLPOOL b1a06acba02043fabf496ba683fb984b1c90df2cd71396457f664beb8cb26b2e3074c8568ec6ce0cfe565721986670c7a40351a29a4856a7e03268c14d545247
+DIST cuda_7.5.18_linux.run 1195424633 SHA256 08411d536741075131a1858a68615b8b73c51988e616e83b835e4632eea75eec SHA512 97459dfd124060200f1c43f763e5bce0bea53e35ed4bef72bee6c8ba1c04ecffb8695af11755443513316f91fdb5cb4d35662f7b87bca7e3de85d562d4e49363 WHIRLPOOL 59d186f5e9176db25e5991e8088417ac778953c3ed2f0dcef034968f7ea695c5d4cfea81759ac0f7f1290c3842d9d0339b5b74d2d90ec8b333135aa1b986ca10
diff --git a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
index 3b7b2117d25f..22e02d75bf89 100644
--- a/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
+++ b/dev-util/nvidia-cuda-sdk/nvidia-cuda-sdk-7.5.18.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit cuda eutils flag-o-matic portability toolchain-funcs unpacker versionator
-MYD=$(get_version_component_range 1)_$(get_version_component_range 2)
+MYD=$(get_version_component_range 1-2)
DESCRIPTION="NVIDIA CUDA Software Development Kit"
HOMEPAGE="https://developer.nvidia.com/cuda-downloads"
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 1e418f120911..285e089ac11a 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -2,4 +2,4 @@ DIST cuda_6.5.14_linux_32.run 76788277 SHA256 63fa1fe5d013e9944d6c1a3a71768fa4dc
DIST cuda_6.5.14_linux_64.run 972320904 SHA256 f3e527f34f317314fe8fcd8c85f10560729069298c0f73105ba89225db69da48 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e WHIRLPOOL 0b890771dcca352168fed1b1df9b29504b03f8c29da59cec29914c541283998edf65f5ca6a41362143a2d5d7359822b036894f563c56b39583b1ac4c64e35180
DIST cuda_6.5.19_linux_32.run 81882112 SHA256 9f767f38b84f52c097bec81669f99e4a6c4c9c09b5da1bc09fe49e0f804bc7a6 SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e WHIRLPOOL ac94b4e7f29811b4240623fb69b3c54214e7f0c60a286d899944dbab9da7fd3c122760199a3357667e33879bd48fbf352d5d39029acca6021e7caf21785557ed
DIST cuda_6.5.19_linux_64.run 982446238 SHA256 5279bc159b72b7445d8aae5f289d24bb4042c35422ef32da68049d8f666d3ff5 SHA512 06854f020a5f72cf4bd714859e6966248ac2f589284113674e869fdaa1254cae27d4101940758ecda5df4724ad3e448a1f6d0c053b6cbc28107750872b6a5797 WHIRLPOOL 6ae8e53719e12997de60ec3688167f3fe33b1145d01217182e39ac386c25b358c8ba6cee45ad6c80e33ef66fd9a511338dce4589f10a31635b8437b6e528fd7a
-DIST cuda_7.5.18_linux.run 1195431560 SHA256 245ffb6c1e2b69d323f8ae3a1b63d3384fec3934222e56e9d801ecc0d6e919c5 SHA512 cb933512fde09376b1d6040c72d24c4f91dc44f73322ca87aa7d1f34156c9c87feea41f9a00f1a403cfb89645b5e7a6a5f2bfe4933703ba81f0cf94968d430fd WHIRLPOOL b1a06acba02043fabf496ba683fb984b1c90df2cd71396457f664beb8cb26b2e3074c8568ec6ce0cfe565721986670c7a40351a29a4856a7e03268c14d545247
+DIST cuda_7.5.18_linux.run 1195424633 SHA256 08411d536741075131a1858a68615b8b73c51988e616e83b835e4632eea75eec SHA512 97459dfd124060200f1c43f763e5bce0bea53e35ed4bef72bee6c8ba1c04ecffb8695af11755443513316f91fdb5cb4d35662f7b87bca7e3de85d562d4e49363 WHIRLPOOL 59d186f5e9176db25e5991e8088417ac778953c3ed2f0dcef034968f7ea695c5d4cfea81759ac0f7f1290c3842d9d0339b5b74d2d90ec8b333135aa1b986ca10
diff --git a/dev-util/pkgconf/pkgconf-0.9.11.ebuild b/dev-util/pkgconf/pkgconf-0.9.11.ebuild
index 94848bd93709..1b17993dfa72 100644
--- a/dev-util/pkgconf/pkgconf-0.9.11.ebuild
+++ b/dev-util/pkgconf/pkgconf-0.9.11.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
inherit eutils multilib-minimal
SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
fi
DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
diff --git a/dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch b/dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch
index bc60708b1d25..b5e3af106804 100644
--- a/dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch
+++ b/dev-vcs/git/files/git-2.6.0-am_configure_gpg_at_startup.patch
@@ -1,4 +1,4 @@
-From: Renee Margaret McConahy <nepella <at> gmail.com>
+From: Renee Margaret McConahy <nepella@gmail.com>
Subject: [PATCH v2] am: configure gpg at startup
Newsgroups: gmane.comp.version-control.git
Date: 2015-09-30 17:49:44 GMT (5 days, 14 hours and 45 minutes ago)
@@ -11,7 +11,7 @@ Perhaps git_gpg_config's functionality ought to be merged into
git_default_config, but this is simpler and in keeping with the current
practice.
-Signed-off-by: Renee Margaret McConahy <nepella <at> gmail.com>
+Signed-off-by: Renee Margaret McConahy <nepella@gmail.com>
---
builtin/am.c | 13 ++++++++++++-
@@ -21,7 +21,7 @@ diff --git a/builtin/am.c b/builtin/am.c
index 4f77e07..3bd4fd7 100644
--- a/builtin/am.c
+++ b/builtin/am.c
- <at> <at> -2208,6 +2208,17 <at> <at> enum resume_mode {
+@@ -2208,6 +2208,17 @@ enum resume_mode {
RESUME_ABORT
};
@@ -39,7 +39,7 @@ index 4f77e07..3bd4fd7 100644
int cmd_am(int argc, const char **argv, const char *prefix)
{
struct am_state state;
- <at> <at> -2308,7 +2319,7 <at> <at> int cmd_am(int argc, const char **argv, const char *prefix)
+@@ -2308,7 +2319,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
OPT_END()
};
diff --git a/dev-vcs/git/git-2.3.9.ebuild b/dev-vcs/git/git-2.3.9.ebuild
index 83988988a637..739ff76f632b 100644
--- a/dev-vcs/git/git-2.3.9.ebuild
+++ b/dev-vcs/git/git-2.3.9.ebuild
@@ -33,7 +33,7 @@ if [[ ${PV} != *9999 ]]; then
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
- KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.4.9.ebuild b/dev-vcs/git/git-2.4.9.ebuild
index 4d2e41cc23fa..0c71a90ce1bc 100644
--- a/dev-vcs/git/git-2.4.9.ebuild
+++ b/dev-vcs/git/git-2.4.9.ebuild
@@ -33,7 +33,7 @@ if [[ ${PV} != *9999 ]]; then
${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
)"
- KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/dev-vcs/git/git-2.6.1-r1.ebuild b/dev-vcs/git/git-2.6.1-r2.ebuild
index b7cc65b3d621..b7cc65b3d621 100644
--- a/dev-vcs/git/git-2.6.1-r1.ebuild
+++ b/dev-vcs/git/git-2.6.1-r2.ebuild
diff --git a/dev-vcs/hgsubversion/Manifest b/dev-vcs/hgsubversion/Manifest
index fc79b5e59fcf..fc1511e02a62 100644
--- a/dev-vcs/hgsubversion/Manifest
+++ b/dev-vcs/hgsubversion/Manifest
@@ -1,6 +1,3 @@
DIST hgsubversion-1.4.tar.gz 133564 SHA256 e3febee217ce321d316712c4c75236dcc2f2769c329c687114e2c37d303f1c0f SHA512 23305b210e2f51cbcd866a5d87caa23f8e5d405532b3139f5700572f13f5a52c1699d937e8c87a8580274ddc1240f51b773334083ced44da98fe7bf270f006fb WHIRLPOOL 5c7b4b9a5537ce4b65f806db23ab4e0ad920b394b44a015d8144c8da9456ad3ed8f3cc8911d539a2488fbd1e446aa7cb6ad5af0c195461ad580ee497cf793a91
-DIST hgsubversion-1.6.1.tar.gz 173184 SHA256 bb2787259a5f9716fe4ff4f6a4e6170fb8109c6f74550cbd92ec314d8d4278a0 SHA512 0f8e50a7445b85ad6a4984d22b976d55ebf6e15ade85aed2ae87aaf7914bcc9fbb4bd68347b1377ca2d0d307de31cbcc5e2b3691327ab9463401a1c5eee8a6f2 WHIRLPOOL c581de56a6ae5cf98ab78c8f61e1f1f1f7df895be582ccad94e05675965770aaee7e51371a14059dd2bbbc29407697dcfe1341c564cced8377283b75e0569752
-DIST hgsubversion-1.6.3.tar.gz 177625 SHA256 915f4415208f61ae7dc551da94a3c6269805af0558945a9f2736e60b0a6190c5 SHA512 b94c5febced30a6d199307ea7ff53b737e287055a97ddc539eb982efd357e8eac97bed52404099ec537ca84ff4a29a109ba88d658dfc0df38128ee1727cf3465 WHIRLPOOL 7a7970cbd223311629cb889389ffe6c48a76d54554c736fe66c025151fdad4f0083216b6465e3734319abfe0a0eb4823812652d8236ce58c20ce90baf5fa9299
-DIST hgsubversion-1.7.tar.gz 179852 SHA256 87ac8ad36dc4252202a3138a1a126710bb8f6783c9806ea408bcb8f467daf292 SHA512 a80884df901d8233ae1e59040dd272b904e6f52bcfa5a3b804e5e2b49dad75c253f1c9efe61f2dbd587f901dac0e0704e618297a975665eed8d6fc6042cd8e49 WHIRLPOOL cab9f0ce016bc1336096aa75f696664524afd391aedfded0455b006f92ed7e5b04d79b2056d3b1892fc6d02c1954edfb21495d5042296a5fe51556a0ec923494
DIST hgsubversion-1.8.2.tar.gz 179341 SHA256 1725a02f4334eceb4930cc0aee46556e11b38515e9b742be3ac3b7dcf9fbf699 SHA512 4e94e5daaf252ecbbda331e5d022be4cc24b6c6cd7ae49eb19e0acd57aa926e0a68bb9f1ef69b43b074af6dc5764ff56a4bc018c2036c2dd8fcbd8e264d78581 WHIRLPOOL 204c0f3e3a680fce42cb4b1d6ed2f394a76197279cf42042908dcf565c04419c4958f6fc7b9eba050bab791e6a2ef28c22364ceabed99650a9011aa408414da8
-DIST hgsubversion-1.8.tar.gz 179375 SHA256 f8e4d1b4fc8621b8ed782f74a6328c76dabec1385d4f732f2a15d4efd27201b1 SHA512 dd38722f771e9fa4b56e8921064c7b819bb9c0483aaef48de7414531c1cc1fa3802ef3870ef22c59526afa6aa10459c0ea9f8ef1b6e3f20b41c8457c644433f9 WHIRLPOOL f70c6061e1f6dda053b65e896a7fd8ac133f08a256d0b3b47910c5b477583f0a921e76efcb557019291c6fb810293d740f8f561b56800b41ac00c050cde9b0ef
+DIST hgsubversion-1.8.3.tar.gz 179464 SHA256 8a64bff00146bd7e03432f802f6b555cdf502d955a7f893c2e30f6b47079998d SHA512 dd712f39b2851b2466a6776cb986eddd92e32ad3b5be22e4429ab5f7a684982c4d2b3a6752fc16ac4211c4a2237f721b8672d8943bc297f591997345975ecd65 WHIRLPOOL 57848cfd343b7c9db41b0265bd05fb1bc7c5180a1704d45e51363d9e7586fb69d210302d3d7474dcbbd5ec3a611641c9c91a870edc5332fe777ad4932596206c
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.6.3.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.6.3.ebuild
deleted file mode 100644
index d256459062f1..000000000000
--- a/dev-vcs/hgsubversion/hgsubversion-1.6.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
-HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.python.org/pypi/hgsubversion"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="test"
-
-# although any ref absent in the source, tests fail badly with >=mercurial-2.8.1
-RDEPEND=">=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
- dev-vcs/mercurial[${PYTHON_USEDEP}]
- || (
- >=dev-python/subvertpy-0.7.4[${PYTHON_USEDEP}]
- >=dev-vcs/subversion-1.5[python] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( README )
-
-#python_test() {
-# "${PYTHON}" tests/run.py || die "Tests failed under ${EPYTHON}"
-#}
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.7.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.7.ebuild
deleted file mode 100644
index d256459062f1..000000000000
--- a/dev-vcs/hgsubversion/hgsubversion-1.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
-HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.python.org/pypi/hgsubversion"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="test"
-
-# although any ref absent in the source, tests fail badly with >=mercurial-2.8.1
-RDEPEND=">=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
- dev-vcs/mercurial[${PYTHON_USEDEP}]
- || (
- >=dev-python/subvertpy-0.7.4[${PYTHON_USEDEP}]
- >=dev-vcs/subversion-1.5[python] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( README )
-
-#python_test() {
-# "${PYTHON}" tests/run.py || die "Tests failed under ${EPYTHON}"
-#}
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.6.1.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.3.ebuild
index 4be605fc93cd..4be605fc93cd 100644
--- a/dev-vcs/hgsubversion/hgsubversion-1.6.1.ebuild
+++ b/dev-vcs/hgsubversion/hgsubversion-1.8.3.ebuild
diff --git a/dev-vcs/hgsubversion/hgsubversion-1.8.ebuild b/dev-vcs/hgsubversion/hgsubversion-1.8.ebuild
deleted file mode 100644
index 4be605fc93cd..000000000000
--- a/dev-vcs/hgsubversion/hgsubversion-1.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="hgsubversion is a Mercurial extension for working with Subversion repositories"
-HOMEPAGE="https://bitbucket.org/durin42/hgsubversion/wiki/Home https://pypi.python.org/pypi/hgsubversion"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="test"
-
-# although any ref absent in the source, tests fail badly with >=mercurial-2.8.1
-RDEPEND=">=dev-vcs/mercurial-1.4[${PYTHON_USEDEP}]
- dev-vcs/mercurial[${PYTHON_USEDEP}]
- || (
- >=dev-python/subvertpy-0.7.4[${PYTHON_USEDEP}]
- >=dev-vcs/subversion-1.5[python] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-DOCS=( README )
-
-#python_test() {
-# "${PYTHON}" tests/run.py || die "Tests failed under ${EPYTHON}"
-#}
diff --git a/eclass/games.eclass b/eclass/games.eclass
index 03421b332e76..7d231e186cc9 100644
--- a/eclass/games.eclass
+++ b/eclass/games.eclass
@@ -247,14 +247,14 @@ prepgamesdirs() {
find "${D}/${dir}" -type f -print0 | xargs -0 chmod $mode
# common trees should not be games owned #264872 #537580
- fowners root:root "${dir}"
+ fowners root:0 "${dir}"
fperms 755 "${dir}"
if [[ ${dir} == "${GAMES_PREFIX}" \
|| ${dir} == "${GAMES_PREFIX_OPT}" ]] ; then
for d in $(get_libdir) bin ; do
# check if dirs exist to avoid "nonfatal" option
if [[ -e ${D}/${dir}/${d} ]] ; then
- fowners root:root "${dir}/${d}"
+ fowners root:0 "${dir}/${d}"
fperms 755 "${dir}/${d}"
fi
done
diff --git a/eclass/gnome2-utils.eclass b/eclass/gnome2-utils.eclass
index 476fb2882370..59ab5861c356 100644
--- a/eclass/gnome2-utils.eclass
+++ b/eclass/gnome2-utils.eclass
@@ -15,7 +15,7 @@
# * GConf schemas management
# * scrollkeeper (old Gnome help system) management
-inherit multilib
+inherit eutils multilib
case "${EAPI:-0}" in
0|1|2|3|4|5) ;;
@@ -431,7 +431,7 @@ gnome2_gdk_pixbuf_update() {
fi
ebegin "Updating gdk-pixbuf loader cache"
- local tmp_file=$(mktemp -t tmp.XXXXXXXXXX_gdkpixbuf)
+ local tmp_file=$(emktemp)
${updater} 1> "${tmp_file}" &&
chmod 0644 "${tmp_file}" &&
cp -f "${tmp_file}" "${EROOT}usr/$(get_libdir)/gdk-pixbuf-2.0/2.10.0/loaders.cache" &&
diff --git a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass
index a7afb15e4d84..f9492a839f31 100644
--- a/eclass/office-ext-r1.eclass
+++ b/eclass/office-ext-r1.eclass
@@ -164,7 +164,7 @@ UNOPKG_BINARY="/usr/lib64/openoffice/program/unopkg"
office-ext-r1_add_extension() {
debug-print-function ${FUNCNAME} "$@"
local ext=$1
- local tmpdir=$(mktemp -d --tmpdir="${T}")
+ local tmpdir=$(emktemp -d)
debug-print "${FUNCNAME}: ${UNOPKG_BINARY} add --shared \"${ext}\""
ebegin "Adding office extension: \"${ext}\""
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 622cb591c42d..a80bdf436eb8 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1117,6 +1117,9 @@ python_fix_shebang() {
python_export_utf8_locale() {
debug-print-function ${FUNCNAME} "${@}"
+ # If the locale program isn't available, just return.
+ type locale >/dev/null || return 0
+
if [[ $(locale charmap) != UTF-8 ]]; then
if [[ -n ${LC_ALL} ]]; then
ewarn "LC_ALL is set to a locale with a charmap other than UTF-8."
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
index f1bc32eb8f94..412ff66e01c9 100644
--- a/eclass/ros-catkin.eclass
+++ b/eclass/ros-catkin.eclass
@@ -125,7 +125,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
S=${WORKDIR}/${P}/${ROS_SUBDIR}
else
SRC_URI="${ROS_REPO_URI}/archive/${VER_PREFIX}${PV%_*}${VER_SUFFIX}.tar.gz -> ${ROS_REPO_URI##*/}-${PV}.tar.gz"
- S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}/${ROS_SUBDIR}
+ S=${WORKDIR}/${VER_PREFIX}${ROS_REPO_URI##*/}-${PV}${VER_SUFFIX}/${ROS_SUBDIR}
fi
HOMEPAGE="http://wiki.ros.org/${PN}"
diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index b6d1ab0fd1fc..59c28617aec4 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -725,6 +725,7 @@ gen_usr_ldscript() {
# Eventually we'd like to get rid of this func completely #417451
case ${CTARGET:-${CHOST}} in
*-darwin*) ;;
+ *-android*) return 0 ;;
*linux*|*-freebsd*|*-openbsd*|*-netbsd*)
use prefix && return 0 ;;
*) return 0 ;;
diff --git a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
index 4000ca30f9b8..3a342c88979d 100644
--- a/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
+++ b/games-arcade/openmortal/files/openmortal-0.7-freetype.patch
@@ -1,5 +1,5 @@
---- openmortal-0.7/src/sge_tt_text.cpp.old 2014-04-04 21:35:37.275483286 +0300
-+++ openmortal-0.7/src/sge_tt_text.cpp 2014-04-04 21:36:08.065359870 +0300
+--- openmortal-0.7/src/sge_tt_text.cpp.old
++++ openmortal-0.7/src/sge_tt_text.cpp
@@ -37,9 +37,9 @@
#ifndef _SGE_NOTTF
@@ -7,9 +7,9 @@
-#include <freetype/freetype.h>
-#include <freetype/ftoutln.h>
-#include <freetype/ttnameid.h>
-+#include <freetype.h>
-+#include <ftoutln.h>
-+#include <ttnameid.h>
++#include FT_FREETYPE_H
++#include FT_OUTLINE_H
++#include FT_TRUETYPE_IDS_H
/* The structure used to hold glyph information (cached) */
struct glyph {
diff --git a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
index fdba61c6b008..1c10ce2ba3d4 100644
--- a/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
+++ b/games-arcade/openmortal/files/openmortal-0.7-gcc41.patch
@@ -1,5 +1,5 @@
---- src/OnlineChat.cpp.old 2006-01-28 14:34:42.000000000 -0700
-+++ src/OnlineChat.cpp 2006-01-28 14:34:53.000000000 -0700
+--- src/OnlineChat.cpp.old
++++ src/OnlineChat.cpp
@@ -56,7 +56,7 @@
class CChallengeMenu: public Menu
{
diff --git a/games-arcade/openmortal/openmortal-0.7-r1.ebuild b/games-arcade/openmortal/openmortal-0.7-r1.ebuild
index c24d9f4a932b..9dcc163dc3f7 100644
--- a/games-arcade/openmortal/openmortal-0.7-r1.ebuild
+++ b/games-arcade/openmortal/openmortal-0.7-r1.ebuild
@@ -21,20 +21,20 @@ DEPEND="media-libs/libsdl[video]
media-libs/sdl-net
>=media-libs/freetype-2.4.0
dev-lang/perl"
-RDEPEND="${DEPEND}"
+RDEPEND=${DEPEND}
src_prepare() {
epatch \
"${FILESDIR}/${P}"-gcc41.patch \
"${FILESDIR}/${P}"-freetype.patch
-
+ mv configure.{in,ac} || die
eautoreconf
}
src_install() {
- emake DESTDIR="${D}" install
+ DOCS="AUTHORS ChangeLog README TODO" \
+ default
newicon data/gfx/icon.png ${PN}.png
make_desktop_entry ${PN} OpenMortal
- dodoc AUTHORS ChangeLog README TODO
prepgamesdirs
}
diff --git a/kde-apps/kdebase-data/kdebase-data-4.14.3-r1.ebuild b/kde-apps/kdebase-data/kdebase-data-4.14.3-r1.ebuild
index 430f3bb1e52f..f61aaf872979 100644
--- a/kde-apps/kdebase-data/kdebase-data-4.14.3-r1.ebuild
+++ b/kde-apps/kdebase-data/kdebase-data-4.14.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
DESCRIPTION="Icons, localization data and various .desktop files from kdebase"
IUSE="+wallpapers"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
RDEPEND="
wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
diff --git a/kde-apps/kopete/kopete-4.14.3-r1.ebuild b/kde-apps/kopete/kopete-4.14.3-r1.ebuild
index e974cfe5bf03..69238a13e1d4 100644
--- a/kde-apps/kopete/kopete-4.14.3-r1.ebuild
+++ b/kde-apps/kopete/kopete-4.14.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="KDE multi-protocol IM client"
HOMEPAGE="https://kopete.kde.org https://www.kde.org/applications/internet/kopete"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug ssl v4l"
# tests hang, last checked for 4.2.96
diff --git a/kde-apps/kstars/kstars-4.14.3-r1.ebuild b/kde-apps/kstars/kstars-4.14.3-r1.ebuild
index 40de021372c5..9bb86911c73c 100644
--- a/kde-apps/kstars/kstars-4.14.3-r1.ebuild
+++ b/kde-apps/kstars/kstars-4.14.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit flag-o-matic kde4-base
DESCRIPTION="KDE Desktop Planetarium"
HOMEPAGE="https://www.kde.org/applications/education/kstars https://edu.kde.org/kstars"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug fits indi"
REQUIRED_USE="indi? ( fits )"
diff --git a/kde-apps/ktp-l10n/ktp-l10n-15.08.1.ebuild b/kde-apps/ktp-l10n/ktp-l10n-15.08.1.ebuild
index 56ff757efcaa..318810e92d34 100644
--- a/kde-apps/ktp-l10n/ktp-l10n-15.08.1.ebuild
+++ b/kde-apps/ktp-l10n/ktp-l10n-15.08.1.ebuild
@@ -80,6 +80,8 @@ src_prepare() {
# We only want messages
sed -e '/messages/!s/^add_subdirectory/# DONT/'\
-i "${SDIR}"/CMakeLists.txt || die
+ sed -e '/KF5DocTools/ s/^/#/'\
+ -i "${SDIR}"/CMakeLists.txt || die
# Remove everything except kdenetwork
if [[ -d "${SDIR}/messages" ]] ; then
diff --git a/kde-apps/step/step-4.14.3.ebuild b/kde-apps/step/step-4.14.3.ebuild
index 02d6c020c015..f529586f9688 100644
--- a/kde-apps/step/step-4.14.3.ebuild
+++ b/kde-apps/step/step-4.14.3.ebuild
@@ -5,7 +5,7 @@
EAPI=5
KDE_HANDBOOK="optional"
-inherit kde4-base
+inherit flag-o-matic kde4-base
DESCRIPTION="The KDE physics simulator"
HOMEPAGE="https://edu.kde.org/step"
@@ -20,6 +20,9 @@ DEPEND="
RDEPEND="${DEPEND}"
src_configure() {
+ # bug 560884
+ use ppc64 && append-flags -mno-altivec
+
local mycmakeargs=(
$(cmake-utils_use_with gsl)
$(cmake-utils_use_with qalculate)
diff --git a/kde-base/akonadiconsole/Manifest b/kde-base/akonadiconsole/Manifest
index eef052f68199..7269a34b1d04 100644
--- a/kde-base/akonadiconsole/Manifest
+++ b/kde-base/akonadiconsole/Manifest
@@ -1,3 +1,2 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.14.3.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.14.3.ebuild
deleted file mode 100644
index eac668be2841..000000000000
--- a/kde-base/akonadiconsole/akonadiconsole-4.14.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="Akonadi developer console"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- >=app-office/akonadi-server-1.12.90
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- akonadi_next/
- calendarsupport/
- messageviewer/
-"
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.14.8.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.14.8.ebuild
index e1a782962867..6f8bdbe0a866 100644
--- a/kde-base/akonadiconsole/akonadiconsole-4.14.8.ebuild
+++ b/kde-base/akonadiconsole/akonadiconsole-4.14.8.ebuild
@@ -9,7 +9,7 @@ EGIT_BRANCH="KDE/4.14"
inherit kde4-meta
DESCRIPTION="Akonadi developer console"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/akregator/Manifest b/kde-base/akregator/Manifest
index 9443459d75d7..650813830c00 100644
--- a/kde-base/akregator/Manifest
+++ b/kde-base/akregator/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/akregator/akregator-4.14.3.ebuild b/kde-base/akregator/akregator-4.14.3.ebuild
deleted file mode 100644
index f303771f6d3e..000000000000
--- a/kde-base/akregator/akregator-4.14.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE news feed aggregator"
-HOMEPAGE="https://www.kde.org/applications/internet/akregator"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/akregator/akregator-4.14.8.ebuild b/kde-base/akregator/akregator-4.14.8.ebuild
index 46b40b570690..2418505ab8d9 100644
--- a/kde-base/akregator/akregator-4.14.8.ebuild
+++ b/kde-base/akregator/akregator-4.14.8.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
DESCRIPTION="KDE news feed aggregator"
HOMEPAGE="https://www.kde.org/applications/internet/akregator"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/blogilo/Manifest b/kde-base/blogilo/Manifest
index 9443459d75d7..650813830c00 100644
--- a/kde-base/blogilo/Manifest
+++ b/kde-base/blogilo/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/blogilo/blogilo-4.14.3.ebuild b/kde-base/blogilo/blogilo-4.14.3.ebuild
deleted file mode 100644
index ef4fbc2fcc8b..000000000000
--- a/kde-base/blogilo/blogilo-4.14.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE Blogging Client"
-HOMEPAGE="https://www.kde.org/applications/internet/blogilo"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepim-common-libs)
- $(add_kdebase_dep kdepimlibs)
- >=net-libs/libkgapi-2.2.0:4
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- composereditor-ng/
- pimcommon/
-"
diff --git a/kde-base/blogilo/blogilo-4.14.8.ebuild b/kde-base/blogilo/blogilo-4.14.8.ebuild
index 3c5cdd226ced..5e291c4b9c24 100644
--- a/kde-base/blogilo/blogilo-4.14.8.ebuild
+++ b/kde-base/blogilo/blogilo-4.14.8.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
DESCRIPTION="KDE Blogging Client"
HOMEPAGE="https://www.kde.org/applications/internet/blogilo"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/calendarjanitor/Manifest b/kde-base/calendarjanitor/Manifest
index eef052f68199..7269a34b1d04 100644
--- a/kde-base/calendarjanitor/Manifest
+++ b/kde-base/calendarjanitor/Manifest
@@ -1,3 +1,2 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/calendarjanitor/calendarjanitor-4.14.3.ebuild b/kde-base/calendarjanitor/calendarjanitor-4.14.3.ebuild
deleted file mode 100644
index 82908d99d4c9..000000000000
--- a/kde-base/calendarjanitor/calendarjanitor-4.14.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="A tool to scan calendar data for buggy instances"
-HOMEPAGE="https://www.kde.org/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepim-common-libs)
- $(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- calendarsupport/
-"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/calendarjanitor/calendarjanitor-4.14.8.ebuild b/kde-base/calendarjanitor/calendarjanitor-4.14.8.ebuild
index 8070925a02b3..20ec7472d171 100644
--- a/kde-base/calendarjanitor/calendarjanitor-4.14.8.ebuild
+++ b/kde-base/calendarjanitor/calendarjanitor-4.14.8.ebuild
@@ -12,7 +12,7 @@ inherit kde4-meta
DESCRIPTION="A tool to scan calendar data for buggy instances"
HOMEPAGE="https://www.kde.org/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/freespacenotifier/Manifest b/kde-base/freespacenotifier/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/freespacenotifier/Manifest
+++ b/kde-base/freespacenotifier/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/freespacenotifier/freespacenotifier-4.11.14.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.11.14.ebuild
deleted file mode 100644
index abf0126148fd..000000000000
--- a/kde-base/freespacenotifier/freespacenotifier-4.11.14.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="A module that monitors free disk space on the home dir"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/freespacenotifier/freespacenotifier-4.11.19.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.11.19.ebuild
index eadcfc285d55..abf0126148fd 100644
--- a/kde-base/freespacenotifier/freespacenotifier-4.11.19.ebuild
+++ b/kde-base/freespacenotifier/freespacenotifier-4.11.19.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-workspace"
inherit kde4-meta
DESCRIPTION="A module that monitors free disk space on the home dir"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
diff --git a/kde-base/kabcclient/Manifest b/kde-base/kabcclient/Manifest
index 9443459d75d7..650813830c00 100644
--- a/kde-base/kabcclient/Manifest
+++ b/kde-base/kabcclient/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kabcclient/kabcclient-4.14.3.ebuild b/kde-base/kabcclient/kabcclient-4.14.3.ebuild
deleted file mode 100644
index 7039bedbea8e..000000000000
--- a/kde-base/kabcclient/kabcclient-4.14.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="A command line client for accessing the KDE addressbook"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-src_install() {
- kde4-meta_src_install
-
- # work around NULL DT_RPATH in kabc2mutt
- dosym kabcclient ${PREFIX}/bin/kabc2mutt
-}
diff --git a/kde-base/kabcclient/kabcclient-4.14.8.ebuild b/kde-base/kabcclient/kabcclient-4.14.8.ebuild
index 888c30a972a6..0eb1b8e964ec 100644
--- a/kde-base/kabcclient/kabcclient-4.14.8.ebuild
+++ b/kde-base/kabcclient/kabcclient-4.14.8.ebuild
@@ -11,7 +11,7 @@ KMMODULE="console/${PN}"
inherit kde4-meta
DESCRIPTION="A command line client for accessing the KDE addressbook"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest
index 9443459d75d7..650813830c00 100644
--- a/kde-base/kaddressbook/Manifest
+++ b/kde-base/kaddressbook/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kaddressbook/kaddressbook-4.14.3.ebuild b/kde-base/kaddressbook/kaddressbook-4.14.3.ebuild
deleted file mode 100644
index 35192889348b..000000000000
--- a/kde-base/kaddressbook/kaddressbook-4.14.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Address Book"
-HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- >=dev-libs/grantlee-0.2.0:0
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
- !kde-base/contactthemeeditor
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRA="
- grantleeeditor/contactthemeeditor
- plugins/kaddressbook/
- plugins/ktexteditor/
-"
-KMCOMPILEONLY="
- grantleetheme/
- kaddressbookgrantlee/
-"
-KMEXTRACTONLY="
- akonadi_next/
- calendarsupport/
- grantleeeditor/grantleethemeeditor/
- libkleo/
- pimcommon/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-pkg_postinst() {
- kde4-meta_pkg_postinst
-
- if ! has_version kde-base/kdepim-kresources:${SLOT}; then
- echo
- elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
- echo
- fi
-}
diff --git a/kde-base/kaddressbook/kaddressbook-4.14.8.ebuild b/kde-base/kaddressbook/kaddressbook-4.14.8.ebuild
index b3e2b5517bb0..65f981bb7eeb 100644
--- a/kde-base/kaddressbook/kaddressbook-4.14.8.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.14.8.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
DESCRIPTION="The KDE Address Book"
HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kalarm/Manifest b/kde-base/kalarm/Manifest
index 9443459d75d7..650813830c00 100644
--- a/kde-base/kalarm/Manifest
+++ b/kde-base/kalarm/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kalarm/kalarm-4.14.3.ebuild b/kde-base/kalarm/kalarm-4.14.3.ebuild
deleted file mode 100644
index 8f7414fe4444..000000000000
--- a/kde-base/kalarm/kalarm-4.14.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
-HOMEPAGE+=" https://userbase.kde.org/KAlarm"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
- media-libs/phonon[qt4]
- x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-KMEXTRACTONLY="
- kmail/
-"
diff --git a/kde-base/kalarm/kalarm-4.14.8.ebuild b/kde-base/kalarm/kalarm-4.14.8.ebuild
index c710d4353e7d..f5d6aaf07fb9 100644
--- a/kde-base/kalarm/kalarm-4.14.8.ebuild
+++ b/kde-base/kalarm/kalarm-4.14.8.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
HOMEPAGE+=" https://userbase.kde.org/KAlarm"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
RDEPEND="
diff --git a/kde-base/kcheckpass/Manifest b/kde-base/kcheckpass/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/kcheckpass/Manifest
+++ b/kde-base/kcheckpass/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kcheckpass/kcheckpass-4.11.14.ebuild b/kde-base/kcheckpass/kcheckpass-4.11.14.ebuild
deleted file mode 100644
index 02ff0dcd7b68..000000000000
--- a/kde-base/kcheckpass/kcheckpass-4.11.14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="A simple password checker, used by any software in need of user authentication"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug pam"
-
-RDEPEND="
- pam? (
- >=kde-base/kdebase-pam-7
- virtual/pam
- )
-"
-
-src_prepare() {
- kde4-meta_src_prepare
-
- use pam && epatch "${FILESDIR}/${PN}-4.4.2-no-SUID-no-GUID.patch"
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with pam)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/kcheckpass/kcheckpass-4.11.19.ebuild b/kde-base/kcheckpass/kcheckpass-4.11.19.ebuild
index ff3952a0d3d6..02ff0dcd7b68 100644
--- a/kde-base/kcheckpass/kcheckpass-4.11.19.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-4.11.19.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
inherit kde4-meta
DESCRIPTION="A simple password checker, used by any software in need of user authentication"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug pam"
RDEPEND="
diff --git a/kde-base/kcminit/Manifest b/kde-base/kcminit/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/kcminit/Manifest
+++ b/kde-base/kcminit/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kcminit/kcminit-4.11.14.ebuild b/kde-base/kcminit/kcminit-4.11.14.ebuild
deleted file mode 100644
index 9079e061784e..000000000000
--- a/kde-base/kcminit/kcminit-4.11.14.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KCMInit - runs startups initialization for Control Modules"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kcminit/kcminit-4.11.19.ebuild b/kde-base/kcminit/kcminit-4.11.19.ebuild
index b56cf8879ff6..9079e061784e 100644
--- a/kde-base/kcminit/kcminit-4.11.19.ebuild
+++ b/kde-base/kcminit/kcminit-4.11.19.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
inherit kde4-meta
DESCRIPTION="KCMInit - runs startups initialization for Control Modules"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kdebase-cursors/Manifest b/kde-base/kdebase-cursors/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/kdebase-cursors/Manifest
+++ b/kde-base/kdebase-cursors/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.11.14.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.11.14.ebuild
deleted file mode 100644
index de20585e6298..000000000000
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.11.14.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="cursors"
-inherit kde4-meta
-
-DESCRIPTION="oxygen cursors from kdebase"
-IUSE=""
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdebase-cursors/kdebase-cursors-4.11.19.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.11.19.ebuild
index a5e787c1bc9d..de20585e6298 100644
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.11.19.ebuild
+++ b/kde-base/kdebase-cursors/kdebase-cursors-4.11.19.ebuild
@@ -10,4 +10,4 @@ inherit kde4-meta
DESCRIPTION="oxygen cursors from kdebase"
IUSE=""
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.14.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.14.ebuild
deleted file mode 100644
index dd32d36a5100..000000000000
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.14.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMNOMODULE="true"
-inherit kde4-meta prefix
-
-DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+wallpapers"
-
-# The KDE apps called from the startkde script.
-# These provide the most minimal KDE desktop.
-RDEPEND="
- $(add_kdebase_dep kcminit)
- $(add_kdeapps_dep kdebase-runtime-meta)
- wallpapers? ( $(add_kdeapps_dep kde-wallpapers) )
- $(add_kdeapps_dep kfmclient)
- $(add_kdeapps_dep knotify)
- $(add_kdeapps_dep kreadconfig)
- $(add_kdebase_dep krunner)
- $(add_kdebase_dep ksmserver)
- $(add_kdebase_dep ksplash)
- $(add_kdebase_dep kstartupconfig)
- $(add_kdebase_dep kwin)
- $(add_kdeapps_dep phonon-kde)
- $(add_kdeapps_dep plasma-apps)
- $(add_kdebase_dep plasma-workspace)
- $(add_kdebase_dep systemsettings)
- x11-apps/mkfontdir
- x11-apps/xmessage
- x11-apps/xprop
- x11-apps/xrandr
- x11-apps/xrdb
- x11-apps/xsetroot
- x11-apps/xset
-"
-
-KMEXTRACTONLY="
- ConfigureChecks.cmake
- kdm/
- startkde.cmake
-"
-
-PATCHES=(
- "${FILESDIR}/gentoo-startkde4-4.patch"
- "${FILESDIR}/${PN}-kscreen.patch"
-)
-
-src_prepare() {
- kde4-meta_src_prepare
-
- cp "${FILESDIR}/KDE-4" "${T}"
-
- # fix ${EPREFIX}
- eprefixify startkde.cmake "${T}/KDE-4"
-}
-
-src_install() {
- kde4-meta_src_install
-
- # startup and shutdown scripts
- insinto /etc/kde/startup
- doins "${FILESDIR}/agent-startup.sh"
-
- insinto /etc/kde/shutdown
- doins "${FILESDIR}/agent-shutdown.sh"
-
- # x11 session script
- exeinto /etc/X11/Sessions
- doexe "${T}/KDE-4"
-
- # freedesktop compliant session script
- sed -e "s:\${BIN_INSTALL_DIR}:${EPREFIX}/usr/bin:g" \
- "${S}/kdm/kfrontend/sessions/kde-plasma.desktop.cmake" > "${T}/KDE-4.desktop"
- insinto /usr/share/xsessions
- doins "${T}/KDE-4.desktop"
-}
-
-pkg_postinst () {
- kde4-meta_pkg_postinst
-
- echo
- elog "To enable gpg-agent and/or ssh-agent in KDE sessions,"
- elog "edit ${EPREFIX}/etc/kde/startup/agent-startup.sh and"
- elog "${EPREFIX}/etc/kde/shutdown/agent-shutdown.sh"
- echo
- elog "The name of the session script has changed."
- elog "If you currently have XSESSION=\"kde-$(get_kde_version)\" in your"
- elog "configuration files, you will need to change it to"
- elog "XSESSION=\"KDE-4\""
-}
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-4.11.19.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.19.ebuild
index 3e8de630a325..dd32d36a5100 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.19.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.19.ebuild
@@ -9,7 +9,7 @@ KMNOMODULE="true"
inherit kde4-meta prefix
DESCRIPTION="Startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="+wallpapers"
# The KDE apps called from the startkde script.
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 9c429df1b36c..63738214aca4 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,5 +1,2 @@
-DIST kdelibs-4.14.10.tar.xz 11644204 SHA256 00f5a7bdb0b2bcb786ea630844c639ebe89c45eb1e88443dde421baa0895ca94 SHA512 051322f6ee24e09f7b705e17aa8cc755bc6728855afe5b310910e976737167d7902f01a6a8ca51b60b1f0904429522d35eeec1b09ac6cfbdcab97e0fdd5429df WHIRLPOOL 4d4b8d6c25af95e4074606f5ffa7f33134a6a625a22ba7912b1b1a5af3474702d9adc12e71da86cedf46ac150678e53dd7a8bafb444a3b687f1efb633af7ff2d
-DIST kdelibs-4.14.11.tar.xz 11631188 SHA256 981274f1e34c9a73593faf347bdb524b476391ddb1919c5ab39365d7f1aa573c SHA512 f0d634a7b4475d32c68f4b04cd032c45de200343349d2880ef625434ce6df17c6b6f040db6fcff29bbfd98df6f2d6540cd4d3e5d977490dbbe28f038a0ffa561 WHIRLPOOL 3865c46dde6da33ddd26765545d6919f69813330f38fe7ec50e6f2885191f45b224cc33abcebb2350df0ffbce7e252d83cfcb04c28742c351dbfbdfbeaf5fb70
DIST kdelibs-4.14.12.tar.xz 11633140 SHA256 2f17d34af6bc7383625df5562239418c808afd7df462073331bd82a84b1f97e8 SHA512 f04b69bffa67ab76457e56c784604e59270bab081694aa5d19d7b19cc190b9c49c25de2ac8f05c49b2dd09b6c47efc091976d2845c4f3eedecda15feffedb20d WHIRLPOOL 7b9474387bad9e1929cbde352c4b30368dca50d7d7d4862b47fb8b1452528655f3fa4461843dcc26c5b704f3a0d87f2637e4a167c1ae75a4d67833f36bc02115
-DIST kdelibs-4.14.3.tar.xz 11600500 SHA256 f8206da1106184ef0bd031b82701c4910b8dade331c4cdaf1cd9c6c5208cfd9e SHA512 7713cec4851fd4d7d5376afd905515902395ca469cefe1924c05ac0cd4499c28ab6a3c3e7bee10c4cfb3584f2fe93cfb6129d5b550d56d18217866f5fde748cf WHIRLPOOL 9b6d525136cee8e43b832dbbe7451494cc30e15cc58cc34eeab8c9040a9cbe893dc8ba794be50cdb3462e20279bfb41bee22385d3d106a353ef738da510f5c04
DIST kdelibs-4.14.8.tar.xz 11648060 SHA256 705fa8a9b3b3c962aa99d040eb32e68863ba4c2f567b82b9513379defbc39bbb SHA512 0cd5e8dd5cec7cf84bc66c6732f4967610211e521898da41601d24174f909043bafacbb9bd9775666cebb132747e2861c6c8ff07de61be708975f44dbbfb856e WHIRLPOOL 6405ee6b273899a26c39fa005c18be7270888113f93302990003b92ca96c52303ce853c5378c812f4ddf53f40c7b6ff9e2a958bc86a676d1e3abbfe4f3d96bd4
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.0-mimetypes.patch b/kde-base/kdelibs/files/kdelibs-4.14.0-mimetypes.patch
deleted file mode 100644
index 5e543902d7b5..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.14.0-mimetypes.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Remove fake MIME types that cause warnings.
-
-The offending MIME types are commented out rather than
-physically removed because doing so would cause the patch
-to be too large.
-
-diff --git a/mimetypes/kde.xml b/mimetypes/kde.xml
-index 76303db..23351c4 100644
---- a/mimetypes/kde.xml
-+++ b/mimetypes/kde.xml
-@@ -1783,8 +1783,8 @@ Notes:
- </magic>
- <glob pattern="*.abc"/>
- </mime-type>
--
-- <!-- all/ fake mime types -->
-+<!--
-+ all/ fake mime types
- <mime-type type="all/all">
- <comment>all files and folders</comment>
- <comment xml:lang="ar">كل الملفات و المجلدات</comment>
-@@ -1902,7 +1902,7 @@ Notes:
- <comment xml:lang="zh_TW">所有檔案</comment>
- </mime-type>
-
-- <!-- uri/ fake mime types -->
-+ uri/ fake mime types
- <mime-type type="uri/mms">
- <comment>mms: URIs</comment>
- <comment xml:lang="ar">mms: وصلات</comment>
-@@ -2245,7 +2245,7 @@ Notes:
- <comment xml:lang="zh_CN">rtspu: 地址</comment>
- <comment xml:lang="zh_TW">rtspu: 網址</comment>
- </mime-type>
--
-+-->
- <mime-type type="application/vnd.kde.fontspackage">
- <sub-class-of type="application/zip"/>
- <comment>fonts package</comment>
diff --git a/kde-base/kdelibs/files/kdelibs-4.14.3-trim-crash.patch b/kde-base/kdelibs/files/kdelibs-4.14.3-trim-crash.patch
deleted file mode 100644
index 12c84dcfe93e..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.14.3-trim-crash.patch
+++ /dev/null
@@ -1,610 +0,0 @@
-From 570425a30c008297df09ef48b60486108fcf33e9 Mon Sep 17 00:00:00 2001
-From: Andrea Iacovitti <aiacovitti@libero.it>
-Date: Tue, 11 Nov 2014 07:54:28 +0100
-Subject: [PATCH] Introduce DOMString::trimSpaces(), useful for removing space
- characters from url string.
-
----
- khtml/css/css_valueimpl.cpp | 4 ++--
- khtml/css/cssparser.cpp | 4 ++--
- khtml/dom/dom_string.cpp | 32 ++++++++++++++++++++++++++++++++
- khtml/dom/dom_string.h | 7 +++++++
- khtml/dom/html_base.cpp | 8 ++++----
- khtml/dom/html_document.cpp | 2 +-
- khtml/dom/html_form.cpp | 4 ++--
- khtml/dom/html_head.cpp | 12 ++++++------
- khtml/dom/html_image.cpp | 8 ++++----
- khtml/dom/html_inline.cpp | 4 ++--
- khtml/ecma/kjs_html.cpp | 4 ++--
- khtml/ecma/xmlhttprequest.cpp | 3 ++-
- khtml/html/html_baseimpl.cpp | 6 +++---
- khtml/html/html_formimpl.cpp | 2 +-
- khtml/html/html_headimpl.cpp | 12 ++++++------
- khtml/html/html_imageimpl.cpp | 6 +++---
- khtml/html/html_inlineimpl.cpp | 2 +-
- khtml/html/html_objectimpl.cpp | 4 ++--
- khtml/html/html_tableimpl.cpp | 4 ++--
- khtml/html/htmlparser.cpp | 4 ++--
- khtml/html/htmlprospectivetokenizer.cpp | 4 ++--
- khtml/khtml_part.cpp | 4 ++--
- khtml/khtmlview.cpp | 2 +-
- khtml/rendering/render_image.cpp | 8 ++++----
- khtml/xml/dom_docimpl.cpp | 7 ++++---
- 25 files changed, 99 insertions(+), 58 deletions(-)
-
-diff --git a/khtml/css/css_valueimpl.cpp b/khtml/css/css_valueimpl.cpp
-index 98f33e6..aa825b7 100644
---- a/khtml/css/css_valueimpl.cpp
-+++ b/khtml/css/css_valueimpl.cpp
-@@ -1383,9 +1383,9 @@ CSSImageValueImpl::CSSImageValueImpl(const DOMString &url, StyleBaseImpl* style)
- : CSSPrimitiveValueImpl(url, CSSPrimitiveValue::CSS_URI)
- {
- m_image = 0;
-- const QString imgUrl = url.string().trimmed();
-+ const DOMString imgUrl = url.trimSpaces();
- if (!imgUrl.isEmpty()) {
-- m_fullImageUrl = KUrl(style->baseURL(), imgUrl).url();
-+ m_fullImageUrl = KUrl(style->baseURL(), imgUrl.string()).url();
- } else {
- m_fullImageUrl.clear();
- }
-diff --git a/khtml/css/cssparser.cpp b/khtml/css/cssparser.cpp
-index e8f8493..600d205 100644
---- a/khtml/css/cssparser.cpp
-+++ b/khtml/css/cssparser.cpp
-@@ -2309,8 +2309,8 @@ bool CSSParser::parseFontFaceSrc()
- while ((val = valueList->current())) {
- CSSFontFaceSrcValueImpl* parsedValue = 0;
- if (val->unit == CSSPrimitiveValue::CSS_URI && !expectComma && styleElement) {
-- const QString uri = qString(val->string).trimmed();
-- parsedValue = new CSSFontFaceSrcValueImpl(DOMString(KUrl(styleElement->baseURL(), uri).url()), false /*local*/);
-+ const DOMString uri = domString(val->string).trimSpaces();
-+ parsedValue = new CSSFontFaceSrcValueImpl(DOMString(KUrl(styleElement->baseURL(), uri.string()).url()), false /*local*/);
- uriValue = parsedValue;
- allowFormat = true;
- expectComma = true;
-diff --git a/khtml/dom/dom_string.cpp b/khtml/dom/dom_string.cpp
-index d54d037..4a10221 100644
---- a/khtml/dom/dom_string.cpp
-+++ b/khtml/dom/dom_string.cpp
-@@ -290,6 +290,38 @@ bool DOMString::startsWith(const DOMString& str) const
- return impl->startsWith(str.implementation());
- }
-
-+static inline bool isSpaceCharacter(const ushort &c)
-+{
-+ // http://dev.w3.org/html5/spec-LC/common-microsyntaxes.html#space-character
-+ return ((c < 0x0021) &&
-+ (c == 0x0020 || c == 0x0009 || c == 0x000A || c == 0x000C || c == 0x000D));
-+}
-+
-+DOMString DOMString::trimSpaces() const
-+{
-+ if (!impl || !impl->l) {
-+ return *this;
-+ }
-+
-+ const QChar *s = impl->s;
-+ unsigned int start = 0;
-+ unsigned int end = impl->l - 1;
-+
-+ while ((start <= end) && isSpaceCharacter(s[start].unicode())) {
-+ ++start;
-+ }
-+
-+ if (start > end) {
-+ return DOMString("");
-+ }
-+
-+ while (end && isSpaceCharacter(s[end].unicode())) {
-+ --end;
-+ }
-+
-+ return new DOMStringImpl(s + start, end - start + 1);
-+}
-+
- // ------------------------------------------------------------------------
-
- bool DOM::strcasecmp( const DOMString &as, const DOMString &bs )
-diff --git a/khtml/dom/dom_string.h b/khtml/dom/dom_string.h
-index 13b4265..84b1378 100644
---- a/khtml/dom/dom_string.h
-+++ b/khtml/dom/dom_string.h
-@@ -125,6 +125,13 @@ public:
- bool startsWith(const DOMString& str) const;
-
- /**
-+ * Returns a string with Space Characters removed from the start and the end.
-+ * Space Characters as defined in
-+ * http://dev.w3.org/html5/spec-LC/common-microsyntaxes.html#space-character
-+ */
-+ DOMString trimSpaces() const;
-+
-+ /**
- * @internal get a handle to the imlementation of the DOMString
- * Use at own risk!!!
- */
-diff --git a/khtml/dom/html_base.cpp b/khtml/dom/html_base.cpp
-index c5e9048..11ee331 100644
---- a/khtml/dom/html_base.cpp
-+++ b/khtml/dom/html_base.cpp
-@@ -231,8 +231,8 @@ void HTMLFrameElement::setScrolling( const DOMString &value )
- DOMString HTMLFrameElement::src() const
- {
- if(!impl) return DOMString();
-- const QString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).string().trimmed();
-- return !s.isNull() ? impl->document()->completeURL(s) : DOMString();
-+ const DOMString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).trimSpaces();
-+ return !s.isNull() ? impl->document()->completeURL(s.string()) : s;
- }
-
- void HTMLFrameElement::setSrc( const DOMString &value )
-@@ -367,8 +367,8 @@ void HTMLIFrameElement::setScrolling( const DOMString &value )
- DOMString HTMLIFrameElement::src() const
- {
- if(!impl) return DOMString();
-- const QString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).string().trimmed();
-- return !s.isNull() ? impl->document()->completeURL(s) : DOMString();
-+ const DOMString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).trimSpaces();
-+ return !s.isNull() ? impl->document()->completeURL(s.string()) : s;
- }
-
- void HTMLIFrameElement::setSrc( const DOMString &value )
-diff --git a/khtml/dom/html_document.cpp b/khtml/dom/html_document.cpp
-index 042bc5a..2acf683 100644
---- a/khtml/dom/html_document.cpp
-+++ b/khtml/dom/html_document.cpp
-@@ -100,7 +100,7 @@ DOMString HTMLDocument::referrer() const
- DOMString HTMLDocument::completeURL(const DOMString& str) const
- {
- if(!impl) return str;
-- return ((HTMLDocumentImpl *)impl)->completeURL(str.string().trimmed());
-+ return ((HTMLDocumentImpl *)impl)->completeURL(str.trimSpaces().string());
- }
-
- DOMString HTMLDocument::domain() const
-diff --git a/khtml/dom/html_form.cpp b/khtml/dom/html_form.cpp
-index 425cb3d..6d44261 100644
---- a/khtml/dom/html_form.cpp
-+++ b/khtml/dom/html_form.cpp
-@@ -504,8 +504,8 @@ void HTMLInputElement::setSize( long value )
- DOMString HTMLInputElement::src() const
- {
- if(!impl) return DOMString();
-- const QString s = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_SRC).string().trimmed();
-- return !s.isNull() ? impl->document()->completeURL(s) : DOMString();
-+ const DOMString s = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_SRC).trimSpaces();
-+ return !s.isNull() ? impl->document()->completeURL(s.string()) : s;
- }
-
- void HTMLInputElement::setSrc( const DOMString &value )
-diff --git a/khtml/dom/html_head.cpp b/khtml/dom/html_head.cpp
-index 4812631..23fe125 100644
---- a/khtml/dom/html_head.cpp
-+++ b/khtml/dom/html_head.cpp
-@@ -58,8 +58,8 @@ HTMLBaseElement::~HTMLBaseElement()
- DOMString HTMLBaseElement::href() const
- {
- if(!impl) return DOMString();
-- const QString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).string().trimmed();
-- return !href.isNull() ? impl->document()->completeURL(href) : DOMString();
-+ const DOMString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).trimSpaces();
-+ return !href.isNull() ? impl->document()->completeURL(href.string()) : href;
- }
-
- void HTMLBaseElement::setHref( const DOMString &value )
-@@ -134,8 +134,8 @@ void HTMLLinkElement::setCharset( const DOMString &value )
- DOMString HTMLLinkElement::href() const
- {
- if(!impl) return DOMString();
-- const QString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).string().trimmed();
-- return !href.isNull() ? impl->document()->completeURL(href) : DOMString();
-+ const DOMString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).trimSpaces();
-+ return !href.isNull() ? impl->document()->completeURL(href.string()) : href;
- }
-
- void HTMLLinkElement::setHref( const DOMString &value )
-@@ -379,8 +379,8 @@ void HTMLScriptElement::setDefer( bool _defer )
- DOMString HTMLScriptElement::src() const
- {
- if(!impl) return DOMString();
-- const QString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).string().trimmed();
-- return !s.isNull() ? impl->document()->completeURL(s) : DOMString();
-+ const DOMString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).trimSpaces();
-+ return !s.isNull() ? impl->document()->completeURL(s.string()) : s;
- }
-
- void HTMLScriptElement::setSrc( const DOMString &value )
-diff --git a/khtml/dom/html_image.cpp b/khtml/dom/html_image.cpp
-index db1f5ea..a8b4ae0 100644
---- a/khtml/dom/html_image.cpp
-+++ b/khtml/dom/html_image.cpp
-@@ -95,8 +95,8 @@ void HTMLAreaElement::setCoords( const DOMString &value )
- DOMString HTMLAreaElement::href() const
- {
- if(!impl) return DOMString();
-- const QString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).string().trimmed();
-- return !href.isNull() ? impl->document()->completeURL(href) : DOMString();
-+ const DOMString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).trimSpaces();
-+ return !href.isNull() ? impl->document()->completeURL(href.string()) : href;
- }
-
- void HTMLAreaElement::setHref( const DOMString &value )
-@@ -302,8 +302,8 @@ void HTMLImageElement::setLongDesc( const DOMString &value )
- DOMString HTMLImageElement::src() const
- {
- if(!impl) return DOMString();
-- const QString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).string().trimmed();
-- return !s.isNull() ? impl->document()->completeURL(s) : DOMString();
-+ const DOMString s = ((ElementImpl *)impl)->getAttribute(ATTR_SRC).trimSpaces();
-+ return !s.isNull() ? impl->document()->completeURL(s.string()) : s;
- }
-
- void HTMLImageElement::setSrc( const DOMString &value )
-diff --git a/khtml/dom/html_inline.cpp b/khtml/dom/html_inline.cpp
-index c01f668..2f74713 100644
---- a/khtml/dom/html_inline.cpp
-+++ b/khtml/dom/html_inline.cpp
-@@ -95,8 +95,8 @@ void HTMLAnchorElement::setCoords( const DOMString &value )
- DOMString HTMLAnchorElement::href() const
- {
- if(!impl) return DOMString();
-- const QString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).string().trimmed();
-- return !href.isNull() ? impl->document()->completeURL(href) : DOMString();
-+ const DOMString href = static_cast<ElementImpl*>(impl)->getAttribute(ATTR_HREF).trimSpaces();
-+ return !href.isNull() ? impl->document()->completeURL(href.string()) : href;
- }
-
- void HTMLAnchorElement::setHref( const DOMString &value )
-diff --git a/khtml/ecma/kjs_html.cpp b/khtml/ecma/kjs_html.cpp
-index ea15929..d5693af 100644
---- a/khtml/ecma/kjs_html.cpp
-+++ b/khtml/ecma/kjs_html.cpp
-@@ -1587,8 +1587,8 @@ QHash<int, const HTMLElement::BoundPropInfo*>* HTMLElement::boundPropInfo()
-
- QString KJS::HTMLElement::getURLArg(unsigned id) const
- {
-- const QString rel = impl()->getAttribute(id).string().trimmed();
-- return !rel.isNull() ? impl()->document()->completeURL(rel) : rel;
-+ const DOMString rel = impl()->getAttribute(id).trimSpaces();
-+ return !rel.isNull() ? impl()->document()->completeURL(rel.string()) : QString();
- }
-
- DOM::HTMLElementImpl *toHTMLElement(JSValue *val) {
-diff --git a/khtml/ecma/xmlhttprequest.cpp b/khtml/ecma/xmlhttprequest.cpp
-index f9fae5d..45c5a4b 100644
---- a/khtml/ecma/xmlhttprequest.cpp
-+++ b/khtml/ecma/xmlhttprequest.cpp
-@@ -906,7 +906,8 @@ JSValue *XMLHttpRequestProtoFunc::callAsFunction(ExecState *exec, JSObject *this
- return throwError(exec, SyntaxError, "Not enough arguments");
-
- QString method = args[0]->toString(exec).qstring();
-- KUrl url = KUrl(request->doc->completeURL(args[1]->toString(exec).qstring()));
-+ DOMString urlArg = args[1]->toString(exec).domString().trimSpaces();
-+ KUrl url = KUrl(request->doc->completeURL(urlArg.string()));
-
- bool async = true;
- if (args.size() >= 3) {
-diff --git a/khtml/html/html_baseimpl.cpp b/khtml/html/html_baseimpl.cpp
-index 5b4a77a..102b56e 100644
---- a/khtml/html/html_baseimpl.cpp
-+++ b/khtml/html/html_baseimpl.cpp
-@@ -71,7 +71,7 @@ void HTMLBodyElementImpl::parseAttribute(AttributeImpl *attr)
-
- case ATTR_BACKGROUND:
- {
-- QString url = attr->val()->string().trimmed();
-+ QString url = attr->value().trimSpaces().string();
- if (!url.isEmpty()) {
- url = document()->completeURL( url );
- addCSSProperty(CSS_PROP_BACKGROUND_IMAGE, DOMString("url('"+url+"')") );
-@@ -325,7 +325,7 @@ void HTMLFrameElementImpl::parseAttribute(AttributeImpl *attr)
- switch(attr->id())
- {
- case ATTR_SRC:
-- setLocation(attr->value().string().trimmed());
-+ setLocation(attr->value().trimSpaces().string());
- break;
- case ATTR_FRAMEBORDER:
- {
-@@ -755,7 +755,7 @@ void HTMLIFrameElementImpl::parseAttribute(AttributeImpl *attr )
- addHTMLAlignment( attr->value() );
- break;
- case ATTR_SRC:
-- url = attr->value().string().trimmed();
-+ url = attr->value().trimSpaces().string();
- setNeedComputeContent();
- // ### synchronously start the process?
- break;
-diff --git a/khtml/html/html_formimpl.cpp b/khtml/html/html_formimpl.cpp
-index 134851a..d227481 100644
---- a/khtml/html/html_formimpl.cpp
-+++ b/khtml/html/html_formimpl.cpp
-@@ -679,7 +679,7 @@ void HTMLFormElementImpl::submit( )
- }
- #endif // KHTML_NO_WALLET
-
-- QString url = getAttribute(ATTR_ACTION).string().trimmed();
-+ QString url = getAttribute(ATTR_ACTION).trimSpaces().string();
- // ignore base url if 'action' attribute is empty.
- if (url.isEmpty())
- url = formUrl.url();
-diff --git a/khtml/html/html_headimpl.cpp b/khtml/html/html_headimpl.cpp
-index 0de904d..a265ae1 100644
---- a/khtml/html/html_headimpl.cpp
-+++ b/khtml/html/html_headimpl.cpp
-@@ -55,7 +55,7 @@ void HTMLBaseElementImpl::parseAttribute(AttributeImpl *attr)
- switch(attr->id())
- {
- case ATTR_HREF:
-- m_href = attr->value().string().trimmed();
-+ m_href = attr->value().trimSpaces().string();
- process();
- break;
- case ATTR_TARGET:
-@@ -116,9 +116,9 @@ void HTMLLinkElementImpl::parseAttribute(AttributeImpl *attr)
- switch (attr->id())
- {
- case ATTR_HREF: {
-- const QString hrefUrl = attr->val()->string().trimmed();
-+ const DOMString hrefUrl = attr->value().trimSpaces();
- if (!hrefUrl.isEmpty()) {
-- m_url = document()->completeURL(hrefUrl);
-+ m_url = document()->completeURL(hrefUrl.string());
- }
- process();
- break;
-@@ -385,7 +385,7 @@ void HTMLScriptElementImpl::parseAttribute(AttributeImpl *attr)
- // we'll only start doing things once we get insertedIntoDocument()
- if (m_evaluated || m_cachedScript || m_createdByParser || !inDocument())
- return;
-- QString url = attr->value().string().trimmed();
-+ const DOMString url = attr->value().trimSpaces();
- if (!url.isEmpty())
- loadFromUrl(url);
- break;
-@@ -490,7 +490,7 @@ void HTMLScriptElementImpl::insertedIntoDocument()
- if (m_createdByParser)
- return;
-
-- QString url = getAttribute(ATTR_SRC).string().trimmed();
-+ const DOMString url = getAttribute(ATTR_SRC).trimSpaces();
- if (!url.isEmpty()) {
- loadFromUrl(url);
- return;
-@@ -622,7 +622,7 @@ void HTMLScriptElementImpl::setDefer(bool defer)
-
- DOMString HTMLScriptElementImpl::src() const
- {
-- return document()->completeURL(getAttribute(ATTR_SRC).string().trimmed());
-+ return document()->completeURL(getAttribute(ATTR_SRC).trimSpaces().string());
- }
-
- void HTMLScriptElementImpl::setSrc(const DOMString &value)
-diff --git a/khtml/html/html_imageimpl.cpp b/khtml/html/html_imageimpl.cpp
-index 51695a8..15a8302 100644
---- a/khtml/html/html_imageimpl.cpp
-+++ b/khtml/html/html_imageimpl.cpp
-@@ -84,7 +84,7 @@ void HTMLImageElementImpl::parseAttribute(AttributeImpl *attr)
- setChanged();
-
- //Start loading the image already, to generate events
-- const QString imgSrcUrl = attr->value().string().trimmed();
-+ const DOMString imgSrcUrl = attr->value().trimSpaces();
- if (!imgSrcUrl.isEmpty()) { //### why do we not hide or something when setting this?
- CachedImage* newImage = document()->docLoader()->requestImage(imgSrcUrl);
- if (newImage && newImage != m_image) {
-@@ -151,7 +151,7 @@ void HTMLImageElementImpl::parseAttribute(AttributeImpl *attr)
- if ( attr->value()[0] == '#' )
- usemap = attr->value().lower();
- else {
-- QString url = document()->completeURL(attr->value().string().trimmed());
-+ QString url = document()->completeURL(attr->value().trimSpaces().string());
- // ### we remove the part before the anchor and hope
- // the map is on the same html page....
- usemap = url;
-@@ -438,7 +438,7 @@ void HTMLMapElementImpl::parseAttribute(AttributeImpl *attr)
- }
- else {
- // add name with full url:
-- const QString url = document()->completeURL(attr->value().string().trimmed());
-+ const QString url = document()->completeURL(attr->value().trimSpaces().string());
- if(document()->isHTMLDocument())
- static_cast<HTMLDocumentImpl*>(document())->mapMap[url] = this;
- }
-diff --git a/khtml/html/html_inlineimpl.cpp b/khtml/html/html_inlineimpl.cpp
-index fc2e6f6..6e9bdd8 100644
---- a/khtml/html/html_inlineimpl.cpp
-+++ b/khtml/html/html_inlineimpl.cpp
-@@ -81,7 +81,7 @@ void HTMLAnchorElementImpl::defaultEventHandler(EventImpl *evt)
- if (k->qKeyEvent()) k->qKeyEvent()->accept();
- }
-
-- QString url = getAttribute(ATTR_HREF).string().trimmed();
-+ QString url = getAttribute(ATTR_HREF).trimSpaces().string();
- QString utarget = getAttribute(ATTR_TARGET).string();
-
- if ( e && e->button() == 1 )
-diff --git a/khtml/html/html_objectimpl.cpp b/khtml/html/html_objectimpl.cpp
-index 863afe6..f5aef26 100644
---- a/khtml/html/html_objectimpl.cpp
-+++ b/khtml/html/html_objectimpl.cpp
-@@ -695,7 +695,7 @@ void HTMLEmbedElementImpl::parseAttribute(AttributeImpl *attr)
- {
- case ATTR_CODE:
- case ATTR_SRC:
-- url = attr->val()->string().trimmed();
-+ url = attr->value().trimSpaces().string();
- setNeedComputeContent();
- break;
- case ATTR_BORDER:
-@@ -775,7 +775,7 @@ void HTMLObjectElementImpl::parseAttribute(AttributeImpl *attr)
- switch ( attr->id() )
- {
- case ATTR_DATA:
-- url = attr->val()->string().trimmed();
-+ url = attr->value().trimSpaces().string();
- setNeedComputeContent();
- break;
- case ATTR_CLASSID:
-diff --git a/khtml/html/html_tableimpl.cpp b/khtml/html/html_tableimpl.cpp
-index 8323093..c135545 100644
---- a/khtml/html/html_tableimpl.cpp
-+++ b/khtml/html/html_tableimpl.cpp
-@@ -495,7 +495,7 @@ void HTMLTableElementImpl::parseAttribute(AttributeImpl *attr)
- break;
- case ATTR_BACKGROUND:
- {
-- QString url = attr->val()->string().trimmed();
-+ QString url = attr->value().trimSpaces().string();
- if (!url.isEmpty()) {
- url = document()->completeURL( url );
- addCSSProperty(CSS_PROP_BACKGROUND_IMAGE, DOMString("url('"+url+"')") );
-@@ -638,7 +638,7 @@ void HTMLTablePartElementImpl::parseAttribute(AttributeImpl *attr)
- break;
- case ATTR_BACKGROUND:
- {
-- QString url = attr->val()->string().trimmed();
-+ QString url = attr->value().trimSpaces().string();
- if (!url.isEmpty()) {
- url = document()->completeURL( url );
- addCSSProperty(CSS_PROP_BACKGROUND_IMAGE, DOMString("url('"+url+"')") );
-diff --git a/khtml/html/htmlparser.cpp b/khtml/html/htmlparser.cpp
-index ce5be3e..49b8068 100644
---- a/khtml/html/htmlparser.cpp
-+++ b/khtml/html/htmlparser.cpp
-@@ -974,7 +974,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
- KHTMLGlobal::defaultHTMLSettings()->isHideAdsEnabled() &&
- !strcasecmp( t->attrs->getValue( ATTR_TYPE ), "image" ) )
- {
-- const QString url = doc()->completeURL(t->attrs->getValue(ATTR_SRC)->string().trimmed());
-+ const QString url = doc()->completeURL(DOMString(t->attrs->getValue(ATTR_SRC)).trimSpaces().string());
- if (KHTMLGlobal::defaultHTMLSettings()->isAdFiltered(url))
- return 0;
- }
-@@ -1104,7 +1104,7 @@ NodeImpl *KHTMLParser::getElement(Token* t)
- KHTMLGlobal::defaultHTMLSettings()->isAdFilterEnabled()&&
- KHTMLGlobal::defaultHTMLSettings()->isHideAdsEnabled())
- {
-- const QString url = doc()->completeURL(t->attrs->getValue(ATTR_SRC)->string().trimmed());
-+ const QString url = doc()->completeURL(DOMString(t->attrs->getValue(ATTR_SRC)).trimSpaces().string());
- if (KHTMLGlobal::defaultHTMLSettings()->isAdFiltered(url))
- return 0;
- }
-diff --git a/khtml/html/htmlprospectivetokenizer.cpp b/khtml/html/htmlprospectivetokenizer.cpp
-index 83c4c16..585a449 100644
---- a/khtml/html/htmlprospectivetokenizer.cpp
-+++ b/khtml/html/htmlprospectivetokenizer.cpp
-@@ -706,7 +706,7 @@ void ProspectiveTokenizer::processAttribute()
- LocalName attrLocal = LocalName::fromString(&attrDS, IDS_NormalizeLower);
- uint attribute = attrLocal.id();
- if (attribute == localNamePart(ATTR_SRC) && m_urlToLoad.isEmpty())
-- m_urlToLoad = DOMString(QString(m_attributeValue.data(), m_attributeValue.size()).trimmed());
-+ m_urlToLoad = DOMString(m_attributeValue.data(), m_attributeValue.size()).trimSpaces();
- break;
- }
- case ID_LINK:
-@@ -715,7 +715,7 @@ void ProspectiveTokenizer::processAttribute()
- LocalName attrLocal = LocalName::fromString(&attrDS, IDS_NormalizeLower);
- uint attribute = attrLocal.id();
- if (attribute == localNamePart(ATTR_HREF) && m_urlToLoad.isEmpty())
-- m_urlToLoad = DOMString(QString(m_attributeValue.data(), m_attributeValue.size()).trimmed());
-+ m_urlToLoad = DOMString(m_attributeValue.data(), m_attributeValue.size()).trimSpaces();
- else if (attribute == localNamePart(ATTR_REL)) {
- DOMStringImpl* lowerAttribute = DOMStringImpl(DOMStringImpl::ShallowCopy, m_attributeValue.data(), m_attributeValue.size()).lower();
- QString val = lowerAttribute->string();
-diff --git a/khtml/khtml_part.cpp b/khtml/khtml_part.cpp
-index 15ea3c9..6c4ed17 100644
---- a/khtml/khtml_part.cpp
-+++ b/khtml/khtml_part.cpp
-@@ -6420,7 +6420,7 @@ bool KHTMLPart::handleMouseMoveEventDrag(khtml::MouseMoveEvent *event)
- if (url.isEmpty() && innerNodeImpl && innerNodeImpl->id() == ID_IMG)
- {
- img = static_cast<HTMLImageElementImpl *>(innerNodeImpl);
-- u = completeURL(img->getAttribute(ATTR_SRC).string().trimmed());
-+ u = completeURL(img->getAttribute(ATTR_SRC).trimSpaces().string());
- pix = KIconLoader::global()->loadIcon("image-x-generic", KIconLoader::Desktop);
- }
- else
-@@ -6719,7 +6719,7 @@ void KHTMLPart::runAdFilter()
- node->id() == ID_IFRAME ||
- (node->id() == ID_INPUT && static_cast<HTMLInputElementImpl *>(node)->inputType() == HTMLInputElementImpl::IMAGE ))
- {
-- if (KHTMLGlobal::defaultHTMLSettings()->isAdFiltered(d->m_doc->completeURL(static_cast<ElementImpl *>(node)->getAttribute(ATTR_SRC).string().trimmed())))
-+ if (KHTMLGlobal::defaultHTMLSettings()->isAdFiltered(d->m_doc->completeURL(static_cast<ElementImpl *>(node)->getAttribute(ATTR_SRC).trimSpaces().string())))
- {
- // Since any kids of node will be deleted, too, fastforward nextNode
- // until we get outside of node.
-diff --git a/khtml/khtmlview.cpp b/khtml/khtmlview.cpp
-index 0c4e317..8078fdc 100644
---- a/khtml/khtmlview.cpp
-+++ b/khtml/khtmlview.cpp
-@@ -2780,7 +2780,7 @@ QMap< ElementImpl*, QChar > KHTMLView::buildFallbackAccessKeys() const
- bool text_before = false;
- switch( element->id()) {
- case ID_A:
-- url = element->getAttribute(ATTR_HREF).string().trimmed();
-+ url = element->getAttribute(ATTR_HREF).trimSpaces().string();
- if( url.isEmpty()) // doesn't have href, it's only an anchor
- continue;
- text = static_cast< HTMLElementImpl* >( element )->innerText().string().simplified();
-diff --git a/khtml/rendering/render_image.cpp b/khtml/rendering/render_image.cpp
-index dee27ab..6741858 100644
---- a/khtml/rendering/render_image.cpp
-+++ b/khtml/rendering/render_image.cpp
-@@ -427,16 +427,16 @@ void RenderImage::updateFromElement()
- else if (element()->id() == ID_IMG)
- alt = static_cast<HTMLImageElementImpl*>(element())->altText();
-
-- const QString u = element()->id() == ID_OBJECT ?
-- element()->getAttribute(ATTR_DATA).string().trimmed() : element()->getAttribute(ATTR_SRC).string().trimmed();
-+ const DOMString u = element()->id() == ID_OBJECT ?
-+ element()->getAttribute(ATTR_DATA).trimSpaces() : element()->getAttribute(ATTR_SRC).trimSpaces();
-
- if (!u.isEmpty()) {
- // Need to compute completeURL, as 'u' can be relative
- // while m_cachedImage->url() is always full url
- DocumentImpl *docImpl = element()->document();
-- const QString fullUrl = docImpl->completeURL(u);
-+ const QString fullUrl = docImpl->completeURL(u.string());
- if (!m_cachedImage || m_cachedImage->url() != fullUrl) {
-- CachedImage *new_image = docImpl->docLoader()->requestImage(fullUrl);
-+ CachedImage *new_image = docImpl->docLoader()->requestImage(DOMString(fullUrl));
- if (new_image && new_image != m_cachedImage) {
- updateImage(new_image);
- }
-diff --git a/khtml/xml/dom_docimpl.cpp b/khtml/xml/dom_docimpl.cpp
-index 0a3e4ed..b8e5910 100644
---- a/khtml/xml/dom_docimpl.cpp
-+++ b/khtml/xml/dom_docimpl.cpp
-@@ -1979,7 +1979,7 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
- v->part()->scheduleRedirection(delay, v->part()->url().url() );
- } else {
- pos++;
-- while(pos < (int)str.length() && str[pos].isSpace()) pos++;
-+ while(pos < str.length() && str[pos].isSpace()) pos++;
- str = str.mid(pos);
- if(str.indexOf("url", 0, Qt::CaseInsensitive ) == 0) str = str.mid(3);
- str = str.trimmed();
-@@ -1987,7 +1987,8 @@ void DocumentImpl::processHttpEquiv(const DOMString &equiv, const DOMString &con
- while (str.length() && (str[str.length()-1] == ';' || str[str.length()-1] == ',')) {
- str.resize(str.length()-1);
- }
-- QString newURL = document()->completeURL(str.trimmed());
-+ str = DOMString(str).trimSpaces().string();
-+ QString newURL = document()->completeURL(str);
- if ( ok )
- v->part()->scheduleRedirection(delay, newURL, delay < 2 || newURL == URL().url());
- }
-@@ -2047,7 +2048,7 @@ bool DocumentImpl::prepareMouseEvent( bool readonly, int _x, int _y, MouseEvent
- //qDebug("urlnode: %s (%d)", getTagName(renderInfo.URLElement()->id()).string().toLatin1().constData(), renderInfo.URLElement()->id());
-
- ElementImpl* e = static_cast<ElementImpl*>(renderInfo.URLElement());
-- const DOMString href = e->getAttribute(ATTR_HREF).string().trimmed();
-+ const DOMString href = e->getAttribute(ATTR_HREF).trimSpaces();
- const DOMString target = e->getAttribute(ATTR_TARGET);
-
- if (!target.isNull() && !href.isNull()) {
---
-2.0.4
-
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.2-armlinking.patch b/kde-base/kdelibs/files/kdelibs-4.6.2-armlinking.patch
deleted file mode 100644
index a207d1088348..000000000000
--- a/kde-base/kdelibs/files/kdelibs-4.6.2-armlinking.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN kdelibs-4.6.2.orig/cmake/modules/FindKDE4Internal.cmake kdelibs-4.6.2/cmake/modules/FindKDE4Internal.cmake
---- kdelibs-4.6.2.orig/cmake/modules/FindKDE4Internal.cmake 2011-04-01 15:56:18.000000000 +0200
-+++ kdelibs-4.6.2/cmake/modules/FindKDE4Internal.cmake 2011-04-11 23:53:19.067196607 +0200
-@@ -1092,8 +1092,8 @@
- if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
- if (CMAKE_COMPILER_IS_GNUCXX)
- set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
-- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
-- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
-+ set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
-+ set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
-
- set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}")
- set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}")
diff --git a/kde-base/kdelibs/kdelibs-4.14.10.ebuild b/kde-base/kdelibs/kdelibs-4.14.10.ebuild
deleted file mode 100644
index e9eddd1d5f9c..000000000000
--- a/kde-base/kdelibs/kdelibs-4.14.10.ebuild
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_HANDBOOK="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
-
-EGIT_BRANCH="KDE/4.14"
-
-DESCRIPTION="KDE libraries needed by all KDE programs"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
-kerberos lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse
-cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
-
-REQUIRED_USE="
- udisks? ( udev )
- upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
- >=app-misc/strigi-0.7.7
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xsl-stylesheets
- >=dev-libs/libattica-0.4.2
- >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)]
- dev-libs/libpcre[unicode]
- dev-libs/libxml2
- dev-libs/libxslt
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/giflib
- media-libs/libpng:0=
- media-libs/phonon[qt4]
- sys-libs/zlib
- virtual/jpeg:0
- >=x11-misc/shared-mime-info-0.60
- acl? ( virtual/acl )
- alsa? ( media-libs/alsa-lib )
- !aqua? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXcursor
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- !kernel_SunOS? (
- || (
- sys-libs/libutempter
- >=sys-freebsd/freebsd-lib-9.0
- )
- )
- )
- bzip2? ( app-arch/bzip2 )
- crypt? ( app-crypt/qca:2[qt4(+)] )
- fam? ( virtual/fam )
- jpeg2k? ( media-libs/jasper )
- kerberos? ( virtual/krb5 )
- openexr? (
- media-libs/openexr:=
- media-libs/ilmbase:=
- )
- policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] )
- spell? ( app-text/enchant )
- ssl? ( dev-libs/openssl:0 )
- udev? ( virtual/udev )
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${COMMONDEPEND}
- doc? ( app-doc/doxygen )
- nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
- !dev-qt/qtphonon
- !<=kde-base/plasma-workspace-4.7.1:4
- !<=kde-base/kcontrol-4.4.50:4
- >=app-crypt/gnupg-2.0.11
- app-misc/ca-certificates
- $(add_kdebase_dep kde-env '' 4.14.3)
- sys-apps/dbus[X]
- !aqua? (
- udisks? ( sys-fs/udisks:2 )
- x11-apps/iceauth
- x11-apps/rgb
- >=x11-misc/xdg-utils-1.0.2-r3
- upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
- )
- udev? ( app-misc/media-player-info )
-"
-PDEPEND="
- $(add_kdebase_dep katepart '' 4.14.3)
- || (
- $(add_kdeapps_dep kfmclient '' 4.14.3)
- x11-misc/xdg-utils
- )
- handbook? (
- || (
- $(add_kdebase_dep khelpcenter '' 4.14.3)
- kde-plasma/khelpcenter:5[compat(+)]
- )
- )
- policykit? ( || (
- >=sys-auth/polkit-kde-agent-0.99
- kde-plasma/polkit-kde-agent
- ) )
-"
-
-PATCHES=(
- "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
- "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
- "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch"
- "${FILESDIR}/${PN}-4.14.5-mimetypes.patch"
- "${FILESDIR}/${PN}-4.4.90-xslt.patch"
- "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
- "${FILESDIR}/${PN}-4.8.1-norpath.patch"
- "${FILESDIR}/${PN}-4.9.3-werror.patch"
- "${FILESDIR}/${PN}-4.10.0-udisks.patch"
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
- && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
- fi
-}
-
-src_prepare() {
- kde4-base_src_prepare
-
- # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
- sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
- -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
- if use aqua; then
- sed -i -e \
- "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
- cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
- #if [[ ${CHOST} == *-darwin8 ]]; then
- sed -i -e \
- "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
- cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
- #fi
-
- # solid/solid/backends/iokit doesn't properly link, so disable it.
- sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
- || die "disabling solid/solid/backends/iokit failed"
- sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
- || die "disabling solid/solid/backends/iokit failed"
-
- # There's no fdatasync on OSX and the check fails to detect that.
- sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
- || die "disabling fdatasync failed"
-
- # Fix nameser include to nameser8_compat
- sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
- || die "fixing nameser include failed"
- append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
- # Try to fix kkeyserver_mac
- epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_HSPELL=OFF
- -DWITH_ASPELL=OFF
- -DWITH_DNSSD=OFF
- -DKDE_DEFAULT_HOME=.kde4
- -DKAUTH_BACKEND=POLKITQT-1
- -DBUILD_libkactivities=OFF
- -DWITH_Soprano=OFF
- -DWITH_SharedDesktopOntologies=OFF
- $(cmake-utils_use_build handbook doc)
- $(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
- $(cmake-utils_use_has altivec PPC_ALTIVEC)
- $(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
- $(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
- $(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
- $(cmake-utils_use_with acl)
- $(cmake-utils_use_with alsa)
- $(cmake-utils_use_with bzip2 BZip2)
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with fam)
- $(cmake-utils_use_with jpeg2k Jasper)
- $(cmake-utils_use_with kerberos GSSAPI)
- $(cmake-utils_use_with lzma LibLZMA)
- $(cmake-utils_use_with nls Libintl)
- $(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_with policykit PolkitQt-1)
- $(cmake-utils_use_with spell ENCHANT)
- $(cmake-utils_use_with ssl OpenSSL)
- $(cmake-utils_use_with udev UDev)
- $(cmake-utils_use_with udisks SOLID_UDISKS2)
- $(cmake-utils_use_with zeroconf Avahi)
- )
- kde4-base_src_configure
-}
-
-src_compile() {
- kde4-base_src_compile
-
- # The building of apidox is not managed anymore by the build system
- if use doc; then
- einfo "Building API documentation"
- cd "${S}"/doc/api/
- ./doxygen.sh "${S}" || die "APIDOX generation failed"
- fi
-}
-
-src_install() {
- kde4-base_src_install
-
- # use system certificates
- rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
- dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
- if use doc; then
- einfo "Installing API documentation. This could take a bit of time."
- cd "${S}"/doc/api/
- docinto /HTML/en/kdelibs-apidox
- dohtml -r ${P}-apidocs/*
- fi
-
- if use aqua; then
- einfo "fixing ${PN} plugins"
-
- local _PV=${PV:0:3}.0
- local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
- install_name_tool -id \
- "${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- || die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
- einfo "fixing ${PN} cmake detection files"
- #sed -i -e \
- # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
- echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
- "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
- || die "failed fixing FindXKB.cmake"
- fi
-
- einfo Installing environment file.
- # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
- echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
- echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
- doenvd "${T}/77kde"
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
-
- if use zeroconf; then
- echo
- elog "To make zeroconf support available in KDE make sure that the avahi daemon"
- elog "is running."
- echo
- einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
- einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
- einfo "to include 'mdns', e.g.:"
- einfo " hosts: files mdns dns"
- echo
- fi
-
- kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
- # Remove ksycoca4 global database
- rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
-}
-
-pkg_postrm() {
- fdo-mime_mime_database_update
-
- kde4-base_pkg_postrm
-}
diff --git a/kde-base/kdelibs/kdelibs-4.14.11.ebuild b/kde-base/kdelibs/kdelibs-4.14.11.ebuild
deleted file mode 100644
index 959b7cc164d5..000000000000
--- a/kde-base/kdelibs/kdelibs-4.14.11.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_MIN_VERSION="3.3.1-r1"
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_HANDBOOK="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
-
-EGIT_BRANCH="KDE/4.14"
-
-DESCRIPTION="KDE libraries needed by all KDE programs"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
-kerberos lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse
-cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
-
-REQUIRED_USE="
- udisks? ( udev )
- upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
- >=app-misc/strigi-0.7.7
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xsl-stylesheets
- >=dev-libs/libattica-0.4.2
- >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)]
- dev-libs/libpcre[unicode]
- dev-libs/libxml2
- dev-libs/libxslt
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/giflib
- media-libs/libpng:0=
- media-libs/phonon[qt4]
- sys-libs/zlib
- virtual/jpeg:0
- >=x11-misc/shared-mime-info-0.60
- acl? ( virtual/acl )
- alsa? ( media-libs/alsa-lib )
- !aqua? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXcursor
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- !kernel_SunOS? (
- || (
- sys-libs/libutempter
- >=sys-freebsd/freebsd-lib-9.0
- )
- )
- )
- bzip2? ( app-arch/bzip2 )
- crypt? ( app-crypt/qca:2[qt4(+)] )
- fam? ( virtual/fam )
- jpeg2k? ( media-libs/jasper )
- kerberos? ( virtual/krb5 )
- openexr? (
- media-libs/openexr:=
- media-libs/ilmbase:=
- )
- policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] )
- spell? ( app-text/enchant )
- ssl? ( dev-libs/openssl:0 )
- udev? ( virtual/udev )
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${COMMONDEPEND}
- doc? ( app-doc/doxygen )
- nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
- !dev-qt/qtphonon
- !<=kde-base/plasma-workspace-4.7.1:4
- !<=kde-base/kcontrol-4.4.50:4
- >=app-crypt/gnupg-2.0.11
- app-misc/ca-certificates
- $(add_kdebase_dep kde-env '' 4.14.3)
- sys-apps/dbus[X]
- !aqua? (
- udisks? ( sys-fs/udisks:2 )
- x11-apps/iceauth
- x11-apps/rgb
- >=x11-misc/xdg-utils-1.0.2-r3
- upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
- )
- udev? ( app-misc/media-player-info )
-"
-PDEPEND="
- $(add_kdebase_dep katepart '' 4.14.3)
- || (
- $(add_kdeapps_dep kfmclient '' 4.14.3)
- x11-misc/xdg-utils
- )
- handbook? (
- || (
- $(add_kdebase_dep khelpcenter '' 4.14.3)
- kde-plasma/khelpcenter:5[compat(+)]
- )
- )
- policykit? ( || (
- >=sys-auth/polkit-kde-agent-0.99
- kde-plasma/polkit-kde-agent
- ) )
-"
-
-PATCHES=(
- "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
- "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
- "${FILESDIR}/${PN}-4.14.5-fatalwarnings.patch"
- "${FILESDIR}/${PN}-4.14.5-mimetypes.patch"
- "${FILESDIR}/${PN}-4.4.90-xslt.patch"
- "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
- "${FILESDIR}/${PN}-4.8.1-norpath.patch"
- "${FILESDIR}/${PN}-4.9.3-werror.patch"
- "${FILESDIR}/${PN}-4.10.0-udisks.patch"
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
- && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
- fi
-}
-
-src_prepare() {
- kde4-base_src_prepare
-
- # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
- sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
- -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
- if use aqua; then
- sed -i -e \
- "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
- cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
- #if [[ ${CHOST} == *-darwin8 ]]; then
- sed -i -e \
- "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
- cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
- #fi
-
- # solid/solid/backends/iokit doesn't properly link, so disable it.
- sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
- || die "disabling solid/solid/backends/iokit failed"
- sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
- || die "disabling solid/solid/backends/iokit failed"
-
- # There's no fdatasync on OSX and the check fails to detect that.
- sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
- || die "disabling fdatasync failed"
-
- # Fix nameser include to nameser8_compat
- sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
- || die "fixing nameser include failed"
- append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
- # Try to fix kkeyserver_mac
- epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_HSPELL=OFF
- -DWITH_ASPELL=OFF
- -DWITH_DNSSD=OFF
- -DKDE_DEFAULT_HOME=.kde4
- -DKAUTH_BACKEND=POLKITQT-1
- -DBUILD_libkactivities=OFF
- -DWITH_Soprano=OFF
- -DWITH_SharedDesktopOntologies=OFF
- $(cmake-utils_use_build handbook doc)
- $(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
- $(cmake-utils_use_has altivec PPC_ALTIVEC)
- $(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
- $(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
- $(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
- $(cmake-utils_use_with acl)
- $(cmake-utils_use_with alsa)
- $(cmake-utils_use_with bzip2 BZip2)
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with fam)
- $(cmake-utils_use_with jpeg2k Jasper)
- $(cmake-utils_use_with kerberos GSSAPI)
- $(cmake-utils_use_with lzma LibLZMA)
- $(cmake-utils_use_with nls Libintl)
- $(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_with policykit PolkitQt-1)
- $(cmake-utils_use_with spell ENCHANT)
- $(cmake-utils_use_with ssl OpenSSL)
- $(cmake-utils_use_with udev UDev)
- $(cmake-utils_use_with udisks SOLID_UDISKS2)
- $(cmake-utils_use_with zeroconf Avahi)
- )
- kde4-base_src_configure
-}
-
-src_compile() {
- kde4-base_src_compile
-
- # The building of apidox is not managed anymore by the build system
- if use doc; then
- einfo "Building API documentation"
- cd "${S}"/doc/api/
- ./doxygen.sh "${S}" || die "APIDOX generation failed"
- fi
-}
-
-src_install() {
- kde4-base_src_install
-
- # use system certificates
- rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
- dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
- if use doc; then
- einfo "Installing API documentation. This could take a bit of time."
- cd "${S}"/doc/api/
- docinto /HTML/en/kdelibs-apidox
- dohtml -r ${P}-apidocs/*
- fi
-
- if use aqua; then
- einfo "fixing ${PN} plugins"
-
- local _PV=${PV:0:3}.0
- local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
- install_name_tool -id \
- "${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- || die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
- einfo "fixing ${PN} cmake detection files"
- #sed -i -e \
- # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
- echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
- "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
- || die "failed fixing FindXKB.cmake"
- fi
-
- einfo Installing environment file.
- # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
- echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
- echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
- doenvd "${T}/77kde"
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
-
- if use zeroconf; then
- echo
- elog "To make zeroconf support available in KDE make sure that the avahi daemon"
- elog "is running."
- echo
- einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
- einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
- einfo "to include 'mdns', e.g.:"
- einfo " hosts: files mdns dns"
- echo
- fi
-
- kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
- # Remove ksycoca4 global database
- rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
-}
-
-pkg_postrm() {
- fdo-mime_mime_database_update
-
- kde4-base_pkg_postrm
-}
diff --git a/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild b/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild
deleted file mode 100644
index 71bd3eb13508..000000000000
--- a/kde-base/kdelibs/kdelibs-4.14.3-r1.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CPPUNIT_REQUIRED="optional"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="optional"
-KDE_HANDBOOK="optional"
-inherit kde4-base fdo-mime multilib toolchain-funcs flag-o-matic
-
-EGIT_BRANCH="KDE/4.14"
-
-DESCRIPTION="KDE libraries needed by all KDE programs"
-
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
-kerberos lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse
-cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf"
-
-REQUIRED_USE="
- udisks? ( udev )
- upower? ( udev )
-"
-
-# needs the kate regression testsuite from svn
-RESTRICT="test"
-
-COMMONDEPEND="
- >=app-misc/strigi-0.7.7
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xsl-stylesheets
- >=dev-libs/libattica-0.4.2
- >=dev-libs/libdbusmenu-qt-0.3.2[qt4(+)]
- dev-libs/libpcre[unicode]
- dev-libs/libxml2
- dev-libs/libxslt
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/giflib
- media-libs/libpng:0=
- media-libs/phonon[qt4]
- sys-libs/zlib
- virtual/jpeg:0
- >=x11-misc/shared-mime-info-0.60
- acl? ( virtual/acl )
- alsa? ( media-libs/alsa-lib )
- !aqua? (
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXcursor
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- !kernel_SunOS? (
- || (
- sys-libs/libutempter
- >=sys-freebsd/freebsd-lib-9.0
- )
- )
- )
- bzip2? ( app-arch/bzip2 )
- crypt? ( app-crypt/qca:2[qt4(+)] )
- fam? ( virtual/fam )
- jpeg2k? ( media-libs/jasper )
- kerberos? ( virtual/krb5 )
- openexr? (
- media-libs/openexr:=
- media-libs/ilmbase:=
- )
- policykit? ( >=sys-auth/polkit-qt-0.103.0[qt4(+)] )
- spell? ( app-text/enchant )
- ssl? ( dev-libs/openssl:0 )
- udev? ( virtual/udev )
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${COMMONDEPEND}
- doc? ( app-doc/doxygen )
- nls? ( virtual/libintl )
-"
-RDEPEND="${COMMONDEPEND}
- !dev-qt/qtphonon
- !<=kde-base/plasma-workspace-4.7.1:4
- !<=kde-base/kcontrol-4.4.50:4
- >=app-crypt/gnupg-2.0.11
- app-misc/ca-certificates
- $(add_kdebase_dep kde-env)
- sys-apps/dbus[X]
- !aqua? (
- udisks? ( sys-fs/udisks:2 )
- x11-apps/iceauth
- x11-apps/rgb
- >=x11-misc/xdg-utils-1.0.2-r3
- upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )
- )
- udev? ( app-misc/media-player-info )
-"
-PDEPEND="
- $(add_kdebase_dep katepart)
- || (
- $(add_kdeapps_dep kfmclient)
- x11-misc/xdg-utils
- )
- handbook? (
- || (
- $(add_kdebase_dep khelpcenter)
- kde-plasma/khelpcenter:5[compat(+)]
- )
- )
- policykit? ( || (
- >=sys-auth/polkit-kde-agent-0.99
- kde-plasma/polkit-kde-agent
- ) )
-"
-
-PATCHES=(
- "${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix-1.patch"
- "${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs-1.patch"
- "${FILESDIR}/${PN}-4.14.0-mimetypes.patch"
- "${FILESDIR}/${PN}-4.4.90-xslt.patch"
- "${FILESDIR}/${PN}-4.6.2-armlinking.patch"
- "${FILESDIR}/${PN}-4.6.3-no_suid_kdeinit.patch"
- "${FILESDIR}/${PN}-4.8.1-norpath.patch"
- "${FILESDIR}/${PN}-4.9.3-werror.patch"
- "${FILESDIR}/${PN}-4.10.0-udisks.patch"
- "${FILESDIR}/${PN}-4.14.3-trim-crash.patch"
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != binary ]]; then
- [[ $(gcc-major-version) -lt 4 ]] || \
- ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 3 ]] ) \
- && die "Sorry, but gcc-4.3 and earlier won't work for KDE SC 4.6 (see bug #354837)."
- fi
-}
-
-src_prepare() {
- kde4-base_src_prepare
-
- # Rename applications.menu (needs 01_gentoo_set_xdg_menu_prefix-1.patch to work)
- sed -e 's|FILES[[:space:]]applications.menu|FILES applications.menu RENAME kde-4-applications.menu|g' \
- -i kded/CMakeLists.txt || die "Sed on CMakeLists.txt for applications.menu failed."
-
- if use aqua; then
- sed -i -e \
- "s:BUNDLE_INSTALL_DIR \"/Applications:BUNDLE_INSTALL_DIR \"${EPREFIX}/${APP_BUNDLE_DIR}:g" \
- cmake/modules/FindKDE4Internal.cmake || die "failed to sed FindKDE4Internal.cmake"
-
- #if [[ ${CHOST} == *-darwin8 ]]; then
- sed -i -e \
- "s:set(_add_executable_param MACOSX_BUNDLE):remove(_add_executable_param MACOSX_BUNDLE):g" \
- cmake/modules/KDE4Macros.cmake || die "failed to sed KDE4Macros.cmake"
- #fi
-
- # solid/solid/backends/iokit doesn't properly link, so disable it.
- sed -e "s|\(APPLE\)|(FALSE)|g" -i solid/solid/CMakeLists.txt \
- || die "disabling solid/solid/backends/iokit failed"
- sed -e "s|m_backend = .*Backends::IOKit.*;|m_backend = 0;|g" -i solid/solid/managerbase.cpp \
- || die "disabling solid/solid/backends/iokit failed"
-
- # There's no fdatasync on OSX and the check fails to detect that.
- sed -e "/HAVE_FDATASYNC/ d" -i config.h.cmake \
- || die "disabling fdatasync failed"
-
- # Fix nameser include to nameser8_compat
- sed -e "s|nameser8_compat.h|nameser_compat.h|g" -i kio/misc/kpac/discovery.cpp \
- || die "fixing nameser include failed"
- append-flags -DHAVE_ARPA_NAMESER8_COMPAT_H=1
-
- # Try to fix kkeyserver_mac
- epatch "${FILESDIR}"/${PN}-4.3.80-kdeui_util_kkeyserver_mac.patch
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_HSPELL=OFF
- -DWITH_ASPELL=OFF
- -DWITH_DNSSD=OFF
- -DKDE_DEFAULT_HOME=.kde4
- -DKAUTH_BACKEND=POLKITQT-1
- -DBUILD_libkactivities=OFF
- -DWITH_Soprano=OFF
- -DWITH_SharedDesktopOntologies=OFF
- $(cmake-utils_use_build handbook doc)
- $(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
- $(cmake-utils_use_has altivec PPC_ALTIVEC)
- $(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
- $(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
- $(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
- $(cmake-utils_use_with acl)
- $(cmake-utils_use_with alsa)
- $(cmake-utils_use_with bzip2 BZip2)
- $(cmake-utils_use_with crypt QCA2)
- $(cmake-utils_use_with fam)
- $(cmake-utils_use_with jpeg2k Jasper)
- $(cmake-utils_use_with kerberos GSSAPI)
- $(cmake-utils_use_with lzma LibLZMA)
- $(cmake-utils_use_with nls Libintl)
- $(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_with policykit PolkitQt-1)
- $(cmake-utils_use_with spell ENCHANT)
- $(cmake-utils_use_with ssl OpenSSL)
- $(cmake-utils_use_with udev UDev)
- $(cmake-utils_use_with udisks SOLID_UDISKS2)
- $(cmake-utils_use_with zeroconf Avahi)
- )
- kde4-base_src_configure
-}
-
-src_compile() {
- kde4-base_src_compile
-
- # The building of apidox is not managed anymore by the build system
- if use doc; then
- einfo "Building API documentation"
- cd "${S}"/doc/api/
- ./doxygen.sh "${S}" || die "APIDOX generation failed"
- fi
-}
-
-src_install() {
- kde4-base_src_install
-
- # use system certificates
- rm -f "${ED}"/usr/share/apps/kssl/ca-bundle.crt || die
- dosym /etc/ssl/certs/ca-certificates.crt /usr/share/apps/kssl/ca-bundle.crt
-
- if use doc; then
- einfo "Installing API documentation. This could take a bit of time."
- cd "${S}"/doc/api/
- docinto /HTML/en/kdelibs-apidox
- dohtml -r ${P}-apidocs/*
- fi
-
- if use aqua; then
- einfo "fixing ${PN} plugins"
-
- local _PV=${PV:0:3}.0
- local _dir=${EPREFIX}/usr/$(get_libdir)/kde4/plugins/script
-
- install_name_tool -id \
- "${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- "${D}/${_dir}/libkrossqtsplugin.${_PV}.dylib" \
- || die "failed fixing libkrossqtsplugin.${_PV}.dylib"
-
- einfo "fixing ${PN} cmake detection files"
- #sed -i -e \
- # "s:if (HAVE_XKB):if (HAVE_XKB AND NOT APPLE):g" \
- echo -e "set(XKB_FOUND FALSE)\nset(HAVE_XKB FALSE)" > \
- "${ED}"/usr/share/apps/cmake/modules/FindXKB.cmake \
- || die "failed fixing FindXKB.cmake"
- fi
-
- einfo Installing environment file.
- # Since 44qt4 is sourced earlier QT_PLUGIN_PATH is defined.
- echo "COLON_SEPARATED=QT_PLUGIN_PATH" > "${T}/77kde"
- echo "QT_PLUGIN_PATH=${EPREFIX}/usr/$(get_libdir)/kde4/plugins" >> "${T}/77kde"
- doenvd "${T}/77kde"
-}
-
-pkg_postinst() {
- fdo-mime_mime_database_update
-
- if use zeroconf; then
- echo
- elog "To make zeroconf support available in KDE make sure that the avahi daemon"
- elog "is running."
- echo
- einfo "If you also want to use zeroconf for hostname resolution, emerge sys-auth/nss-mdns"
- einfo "and enable multicast dns lookups by editing the 'hosts:' line in /etc/nsswitch.conf"
- einfo "to include 'mdns', e.g.:"
- einfo " hosts: files mdns dns"
- echo
- fi
-
- kde4-base_pkg_postinst
-}
-
-pkg_prerm() {
- # Remove ksycoca4 global database
- rm -f "${EROOT}${PREFIX}"/share/kde4/services/ksycoca4
-}
-
-pkg_postrm() {
- fdo-mime_mime_database_update
-
- kde4-base_pkg_postrm
-}
diff --git a/kde-base/kdelibs/kdelibs-4.14.8.ebuild b/kde-base/kdelibs/kdelibs-4.14.8.ebuild
index 4c7391fd527f..fa3753a0fd4d 100644
--- a/kde-base/kdelibs/kdelibs-4.14.8.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.8.ebuild
@@ -14,7 +14,7 @@ EGIT_BRANCH="KDE/4.14"
DESCRIPTION="KDE libraries needed by all KDE programs"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
LICENSE="LGPL-2.1"
IUSE="cpu_flags_x86_3dnow acl alsa altivec +bzip2 +crypt debug doc fam jpeg2k
kerberos lzma cpu_flags_x86_mmx nls openexr +policykit spell cpu_flags_x86_sse
diff --git a/kde-base/kdepim-common-libs/Manifest b/kde-base/kdepim-common-libs/Manifest
index eef052f68199..7269a34b1d04 100644
--- a/kde-base/kdepim-common-libs/Manifest
+++ b/kde-base/kdepim-common-libs/Manifest
@@ -1,3 +1,2 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.3.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.3.ebuild
deleted file mode 100644
index f50ca9641398..000000000000
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdepim"
-KMNOMODULE="true"
-inherit kde4-meta
-
-DESCRIPTION="Common libraries for KDE PIM apps"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- app-crypt/gpgme
- >=app-office/akonadi-server-1.12.90
- dev-libs/grantlee:0
- $(add_kdebase_dep baloo)
- $(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}
- !kde-base/akonadi:4
- !kde-base/libkdepim:4
- !kde-base/libkleo:4
- !kde-base/libkpgp:4
- !<kde-base/kaddressbook-4.11.50:4
- !kde-base/kdepim-wizards:4
- !<kde-base/kmail-4.4.80:4
- !=kde-base/kmail-4.11*
- !=kde-base/kmail-4.12.0
- !=kde-base/kmail-4.12.1
- !<kde-base/kmail-4.13.60
- !<kde-base/korganizer-4.5.67:4
- app-crypt/gnupg
- $(add_kdebase_dep kdepim-runtime)
-"
-
-RESTRICT="test"
-# bug 393131
-
-KMEXTRA="
- agents/sendlateragent/
- akonadi_next/
- calendarsupport/
- calendarviews/
- composereditor-ng/
- grantleeeditor/grantleethemeeditor/
- grantleetheme/
- kaddressbookgrantlee/
- incidenceeditor-ng/
- libkdepim/
- libkdepimdbusinterfaces/
- libkleo/
- libkpgp/
- kdgantt2/
- messagecomposer/
- messagecore/
- messagelist/
- messageviewer/
- noteshared/
- pimcommon/
- templateparser/
-"
-KMEXTRACTONLY="
- kleopatra/
- kmail/
- knode/org.kde.knode.xml
- korgac/org.kde.korganizer.KOrgac.xml
- korganizer/org.kde.korganizer.Korganizer.xml
- mailcommon/
-"
-KMSAVELIBS="true"
-
-PATCHES=( "${FILESDIR}/install-composereditorng.patch" )
-
-src_prepare() {
- kde4-meta_src_prepare
- sed -e '/folderarchiveagent.desktop/d' \
- -i agents/CMakeLists.txt || die
-}
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.8.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.8.ebuild
index 38b750aaad76..77c7cc989dab 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.8.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.14.8.ebuild
@@ -10,7 +10,7 @@ KMNOMODULE="true"
inherit kde4-meta
DESCRIPTION="Common libraries for KDE PIM apps"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kdepim-icons/Manifest b/kde-base/kdepim-icons/Manifest
index 9443459d75d7..650813830c00 100644
--- a/kde-base/kdepim-icons/Manifest
+++ b/kde-base/kdepim-icons/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.14.3.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.14.3.ebuild
deleted file mode 100644
index fb37556fa028..000000000000
--- a/kde-base/kdepim-icons/kdepim-icons-4.14.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdepim"
-KMMODULE="icons"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM icons"
-IUSE=""
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="$(add_kdebase_dep kdepimlibs)"
-RDEPEND=""
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.14.8.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.14.8.ebuild
index 45b98bc28244..d31b19cc66f6 100644
--- a/kde-base/kdepim-icons/kdepim-icons-4.14.8.ebuild
+++ b/kde-base/kdepim-icons/kdepim-icons-4.14.8.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
DESCRIPTION="KDE PIM icons"
IUSE=""
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
DEPEND="$(add_kdebase_dep kdepimlibs)"
RDEPEND=""
diff --git a/kde-base/kdepim-kresources/Manifest b/kde-base/kdepim-kresources/Manifest
index 9443459d75d7..650813830c00 100644
--- a/kde-base/kdepim-kresources/Manifest
+++ b/kde-base/kdepim-kresources/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.14.3.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.14.3.ebuild
deleted file mode 100644
index b61c1017cfe0..000000000000
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.14.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdepim"
-KMMODULE="kresources"
-inherit kde4-meta
-
-DESCRIPTION="KDE PIM groupware plugin collection"
-IUSE="debug"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- kmail/
- knotes/
- korganizer/version.h
-"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.14.8.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.14.8.ebuild
index c83eb2c64c05..964a91e8ca2b 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.14.8.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.14.8.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
DESCRIPTION="KDE PIM groupware plugin collection"
IUSE="debug"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
DEPEND="
$(add_kdebase_dep kdepimlibs)
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.14.3.ebuild
deleted file mode 100644
index e2f4ca1a43d9..000000000000
--- a/kde-base/kdepim-meta/kdepim-meta-4.14.3.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 kde4-meta-pkg
-
-DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
-HOMEPAGE+=" https://community.kde.org/KDE_PIM"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="nls"
-
-RDEPEND="
- $(add_kdebase_dep akonadiconsole)
- $(add_kdebase_dep akregator)
- $(add_kdebase_dep blogilo)
- $(add_kdebase_dep calendarjanitor)
- $(add_kdebase_dep kabcclient)
- $(add_kdebase_dep kaddressbook)
- $(add_kdebase_dep kalarm)
- $(add_kdebase_dep kdepim-icons)
- $(add_kdebase_dep kdepim-kresources)
- $(add_kdebase_dep kdepim-runtime)
- $(add_kdebase_dep kjots)
- $(add_kdebase_dep kleopatra)
- $(add_kdebase_dep kmail)
- $(add_kdebase_dep knode)
- $(add_kdebase_dep knotes)
- $(add_kdebase_dep konsolekalendar)
- $(add_kdebase_dep kontact)
- $(add_kdebase_dep korganizer)
- $(add_kdebase_dep ktimetracker)
- $(add_kdebase_dep ktnef)
- nls? (
- $(add_kdeapps_dep kde4-l10n '' 4.14.3)
- $(add_kdebase_dep kdepim-l10n '' 4.14.3)
- )
-"
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild
index 4943a96e8c84..e2f4ca1a43d9 100644
--- a/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-4.14.8.ebuild
@@ -7,7 +7,7 @@ inherit kde4-meta-pkg
DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
HOMEPAGE+=" https://community.kde.org/KDE_PIM"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="nls"
RDEPEND="
diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
index bd18d268ba37..ea60e1a8045d 100644
--- a/kde-base/kdepim-runtime/Manifest
+++ b/kde-base/kdepim-runtime/Manifest
@@ -1,3 +1,2 @@
DIST kdepim-runtime-4.14.10.tar.xz 1175432 SHA256 d68d1e3278646c3e82c7913dd443b5e10c887fb983fad7d24b26916ed4afcd52 SHA512 599cf08ee7c4bfcc2dcde7d146c5c889663a463e59e4e4773e6b1cee909d02914fce414afe473a127d484b5daa2fa9332dcef8092c3b953cdbebc87663e70577 WHIRLPOOL c40c44f266716f7136c253904e7ee65c6e40de40df458608cc4a1f7e02ada5b17febe4611e7693ef48c63201577ca21866b82005849bdd2409dfd1415d9ba251
-DIST kdepim-runtime-4.14.3.tar.xz 1168856 SHA256 2d8fe881c86b74015e3aa44df042110f8fc21156b5e596f93229435e58aab50f SHA512 1594c63d52111c5bcd923e733cf4e90e60791f332b5500454738df29a8dc6cd8ac3afea497471b5f81cbb9c290cc478d20815d2a38fdcf1b8319d7112385d849 WHIRLPOOL db8e25a40f835a5efa61730ceeace0913ccefed12754a06e36beb88b80bb0fef1465b89fb0a6b01b8f4af3cdedb5e3352246a8938f38501580c67a46b3073123
DIST kdepim-runtime-4.14.8.tar.xz 1173688 SHA256 1f4c82629947d7f1f796f1faf6333c861f908f1a02d9ae26a2adcfa698aa34b1 SHA512 378d59077493b9483ced85b7dd035ac792c1f5351f85a42459516f86028c8372f6304e6d36d6c4d33bb299847cc7650299e59afd7b100e755702943841f7f013 WHIRLPOOL e6554d278461e4324d28890c39ed083369eb89db64be9ac7270510e0e0f0c82a24ac7fd49a62567dae2168611a409f990bdd504e574493b90761378f3c1e7798
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.14.3.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.14.3.ebuild
deleted file mode 100644
index 8cb9b31f3479..000000000000
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.14.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kdepim-runtime"
-inherit kde4-base
-
-DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug facebook google kolab"
-
-RESTRICT="test"
-# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
-
-DEPEND="
- >=app-office/akonadi-server-1.12.90
- dev-libs/boost:=
- dev-libs/libxml2:2
- dev-libs/libxslt
- $(add_kdebase_dep kdepimlibs)
- x11-misc/shared-mime-info
- facebook? ( net-libs/libkfbapi:4 )
- google? ( >=net-libs/libkgapi-2.0:4 )
- kolab? ( >=net-libs/libkolab-0.5 )
-"
-RDEPEND="${DEPEND}
- $(add_kdebase_dep kdepim-icons)
- !kde-misc/akonadi-google
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package facebook LibKFbAPI)
- $(cmake-utils_use_find_package google LibKGAPI2)
- $(cmake-utils_use_find_package kolab Libkolab)
- $(cmake-utils_use_find_package kolab Libkolabxml)
- )
-
- kde4-base_src_configure
-}
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.14.8.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.14.8.ebuild
index ab96a396d076..253899e2e4bb 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.14.8.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.14.8.ebuild
@@ -9,7 +9,7 @@ EGIT_BRANCH="KDE/4.14"
inherit kde4-base
DESCRIPTION="KDE PIM runtime plugin collection"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug facebook google kolab"
RESTRICT="test"
diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest
index b14e3b05762d..85b70cfaff00 100644
--- a/kde-base/kdepimlibs/Manifest
+++ b/kde-base/kdepimlibs/Manifest
@@ -1,3 +1,2 @@
DIST kdepimlibs-4.14.10.tar.xz 2831160 SHA256 c8cc9694add6ecf121bda050235ffa68d8307a82c85fbdffe69a8eab5be584c2 SHA512 64f396957ae1f70a19ba689fabc0850aed04e4e4bce58a4bbc27af2b5cfa27b50472614b4096d8424ee6b4463faaed37d98e6cccfe36d208e9193ba20dc6766a WHIRLPOOL b9123e702f5d4f696cd09d3e7932dbc796f4d8e09feace56a49a96ddb64478bf8cd237bcac9c438d77491822cd655f3f44b76e657f6dbb09b8deb96ab90da52a
-DIST kdepimlibs-4.14.3.tar.xz 2790888 SHA256 65edb1bec191be1b6f8450dc71eadae734f4ab0585aab0a885207390399868d7 SHA512 0106f3b03cb7541f54fe568276ca3e5c5d14da244b8b1e73a9a34ca1b1f3b6d2ce3922cb499d79fca53f27429c84f1fcb1472fa3b9df80531cd1542825aa27d7 WHIRLPOOL 79a7b59aa67e06a94804dcbd9ee3807ce66ba5f1641620afa1d38cba453251189bd9cefe8efb26e33fdaa68a94af3b956527a47688783077f75165a3548ce13e
DIST kdepimlibs-4.14.8.tar.xz 2832092 SHA256 8208e7fcd9751c244b6454d29f93d41efc9f41dca9dcf350b029d537fc524214 SHA512 49bd845d085bbf1279dbaf25663f151ce10e82d0823e00d44643bf41ea678bbc9792969b6a165789984476a15cb215a95c25ac3e7d4cf3f76228c63a0766e81b WHIRLPOOL 495a828ebd34f529f8bfd07eb1dbbaa1a9fd7c7d2ffece4750edfc6f66f30f812bae17479dfbc03de993a7b61b8de9823fd0c7226a4e3319ead7448a41e3a0ed
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.14.3.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.14.3.ebuild
deleted file mode 100644
index b9bf68686c9a..000000000000
--- a/kde-base/kdepimlibs/kdepimlibs-4.14.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-CPPUNIT_REQUIRED="optional"
-inherit kde4-base
-
-DESCRIPTION="Common library for KDE PIM apps"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="debug ldap prison"
-
-# some akonadi tests timeout, that probaly needs more work as its ~700 tests
-RESTRICT="test"
-
-DEPEND="
- !kde-misc/akonadi-social-utils
- >=app-crypt/gpgme-1.1.6
- >=app-office/akonadi-server-1.12.90[qt4]
- >=dev-libs/boost-1.35.0-r5:=
- dev-libs/libgpg-error
- >=dev-libs/libical-0.48-r2:=
- dev-libs/cyrus-sasl
- >=dev-libs/qjson-0.8.1
- media-libs/phonon[qt4]
- x11-misc/shared-mime-info
- prison? ( media-libs/prison:4 )
- ldap? ( net-nds/openldap )
-"
-# boost is not linked to, but headers which include it are installed
-# bug #418071
-RDEPEND="${DEPEND}
- !=kde-base/kdepim-runtime-4.10*
- !=kde-base/kdepim-runtime-4.11*
- !<kde-base/kdepim-runtime-4.4.11.1-r2
-"
-
-PATCHES=( "${FILESDIR}/${PN}-4.9.1-boostincludes.patch" )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_build handbook doc)
- $(cmake-utils_use_find_package ldap)
- $(cmake-utils_use_find_package prison)
- )
-
- kde4-base_src_configure
-}
-
-src_install() {
- kde4-base_src_install
- rm "${ED}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake #Collides with net-im/choqok
-}
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.14.8.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.14.8.ebuild
index 856e749f701a..448b9e5e9f49 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.14.8.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.14.8.ebuild
@@ -10,7 +10,7 @@ EGIT_BRANCH="KDE/4.14"
inherit kde4-base
DESCRIPTION="Common library for KDE PIM apps"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
LICENSE="LGPL-2.1"
IUSE="debug ldap prison"
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
index aeee82b363f9..113fc9170710 100644
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.14.3.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit kde4-base
+inherit flag-o-matic kde4-base
DESCRIPTION="Extra Plasma applets and engines"
LICENSE="GPL-2 LGPL-2"
@@ -41,6 +41,8 @@ RDEPEND="${COMMON_DEPEND}
"
src_configure() {
+ # bug 560884
+ use ppc64 && append-flags -mno-altivec
local mycmakeargs=(
-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
-DWITH_Nepomuk=OFF
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kdm/kdm-4.11.14.ebuild b/kde-base/kdm/kdm-4.11.14.ebuild
deleted file mode 100644
index c3d1f7c3ff04..000000000000
--- a/kde-base/kdm/kdm-4.11.14.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit systemd kde4-meta flag-o-matic user
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +consolekit kerberos pam systemd"
-
-REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )"
-
-DEPEND="
- $(add_kdebase_dep libkworkspace)
- media-libs/qimageblitz
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXtst
- consolekit? (
- >=sys-apps/dbus-1.0.2
- sys-auth/consolekit
- )
- kerberos? ( virtual/krb5 )
- pam? (
- $(add_kdebase_dep kcheckpass)
- virtual/pam
- )
- systemd? ( sys-apps/systemd )
-"
-RDEPEND="${DEPEND}
- $(add_kdeapps_dep kdepasswd)
- >=x11-apps/xinit-1.0.5-r2
- x11-apps/xmessage
-"
-
-KMEXTRA="
- libs/kdm/
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
-)
-
-# bug #413811
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
- kde4-meta_pkg_setup
-
- # Create kdm:kdm user
- KDM_HOME=/var/lib/kdm
- enewgroup kdm
- enewuser kdm -1 -1 "${KDM_HOME}" kdm
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use kerberos KDE4_KRB5AUTH)
- $(cmake-utils_use_with pam)
- $(cmake-utils_use_with consolekit CkConnector)
- )
-
- kde4-meta_src_configure
-}
-
-src_install() {
- export GENKDMCONF_FLAGS="--no-old --no-backup"
-
- kde4-meta_src_install
-
- # an equivalent file is already installed by kde-base/startkde, bug 377151
- rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die
-
- # Customize the kdmrc configuration:
- # - SessionDirs set to /usr/share/xsessions
- # - increase server timeout to 30s
- # - TerminateServer=true to workaround X server regen bug, bug 278473
- # - DataDir set to /var/lib/kdm
- # - FaceDir set to /var/lib/kdm/faces
- sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
- -e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
- -e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
- -e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
- -e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \
- -i "${ED}"/usr/share/config/kdm/kdmrc \
- || die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc."
-
- # Don't install empty dir
- rmdir "${ED}"/usr/share/config/kdm/sessions
-
- # Set up permissions to kdm work directory
- keepdir "${KDM_HOME}"
- fowners root:kdm "${KDM_HOME}"
- fperms 1770 "${KDM_HOME}"
-
- # install logrotate file
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/kdm-logrotate kdm
-
- systemd_dounit "${FILESDIR}"/kdm.service
-}
-
-pkg_postinst() {
- kde4-meta_pkg_postinst
-
- local file src dest dir old_dirs=(
- /var/lib/kdm-live
- /var/lib/kdm-4.6
- /var/lib/kdm-4.5
- /var/lib/kdm-4.4
- /usr/share/apps/kdm
- /usr/kde/4.4/share/apps/kdm
- /usr/kde/4.3/share/apps/kdm
- /usr/kde/4.2/share/apps/kdm
- )
-
- mkdir -p "${EROOT}${KDM_HOME}/faces"
- # Set the default kdm face icon if it's not already set by the system admin
- # because this is user-overrideable in that way, it's not in src_install
- for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do
- src=${file#*:}
- dest=${file%:*}
- if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then
- for dir in "${old_dirs[@]}"; do
- if [[ -e ${EROOT}${dir}/${dest} ]]; then
- cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}"
- break 2
- fi
- done
- if [[ -n ${src} ]]; then
- cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \
- "${EROOT}${KDM_HOME}/${dest}"
- fi
- fi
- done
- for dir in "${old_dirs[@]}"; do
- if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then
- echo
- elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE."
- elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}."
- echo
- elog "After doing so, you may delete the directory."
- echo
- fi
- done
-
- # Make sure permissions are correct -- old installations may have
- # gotten this wrong
- use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
- chmod 1770 "${EROOT}${KDM_HOME}"
-
- if use consolekit; then
- echo
- elog "You have compiled 'kdm' with consolekit support. If you want to use kdm,"
- elog "make sure consolekit daemon is running and started at login time"
- elog
- elog "rc-update add consolekit default && /etc/init.d/consolekit start"
- echo
- fi
-}
diff --git a/kde-base/kdm/kdm-4.11.19.ebuild b/kde-base/kdm/kdm-4.11.19.ebuild
index 61f72311e900..f9a4dee7475a 100644
--- a/kde-base/kdm/kdm-4.11.19.ebuild
+++ b/kde-base/kdm/kdm-4.11.19.ebuild
@@ -9,7 +9,7 @@ KMNAME="kde-workspace"
inherit systemd kde4-meta flag-o-matic user
DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug +consolekit kerberos pam systemd"
REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )"
diff --git a/kde-base/kephal/Manifest b/kde-base/kephal/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/kephal/Manifest
+++ b/kde-base/kephal/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kephal/kephal-4.11.14.ebuild b/kde-base/kephal/kephal-4.11.14.ebuild
deleted file mode 100644
index 8cf7c42d42da..000000000000
--- a/kde-base/kephal/kephal-4.11.14.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/kephal"
-inherit kde4-meta
-
-DESCRIPTION="Allows handling of multihead systems via the XRandR extension"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXrandr
-"
-DEPEND="${RDEPEND}
- x11-proto/randrproto
-"
-
-KMEXTRACTONLY+="
- kephal/kephal/screens.h
-"
diff --git a/kde-base/kephal/kephal-4.11.19.ebuild b/kde-base/kephal/kephal-4.11.19.ebuild
index 21b74258c862..8cf7c42d42da 100644
--- a/kde-base/kephal/kephal-4.11.19.ebuild
+++ b/kde-base/kephal/kephal-4.11.19.ebuild
@@ -9,7 +9,7 @@ KMMODULE="libs/kephal"
inherit kde4-meta
DESCRIPTION="Allows handling of multihead systems via the XRandR extension"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
RDEPEND="
diff --git a/kde-base/khotkeys/Manifest b/kde-base/khotkeys/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/khotkeys/Manifest
+++ b/kde-base/khotkeys/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/khotkeys/khotkeys-4.11.14.ebuild b/kde-base/khotkeys/khotkeys-4.11.14.ebuild
deleted file mode 100644
index 380e17a57872..000000000000
--- a/kde-base/khotkeys/khotkeys-4.11.14.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep libkworkspace)
- x11-libs/libX11
- x11-libs/libXtst
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- libs/kworkspace/
-"
diff --git a/kde-base/khotkeys/khotkeys-4.11.19.ebuild b/kde-base/khotkeys/khotkeys-4.11.19.ebuild
index 2924c390b166..e5686e57e2d4 100644
--- a/kde-base/khotkeys/khotkeys-4.11.19.ebuild
+++ b/kde-base/khotkeys/khotkeys-4.11.19.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
inherit kde4-meta
DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kinfocenter/Manifest b/kde-base/kinfocenter/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/kinfocenter/Manifest
+++ b/kde-base/kinfocenter/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kinfocenter/kinfocenter-4.11.14.ebuild b/kde-base/kinfocenter/kinfocenter-4.11.14.ebuild
deleted file mode 100644
index 7c8226936b21..000000000000
--- a/kde-base/kinfocenter/kinfocenter-4.11.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="The KDE Info Center"
-HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug ieee1394"
-
-DEPEND="
- sys-apps/pciutils
- x11-libs/libX11
- ieee1394? ( sys-libs/libraw1394 )
- opengl? (
- virtual/glu
- virtual/opengl
- )
-"
-RDEPEND="${DEPEND}
- sys-apps/usbutils
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with ieee1394 RAW1394)
- $(cmake-utils_use_with opengl OpenGL)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/kinfocenter/kinfocenter-4.11.19.ebuild b/kde-base/kinfocenter/kinfocenter-4.11.19.ebuild
index 864f8775ea2a..d5f238ed51fe 100644
--- a/kde-base/kinfocenter/kinfocenter-4.11.19.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.11.19.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
DESCRIPTION="The KDE Info Center"
HOMEPAGE="https://www.kde.org/applications/system/kinfocenter/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug ieee1394"
DEPEND="
diff --git a/kde-base/kjots/Manifest b/kde-base/kjots/Manifest
index 9443459d75d7..650813830c00 100644
--- a/kde-base/kjots/Manifest
+++ b/kde-base/kjots/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kjots/kjots-4.14.3.ebuild b/kde-base/kjots/kjots-4.14.3.ebuild
deleted file mode 100644
index e36acc601a93..000000000000
--- a/kde-base/kjots/kjots-4.14.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE note taking utility"
-HOMEPAGE="https://www.kde.org/applications/utilities/kjots/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- >=dev-libs/grantlee-0.2.0:0
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- akonadi_next/
- noteshared/
-"
diff --git a/kde-base/kjots/kjots-4.14.8.ebuild b/kde-base/kjots/kjots-4.14.8.ebuild
index 1d0ff15428f0..1ac3c5121dae 100644
--- a/kde-base/kjots/kjots-4.14.8.ebuild
+++ b/kde-base/kjots/kjots-4.14.8.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
DESCRIPTION="KDE note taking utility"
HOMEPAGE="https://www.kde.org/applications/utilities/kjots/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kleopatra/Manifest b/kde-base/kleopatra/Manifest
index 21921cadb493..69e0972c0b0d 100644
--- a/kde-base/kleopatra/Manifest
+++ b/kde-base/kleopatra/Manifest
@@ -1,5 +1,4 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
DIST kleopatra-4.4.11.1-libassuan2.patch.bz2 9404 SHA256 83d6930917e59450690394ee948b30fe138d631928d4afffc8be25d1a41e75c2 SHA512 4f514e6dfbe89d777604485d3144ada9a600b1c3c031a732b34b0cb7533eadae545e67a2819e43fafd4b7ada84845c25e1f93b01b06fc169daf48734684893de WHIRLPOOL f749ee88b13a905138a0c63a5833c71470f77923125f6c93e09fd83d399edfd1497342112ef420c7823d570d8676666117b5f821f46ed0d1ad961c9497142252
diff --git a/kde-base/kleopatra/kleopatra-4.14.3.ebuild b/kde-base/kleopatra/kleopatra-4.14.3.ebuild
deleted file mode 100644
index 9cb2b21836b6..000000000000
--- a/kde-base/kleopatra/kleopatra-4.14.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="Kleopatra - KDE X.509 key manager"
-HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- >=app-crypt/gpgme-1.3.2
- dev-libs/boost:=
- dev-libs/libassuan
- dev-libs/libgpg-error
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}
- app-crypt/gnupg
-"
-
-KMEXTRACTONLY="
- libkleo/
-"
-
-src_unpack() {
- if use handbook; then
- KMEXTRA="
- doc/kwatchgnupg
- "
- fi
-
- kde4-meta_src_unpack
-}
diff --git a/kde-base/kleopatra/kleopatra-4.14.8.ebuild b/kde-base/kleopatra/kleopatra-4.14.8.ebuild
index f4bbcd266bdc..0661dd4b12fc 100644
--- a/kde-base/kleopatra/kleopatra-4.14.8.ebuild
+++ b/kde-base/kleopatra/kleopatra-4.14.8.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
DESCRIPTION="Kleopatra - KDE X.509 key manager"
HOMEPAGE="https://www.kde.org/applications/utilities/kleopatra/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/klipper/Manifest b/kde-base/klipper/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/klipper/Manifest
+++ b/kde-base/klipper/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/klipper/klipper-4.11.14.ebuild b/kde-base/klipper/klipper-4.11.14.ebuild
deleted file mode 100644
index c1f7c3faa58a..000000000000
--- a/kde-base/klipper/klipper-4.11.14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Applet for KDE and X clipboard management"
-HOMEPAGE+=" https://userbase.kde.org/Klipper"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug prison"
-
-DEPEND="
- $(add_kdebase_dep libkworkspace)
- $(add_kdebase_dep libtaskmanager)
- sys-libs/zlib
- x11-libs/libX11
- prison? ( media-libs/prison:4 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with prison)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/klipper/klipper-4.11.19.ebuild b/kde-base/klipper/klipper-4.11.19.ebuild
index 140e9308d836..c1f7c3faa58a 100644
--- a/kde-base/klipper/klipper-4.11.19.ebuild
+++ b/kde-base/klipper/klipper-4.11.19.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
DESCRIPTION="Applet for KDE and X clipboard management"
HOMEPAGE+=" https://userbase.kde.org/Klipper"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug prison"
DEPEND="
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 9443459d75d7..650813830c00 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kmail/kmail-4.14.3.ebuild b/kde-base/kmail/kmail-4.14.3.ebuild
deleted file mode 100644
index ceca5af45be0..000000000000
--- a/kde-base/kmail/kmail-4.14.3.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-VIRTUALX_REQUIRED=test
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE"
-HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep korganizer)
- $(add_kdebase_dep kdepim-common-libs "" 4.12.1-r2)
-"
-RDEPEND="
- ${DEPEND}
- !=kde-base/kdepim-common-libs-4.12.1-r1
-"
-
-RESTRICT="test"
-# bug 393147
-
-KMEXTRACTONLY="
- agents/folderarchiveagent.desktop
- agents/sendlateragent/
- akonadi_next/
- calendarsupport/
- calendarviews/
- grantleeeditor/grantleethemeeditor/
- korganizer/
- kresources/
- libkleo/
- libkpgp/
- libkdepimdbusinterfaces/
- kdgantt2/
-"
-KMCOMPILEONLY="
- grantleetheme/
- kaddressbookgrantlee/
- messagecomposer/
- messagecore/
- messagelist/
- messageviewer/
- pimcommon/
- templateparser/
- incidenceeditor-ng/
- calendarsupport/
- noteshared/
-"
-KMEXTRA="
- agents/archivemailagent/
- agents/followupreminderagent/
- agents/mailfilteragent/
- grantleeeditor/headerthemeeditor/
- kmailcvt/
- ksendemail/
- importwizard/
- libksieve/
- mailcommon/
- mailimporter/
- mboximporter/
- pimsettingexporter/
- plugins/messageviewer/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_configure() {
- # Bug 308903
- use ppc64 && append-flags -mminimal-toc
-
- kde4-meta_src_configure
-}
-
-src_compile() {
- kde4-meta_src_compile kmail_xml
- kde4-meta_src_compile
-}
-
-pkg_postinst() {
- kde4-meta_pkg_postinst
-
- if ! has_version kde-base/kdepim-kresources:${SLOT}; then
- echo
- elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
- echo
- fi
- if ! has_version kde-base/kleopatra:${SLOT}; then
- echo
- elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
- echo
- fi
-
- if has_version "app-office/akonadi-server[sqlite]"; then
- ewarn
- ewarn "We strongly recommend you set your Akonadi database backend to QMYSQL in your"
- ewarn "user configuration. This is the backend recommended by KDE upstream."
- ewarn "Reports indicate that kde-base/kmail-4.10 does not work properly with the sqlite"
- ewarn "backend anymore."
- if has_version "app-office/akonadi-server[-mysql]"; then
- ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD app-office/akonadi-server WITH mysql USEFLAG ENABLED."
- fi
- ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
- ewarn
- fi
-}
diff --git a/kde-base/kmail/kmail-4.14.8.ebuild b/kde-base/kmail/kmail-4.14.8.ebuild
index 2f679f359d2b..cec2bcdfde3c 100644
--- a/kde-base/kmail/kmail-4.14.8.ebuild
+++ b/kde-base/kmail/kmail-4.14.8.ebuild
@@ -12,7 +12,7 @@ inherit flag-o-matic kde4-meta
DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE"
HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kmenuedit/Manifest b/kde-base/kmenuedit/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/kmenuedit/Manifest
+++ b/kde-base/kmenuedit/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kmenuedit/kmenuedit-4.11.14.ebuild b/kde-base/kmenuedit/kmenuedit-4.11.14.ebuild
deleted file mode 100644
index 202f342c8d92..000000000000
--- a/kde-base/kmenuedit/kmenuedit-4.11.14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE menu editor"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
- $(add_kdebase_dep khotkeys)
-"
-DEPEND=${RDEPEND}
-
-KMEXTRACTONLY="
- libs/kworkspace/
-"
-
-src_configure() {
- sed -i -e \
- "s:\${CMAKE_CURRENT_BINARY_DIR}/../khotkeys/app/org.kde.khotkeys.xml:${EPREFIX}/usr/share/dbus-1/interfaces/org.kde.khotkeys.xml:g" \
- kmenuedit/CMakeLists.txt \
- || die "sed failed"
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/kmenuedit/kmenuedit-4.11.19.ebuild b/kde-base/kmenuedit/kmenuedit-4.11.19.ebuild
index 9ae09142bd74..202f342c8d92 100644
--- a/kde-base/kmenuedit/kmenuedit-4.11.19.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-4.11.19.ebuild
@@ -9,7 +9,7 @@ KMNAME="kde-workspace"
inherit kde4-meta
DESCRIPTION="KDE menu editor"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
RDEPEND="
diff --git a/kde-base/knode/Manifest b/kde-base/knode/Manifest
index 9443459d75d7..650813830c00 100644
--- a/kde-base/knode/Manifest
+++ b/kde-base/knode/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/knode/knode-4.14.3.ebuild b/kde-base/knode/knode-4.14.3.ebuild
deleted file mode 100644
index 3a89606efd65..000000000000
--- a/kde-base/knode/knode-4.14.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="A newsreader for KDE"
-HOMEPAGE="https://www.kde.org/applications/internet/knode/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-# test fails, last checked for 4.2.96
-RESTRICT=test
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs "" 4.12.1-r1)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- agents/
- libkleo/
- libkpgp/
- messagecomposer/
- messageviewer/
- messagecore/
-"
-KMCOMPILEONLY="
- grantleetheme/
- kaddressbookgrantlee/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_unpack() {
- if use handbook; then
- KMEXTRA="
- doc/kioslave/news
- "
- fi
-
- kde4-meta_src_unpack
-}
diff --git a/kde-base/knode/knode-4.14.8.ebuild b/kde-base/knode/knode-4.14.8.ebuild
index c1840d64050d..79845741a900 100644
--- a/kde-base/knode/knode-4.14.8.ebuild
+++ b/kde-base/knode/knode-4.14.8.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
DESCRIPTION="A newsreader for KDE"
HOMEPAGE="https://www.kde.org/applications/internet/knode/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
# test fails, last checked for 4.2.96
diff --git a/kde-base/knotes/Manifest b/kde-base/knotes/Manifest
index 9443459d75d7..650813830c00 100644
--- a/kde-base/knotes/Manifest
+++ b/kde-base/knotes/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/knotes/knotes-4.14.3.ebuild b/kde-base/knotes/knotes-4.14.3.ebuild
deleted file mode 100644
index d7e3614bad05..000000000000
--- a/kde-base/knotes/knotes-4.14.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE Notes application"
-HOMEPAGE="https://www.kde.org/applications/utilities/knotes/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMCOMPILEONLY="
- noteshared/
-"
-
-KMEXTRACTONLY="
- akonadi_next/
- pimcommon/
-"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/knotes/knotes-4.14.8.ebuild b/kde-base/knotes/knotes-4.14.8.ebuild
index cb9b4239c11a..fe45e46d6d73 100644
--- a/kde-base/knotes/knotes-4.14.8.ebuild
+++ b/kde-base/knotes/knotes-4.14.8.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
DESCRIPTION="KDE Notes application"
HOMEPAGE="https://www.kde.org/applications/utilities/knotes/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/konsolekalendar/Manifest b/kde-base/konsolekalendar/Manifest
index 9443459d75d7..650813830c00 100644
--- a/kde-base/konsolekalendar/Manifest
+++ b/kde-base/konsolekalendar/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.14.3.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.14.3.ebuild
deleted file mode 100644
index 3e34ec535bcd..000000000000
--- a/kde-base/konsolekalendar/konsolekalendar-4.14.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-KMMODULE="console/${PN}"
-inherit kde4-meta
-
-DESCRIPTION="A command line interface to KDE calendars"
-HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMCOMPILEONLY="
- calendarsupport/
-"
-KMEXTRACTONLY="
- calendarviews/
- libkdepimdbusinterfaces/
-"
-
-KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.14.8.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.14.8.ebuild
index 75dab92517b9..47af89a8d6cc 100644
--- a/kde-base/konsolekalendar/konsolekalendar-4.14.8.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-4.14.8.ebuild
@@ -12,7 +12,7 @@ inherit kde4-meta
DESCRIPTION="A command line interface to KDE calendars"
HOMEPAGE+=" https://userbase.kde.org/KonsoleKalendar"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/kontact/Manifest b/kde-base/kontact/Manifest
index 9443459d75d7..650813830c00 100644
--- a/kde-base/kontact/Manifest
+++ b/kde-base/kontact/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/kontact/kontact-4.14.3.ebuild b/kde-base/kontact/kontact-4.14.3.ebuild
deleted file mode 100644
index cec1a2d89802..000000000000
--- a/kde-base/kontact/kontact-4.14.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KDE personal information manager"
-HOMEPAGE="https://www.kde.org/applications/office/kontact/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
-"
-RDEPEND="${DEPEND}"
-
-KMLOADLIBS="kdepim-common-libs"
-KMSAVELIBS="true"
-
-# We remove plugins that are related to external kdepim programs. This way
-# kontact doesn't have to depend on all programs it has plugins for.
-# kcontactmanager gone from kdesvn
-#
-KMEXTRACTONLY="
- kontact/plugins/akregator/
- kontact/plugins/kaddressbook/
- kontact/plugins/kjots/
- kontact/plugins/kmail/
- kontact/plugins/knode/
- kontact/plugins/knotes/
- kontact/plugins/korganizer/
- kontact/plugins/ktimetracker/
- kontact/plugins/planner/
- kontact/plugins/specialdates/
- libkdepimdbusinterfaces/
-"
-
-src_unpack() {
- if use handbook; then
- KMEXTRA+="
- doc/kontact-admin/
- "
- fi
-
- kde4-meta_src_unpack
-}
diff --git a/kde-base/kontact/kontact-4.14.8.ebuild b/kde-base/kontact/kontact-4.14.8.ebuild
index 280aa19dd13b..50f29e125b71 100644
--- a/kde-base/kontact/kontact-4.14.8.ebuild
+++ b/kde-base/kontact/kontact-4.14.8.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
DESCRIPTION="KDE personal information manager"
HOMEPAGE="https://www.kde.org/applications/office/kontact/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/korganizer/Manifest b/kde-base/korganizer/Manifest
index 9443459d75d7..650813830c00 100644
--- a/kde-base/korganizer/Manifest
+++ b/kde-base/korganizer/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/korganizer/korganizer-4.14.3.ebuild b/kde-base/korganizer/korganizer-4.14.3.ebuild
deleted file mode 100644
index 1623cfac1af3..000000000000
--- a/kde-base/korganizer/korganizer-4.14.3.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
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="A Personal Organizer for KDE"
-HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
- sys-libs/zlib
-"
-RDEPEND="${DEPEND}
- $(add_kdeapps_dep ktimezoned '' 4.14.3)
-"
-
-RESTRICT="test"
-# bug 393135
-
-KMLOADLIBS="kdepim-common-libs"
-
-KMEXTRA="
- korgac/
-"
-
-KMEXTRACTONLY="
- akonadi_next/
- calendarviews/
- kdgantt2/
- kmail/
- pimcommon/
- knode/org.kde.knode.xml
- libkdepimdbusinterfaces/
- korgac/org.kde.korganizer.KOrgac.xml
-"
-
-KMCOMPILEONLY="
- incidenceeditor-ng/
- calendarsupport/
-"
-
-src_unpack() {
- if use kontact; then
- KMEXTRA="${KMEXTRA}
- kontact/plugins/planner/
- kontact/plugins/specialdates/
- "
- fi
-
- kde4-meta_src_unpack
-}
-
-src_install() {
- kde4-meta_src_install
- # colliding with kdepim-common-libs
- rm -rf "${ED}"/usr/share/kde4/servicetypes/calendarplugin.desktop
- rm -rf "${ED}"/usr/share/kde4/servicetypes/calendardecoration.desktop
-}
-
-pkg_postinst() {
- kde4-meta_pkg_postinst
-
- if ! has_version kde-base/kdepim-kresources:${SLOT}; then
- echo
- elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
- echo
- fi
-}
diff --git a/kde-base/korganizer/korganizer-4.14.8.ebuild b/kde-base/korganizer/korganizer-4.14.8.ebuild
index cb8f21701422..44b47d208b7b 100644
--- a/kde-base/korganizer/korganizer-4.14.8.ebuild
+++ b/kde-base/korganizer/korganizer-4.14.8.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
DESCRIPTION="A Personal Organizer for KDE"
HOMEPAGE="https://www.kde.org/applications/office/korganizer/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/krunner/Manifest b/kde-base/krunner/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/krunner/Manifest
+++ b/kde-base/krunner/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/krunner/krunner-4.11.14.ebuild b/kde-base/krunner/krunner-4.11.14.ebuild
deleted file mode 100644
index f355dcc12734..000000000000
--- a/kde-base/krunner/krunner-4.11.14.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE Command Runner"
-HOMEPAGE+=" https://userbase.kde.org/Plasma/Krunner"
-IUSE="debug"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
- $(add_kdebase_dep kcheckpass)
- $(add_kdebase_dep kephal)
- $(add_kdebase_dep ksmserver)
- $(add_kdebase_dep ksysguard)
- $(add_kdebase_dep libkworkspace)
- $(add_kdebase_dep libplasmagenericshell)
- !aqua? (
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- )
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- libs/kdm/
- libs/kephal/
- libs/ksysguard/
- libs/kworkspace/
- libs/plasmagenericshell/
- kcheckpass/
- ksmserver/org.kde.KSMServerInterface.xml
- ksysguard/
- plasma/screensaver/shell/org.kde.plasma-overlay.App.xml
-"
-
-KMLOADLIBS="libkworkspace"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with opengl OpenGL)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/krunner/krunner-4.11.19.ebuild b/kde-base/krunner/krunner-4.11.19.ebuild
index c2cfaeda3428..f355dcc12734 100644
--- a/kde-base/krunner/krunner-4.11.19.ebuild
+++ b/kde-base/krunner/krunner-4.11.19.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
DESCRIPTION="KDE Command Runner"
HOMEPAGE+=" https://userbase.kde.org/Plasma/Krunner"
IUSE="debug"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
DEPEND="
$(add_kdebase_dep kcheckpass)
diff --git a/kde-base/kscreensaver/Manifest b/kde-base/kscreensaver/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/kscreensaver/Manifest
+++ b/kde-base/kscreensaver/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kscreensaver/kscreensaver-4.11.14.ebuild b/kde-base/kscreensaver/kscreensaver-4.11.14.ebuild
deleted file mode 100644
index 029f7e65314b..000000000000
--- a/kde-base/kscreensaver/kscreensaver-4.11.14.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE screensaver framework"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
- $(add_kdebase_dep kcheckpass)
- x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.5.95-nsfw.patch"
-)
diff --git a/kde-base/kscreensaver/kscreensaver-4.11.19.ebuild b/kde-base/kscreensaver/kscreensaver-4.11.19.ebuild
index fd16f6a6d3f4..029f7e65314b 100644
--- a/kde-base/kscreensaver/kscreensaver-4.11.19.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.11.19.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
inherit kde4-meta
DESCRIPTION="KDE screensaver framework"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
RDEPEND="
diff --git a/kde-base/ksmserver/Manifest b/kde-base/ksmserver/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/ksmserver/Manifest
+++ b/kde-base/ksmserver/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/ksmserver/ksmserver-4.11.14.ebuild b/kde-base/ksmserver/ksmserver-4.11.14.ebuild
deleted file mode 100644
index 93b662138bca..000000000000
--- a/kde-base/ksmserver/ksmserver-4.11.14.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-KMNAME="kde-workspace"
-inherit kde4-meta pax-utils
-
-DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kcminit)
- $(add_kdebase_dep libkworkspace)
- media-libs/qimageblitz
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXrender
-"
-RDEPEND="${DEPEND}
- $(add_kdebase_dep kdm)
-"
-
-KMEXTRACTONLY="
- kcminit/main.h
- libs/kdm/kgreeterplugin.h
- kcheckpass/
- libs/kephal/
- libs/kworkspace/
-"
-
-KMLOADLIBS="libkworkspace"
-
-src_install() {
- kde4-meta_src_install
-
- # bug #483236
- pax-mark m "${ED}/usr/$(get_libdir)/kde4/libexec/kscreenlocker_greet"
-}
diff --git a/kde-base/ksmserver/ksmserver-4.11.19.ebuild b/kde-base/ksmserver/ksmserver-4.11.19.ebuild
index 6acafd83169c..4b5b65a6039f 100644
--- a/kde-base/ksmserver/ksmserver-4.11.19.ebuild
+++ b/kde-base/ksmserver/ksmserver-4.11.19.ebuild
@@ -9,7 +9,7 @@ KMNAME="kde-workspace"
inherit kde4-meta pax-utils
DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/ksplash/Manifest b/kde-base/ksplash/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/ksplash/Manifest
+++ b/kde-base/ksplash/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/ksplash/ksplash-4.11.14.ebuild b/kde-base/ksplash/ksplash-4.11.14.ebuild
deleted file mode 100644
index 756d6d193b54..000000000000
--- a/kde-base/ksplash/ksplash-4.11.14.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_3dnow altivec debug cpu_flags_x86_mmx cpu_flags_x86_sse
-cpu_flags_x86_sse2 xinerama"
-
-COMMONDEPEND="
- media-libs/libpng:0=
- virtual/jpeg:0
- x11-libs/libX11
- x11-libs/libXext
- xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
- xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_has cpu_flags_x86_3dnow X86_3DNOW)
- $(cmake-utils_use_has altivec PPC_ALTIVEC)
- $(cmake-utils_use_has cpu_flags_x86_mmx X86_MMX)
- $(cmake-utils_use_has cpu_flags_x86_sse X86_SSE)
- $(cmake-utils_use_has cpu_flags_x86_sse2 X86_SSE2)
- $(cmake-utils_use_with xinerama)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/ksplash/ksplash-4.11.19.ebuild b/kde-base/ksplash/ksplash-4.11.19.ebuild
index 1052d935776b..756d6d193b54 100644
--- a/kde-base/ksplash/ksplash-4.11.19.ebuild
+++ b/kde-base/ksplash/ksplash-4.11.19.ebuild
@@ -9,7 +9,7 @@ KMNAME="kde-workspace"
inherit kde4-meta
DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="cpu_flags_x86_3dnow altivec debug cpu_flags_x86_mmx cpu_flags_x86_sse
cpu_flags_x86_sse2 xinerama"
diff --git a/kde-base/kstartupconfig/Manifest b/kde-base/kstartupconfig/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/kstartupconfig/Manifest
+++ b/kde-base/kstartupconfig/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kstartupconfig/kstartupconfig-4.11.14.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.11.14.ebuild
deleted file mode 100644
index d13af3d1ca54..000000000000
--- a/kde-base/kstartupconfig/kstartupconfig-4.11.14.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/kstartupconfig/kstartupconfig-4.11.19.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.11.19.ebuild
index 145b3c249838..d13af3d1ca54 100644
--- a/kde-base/kstartupconfig/kstartupconfig-4.11.19.ebuild
+++ b/kde-base/kstartupconfig/kstartupconfig-4.11.19.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-workspace"
inherit kde4-meta
DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
diff --git a/kde-base/kstyles/Manifest b/kde-base/kstyles/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/kstyles/Manifest
+++ b/kde-base/kstyles/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kstyles/kstyles-4.11.14.ebuild b/kde-base/kstyles/kstyles-4.11.14.ebuild
deleted file mode 100644
index feb60e53d41f..000000000000
--- a/kde-base/kstyles/kstyles-4.11.14.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE: A set of different KDE styles"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- kde-base/liboxygenstyle:4=
- x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- libs/oxygen
-"
diff --git a/kde-base/kstyles/kstyles-4.11.19.ebuild b/kde-base/kstyles/kstyles-4.11.19.ebuild
index e310987495d6..75de5095bae1 100644
--- a/kde-base/kstyles/kstyles-4.11.19.ebuild
+++ b/kde-base/kstyles/kstyles-4.11.19.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
inherit kde4-meta
DESCRIPTION="KDE: A set of different KDE styles"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/ksysguard/Manifest b/kde-base/ksysguard/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/ksysguard/Manifest
+++ b/kde-base/ksysguard/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/ksysguard/ksysguard-4.11.14.ebuild b/kde-base/ksysguard/ksysguard-4.11.14.ebuild
deleted file mode 100644
index a8511c0ba01d..000000000000
--- a/kde-base/ksysguard/ksysguard-4.11.14.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-CPPUNIT_REQUIRED="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde4-meta
-
-DESCRIPTION="KSysguard is a network enabled task manager and system monitor application"
-HOMEPAGE+=" https://userbase.kde.org/KSysGuard"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug lm_sensors test"
-
-DEPEND="
- sys-libs/zlib
- x11-libs/libX11
- x11-libs/libXres
- lm_sensors? ( sys-apps/lm_sensors )
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-# bug 393091
-
-KMEXTRA="
- libs/ksysguard/
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with lm_sensors Sensors)
- )
-
- kde4-meta_src_configure
-}
-
-pkg_postinst() {
- kde4-meta_pkg_postinst
- ewarn "Note that ksysguard has powerful features; one of these is the executing of arbitrary"
- ewarn "programs with elevated privileges (as data sources). So be careful opening worksheets"
- ewarn "from untrusted sources!"
-}
diff --git a/kde-base/ksysguard/ksysguard-4.11.19.ebuild b/kde-base/ksysguard/ksysguard-4.11.19.ebuild
index 072538c40201..a8511c0ba01d 100644
--- a/kde-base/ksysguard/ksysguard-4.11.19.ebuild
+++ b/kde-base/ksysguard/ksysguard-4.11.19.ebuild
@@ -12,7 +12,7 @@ inherit kde4-meta
DESCRIPTION="KSysguard is a network enabled task manager and system monitor application"
HOMEPAGE+=" https://userbase.kde.org/KSysGuard"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug lm_sensors test"
DEPEND="
diff --git a/kde-base/ksystraycmd/Manifest b/kde-base/ksystraycmd/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/ksystraycmd/Manifest
+++ b/kde-base/ksystraycmd/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/ksystraycmd/ksystraycmd-4.11.14.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.11.14.ebuild
deleted file mode 100644
index a3ea9f595f6c..000000000000
--- a/kde-base/ksystraycmd/ksystraycmd-4.11.14.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/ksystraycmd/ksystraycmd-4.11.19.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.11.19.ebuild
index 8fee01b1910d..a3ea9f595f6c 100644
--- a/kde-base/ksystraycmd/ksystraycmd-4.11.19.ebuild
+++ b/kde-base/ksystraycmd/ksystraycmd-4.11.19.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-workspace"
inherit kde4-meta
DESCRIPTION="Ksystraycmd embeds applications given as argument into the system tray"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="x11-libs/libX11"
diff --git a/kde-base/ktimetracker/Manifest b/kde-base/ktimetracker/Manifest
index 9443459d75d7..650813830c00 100644
--- a/kde-base/ktimetracker/Manifest
+++ b/kde-base/ktimetracker/Manifest
@@ -1,4 +1,3 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
DIST kdepim-4.4.2015.06.tar.xz 8901968 SHA256 d9153c57e697ca33d0bd82f1f93ed2befdabbe3822189c1c8acbdf7bf9bbaec6 SHA512 10e89ff1bb22ef03ae2128b800f87c76da945703fa98c07fa0ac29deb17c724beeca84995c50b067138ab7cf0543112173eb850d897b38c512a25974bfc15e1e WHIRLPOOL 543b9d629380e9923b38c414cf6e7390437a48acfb31b9ed934e9655bb1efb1f480065942775dc68d8382e639e4df122f953388dad90a9fadb3734d2f2fe72f0
diff --git a/kde-base/ktimetracker/ktimetracker-4.14.3.ebuild b/kde-base/ktimetracker/ktimetracker-4.14.3.ebuild
deleted file mode 100644
index c02d01097590..000000000000
--- a/kde-base/ktimetracker/ktimetracker-4.14.3.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
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="KTimeTracker tracks time spent on various tasks"
-HOEMPAGE="https://www.kde.org/applications/utilities/ktimetracker/"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
- $(add_kdebase_dep kdepim-kresources)
- $(add_kdebase_dep kdepimlibs)
- $(add_kdebase_dep kdepim-common-libs)
- x11-libs/libXScrnSaver
-"
-DEPEND="${RDEPEND}
- x11-proto/scrnsaverproto
-"
-
-KMEXTRACTONLY="
- kresources/
-"
-
-KMLOADLIBS="kdepim-common-libs"
-
-src_unpack() {
- if use kontact; then
- KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
- fi
-
- kde4-meta_src_unpack
-}
diff --git a/kde-base/ktimetracker/ktimetracker-4.14.8.ebuild b/kde-base/ktimetracker/ktimetracker-4.14.8.ebuild
index ec1126115171..f5397b75972c 100644
--- a/kde-base/ktimetracker/ktimetracker-4.14.8.ebuild
+++ b/kde-base/ktimetracker/ktimetracker-4.14.8.ebuild
@@ -11,7 +11,7 @@ inherit kde4-meta
DESCRIPTION="KTimeTracker tracks time spent on various tasks"
HOEMPAGE="https://www.kde.org/applications/utilities/ktimetracker/"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
RDEPEND="
diff --git a/kde-base/ktnef/Manifest b/kde-base/ktnef/Manifest
index eef052f68199..7269a34b1d04 100644
--- a/kde-base/ktnef/Manifest
+++ b/kde-base/ktnef/Manifest
@@ -1,3 +1,2 @@
DIST kdepim-4.14.10.tar.xz 14585020 SHA256 edad865b81259331780a25906127e105d06fda8aa56f6f11cfee4bc8f85bb7e2 SHA512 aa7e5a488964d11d355557e89053993bb0bed4860072dbb8ae1851df881713a15ec5aa4e428de9b85a8bef678ace307b33f186314fe5a8011521e30331a1691b WHIRLPOOL 358589e29baeb2f7bf648d1bbccb9bbf37c4c1a447f05a2eff472b50282d7d5118ad40ced2f93ac7f47f2c394f745216632d33be389e82f88efd69386f6ab57d
-DIST kdepim-4.14.3.tar.xz 14483432 SHA256 a3fd17fa2f3b1debc32bd28537402aaf7337582ff2fe39dbadd47d5b3232f944 SHA512 e7a125f36cc8b9e827808d9503861c3f0a6b518034c3cacf544739626907e2392c6e1d778fad058457f00cdae180cd01511f65633a76afeeeb169a56422b04a7 WHIRLPOOL 7b4e01fa56a4cc6a4c9ec1a5f4b06df68d1b84f00b3201197b5e118597c3ffd2544db56b13413c8ba5d106c841a8ade92107189a9566a8a93903387ff4493bef
DIST kdepim-4.14.8.tar.xz 14575884 SHA256 52b4174924387030c1b3803267f099f3534aa8ccde796953d6cf34b4aabbe3a7 SHA512 687b0db97476e692718039153a1ee60cf9ddab8d9adad06abba702a170d49488f60f0fe050a339db2da2a5996d1bdbe1faec73c1c2e2b655fa9ea66aa538899c WHIRLPOOL 4ce31c3c526a0eed7819137cb5c29450da75fac8a7f4f74e25794b6617bbd7e12987bb45983408ae87bd892a57508d171941b9c4e1a75324773611d950fe55e4
diff --git a/kde-base/ktnef/ktnef-4.14.3.ebuild b/kde-base/ktnef/ktnef-4.14.3.ebuild
deleted file mode 100644
index be333925540a..000000000000
--- a/kde-base/ktnef/ktnef-4.14.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="A viewer for TNEF attachments"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-LICENSE="LGPL-2.1"
-IUSE="debug"
-
-DEPEND="
- app-office/akonadi-server
- $(add_kdebase_dep kdepimlibs)
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
- akonadi/
-"
diff --git a/kde-base/ktnef/ktnef-4.14.8.ebuild b/kde-base/ktnef/ktnef-4.14.8.ebuild
index de79b5fd9339..cca81e53f0c1 100644
--- a/kde-base/ktnef/ktnef-4.14.8.ebuild
+++ b/kde-base/ktnef/ktnef-4.14.8.ebuild
@@ -10,7 +10,7 @@ EGIT_BRANCH="KDE/4.14"
inherit kde4-meta
DESCRIPTION="A viewer for TNEF attachments"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
LICENSE="LGPL-2.1"
IUSE="debug"
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kwin/kwin-4.11.14.ebuild b/kde-base/kwin/kwin-4.11.14.ebuild
deleted file mode 100644
index 404681da2c4d..000000000000
--- a/kde-base/kwin/kwin-4.11.14.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-DECLARATIVE_REQUIRED="always"
-OPENGL_REQUIRED="always"
-
-#VIRTUALX_REQUIRED=test
-RESTRICT=test
-# test 8: kwin-TestVirtualDesktops hangs even with virtualx
-
-inherit flag-o-matic kde4-meta
-
-DESCRIPTION="KDE window manager"
-HOMEPAGE+=" https://userbase.kde.org/KWin"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug gles opengl wayland"
-
-COMMONDEPEND="
- $(add_kdebase_dep kactivities)
- $(add_kdebase_dep kdelibs opengl)
- $(add_kdebase_dep kephal)
- $(add_kdebase_dep libkworkspace)
- $(add_kdebase_dep liboxygenstyle)
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libxcb
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/libXrandr-1.2.1
- x11-libs/libXrender
- x11-libs/libXxf86vm
- opengl? ( >=media-libs/mesa-7.10 )
- gles? ( >=media-libs/mesa-7.12[egl(+),gles2] )
- wayland? ( >=media-libs/mesa-9.0[egl(+),wayland] )
-"
-DEPEND="${COMMONDEPEND}
- x11-libs/xcb-util-renderutil
- x11-proto/compositeproto
- x11-proto/damageproto
- x11-proto/fixesproto
- x11-proto/randrproto
- x11-proto/renderproto
-"
-RDEPEND="${COMMONDEPEND}
- x11-apps/scripts
-"
-
-KMEXTRACTONLY="
- ksmserver/
- libs/kephal/
- libs/oxygen/
-"
-
-# you need one of these
-REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl ) wayland? ( gles )"
-
-src_configure() {
- # FIXME Remove when activity API moved away from libkworkspace
- append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
-
- local mycmakeargs=(
- $(cmake-utils_use_with gles OpenGLES)
- $(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
- $(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_with wayland Wayland)
- -DWITH_X11_Xcomposite=ON
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/kwin/kwin-4.11.19.ebuild b/kde-base/kwin/kwin-4.11.19.ebuild
index de641a905b11..404681da2c4d 100644
--- a/kde-base/kwin/kwin-4.11.19.ebuild
+++ b/kde-base/kwin/kwin-4.11.19.ebuild
@@ -16,7 +16,7 @@ inherit flag-o-matic kde4-meta
DESCRIPTION="KDE window manager"
HOMEPAGE+=" https://userbase.kde.org/KWin"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug gles opengl wayland"
COMMONDEPEND="
diff --git a/kde-base/kwrited/Manifest b/kde-base/kwrited/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/kwrited/Manifest
+++ b/kde-base/kwrited/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/kwrited/kwrited-4.11.14.ebuild b/kde-base/kwrited/kwrited-4.11.14.ebuild
deleted file mode 100644
index e80de9611bfb..000000000000
--- a/kde-base/kwrited/kwrited-4.11.14.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="KDE daemon listening for wall and write messages"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- || ( >=sys-libs/libutempter-1.1.5 >=sys-freebsd/freebsd-lib-9.0 )
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/kwrited/kwrited-4.11.19.ebuild b/kde-base/kwrited/kwrited-4.11.19.ebuild
index a7a8f3ef2f8d..e80de9611bfb 100644
--- a/kde-base/kwrited/kwrited-4.11.19.ebuild
+++ b/kde-base/kwrited/kwrited-4.11.19.ebuild
@@ -7,7 +7,7 @@ KMNAME="kde-workspace"
inherit kde4-meta
DESCRIPTION="KDE daemon listening for wall and write messages"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/libkgreeter/libkgreeter-4.11.19.ebuild b/kde-base/libkgreeter/libkgreeter-4.11.19.ebuild
index b8af0656248d..5916b461b027 100644
--- a/kde-base/libkgreeter/libkgreeter-4.11.19.ebuild
+++ b/kde-base/libkgreeter/libkgreeter-4.11.19.ebuild
@@ -9,7 +9,7 @@ KMMODULE="libs/kdm"
inherit kde4-meta
DESCRIPTION="Conversation widgets for KDM greeter"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/libkworkspace/Manifest b/kde-base/libkworkspace/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/libkworkspace/Manifest
+++ b/kde-base/libkworkspace/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/libkworkspace/libkworkspace-4.11.14.ebuild b/kde-base/libkworkspace/libkworkspace-4.11.14.ebuild
deleted file mode 100644
index 512c05f5fe6f..000000000000
--- a/kde-base/libkworkspace/libkworkspace-4.11.14.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/kworkspace"
-inherit kde4-meta
-
-DESCRIPTION="A library for KDE desktop applications"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-KMEXTRACTONLY="
- ksmserver/org.kde.KSMServerInterface.xml
- kwin/org.kde.KWin.xml
-"
-
-KMSAVELIBS="true"
-
-DEPEND="
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libXau
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- sed -i -e 's/install( FILES kdisplaymanager.h/install( FILES kdisplaymanager.h screenpreviewwidget.h/' \
- libs/kworkspace/CMakeLists.txt || die "failed to provide screenpreviewwidget.h"
-
- kde4-meta_src_prepare
-}
diff --git a/kde-base/libkworkspace/libkworkspace-4.11.19.ebuild b/kde-base/libkworkspace/libkworkspace-4.11.19.ebuild
index 079e9d4d6394..d3434d8ca257 100644
--- a/kde-base/libkworkspace/libkworkspace-4.11.19.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-4.11.19.ebuild
@@ -9,7 +9,7 @@ KMMODULE="libs/kworkspace"
inherit kde4-meta
DESCRIPTION="A library for KDE desktop applications"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
KMEXTRACTONLY="
diff --git a/kde-base/liboxygenstyle/Manifest b/kde-base/liboxygenstyle/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/liboxygenstyle/Manifest
+++ b/kde-base/liboxygenstyle/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.11.14.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.11.14.ebuild
deleted file mode 100644
index b99a6d797195..000000000000
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.11.14.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/oxygen"
-inherit kde4-meta
-
-DESCRIPTION="Library to support the Oxygen style in KDE"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-SLOT="4/${PV}"
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
diff --git a/kde-base/liboxygenstyle/liboxygenstyle-4.11.19.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.11.19.ebuild
index 0f3ba6bee270..a9772af7345b 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.11.19.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-4.11.19.ebuild
@@ -9,7 +9,7 @@ KMMODULE="libs/oxygen"
inherit kde4-meta
DESCRIPTION="Library to support the Oxygen style in KDE"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
SLOT="4/${PV}"
diff --git a/kde-base/libplasmaclock/Manifest b/kde-base/libplasmaclock/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/libplasmaclock/Manifest
+++ b/kde-base/libplasmaclock/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.11.14.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.11.14.ebuild
deleted file mode 100644
index 9834f5a639d5..000000000000
--- a/kde-base/libplasmaclock/libplasmaclock-4.11.14.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/plasmaclock"
-inherit kde4-meta
-
-DESCRIPTION="Libraries for KDE Plasma's clocks"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +kdepim"
-
-DEPEND="
- $(add_kdebase_dep kephal)
- kdepim? ( $(add_kdebase_dep kdepimlibs) )
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
- libs/kephal/
-"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with kdepim KdepimLibs)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/libplasmaclock/libplasmaclock-4.11.19.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.11.19.ebuild
index ecebba3e7fa4..9834f5a639d5 100644
--- a/kde-base/libplasmaclock/libplasmaclock-4.11.19.ebuild
+++ b/kde-base/libplasmaclock/libplasmaclock-4.11.19.ebuild
@@ -9,7 +9,7 @@ KMMODULE="libs/plasmaclock"
inherit kde4-meta
DESCRIPTION="Libraries for KDE Plasma's clocks"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug +kdepim"
DEPEND="
diff --git a/kde-base/libplasmagenericshell/Manifest b/kde-base/libplasmagenericshell/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/libplasmagenericshell/Manifest
+++ b/kde-base/libplasmagenericshell/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.14.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.14.ebuild
deleted file mode 100644
index 66a1cc007b90..000000000000
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.14.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-KMNAME="kde-workspace"
-KMMODULE="libs/plasmagenericshell"
-inherit kde4-meta
-
-DESCRIPTION="Libraries for the KDE Plasma shell"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug test"
-
-DEPEND="
- $(add_kdebase_dep kephal)
- $(add_kdebase_dep libkworkspace)
- x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
- libs/kephal/kephal/
- plasma/desktop/shell/data/
-"
diff --git a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.19.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.19.ebuild
index a4a9728b2ed2..66a1cc007b90 100644
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.19.ebuild
+++ b/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.19.ebuild
@@ -10,7 +10,7 @@ KMMODULE="libs/plasmagenericshell"
inherit kde4-meta
DESCRIPTION="Libraries for the KDE Plasma shell"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug test"
DEPEND="
diff --git a/kde-base/libtaskmanager/Manifest b/kde-base/libtaskmanager/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/libtaskmanager/Manifest
+++ b/kde-base/libtaskmanager/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/libtaskmanager/libtaskmanager-4.11.14.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.11.14.ebuild
deleted file mode 100644
index 71ed0818da06..000000000000
--- a/kde-base/libtaskmanager/libtaskmanager-4.11.14.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-KMMODULE="libs/taskmanager"
-inherit kde4-meta
-
-DESCRIPTION="A library that provides basic taskmanager functionality"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-DEPEND="
- $(add_kdebase_dep kactivities)
- $(add_kdebase_dep kephal)
- $(add_kdebase_dep ksysguard)
- $(add_kdebase_dep libkworkspace)
- x11-libs/libX11
-"
-RDEPEND="${DEPEND}"
-
-KMSAVELIBS="true"
-
-KMEXTRACTONLY="
- libs/kephal/
- libs/kworkspace/
-"
-
-src_prepare() {
- kde4-meta_src_prepare
- sed -e 's:ksysguard/processcore/processes.h:ksysguard/processes.h:g' -i "${S}/libs/taskmanager/taskitem.cpp" || die
- sed -e 's:ksysguard/processcore/process.h:ksysguard/process.h:g' -i "${S}/libs/taskmanager/taskitem.cpp" || die
-}
diff --git a/kde-base/libtaskmanager/libtaskmanager-4.11.19.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.11.19.ebuild
index 113bdbd05b49..71ed0818da06 100644
--- a/kde-base/libtaskmanager/libtaskmanager-4.11.19.ebuild
+++ b/kde-base/libtaskmanager/libtaskmanager-4.11.19.ebuild
@@ -9,7 +9,7 @@ KMMODULE="libs/taskmanager"
inherit kde4-meta
DESCRIPTION="A library that provides basic taskmanager functionality"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
DEPEND="
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.11.14.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.11.14.ebuild
deleted file mode 100644
index 883850afacff..000000000000
--- a/kde-base/plasma-workspace/plasma-workspace-4.11.14.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DECLARATIVE_REQUIRED="always"
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-KMMODULE="plasma"
-PYTHON_COMPAT=( python2_7 )
-OPENGL_REQUIRED="always"
-inherit python-single-r1 kde4-meta
-
-DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug gps json +kdepim python qalculate"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMONDEPEND="
- dev-libs/libdbusmenu-qt[qt4(+)]
- >=dev-qt/qtcore-4.8.4-r3:4
- !kde-misc/ktouchpadenabler
- $(add_kdebase_dep kactivities)
- $(add_kdebase_dep kdelibs 'crypt')
- $(add_kdebase_dep kephal)
- $(add_kdebase_dep ksysguard)
- $(add_kdebase_dep libkworkspace)
- $(add_kdebase_dep libplasmaclock 'kdepim?')
- $(add_kdebase_dep libplasmagenericshell)
- $(add_kdebase_dep libtaskmanager)
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrender
- gps? ( >=sci-geosciences/gpsd-2.37 )
- json? ( dev-libs/qjson )
- kdepim? ( $(add_kdebase_dep kdepimlibs) )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/PyQt4-4.4.0[X,${PYTHON_USEDEP}]
- $(add_kdebase_dep pykde4 "${PYTHON_USEDEP}")
- )
- qalculate? ( sci-libs/libqalculate )
-"
-DEPEND="${COMMONDEPEND}
- dev-libs/boost
- x11-proto/compositeproto
- x11-proto/damageproto
- x11-proto/fixesproto
- x11-proto/renderproto
-"
-RDEPEND="${COMMONDEPEND}
- $(add_kdeapps_dep plasma-runtime)
-"
-
-KMEXTRA="
- appmenu/
- ktouchpadenabler/
- statusnotifierwatcher/
-"
-KMEXTRACTONLY="
- kcheckpass/
- krunner/dbus/org.freedesktop.ScreenSaver.xml
- krunner/dbus/org.kde.krunner.App.xml
- ksmserver/org.kde.KSMServerInterface.xml
- ksmserver/screenlocker/
- libs/kephal/
- libs/kworkspace/
- libs/taskmanager/
- libs/plasmagenericshell/
- libs/ksysguard/
- libs/kdm/kgreeterplugin.h
- ksysguard/
-"
-
-pkg_setup() {
- if use python ; then
- python-single-r1_pkg_setup
- fi
- kde4-meta_pkg_setup
-}
-
-src_unpack() {
- if use handbook; then
- KMEXTRA+=" doc/plasma-desktop"
- fi
-
- kde4-meta_src_unpack
-}
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_NepomukCore=OFF
- -DWITH_Soprano=OFF
- -DWITH_Xmms=OFF
- $(cmake-utils_use_with gps libgps)
- $(cmake-utils_use_with json QJSON)
- $(cmake-utils_use_with kdepim Akonadi)
- $(cmake-utils_use_with kdepim KdepimLibs)
- $(cmake-utils_use_with python PythonLibrary)
- $(cmake-utils_use_with qalculate)
- )
-
- kde4-meta_src_configure
-}
-
-src_install() {
- kde4-meta_src_install
-
- if use python; then
- python_optimize "${ED}"
- fi
-}
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.11.19.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.11.19.ebuild
index 898922819cb0..23c3ccfe33b5 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.11.19.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.11.19.ebuild
@@ -13,7 +13,7 @@ OPENGL_REQUIRED="always"
inherit python-single-r1 kde4-meta
DESCRIPTION="Plasma: KDE desktop framework"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug gps json +kdepim python qalculate"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-base/powerdevil/Manifest b/kde-base/powerdevil/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/powerdevil/Manifest
+++ b/kde-base/powerdevil/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/powerdevil/powerdevil-4.11.14.ebuild b/kde-base/powerdevil/powerdevil-4.11.14.ebuild
deleted file mode 100644
index c0fd52818066..000000000000
--- a/kde-base/powerdevil/powerdevil-4.11.14.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement"
-HOMEPAGE="https://solid.kde.org"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +pm-utils"
-
-DEPEND="
- $(add_kdebase_dep kactivities)
- $(add_kdebase_dep libkworkspace)
- !aqua? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXrandr
- )
-"
-RDEPEND="${DEPEND}
- pm-utils? ( sys-power/pm-utils )
-"
-
-KMEXTRACTONLY="
- krunner/
- ksmserver/org.kde.KSMServerInterface.xml
- ksmserver/screenlocker/dbus/org.freedesktop.ScreenSaver.xml
-"
diff --git a/kde-base/powerdevil/powerdevil-4.11.19.ebuild b/kde-base/powerdevil/powerdevil-4.11.19.ebuild
index 8a001c3ecb5a..c0fd52818066 100644
--- a/kde-base/powerdevil/powerdevil-4.11.19.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.11.19.ebuild
@@ -9,7 +9,7 @@ inherit kde4-meta
DESCRIPTION="PowerDevil is an utility for KDE4 for Laptop Powermanagement"
HOMEPAGE="https://solid.kde.org"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug +pm-utils"
DEPEND="
diff --git a/kde-base/qguiplatformplugin_kde/Manifest b/kde-base/qguiplatformplugin_kde/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/qguiplatformplugin_kde/Manifest
+++ b/kde-base/qguiplatformplugin_kde/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.14.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.14.ebuild
deleted file mode 100644
index b6b120df226e..000000000000
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.14.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-inherit kde4-meta
-
-DESCRIPTION="Helps integration of pure Qt applications with KDE Workspace"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug"
diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.19.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.19.ebuild
index 47f89163d2e1..b6b120df226e 100644
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.19.ebuild
+++ b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.19.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-workspace"
inherit kde4-meta
DESCRIPTION="Helps integration of pure Qt applications with KDE Workspace"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
diff --git a/kde-base/solid-actions-kcm/Manifest b/kde-base/solid-actions-kcm/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/solid-actions-kcm/Manifest
+++ b/kde-base/solid-actions-kcm/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.14.ebuild b/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.14.ebuild
deleted file mode 100644
index 1782a6705336..000000000000
--- a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.14.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KMNAME="kde-workspace"
-CPPUNIT_REQUIRED="test"
-inherit kde4-meta
-
-DESCRIPTION="KDE control module for Solid actions"
-HOMEPAGE="https://solid.kde.org"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="
- $(add_kdeapps_dep solid-runtime)
- !kde-base/solid:4
-"
diff --git a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.19.ebuild b/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.19.ebuild
index 368f1e8c0b67..aacce347447b 100644
--- a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.19.ebuild
+++ b/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.19.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
DESCRIPTION="KDE control module for Solid actions"
HOMEPAGE="https://solid.kde.org"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug"
RDEPEND="
diff --git a/kde-base/systemsettings/Manifest b/kde-base/systemsettings/Manifest
index cc64a3a8189d..d02206e1ac86 100644
--- a/kde-base/systemsettings/Manifest
+++ b/kde-base/systemsettings/Manifest
@@ -1,3 +1,2 @@
-DIST kde-workspace-4.11.14.tar.xz 13529808 SHA256 cf20a562f3abf848ab0e122d6af1971dcc6383b91565f6da21f46f1011386e01 SHA512 203a5ffe1eea6f6d3e70fdcded0ac1fc86f76f8a175c043beddb5cbfaa865a07d53b6c1be55d63f4ff47946757267f390318cfad41bb0006f10462e8ec47dea7 WHIRLPOOL dd91f268701de19108eac235a12047aabf319189ce927dea1a60450183878ed454110b4a9d5bfa9613fa7732c8ac7f1344dc8cbc2d12d0b29c42b05e725183a2
DIST kde-workspace-4.11.19.tar.xz 13547744 SHA256 1c1429db0a12d6ad076e0f1c6f1a00cac781aceb1aa8c88937fbf2700dc2c5c2 SHA512 37fad2704347bb123d05fbefe35ab73a24641baf83bc3486c2d8078ef0c601a1ef0438261040feefe8ee1d4341e7fa453d3412ccbb6e00d60ce7992ca5e5ac38 WHIRLPOOL 9a95bbad4c14988316c4c6c93738e5c945d6d4b1628c037edb46387c78abbc878ae6482ebec825257e30d5a0349e85db6261fdbf14100f798de6f2ca978a57ee
DIST kde-workspace-4.11.22.tar.xz 13553668 SHA256 f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 SHA512 9def2cc8d1e597259966cd6cc44e9aad7ebe2c7cde5943e362c6782d1344e7da4fff0dddd0fe0c948bca159dba128d8a36006e1ae409415cd22f74955d0a9b95 WHIRLPOOL 14b0fcef19bda4b92a42612387fb6307a50dbb3620e911e3e0aaf5d764fb263e1959baae2e55cb71d92d064542844ae963b170bb960a9b7dc18a11627b731802
diff --git a/kde-base/systemsettings/systemsettings-4.11.14.ebuild b/kde-base/systemsettings/systemsettings-4.11.14.ebuild
deleted file mode 100644
index f94ca4616b87..000000000000
--- a/kde-base/systemsettings/systemsettings-4.11.14.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde4-meta
-
-DESCRIPTION="System settings utility"
-HOMEPAGE+=" https://userbase.kde.org/System_Settings"
-IUSE="debug gtk +kscreen +usb"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-COMMONDEPEND="
- app-misc/strigi
- dev-libs/glib:2
- $(add_kdebase_dep kwin)
- $(add_kdebase_dep libkworkspace)
- media-libs/fontconfig
- >=media-libs/freetype-2
- >=x11-libs/libxklavier-3.2
- x11-libs/libX11
- x11-libs/libXcursor
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXtst
- opengl? ( virtual/opengl )
- usb? ( virtual/libusb:0 )
-"
-DEPEND="${COMMONDEPEND}
- x11-proto/kbproto
- x11-proto/xextproto
-"
-RDEPEND="${COMMONDEPEND}
- sys-libs/timezone-data
- x11-apps/setxkbmap
- x11-misc/xkeyboard-config
- gtk? ( kde-misc/kde-gtk-config )
- kscreen? ( kde-misc/kscreen:4 )
-"
-
-KMEXTRA="
- kcontrol/
-"
-KMEXTRACTONLY="
- krunner/dbus/org.kde.krunner.App.xml
- krunner/dbus/org.kde.screensaver.xml
- ksmserver/screenlocker/dbus/org.kde.screensaver.xml
- kwin/
- libs/
- plasma/
-"
-# fails to connect to a kded instance
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-kcm-randr.patch" )
-
-src_unpack() {
- if use handbook; then
- KMEXTRA+="
- doc/kcontrol
- doc/kfontview
- "
- fi
-
- kde4-meta_src_unpack
-}
-
-src_prepare() {
- sed -i -e 's/systemsettingsrc DESTINATION ${SYSCONF_INSTALL_DIR}/systemsettingsrc DESTINATION ${CONFIG_INSTALL_DIR}/' \
- systemsettings/CMakeLists.txt \
- || die "Failed to fix systemsettingsrc install location"
-
- kde4-meta_src_prepare
-}
-
-# FIXME: is have_openglxvisual found without screensaver
-src_configure() {
- # Old keyboard-detection code is unmaintained,
- # so we force the new stuff, using libxklavier.
- local mycmakeargs=(
- -DUSE_XKLAVIER=ON -DWITH_LibXKlavier=ON
- -DWITH_GLIB2=ON -DWITH_GObject=ON
- -DBUILD_KCM_RANDR=$(usex !kscreen)
- $(cmake-utils_use_with opengl OpenGL)
- $(cmake-utils_use_with usb)
- )
-
- kde4-meta_src_configure
-}
diff --git a/kde-base/systemsettings/systemsettings-4.11.19.ebuild b/kde-base/systemsettings/systemsettings-4.11.19.ebuild
index d904806f7dcb..f41fcb50cffc 100644
--- a/kde-base/systemsettings/systemsettings-4.11.19.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.11.19.ebuild
@@ -14,7 +14,7 @@ inherit kde4-meta
DESCRIPTION="System settings utility"
HOMEPAGE+=" https://userbase.kde.org/System_Settings"
IUSE="debug gtk +kscreen +usb"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
COMMONDEPEND="
app-misc/strigi
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 52c0770c3c4c..5e13cb6b5497 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1 +1,2 @@
DIST attica-5.14.0.tar.xz 60456 SHA256 5eba50b9f0d28163b8a4fbdc909b1b88ad72de60df6f5e850c51849082b3bf58 SHA512 5ec53549738287a673041deed51c3fbb08e75f9fc3ffdf88e1948bff6659b6a9c58a93cc210010fd1a925d4bc665d0c61acccb1e091c62075a15cf9c2735a91b WHIRLPOOL 9bb703438dfa283b7be3928ceea5a6e51df3a7314a74aef0b77faed59d9d2eafd92086022ef1d7887f4931cf1eabe9ae515ac31346a99748747d939293796d6d
+DIST attica-5.15.0.tar.xz 60476 SHA256 94c928b84a82c44c1331a1b4d585e894524c4a023f90e1906eaf5441d955ad3d SHA512 4cc05218c73f51557a9bbb1c74b401fcb9893ab4e853a5f88f618cc7a503ea845ecf4f04f8a57bcc75979dacaba172d719cb935f7879125a36f444f1c4a9dcf1 WHIRLPOOL 4c44226acd570a4a2c7fb3ab8bea578907cdf8ba6692a8939bac71c5180a23a03fcdaa18957d5076d769ce299a10f585290e870a00a7ee40f06113933529b794
diff --git a/kde-frameworks/attica/attica-5.15.0.ebuild b/kde-frameworks/attica/attica-5.15.0.ebuild
new file mode 100644
index 000000000000..fa5c97a62fec
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.15.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework providing access to Open Collaboration Services"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtnetwork:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index 7175a141305a..e4f3116e8e2b 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1 +1,2 @@
DIST baloo-5.14.0.tar.xz 152668 SHA256 ad082b1d830de72d2aaa2429ae9634d2a2508c4bd8085e531147a04c888ce260 SHA512 9d02de8a9b482da741d6ef7fdf215fece1d766131420750dd076c9f6e9abc3469e048c5952e2d6772c559f0a4b7c293f058ec78cfa0f9cc7cff25fddc1717f36 WHIRLPOOL 9b2bed92e4f8f788cc748f56ad6bff7e245ad5397fd6aff0888d9355c005960d6f2ea2d52386d4aefc4f52a35287cc0c7a578e28a63d7d0214a3f8ea49774139
+DIST baloo-5.15.0.tar.xz 169400 SHA256 7fdd56331e7fbf939d18a20d706e9e1299f929ae79b55ddd531c51f825ed1c83 SHA512 d547b156abb286a0ee93b932d7d428ab62585205e73c6cea27f7cf40dcb7a04b1d75dc63c8d789f97874bec675c383dce9069d14ed2f0114cf6a95d421d4a41b WHIRLPOOL 02f60065f9d3900ed75301ec0543bd74fee20baaba620522331eb4cc68e6ab94c1f5e2bbc94f8d9e0638a5f71911726460a34c52f10f66025f249cccf99c99c0
diff --git a/kde-frameworks/baloo/baloo-5.15.0.ebuild b/kde-frameworks/baloo/baloo-5.15.0.ebuild
new file mode 100644
index 000000000000..ee8dc72eb759
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_PUNT_BOGUS_DEPS="true"
+inherit kde5
+
+DESCRIPTION="Framework for searching and managing metadata"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kfilemetadata)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kidletime)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep solid)
+ dev-db/lmdb
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+ !kde-base/baloo:4[-minimal(-)]
+"
diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest
index 31147b8d5fb8..27c4412bb701 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1 +1,2 @@
DIST bluez-qt-5.14.0.tar.xz 73164 SHA256 5fd2129c6858f6d1eba112ae7fef55a1606c6d001a8224e72d6886d40897d38c SHA512 b52c34b3dda6b4bdb444efd0d3f279355a0c50c754d1b4403c25e36ca1a13b828fda6b83362253b471126c3cd2c4bfda8bbdf8984ddb8d43d00737a43c6e81e7 WHIRLPOOL 49d6074764c71398923e68392d22fb4360891dc23ced23f4f01966d7d7ce785ecf4893a068c62dce862bd5a1376d2c7af0307fd809457462da8c21f951085091
+DIST bluez-qt-5.15.0.tar.xz 73348 SHA256 aeb8af820c0980ec93350c727018549b1d603f01059e0d1ef0ae0ee9a2206296 SHA512 e642150c3c556aebc334f979a661400a2e84d508f7994c9403926a2fbbec67432cf92e194d5d60edd23c914f0da508bc5102a20d35cbebaa18c229ecf4e56194 WHIRLPOOL 4ef37ed032dc4bb6b6d13d8d1681d8c07f3e2e794fa79970dd128ffc3725e04fb61d3bb227fddcbb9f18f1bc76dfa85734fe9fbdd4cadbdc00e26ffab019e8cd
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.15.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.15.0.ebuild
new file mode 100644
index 000000000000..528fd60d2010
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.15.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5 udev
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtnetwork:5
+"
+RDEPEND="${DEPEND}
+ !kde-plasma/bluez-qt
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index f33f28b1b35c..00d8e55de456 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1 +1,2 @@
DIST extra-cmake-modules-5.14.0.tar.xz 134436 SHA256 cfefdcada703b28de45ec64756ecae1dc23b305eeca506a477a648a477ceceb0 SHA512 4a4c73ee8ea30201bedd6ee9c81e1cca45b5f5899bb1695aa03d3e6eb56b108370d20d5b9df24794cc1327dae5fff1aa084b663ecb5268cc36fc8b5042d5de49 WHIRLPOOL 46ff0fa7a059636e8028ec7dda3593be101a73ffc4dcdb96ab64cc01b96715096339f4248dcbb6ac426e2d6352e41be23694850f28252b4fb5b0144500a3e806
+DIST extra-cmake-modules-5.15.0.tar.xz 135160 SHA256 8f3d4adadfa835c627852ca4a84e8c6be3c9ee68865598a71616e4d0176b02bc SHA512 ba6035e79cc7e49e9d7a1c0ba5133881378275c8ba5f6bfd5beb093c03180501b94e2aee6f3289fbaf11e44ee7f4de9844beffd364a97ab97b6ac95dacb25423 WHIRLPOOL 69f43334006457fb17c53bd4431c61cad4705202ac326bade995678c20044528201257b754e3950327c97e1e683eca156c4c872d48af4a1df5ad33aed772181f
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.15.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.15.0.ebuild
new file mode 100644
index 000000000000..df3da72712d2
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.15.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+inherit kde5 python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc"
+
+DEPEND="
+ >=dev-util/cmake-2.8.12
+ doc? (
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+ )
+"
+RDEPEND="
+ dev-qt/qtcore:5
+"
+
+python_check_deps() {
+ has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_build doc HTML_DOCS)
+ $(cmake-utils_use_build doc MAN_DOCS)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 41b545007d0f..7d7d9581c298 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1 +1,2 @@
DIST frameworkintegration-5.14.0.tar.xz 1780396 SHA256 c8f7e49d3c2100716f2b87f94c6a779d7b541946208697cc46ac5db9e4829ba4 SHA512 b5f21ee008119a7e14f8a21df5a095795498272bfbc6b2a875bbf128c9495a9a020b0fb201775f6b0c9c73358a3133f9304d20e94e4ff7b8aabcccb8973498dc WHIRLPOOL 11be017f7a760f49faa6b4e9137f4901bc50425785f27a11ee0c8a9e8ce364d0c86319a3227f476b37e3ed7804db857ec0ddcec0e3e3c8c51b91fed9526bb0b7
+DIST frameworkintegration-5.15.0.tar.xz 1781464 SHA256 2a7a3d450c28d7f1ac19ddf02cb5e2badcd6903cf3981d82ce70bcd16d644a1b SHA512 7b526f2919f3fa2682a7b45c158b933c9e46a28467ac93c9fdd2a9266b6bee05157bb9dbb5f297a61e312381b9184440e3d935acc7de71c0475efd6f74bef44e WHIRLPOOL 654b5257ec6f5e013d2e1ef593b6e861fb3f81ee6c7f598cdb1d30ef4491a95e08a1b25135631a5d47c10ea5e05ad1ed4d42ff516b25d1f08a8988da26d097ba
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.15.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.15.0.ebuild
new file mode 100644
index 000000000000..0c41d1b5cf4e
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.15.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for integrating Qt applications with KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+ $(add_plasma_dep oxygen-fonts)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libxcb
+ x11-libs/libXcursor
+ )
+"
+DEPEND="${RDEPEND}"
+
+# requires running kde environment
+RESTRICT="test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X XCB)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index 57f73d8591f4..4923e00bf9ca 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1 +1,2 @@
DIST kactivities-5.14.0.tar.xz 172720 SHA256 e91b3a02df48f5fe81b67bc5c2d96cdb215b2af49b03d3918fe35d2fb101cc60 SHA512 c7214c70bb97a05001310aea3e567b11cf4ad7cef2d4a774dbbfa2976c2f66ef587313e72bedc21f742bbb1a6f6a93d8d0ef75a7e9e951770e2b766eb9314119 WHIRLPOOL 2896bdea0a81dd3a31917a71afdc75120de85ba63c5c3a97955d3f22a373fe0f010edd49246865bd10b8e5ce9c48db79755a61c84d5c49eac8728b850451e31a
+DIST kactivities-5.15.0.tar.xz 175680 SHA256 d8d2603b212081a7137b0647d4e0177f7f50034426c0dbb392e5978c1c3a2e41 SHA512 3d9eaf71e4699c9cf2a94859161ce0eb056615ddfcc51a96101af66fa57d1ff869b04ec4082b260c074fbba67b5aa7f31462c30467576bcb87b45cbaef2cd481 WHIRLPOOL 56e32abeb54b2cd79612261a8dca56568535e4abcb1c4813b3d00679c7d4bc053f580e5ee28027eb223e42dc28e43cca6c2f51a063b541ecee9587a666030197
diff --git a/kde-frameworks/kactivities/kactivities-5.15.0.ebuild b/kde-frameworks/kactivities/kactivities-5.15.0.ebuild
new file mode 100644
index 000000000000..23368a13adaa
--- /dev/null
+++ b/kde-frameworks/kactivities/kactivities-5.15.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for working with KDE activities"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtsql:5
+ dev-qt/qtwidgets:5
+ !kde-base/kactivities:4[-minimal(-)]
+"
+DEPEND="${RDEPEND}
+ || ( >=dev-libs/boost-1.54 <dev-libs/boost-1.53 )
+"
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index a0abdf700eee..0d7617695376 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1 +1,2 @@
DIST kapidox-5.14.0.tar.xz 132784 SHA256 d86cc54b18117f27ff9131b6e1e6ae49cff01cc8b0780f76c31a55a98a155191 SHA512 f3f94217518c8839cf530e34e95120c90cf053df21555e4b7024a172ef9577099bc68cab0138abf4b7ce6e4f628c3e1e153c3af7e9a2bdfceee3d4d26e391021 WHIRLPOOL 107fe29d8696b01674d499e7ca1e792dd73b6e7c87bfb3dec510973adc4628c4cf1b837bbce0621cd9820b23c20cdd2df64ac4fde43f3ff8a86d6b155501697a
+DIST kapidox-5.15.0.tar.xz 132792 SHA256 98ed6ce505f4e17264809ab0414d6305b0626280d45aa06df84ee554c891828c SHA512 de8bd6e4a72b644fa90002ea50380fb6a1fb3ae9eaa688b0845c4fa6678a945da4f5d3f8c1df2c44b5776b39a35a0ac7be48bac0090b1fe02e4762d3aa65cc6f WHIRLPOOL 901a363614640750dfae30be9e6ad6e980bda3a29495155841ff68349c956b6301b1a54166ebbd781e44857a43f80ae66ba8eb4bb00756be947d7b206aa9705a
diff --git a/kde-frameworks/kapidox/kapidox-5.15.0.ebuild b/kde-frameworks/kapidox/kapidox-5.15.0.ebuild
new file mode 100644
index 000000000000..a347050f430d
--- /dev/null
+++ b/kde-frameworks/kapidox/kapidox-5.15.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_DEBUG="false"
+KDE_DOXYGEN="false"
+KDE_TEST="false"
+DISTUTILS_SINGLE_IMPL="true"
+PYTHON_COMPAT=( python2_7 )
+inherit kde5 distutils-r1
+
+DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ app-doc/doxygen
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ media-gfx/graphviz[python,${PYTHON_USEDEP}]
+"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+ kde5_pkg_setup
+}
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 1342646c8a28..4d47b883b3e7 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1 +1,2 @@
DIST karchive-5.14.0.tar.xz 108180 SHA256 8473fc7e9735c50274a97bd1d9299d7f4873211d5f35cb5fde095c4e13f159e9 SHA512 a57e28c553d54c2cd097360abc5e8ede6ce476f3c7443083a21dbb1e1f3a1bdd6f4d08cc9742afb1c4f05e5128ce477c554ded87e7124e6f8e3253b63a488534 WHIRLPOOL cdd9905d96a5126524cf9c94e8cb00e93a709779be9317d469f4857ed9bc2c32a95c691316e2a0321825ed4c1023e476860bbae9ad04feb516fd27e456377347
+DIST karchive-5.15.0.tar.xz 108172 SHA256 d0b5dfaf6a98ad40e499c67ec6788247c285c97564e2840a4faff90de27bb5e8 SHA512 a19c9e1ba9db4669ed91c852fa1f34d4f0f8ec2bbf0fbd7d7970ea07f1fa6b3a45c1ce09ca7f493485b5dc0428c1acf3bf85b502762232138a73830f1a6adef3 WHIRLPOOL 821286e8dd7a25c752d2932b73b0f1c4725efcc0be7187171e4a4b5d7dc2eb9313f447bccf6beb957198b998567fce2ab862fed62d2c20741fa6d53135b813ae
diff --git a/kde-frameworks/karchive/karchive-5.15.0.ebuild b/kde-frameworks/karchive/karchive-5.15.0.ebuild
new file mode 100644
index 000000000000..7d0a2a6ce97d
--- /dev/null
+++ b/kde-frameworks/karchive/karchive-5.15.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for easy reading, creation, and manipulation of various archive formats"
+LICENSE="GPL-2 LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bzip2 +lzma"
+
+RDEPEND="
+ bzip2? ( app-arch/bzip2 )
+ lzma? ( app-arch/xz-utils )
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package bzip2 BZip2)
+ $(cmake-utils_use_find_package lzma LibLZMA)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 7c314f3fa49a..53c956798791 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1 +1,2 @@
DIST kauth-5.14.0.tar.xz 82116 SHA256 1430e9f480c8fffdefe7281c4b6365472404e2d549647aeda73cf497a5b9d8cd SHA512 633722520c47184dcba726e5909b0a10224de43892cafce36f62796b6934c764da071eb6579fb51dc56eae1c0dc32431010678bb7d4c5c75b35deae607c93eef WHIRLPOOL 449c7566fd86fe9ca58ad1f3edf4be5614989df590c0121e7d56a0ccf2c069426f91d881995c7f6f0ae380bee762c3d9084f51f2d1169bc4c9aa8e74e59b6487
+DIST kauth-5.15.0.tar.xz 82088 SHA256 e2a91e1a4c40d5547c8963c74a805810b6bc192e3193245f52e855addc7219da SHA512 0be2173f33076f9ede4ae90561743686df618be255edf8eeafe934bc8f698b72771a02d019f4fd7a94f074718c25115565115271637a383b73d1705ab128479a WHIRLPOOL 84f40e08eb7581d82a46f15214572bb55fac43287e12733dddd5f661799046f69889fb52a8022bb8785253372487309edc7d66c474418f6a71d0c0456b0365ec
diff --git a/kde-frameworks/kauth/kauth-5.15.0.ebuild b/kde-frameworks/kauth/kauth-5.15.0.ebuild
new file mode 100644
index 000000000000..01504008c4aa
--- /dev/null
+++ b/kde-frameworks/kauth/kauth-5.15.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework to let applications perform actions as a privileged user"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls +policykit"
+
+RDEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ policykit? ( sys-auth/polkit-qt[qt5] )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+"
+PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package policykit PolkitQt5-1)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 01bedb5b8ff3..5b333457383f 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1 +1,2 @@
DIST kbookmarks-5.14.0.tar.xz 115004 SHA256 e31679916e7f60c9f7964b98f34329ad937a76b7a5241575ddb9683fbd307b8a SHA512 17aa2785351f74ebfc9c9297f99f70659e66c4ab9e3f5956bb30b0760a4449eeb68a7d146270d272eef69da5ddd76727ce884ca869daf702d5fe21bda8a98ae1 WHIRLPOOL 5a740391c9e746dc7630b67399e047018e9a1f510ee4d5ee3a6fb54b60371e248942bbcfd2edfd5cc62338800d7768dbcc0fae1bf55e843758bb4aa3a8e74d2f
+DIST kbookmarks-5.15.0.tar.xz 114968 SHA256 e80ff2b6dcb1690dd144adc3d351b84a2a5be641c66f011cbf9a9ea1d23141f8 SHA512 7b1f8b2e7810d11bab1a4ee0657dde72aee14b2da87aaee075796b8ffaf0d253945093ee663b6f859b0d6981e71c7aeb110e1c61c51ec4a10ac889b8f1c4fc40 WHIRLPOOL f9d037265dd20b5511f839b622a4b76e11af09d9ffff89dbe8e743508261fb25de4d1d5efc6b8f6e67982f803af6aa1dc3ca00e7398127c888be119d8c8c8f1d
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.15.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.15.0.ebuild
new file mode 100644
index 000000000000..ffd7d1a9b703
--- /dev/null
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.15.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kconfigwidgets)
+ nls? ( dev-qt/linguist-tools:5 )
+"
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index 4cba3f5f687e..2808223a9fef 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1 +1,2 @@
DIST kcmutils-5.14.0.tar.xz 234844 SHA256 aef4ab0c1877a9a87b9aa19c0537ac76bf8ccf07d69f3529da3828891f5ae130 SHA512 6b5a731bf4a724abf553d8f98699cc4604d64da91a08f0cf6be840a305207939017453c375417b828826c8c5ca551c0f6631e6d23351c9f5f9fadf7f8b8100c3 WHIRLPOOL 6a22a596460c05c3831451a7a10676fe1a7122c74c2fa30ce65c42a196ad1040de33ae8a5422fe97f551dac1c4848221d9ca0ffe9d136a5468af68793bbcd0d1
+DIST kcmutils-5.15.0.tar.xz 234908 SHA256 df584c8a4688b8716d77bdbb77a354ca8f609ea235b4829402e927b4c000d36b SHA512 8a79f4420db0c7601f2a707f1b5e7355a237850ae058b06b2bc8123649affc3200f12f9d19528882b16abbcd930dc578decbebea47e240656e4ab5fb202220ea WHIRLPOOL 98909416bfb02b44a432d0a36cc6316c1e6e43bff7db6b07ff8944136403af9dfcb781689eaad33e422680e4d4d667aa53f6ad790f7ee32d7cd3e6418ea4a967
diff --git a/kde-frameworks/kcmutils/kcmutils-5.15.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.15.0.ebuild
new file mode 100644
index 000000000000..02a1414f79ff
--- /dev/null
+++ b/kde-frameworks/kcmutils/kcmutils-5.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+FRAMEWORK_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework to work with KDE System Settings modules"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index eddc2cf60958..31772efe0dd2 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1 +1,2 @@
DIST kcodecs-5.14.0.tar.xz 215904 SHA256 fe80bf80c2a5816bac5bf4042cc8fb6ceacd8135d7cde1424004b6030791305f SHA512 0eb66bc76228573fa8bf633e67ba0685fea0a652789f7e13ba0ebe0789d48e791700c6cefa778dfbbed98eedf0031df93b72f1c6a43e389a3729d3bbfc292e4f WHIRLPOOL 329463758cb1ae038acf0ccb2917b82d62150653b234d57e519a2f2ca373fef1a24572a654a79eb395c0305afd973086a556ab0d896818ebc6c9df0ef340cec8
+DIST kcodecs-5.15.0.tar.xz 215880 SHA256 f71c51f064fdfde2b6eeb898aaf1f651c407e91844306359a7c07dbafadae8cf SHA512 334587aa5dac8b8187193442d8a395c3cb805f503d979f9428cd32f0b65016560a297c6627614ba7c550a1c1eb40f3e9935dc45bfdfecfd7c7778814412519a5 WHIRLPOOL 06db836d3138a2957a9bd9b3444561275d0cf346a3f45f20cd80eb851cf98ebb63118d970fb33dbd26f447e0fce1c7b73d4522d09f2cdbeca9023292675cc7fc
diff --git a/kde-frameworks/kcodecs/kcodecs-5.15.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.15.0.ebuild
new file mode 100644
index 000000000000..4698328f603e
--- /dev/null
+++ b/kde-frameworks/kcodecs/kcodecs-5.15.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for manipulating strings using various encodings"
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DEPEND="nls? ( dev-qt/linguist-tools:5 )"
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 929dfe84b5d3..3cc150771f82 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1 +1,2 @@
DIST kcompletion-5.14.0.tar.xz 115824 SHA256 db2430cfab40313532da600d63d2d7327d98a2cace20c6176e943856dd396a91 SHA512 4cd51c50fb7301d24e3aae95c0b7df412f5a51217e68993104f496eaf18af09fa2f4cfadfa9ae6b602c13406ee69ffd6206f1f15e056a39c2678c919ac039ded WHIRLPOOL 4536602a93b5ae80a948c6ef55f6cd287b0db3d49e8bc036e987af14d53150f5fe19eeed66b6a3ee193dc6a5493a90b8409cc20f38b88f6ac86f266866cfac4a
+DIST kcompletion-5.15.0.tar.xz 115808 SHA256 deb2c24d995b8b6aa57309980f45fad49739bef693b1286bebc383f11c0801d7 SHA512 4bb94258393fc473bfc1f8e88890f91eb74d429c65eebd1b8ad4563d7f62fdf4a9d261072ea5751010e1597d28eca994e5553da85c38a0c04a7d06665bedee5d WHIRLPOOL 28fc29039facd088ee4557a335694f0124d3066d0e2b911bf4c9b832312d3677f2dd4c0b1dc1a4064bbb4e8c2c19491c1f230efeffee20ec03e2863c5f24e6ff
diff --git a/kde-frameworks/kcompletion/kcompletion-5.15.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.15.0.ebuild
new file mode 100644
index 000000000000..1a2fcb836062
--- /dev/null
+++ b/kde-frameworks/kcompletion/kcompletion-5.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kwidgetsaddons)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+"
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 666b6dc2acd8..4c3dcba01911 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1 +1,2 @@
DIST kconfig-5.14.0.tar.xz 222388 SHA256 1d14146a5902d5d6115b87d23cf5867f07e6da6032e5e5d5acf9b047d7e059b0 SHA512 1ddd59811991e5ae4ec546032055b84ea1fcc99cad839fcdd1d2127c0fe28a46099c80379901f2be22cb08e68c971b330cffdf8b328cb596d785167371ba3fba WHIRLPOOL 8d58791deabf1258a04fc3bdd2978446d7b45466c8466ae7573cac0c2de172b95401139bbb7e26347d772271df1cc0e7861e6db323287c481ba5c58f871a3597
+DIST kconfig-5.15.0.tar.xz 222316 SHA256 764bc8af55482cf1c88817c85c12a0fdb3fde5726ab0386cbb1b2f5df2256f20 SHA512 9eeeb07f6da251480a9e9a359b239877fd0109625a1d5270900dac6e42ec76cc85ebecf9787abad8b8ccc022aab020847b126f0b37a40d8857a30d873df12e68 WHIRLPOOL 2d97fd7545212838c612cc78cba06ba0eb436ae5dd70d5e79a56a305ee7b33fbf9fb7c2dcc8abf5ebf89a469fd2fe6b5c6124f85de591b2e946cae130bd053bd
diff --git a/kde-frameworks/kconfig/kconfig-5.15.0.ebuild b/kde-frameworks/kconfig/kconfig-5.15.0.ebuild
new file mode 100644
index 000000000000..88b2df9588b4
--- /dev/null
+++ b/kde-frameworks/kconfig/kconfig-5.15.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for reading and writing configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+ test? ( dev-qt/qtconcurrent:5 )
+"
+
+DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 77934d71c4b0..5620c3932743 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1 +1,2 @@
DIST kconfigwidgets-5.14.0.tar.xz 359064 SHA256 4f36a259daeeef15b754e506340223a9c10d1afaf6fbe3f0f795b102da166c80 SHA512 47a825e4858c474be64daab603eb485a687bdd51422f7203ec5272b04a04aaef7c108a3f717578e327f99aa5e8b49d5538de7614faa9cc3068e78268b8755e78 WHIRLPOOL 6ed6358080219b75c36ae9401ddd1bebb1ca4cf9d5f24c0a0e1624749c4f3c2b564298d11e366084d17747a2e0ed74e0a860fa799f23875c18dd7795a3139e8f
+DIST kconfigwidgets-5.15.0.tar.xz 359080 SHA256 43664b4e2b4175401dba9da379c0cd98d86627e68cb87e7d31e838ff5c3c783e SHA512 aea70395db12bb2d2ee2ea20a38e9da0118b6c472918cc978943822cb996579c95ab1c0a154fed17ec009ad44b519e671d599908e49036264bfdb61f771aad16 WHIRLPOOL bbb952f32f73bfdc9dd6d73785116c51ced9984eddb2980f8d5003d9a1f0b901d732bf73674f76c4cc8e3f6d7cc68f80551f3125150a2bdcb8d878604ddb6df4
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.15.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.15.0.ebuild
new file mode 100644
index 000000000000..a047df83d187
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.15.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing an assortment of configuration-related widgets"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kwidgetsaddons)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ !<kde-frameworks/kdelibs4support-5.3.0:5
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+"
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index a31f869a43c6..9c0ae18c0b70 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1 +1,2 @@
DIST kcoreaddons-5.14.0.tar.xz 302456 SHA256 d8889a5ba47e270acd51c3441c7654f326c9d5fc683d143923c7e0bfdfb1a276 SHA512 fa7f875b0af6903b6f401ef70bc4fb7d5af3d80ea10eebe33f46a71d97ebbefddfeb6533ca6a36f754b2ab502c475af75b7f13b9bc302779ce37fec8de30f47b WHIRLPOOL 04dfdbd9dcd6671d034d6515fb98c5b783e02fd261191131b2c0385052922898087da5e27a96e972f0e50c482ff8f7047170a97c3efcee4b9b688c4f2fa4ed6d
+DIST kcoreaddons-5.15.0.tar.xz 302640 SHA256 b5dd4db06ed1d7b50047bade34520d433c6f30defd7cbd74929cf5dce95a06ec SHA512 e3b762ab4b03afefe5f6bf733819a1e19f5f0eb1bffe6ab773745c7025a13dfacbfea15b16a81f0f153656dd803a4189bf4912208a3f2918879193678d4dcb6d WHIRLPOOL 08461bfaf6c791b310e77334b342ec62339967f29df0b2276bfc0a1ed18b6f9bac8c0f4cb7f7f7e11fa19cfa7bf890d90f14d17cf56ab2dac0a98c92848ee850
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.15.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.15.0.ebuild
new file mode 100644
index 000000000000..d896092d151f
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.15.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fdo-mime kde5
+
+DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="fam nls"
+
+RDEPEND="
+ dev-qt/qtcore:5[icu]
+ fam? ( virtual/fam )
+ !<kde-frameworks/kservice-5.2.0:5
+"
+DEPEND="${RDEPEND}
+ x11-misc/shared-mime-info
+ nls? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -D_KDE4_DEFAULT_HOME_POSTFIX=4
+ $(cmake-utils_use_find_package fam FAM)
+ )
+
+ kde5_src_configure
+}
+
+pkg_postinst() {
+ kde5_pkg_postinst
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ kde5_pkg_postinst
+ fdo-mime_mime_database_update
+}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index 8ee8d35ae529..1272ceca8f79 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1 +1,2 @@
DIST kcrash-5.14.0.tar.xz 19608 SHA256 443b0069f31efc7d75f9ecdae28029ced0afc8a0c48050415eae39ce09218ca1 SHA512 820282b3e3704e80ed085136e2933a893e77b88a0641a49544b735b0b70cfd0546b80ad5196220fa5589cb4b1be98501544add7788caa846fd268b954408e5e5 WHIRLPOOL 0084ae5b1ba1fd9cb854a83927ba713436e4e3608b539ac4cfe5338824fb2badc6dd9173c72819e505569aadcca14518b9d8d2f099391d56268b42ac4fe168e3
+DIST kcrash-5.15.0.tar.xz 19900 SHA256 7eac0e5ed260bf60c674a82981aaac81feea9ca5b6bb2a34256b95845ee56198 SHA512 d3da44c630ba2c64a4e56799551ef1b0961323d00be034b7ef71ebec4f434dfaf60fc63fd031c41f737407d5bfebae5a78794c59c40df6331c373aa8a838480c WHIRLPOOL 21759c701dd889a923860cb463f66cf665b8c05764d06a3e6e358913251097e423cf384c43cc2c0048e49dfe336d1ddbade9fc67a730d01cc8a93de306daefeb
diff --git a/kde-frameworks/kcrash/kcrash-5.15.0.ebuild b/kde-frameworks/kcrash/kcrash-5.15.0.ebuild
new file mode 100644
index 000000000000..8cf2e088f68f
--- /dev/null
+++ b/kde-frameworks/kcrash/kcrash-5.15.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for intercepting and handling application crashes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls X"
+
+# requires running kde environment
+RESTRICT="test"
+
+RDEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kwindowsystem)
+ dev-qt/qtgui:5
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+ test? ( dev-qt/qtwidgets:5 )
+ X? ( x11-proto/xproto )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index ee57d75c8c32..64ff6127641e 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1 +1,2 @@
DIST kdbusaddons-5.14.0.tar.xz 33284 SHA256 1e7ba26008611977a21943e7e165028ad69122ffe6bf301cb1f6235532fd3901 SHA512 9cf3ce84517eddf4f10f0e8167ca18fdf0fc6d0f26c7cc7ce63a10cd59367c65302ac0bc72d6c9dccbb68794939b59a865c189aa0f784426a7a60d74bd6f3915 WHIRLPOOL 04a90220e43ee72b0dafdd2d10dd4aa57447f8fbed157e56704f9dd14c682432406e1722e072fc607f2b1560fc12d82363f929c7d9205bae741a3ea04a788905
+DIST kdbusaddons-5.15.0.tar.xz 33276 SHA256 dddd802bd03862eac02423fb24abce8017c372c6ae0d29a69862411789ca62f0 SHA512 46d2126e655a4513b9165460bdf3a72162d21cc04cf3d814984336bcf03d3e303a451db697ceafd1b5aa78a6b88e1cbea0cb276971836ab3d9382713a27ea70e WHIRLPOOL 5082dcd2b3043801235b215c9807492be90f36f5d4d365837f51ad7b53d04193d63608e11a15570c518a01beffea68c549a663b2dafb8b77ef5a507d0fb54490
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.15.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.15.0.ebuild
new file mode 100644
index 000000000000..823ae740c4ba
--- /dev/null
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.15.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALDBUS_TEST="true"
+inherit kde5
+
+DESCRIPTION="Framework for registering services and applications according to freedesktop standards"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+ dev-qt/qtdbus:5
+ X? ( dev-qt/qtx11extras:5 )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X Qt5X11Extras)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index a2d8c9bad03b..cd8977bedf9c 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1 +1,2 @@
DIST kdeclarative-5.14.0.tar.xz 164156 SHA256 24efe52b31fff61efadd8bbe945913a005359a557876841ee024edcc8cd007b5 SHA512 51b361bd9d8de6891efbdbca8df642e396acd5b7d770a2efeb6e723e0c521bd0883a4f3eb06f0f8c6aad2f013cead19f9951b401f6c211b1146e17c7e03048e7 WHIRLPOOL 02ecd3430c0baea7b1d0dda003e118f312857933182491b3da3df8ca41dd11af0749d4b54e589b36a7a1f0e0b78fecc171c867f694343588b1b2f76a07a0783f
+DIST kdeclarative-5.15.0.tar.xz 165320 SHA256 627ce0d7f141c6fa11d0a86e7999ba7c549bf465839b5d164ef78bb24529bb1b SHA512 73573bd225af6025851f5ac711183279ce4f48a33885543685eae1c8874060abbb89551fd137ac98c80bf6c145377fc6f719c00a7da6b4b50d073bdbf4dd69fd WHIRLPOOL e280396541e9a6f5e3ca848bb658bc33cc90f2d375442469fafbb1c032ff612e4a78021712320a96816cdbb8e24bb9ad428a836271bc5bdcaf1e182e87079bb5
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.15.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.15.0.ebuild
new file mode 100644
index 000000000000..25395f3b4337
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing integration of QML and KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ media-libs/libepoxy
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index c68d041b53fe..b0fb62ede865 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1 +1,2 @@
DIST kded-5.14.0.tar.xz 36336 SHA256 5835731de2839becc2b40c956b6f58cc891864a6492f03c2b3720f24f02d490f SHA512 988a2ca059c324959aabc6835af5c6c24dcf95e4c8ef7ad7aff36fd4cf3e5b72595b295245daa106db6c3016ae2cdf5ef0f23499ecc5ad1414ee96f2232ae05a WHIRLPOOL e8a3dd2e53fd5a079c0d34bc9e06b0d11b8081a67dbddbc2c65b73baebf58d04c5980a29a9d65017a084c7585c8c287126fb92b89cb765823f6ffe2c6c4c8028
+DIST kded-5.15.0.tar.xz 35812 SHA256 98330b8512dbc06f35b93edd85ac6777c84c960a9492dd38c670d567ba749490 SHA512 bed69b517454c4c9fb82e111ab6e93c920dcdcf2bf1511189142f1bf7f1aa5f303fdbbd92f5fa05d3283fe007b189f335351d09680341efeb4c4c659a57cabae WHIRLPOOL 62cc75d97d5c00c31689269930a808951f55a5f5639b126ce1f4c1da92a62a2f4922dfb1cc27d0eda1b4282727e3cf6c33b1c8f0853d7fbcb72eaa2338195a18
diff --git a/kde-frameworks/kded/kded-5.15.0.ebuild b/kde-frameworks/kded/kded-5.15.0.ebuild
new file mode 100644
index 000000000000..a54c0aa2edea
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.15.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Central daemon of KDE workspaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kservice)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+"
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index d7920d0e236e..e95fea59bc29 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1 +1,2 @@
DIST kdelibs4support-5.14.0.tar.xz 3202432 SHA256 19d58071cde2a0c0c42410e9753b00e0202a15977ee07f015f831867a92abce1 SHA512 c9f412a3eb9bb79fda17e76145520f2c929d92bca62a79d1c864f86d6f7b9eed90f5e4b1876efb613a5eb4838cb6fbd580f31cc66bd3558f2a4052924e10df71 WHIRLPOOL 76ce2816b66594083afcac26c442223ab3327fccc9a44ff947443fc60f0c36f5a7f0869dc044429ee0409d178a39fc81968b8d13f6d23b2c5b4c3c9d61118cf1
+DIST kdelibs4support-5.15.0.tar.xz 3203140 SHA256 1e0bb3afeced27227a7a86626a5902a2d5cd7bddd6531a353003b39c07b32181 SHA512 30edffe95388aa051bfebbb3c6adf311ce35357036b9e947643b11d8fe1f8251fb10d77f69e1d20e3438a2d4b1b4ed53f602c16cede2a7a0e2e8d09a91cc007e WHIRLPOOL 9f93469e40fa3ee557f52c0644ae686163002952fb2b7e43b4e8aa7551186bc1ec2ee1d6ed00d7828a18935fd47d0176363ca4503ee0c7beaa05d581033a29b6
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.15.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.15.0.ebuild
new file mode 100644
index 000000000000..1ed70f5d5e3d
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.15.0.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework easing the development transition from KDE 4 to KF 5"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdesignerplugin)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kunitconversion)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ app-text/docbook-xml-dtd:4.2
+ dev-libs/openssl:0
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qttest:5
+ dev-qt/qtwidgets:5
+ virtual/libintl
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kdoctools)
+ $(add_frameworks_dep kemoticons)
+ $(add_frameworks_dep kinit)
+ $(add_frameworks_dep kitemmodels)
+ dev-qt/qtxml:5
+ !<kde-apps/kcontrol-15.08.0[handbook]
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_frameworks_dep kdoctools)
+ dev-lang/perl
+ dev-perl/URI
+ dev-qt/designer:5
+ test? ( dev-qt/qtconcurrent:5 )
+ X? ( x11-proto/xproto )
+"
+
+RESTRICT="test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kdesignerplugin/Manifest b/kde-frameworks/kdesignerplugin/Manifest
index b806ef28ef34..c3dcabe89617 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1 +1,2 @@
DIST kdesignerplugin-5.14.0.tar.xz 86840 SHA256 e58cfac780f7cfbdac9ff15ce32a1431d965a3319ddcd327d39edee7bf4e67ad SHA512 890fd3f102c175b982c99fb7f7a4f73a44fcf06961de45f92b9e6364757a600c5fbd5929ea5a9e7713aae2ece975ea490dd703ba4848a90da6b2d19784b2fc7a WHIRLPOOL 5b0db29d732c06f0213e671d7c73c12cd8341275b71c5a54f32640e98ea132982bac2ae31be139eac07649a26609515193170a53d8a6291c9bf8868512d4f0b2
+DIST kdesignerplugin-5.15.0.tar.xz 86956 SHA256 98b7a439eaa0cc0c969286d2adab1086b9d8950b562a6a7e31b389d31de8c657 SHA512 17a0aa441cd82eb87b52caa57b194ee2ddde9598e7792b7ba1f1a200e5e23a44cd1321208ec013a49d9601b850721369e7eb433a9e199a54694e2a3cb3cbed8a WHIRLPOOL 18f80d7c2e63cf882e5876e60065c976c6f17b2c37655c7c55eb3f76d1c75d965705f9c60a71cbe0552cf956269327354deffd76d5b9e2ede643cee9ca27dc75
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.15.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.15.0.ebuild
new file mode 100644
index 000000000000..f2ddfb7b6e96
--- /dev/null
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.15.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="designer nls webkit"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ designer? (
+ dev-qt/designer:5
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kplotting)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ )
+ webkit? (
+ dev-qt/designer:5
+ dev-qt/qtgui:5
+ $(add_frameworks_dep kdewebkit)
+ )
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+ nls? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package designer KF5IconThemes)
+ $(cmake-utils_use_find_package designer KF5ItemViews)
+ $(cmake-utils_use_find_package designer KF5KIO)
+ $(cmake-utils_use_find_package designer KF5Plotting)
+ $(cmake-utils_use_find_package designer KF5TextWidgets)
+ $(cmake-utils_use_find_package designer KF5WidgetsAddons)
+ $(cmake-utils_use_find_package webkit KF5WebKit)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index dcbadea87c4e..bde2c356545a 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1 +1,2 @@
DIST kdesu-5.14.0.tar.xz 43668 SHA256 d69a52f6263d3f03ab2bade946ed13d6304186061c07c17137eb7443a11443d0 SHA512 2af3f36db75d196baca997ae7ac07b8139aef1877ad4b8f69bee675adc486126e7529d716859b6cd32f108279c88b1de0c3063fc5f784937a5870ae329c4634d WHIRLPOOL 69d5b9de6c0fc5b506784c4999cb038cf69a6750f5bb2f4de4e77d941c97524c4bf516cd65e7035abf7479a1bf7c230a33ffa7c99dd096653380967ad99806a3
+DIST kdesu-5.15.0.tar.xz 43680 SHA256 3ee5aad2760e5b0793cfa177b41da37105e080cea603fa2cd6d8f7521f68d832 SHA512 812cecc5c123cda41fff0e35f4c854de35c597212aee56e2b9b51ff01e63f8a7474fefc4e14593f714ebb7559d40c2b025bede39ba035e9b3ae11126991f7b2f WHIRLPOOL 0b709aafb18c0ebf062c09562342a7329eec91fb23a43b1181c203fc79456845d76b1fa9df06ee4286433627cf6a3cfe526997c47c5e8c38fa0e110999df0347
diff --git a/kde-frameworks/kdesu/kdesu-5.15.0.ebuild b/kde-frameworks/kdesu/kdesu-5.15.0.ebuild
new file mode 100644
index 000000000000..ffd4854c85aa
--- /dev/null
+++ b/kde-frameworks/kdesu/kdesu-5.15.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework to handle super user actions"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kpty)
+ $(add_frameworks_dep kservice)
+ X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+ X? ( x11-proto/xproto )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kdewebkit/Manifest b/kde-frameworks/kdewebkit/Manifest
index 0d1ec1693719..ca7bea881e0d 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1 +1,2 @@
DIST kdewebkit-5.14.0.tar.xz 29336 SHA256 144d622720927505f7905eb5688504d429ce40375462d666a9e4b25707f9e05f SHA512 d828554840d6c2f1ee198ae1185b85491c7dab56a28e41dd7e81daaf979c5ff56e1d6c0f547a63ca30eef6d66ee6f6bb4157501461f20eee8eb17b062236040c WHIRLPOOL 143f262906ed4b4d8b41ec152a1452f1b345fe8debff6a9e1c742f4fe7abe12376122c99b2e56603f23e7cd5c0a704314ed93e4e9dc5c397547984cf3e697a82
+DIST kdewebkit-5.15.0.tar.xz 29344 SHA256 0acf37abcf87fe8a73d4b4519272638a6f2a1b04318afbd5f0e6996ccb82fcb1 SHA512 55d6a263a95a86b80ed0fb97937f20469dc97a53cf958926338cbf392edcb1892d148d4cc2f454eefa40277849abf405d905676f77fcbaeed260a648d89db424 WHIRLPOOL 6bc3472e119293536638aa35b901442db7f72ab90c180d6ccb25b52d2a28d2e9b2644820d30f534e55bb3fcd8a5b3b85131be9d508aa9e2e3e25df9b878cc983
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.15.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.15.0.ebuild
new file mode 100644
index 000000000000..e79c7ac8efdc
--- /dev/null
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.15.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing KDE integration of QtWebKit"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwallet)
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ dev-qt/qtnetwork:5
+"
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index 7a4e04f8f38f..9d4485ea7247 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1 +1,2 @@
DIST kdnssd-5.14.0.tar.xz 56440 SHA256 612be6a9c1e2b32b8facad1b1748c2a09f89a0d92b9cddaad1805d627f538031 SHA512 80952e8c440aed7b7eeab061a57eb98dd950276ad07f8cf861e1e0dfad9040e2b56a61bd1978bbce3e54e038a0e79dcbff1827ffc66d1bcd1ab8e3b64b03d5d2 WHIRLPOOL 545191690acffa246019894c95434d86ae96b59213b9c30f7f70a3994cb6069fa0791dd508f13ffc947d884de4db1aa9adfefa2ed96f1379d79c8a56d0b222d1
+DIST kdnssd-5.15.0.tar.xz 56424 SHA256 13407b4d76cb5aeee808b9b88e6e76f2ba820a65b38cffc170752756af11adfc SHA512 be75f440ba9ceef2adb1130f799e830d8adaac3f252d58b446e95c84c38a93a55b7804759758413e47f033a3c6c72fb24789359a97dadf37e93c5167d9a82f1b WHIRLPOOL 086f715166de7ad4af2e54fb973bfd82be9ec9f62fab640b175fbe347bc0837e8272fe1d2c09078b664f65b6525cd9b3efb6be7afd4389e86bad64c3a3268dfb
diff --git a/kde-frameworks/kdnssd/kdnssd-5.15.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.15.0.ebuild
new file mode 100644
index 000000000000..aeef081ff48f
--- /dev/null
+++ b/kde-frameworks/kdnssd/kdnssd-5.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for network service discovery using Zeroconf"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls zeroconf"
+
+RDEPEND="
+ dev-qt/qtnetwork:5
+ zeroconf? (
+ dev-qt/qtdbus:5
+ net-dns/avahi[mdnsresponder-compat]
+ )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
+ $(cmake-utils_use_find_package zeroconf Avahi)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 2dfeab71baac..c21e5d4fd926 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1 +1,2 @@
DIST kdoctools-5.14.0.tar.xz 407856 SHA256 7a3d249795f34610c1922da5a19dae21791f28cb6607861003245a0ee63d8718 SHA512 8c005a478ab993949374259dcba1a931879232509ca2a66d584e2d0e4307c8c6004f655e0ffffd88ca66f39d86059463a5c96cc01d1d15b3dc4a2f052cc5aefa WHIRLPOOL 4291b95747bd357e92b2f59a611a960d2ce4a84488ff05830d3d762a2a603778505d75dad9d05f7a153506a3e3008567ae4bab0543f488dca8efb4df5344f6ed
+DIST kdoctools-5.15.0.tar.xz 407836 SHA256 6ac31e6349420cd94a5353c8f608700e2c8adb7f29e57f3eeb9118aaf619916d SHA512 370a89c984493efa32c35c5dce183dff6ecd3516482384e65503b2333c4251134597533f9104b52d6181d992e6568dd8ed4cf21a26f9ff1c267c08c49aed7484 WHIRLPOOL 982ac4b73976d730801966cc1d80a6d7e2d938e2e35de4e065b6fe3f315f37423a872cf62eee7f3124d40464b00b7ef383843e99c3fd5633d0e1a9139968c45c
diff --git a/kde-frameworks/kdoctools/kdoctools-5.15.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.15.0.ebuild
new file mode 100644
index 000000000000..098749295725
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.15.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework providing tools to generate documentation in various formats from DocBook files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-perl/URI
+"
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index dd3d01e7073e..4d8e4210c2a1 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1 +1,2 @@
DIST kemoticons-5.14.0.tar.xz 94416 SHA256 f983d9579eb9503a53109a6c2f3d484b22af51b5aac4543f21966789174c59b7 SHA512 a45dc78c71118b9431aef4ea1993dd998d7393e56d6ddc41fea6a9f31ab0a2d0154410cea55ac0ab6db4b29f21fc96ed81dee992688252c1a5b31b94665a0963 WHIRLPOOL e85c99a2777e6b03418a9b3a1e571745e5b614096b0a77e69c5f7290dd9dca0eae6a7211050d29536eb7a5ff28147632d8542b7bc86d51d17f538d5862f1de12
+DIST kemoticons-5.15.0.tar.xz 94396 SHA256 2c710785e35c64ff5e24cc4204f92d30dbc4d3094f70b34cc367f0c10dfe7128 SHA512 c5d40f893193e020601cfeb5d53a30ca52c7cf4206dc39e65dc08e3e36f62414838bc63911b55872713d6ac9c74e285aa94479a51ff6de64b0a129eead7eafb8 WHIRLPOOL 7b42543d083b73a700ea5f6907b2bfdd37d036ab4fcd31cc0131c62372cef356678ad63e306e712bae53e648f4ee4a086305983217905a888a96fc791aa107ee
diff --git a/kde-frameworks/kemoticons/kemoticons-5.15.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.15.0.ebuild
new file mode 100644
index 000000000000..3450cbcc4482
--- /dev/null
+++ b/kde-frameworks/kemoticons/kemoticons-5.15.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for converting text emoticons to graphical representations"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kservice)
+ dev-qt/qtgui:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+# requires running kde environment
+RESTRICT="test"
diff --git a/kde-frameworks/kfilemetadata/Manifest b/kde-frameworks/kfilemetadata/Manifest
index bd599b3ea2bd..e633db836bc2 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1 +1,2 @@
DIST kfilemetadata-5.14.0.tar.xz 121596 SHA256 a269883f64dbef673b167f348b5970af84a7fb84fcc001ecb6431379982fb6c7 SHA512 bc12565fb00e43b9adcca24fa29ed342fc98c08149195f7bac4279cbb014955e194bcb933480461598f517690a526e188bafe5f46a17f0d88697fbf2f38cb4a3 WHIRLPOOL 226cf6f81f0e1c6a4d87850c1a6423f881560b965d8d2ce8f685b960fc713483eda88018025288ad14157a12d2b82975d9f787c742e92d551f74eebe4454e403
+DIST kfilemetadata-5.15.0.tar.xz 122728 SHA256 1667e428b35b5f98b711b4ed6f45b3d705a1e90baf721a1d17dcd623ea5720f9 SHA512 08f3dcebc81f2d7fbce73184dc5195d418b2300b488408bbaeed0defcb809c658180ec3077e259ebb465c193cff95da44d62b8b3122b0e3a6fb34b6407c66876 WHIRLPOOL 7c30283fbe864a9e0c3f41bdd060db2a24466d5695c4e59bc9616bf57586a8fe27c2c846932237a4511118ee986185530e24a76e1aa8e198b38fb5be32d8052f
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.15.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.15.0.ebuild
new file mode 100644
index 000000000000..084ac184d32e
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.15.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Library for extracting file metadata"
+KEYWORDS="~amd64 ~x86"
+IUSE="epub exif ffmpeg libav pdf taglib"
+
+# TODO: mobi? ( $(add_plasma_dep kdegraphics-mobipocket) ) NOTE: not integrated upstream
+DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep ki18n)
+ dev-qt/qtxml:5
+ epub? ( app-text/ebook-tools )
+ exif? ( media-gfx/exiv2:= )
+ ffmpeg? (
+ libav? ( media-video/libav:= )
+ !libav? ( media-video/ffmpeg:0= )
+ )
+ pdf? ( app-text/poppler[qt5] )
+ taglib? ( media-libs/taglib )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package epub EPub)
+ $(cmake-utils_use_find_package exif Exiv2)
+ $(cmake-utils_use_find_package ffmpeg FFmpeg)
+ $(cmake-utils_use_find_package pdf PopplerQt5)
+ $(cmake-utils_use_find_package taglib Taglib)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index d2682b7dd583..6fb7796928f2 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1 +1,2 @@
DIST kglobalaccel-5.14.0.tar.xz 81608 SHA256 8319dc5f97c8a824a6f1fa145ccc9dd67e36fb84352bd65623630e4bb4122633 SHA512 b6f264f95c1b0d74154ad9aa9990261945a5d4e13494e1e23d323cd35917d0b0f6fbce4faadadabfb61c196a82beb05aed7d4a2a46e02b35f70f8b3b4629de84 WHIRLPOOL 1de57b6a6c15206121323a1ab392bcffed09dbd67e427ebf9e56861108a69d87da094e032acede6fdc4598f83dfc7a35a9a8b5ad6a3eae9604969ef19aee27bf
+DIST kglobalaccel-5.15.0.tar.xz 81584 SHA256 5942afd96e8e5c6b1adf71666f1bcecd9ce8ac16cd9e5fa3fc680097435b27c6 SHA512 d6ff8b1015e237cc8481ecacff7422f497300269f51088f2e9987725945caaffc7f543af9a97dc50e395b707a0a1fad38515a6acdf362622f26d3919b2ddb452 WHIRLPOOL 760a59fbd5c32d5c0ac5b41379f754934629c01452cbc1d7c9159e026c8c77977778ea20fe610cd1894dece71acc10a0479e49c30ff511d9351350258552a308
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.15.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.15.0.ebuild
new file mode 100644
index 000000000000..caf8e3b5382a
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.15.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework to handle global shortcuts"
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="nls"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kwindowsystem X)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ !<kde-plasma/plasma-workspace-5.2.0-r2
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+"
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index b713eee719b7..9b6bcf5da7a5 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1 +1,2 @@
DIST kguiaddons-5.14.0.tar.xz 39180 SHA256 96591086680231eec09fc6aacc0262a83ca204d5aaceb48cfd3b954589b5a818 SHA512 6c201ffd1120d35b08539e5a9ee465bc0eb4a3ada6d325cafea42dd023db68ca4d2682486d070ab08e72bb1084abdf062bf1e81d6b2dc5ebafd66f974f53662f WHIRLPOOL 292f2fc4cef3433bde5f9ca2197d4bad19c2b9711466427e03e37eae86ee697c53af97116855e2bcd249de9fb87d401143d64ffec2a781c5383ef5d14137ac12
+DIST kguiaddons-5.15.0.tar.xz 39188 SHA256 081b18c79c37f9e050c87264563392625a7eb0b527fb27c6840f443382b6cc5d SHA512 aea38a6d17e2fdcc71c5b92a84711af1bd5570d9194b929de7188130b40b8fca7779cc1b4355cb996e43494f2129c710b3b6406c44fa9f52eed87783b023a7dd WHIRLPOOL 16f99456bbdb05ab7a0a4bb7282a9561d32deea3b73dac85af03baaaf4cbb8baf66196c72f37fd78bcf4313df4410bce2c543410271c6033cc8a739ef31fecb2
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.15.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.15.0.ebuild
new file mode 100644
index 000000000000..ac79d6597355
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.15.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing assorted high-level user interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+ x11-libs/libxcb
+ x11-proto/xproto
+"
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index b73d0d963330..0e3aed5291fd 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1 +1,2 @@
DIST khtml-5.14.0.tar.xz 2070504 SHA256 4296c5875e91dd7489e1fdbdb22512e147108ae68770bdff7a4f4703b60144c2 SHA512 189f854a74f9539dd8ce43ea4c46088c4024f86e9decb8d0e6fa8d4c44fb5131513bd4321ec601aa7b81ec76af74eecd5f7471dc06034300d13b7487b1f8e058 WHIRLPOOL 14b34f1c22f9f937f20d8f66994fb0e7f46811bc6f620e4f7cee7c19a761a0830a50da67bd564e4f9f83df321ade51ee94c9821941bdc48e6f53de5fd35d972f
+DIST khtml-5.15.0.tar.xz 2070660 SHA256 e0287004d369a9cb0d5d7da2787e469fcaf17ce213d9d8ec877e43781a0efd05 SHA512 b967674e07f882a376f6c22479a844c173e4eda3e4064778d2cdf9c659933b6010796472a1762686d929cf7da4bc2c00bb431a3f779e05d28d60c67cbf9874d0 WHIRLPOOL ee8f7ee0b31be30bfe52b49c6d0e2e97ab0809344237bfcf7e135b30b15a9ef23d2abda74f697b0ced733ef12ce5186742943a0aaa1231d28f2ba99b1360a8ca
diff --git a/kde-frameworks/khtml/khtml-5.15.0.ebuild b/kde-frameworks/khtml/khtml-5.15.0.ebuild
new file mode 100644
index 000000000000..6ad130922866
--- /dev/null
+++ b/kde-frameworks/khtml/khtml-5.15.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KHTML web rendering engine"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="X"
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kjs)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ media-libs/giflib
+ media-libs/libpng:0=
+ media-libs/phonon[qt5]
+ sys-libs/zlib
+ virtual/jpeg:0
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ )
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ dev-libs/openssl
+ test? ( dev-qt/qtx11extras:5 )
+ X? ( x11-proto/xproto )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index aaf27e07fdfd..0ed18c90691e 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1 +1,2 @@
DIST ki18n-5.14.0.tar.xz 593204 SHA256 1f07d8f2fd51cfaea09dfc319baf738eea50f34246aaffa535149e5954eb975f SHA512 9aec412ebff122275428074eb7051f5d2902597f4eb3e21f043af28d60f6b36d609514f39c686c97cb3839b3775d3ef5492c0587b7c90ec968c769c799909ea7 WHIRLPOOL e835b0d977c8c08ff7828e03967a08214dd6022d58a297ea8a6ae22a0ade9385b42a34b986b0aa12218e3fdbae50e5872c87b88d9be97f7a60fe997d57768796
+DIST ki18n-5.15.0.tar.xz 594400 SHA256 ade17464f9d794fb732aa77de3060a8fcbf4b6c91a750be5d47e49adc9b6c763 SHA512 3dedb1e32662d0f532a9b103f358fd3fcafde7c1acd7d0a724b5535dfb80cbc989650158352ca400bed6df3fd668243b2360a556161bb65bf16d11402c00946b WHIRLPOOL f30bcd7386ccc42f7aa424bb0dba85c5912e811b2d581b926e2a2be6ef345ebc3640144fccd85df2213d01f2743ba7770bfa2a05d3d6d9afe7e4055f14d4c960
diff --git a/kde-frameworks/ki18n/ki18n-5.15.0.ebuild b/kde-frameworks/ki18n/ki18n-5.15.0.ebuild
new file mode 100644
index 000000000000..771af54ea26c
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-5.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtscript:5
+ sys-devel/gettext
+ virtual/libintl
+"
+DEPEND="${RDEPEND}
+ test? ( dev-qt/qtconcurrent:5 )
+"
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 0463c92bc659..0c8602825920 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1 +1,2 @@
DIST kiconthemes-5.14.0.tar.xz 196176 SHA256 9937b46283fd64894dc2bcf9916d3da5078154d5428b750b14212cf5619b1e56 SHA512 add07f6dd1f60b22dba5be0592d66e763f3f88e8ee383f3462cc3af987a5dfa9ff9aeb4593414f52c6c57ab2c8428e144022e8d11c92ffc029ff03a854db0eee WHIRLPOOL ab6cec91e1b4a6991f8b0bdafd2cb4de94128a86fe7bf53c2ed396ba385c6189e272c0bbe624aa422e240e6cb678a6f70cc61b793387bf3f53c5c1c4d82a8026
+DIST kiconthemes-5.15.0.tar.xz 196128 SHA256 e2fdf07e04e9fd06a4515677a5bcaf31bfc309d0772578e5ff915039e28c6929 SHA512 48ce63158ae523f2809d8d13c31e89d020f18f09f75f995371ff9fa1e1343212584267fd9e2acf7b2d9c58c6689366327916aa5691e5290749ac629dabcd1488 WHIRLPOOL ed409f60fe3bf4128eb64927c443c94db58e41185676c91852e9a63f86e420e25fe6a0512e5d94cb047192dd335584e96c212d068e7470e0a3e52c97a2721855
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.15.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.15.0.ebuild
new file mode 100644
index 000000000000..5030aa57f5a7
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.15.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for icon theming and configuration"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kwidgetsaddons)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index c57195332ed3..a3cd8ae6473c 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1 +1,2 @@
DIST kidletime-5.14.0.tar.xz 26348 SHA256 282f47eb34163420ecc4d1c1f3e15dd6ee8e7af94cf309578bac07d0a8af101f SHA512 23e844373a431defd34a481f97cabbc67500238a2328b89e526b2548d3b23ea77dbf1972c3ce06cbcd1938dfda8db29ad5a1f1b2c0c88047aabe9b77b8efbb37 WHIRLPOOL 69b3d503dc32a10c2de0e0ab4ad501fb7930451235e81e68c3e3c44004d34f334683942fcae5b5ece18d2c627730b7da1dccbc5f7b3c4873f1e3bf9412208a30
+DIST kidletime-5.15.0.tar.xz 26352 SHA256 228a74c02dbc0787747a45d20f40d986a40063b1dcfeec3c09eb2765767ee63e SHA512 7d8645239f08e68d8b28a560ac0f2a5d3e2de326ee95b1346a5ec0a011e94ad6eee6acf9c635a523d0c4d95b10aa4f6a141dbd122573b5d7c52f82d4a26c68ea WHIRLPOOL f5b5403762a4e623f101e9c24066f068eb568c348ef1403ac5ee681e342f77caaabc9204a2ec3089cb38945e055e0719e6ef796d03b0b7ec8b236ff8094841e2
diff --git a/kde-frameworks/kidletime/kidletime-5.15.0.ebuild b/kde-frameworks/kidletime/kidletime-5.15.0.ebuild
new file mode 100644
index 000000000000..f045d6bfc847
--- /dev/null
+++ b/kde-frameworks/kidletime/kidletime-5.15.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for detection and notification of device idle time"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXext
+ x11-libs/libxcb
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index 449683a209dc..76109e88ad0e 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1 +1,2 @@
DIST kimageformats-5.14.0.tar.xz 85192 SHA256 de5f84a755a8d48ce9f367a33010086c4ece646617d0e4f65fab35d9fb2d428f SHA512 88047df741b5c3795648c217a1907c5b4fafca1a9ad4199b3c46c79638a600ab7f89b56a7ab44d7dcd0d736221598edb16a48707157bbdc33bd5f790bb267f2b WHIRLPOOL 40c17e7c8241f52a375d670e08fe522d13e1f925ee1e90f249585327b4b789b4908007dee23a396b1925f90a810ef906aa3e001a9df8bc3076cd13cbf4e2ea51
+DIST kimageformats-5.15.0.tar.xz 85192 SHA256 7bdf0592cbc7fef643d857b58359f116835c79ca65aa6f49579d483843e2c660 SHA512 7c92d7f62570bd4fa38e49e01446a8c38b42f30f274c80adac4fd88def5183f897e498f751695434376c3db1d684476572619d47d08c3f5c4ee515117bf003fc WHIRLPOOL 009e1b9010eebd390d9daf1d2fbf61e82adc70e7ee3fc4f5602bfd5d7af73b9c7c744664ba2e069838082d7b4351af09e9c2f08e8256825fdb5b3dc99e623059
diff --git a/kde-frameworks/kimageformats/kimageformats-5.15.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.15.0.ebuild
new file mode 100644
index 000000000000..e5e05fe830e7
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.15.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="eps openexr"
+
+RDEPEND="
+ dev-qt/qtgui:5
+ eps? ( dev-qt/qtprintsupport:5 )
+ openexr? (
+ media-libs/ilmbase:=
+ media-libs/openexr:=
+ )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( src/imageformats/AUTHORS )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package eps Qt5PrintSupport)
+ $(cmake-utils_use_find_package openexr OpenEXR)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 26bd6fabbf53..cc36e35c7e2b 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1 +1,2 @@
DIST kinit-5.14.0.tar.xz 117464 SHA256 ca7c21bf571777cbf7edee53e642528aaef0ac3ef08aae9c57b6fe79dadddcbc SHA512 c5f78f8bac23f7622d9bb0d7012aee78c0f9e2f5862143f05059014bea8c66c0effe0f421ea1d474446aab84adeaa077d36746e95eefb3d707cead9dbc96779c WHIRLPOOL 060730693e91be26b0f84716244bed6ee258eea0d216fdec968a46123a180734a556b564627387582af7094e2f515ee7e51d222b52758c3e8c5213b935f12979
+DIST kinit-5.15.0.tar.xz 117572 SHA256 ce17b952e0241c62f3a6e33a5aa1e7930b9a00d50e4482eb919d9c6a5e168e31 SHA512 89691ab931c1e251b365875f853eee09bef16d171071e44033a7dc089b1194448ba0fb6e23ffa34acae3db983fb34761483872552c9924cb7eb2521a31ce564f WHIRLPOOL 853421305bf4acae1f0ef56e636e3b7a128a9c57255ecb029e38a1724136c6e4a80f0f76d27d48f98d23b42662e2463a7f73d4cc2b682fda455aa3d0f733cc91
diff --git a/kde-frameworks/kinit/kinit-5.15.0.ebuild b/kde-frameworks/kinit/kinit-5.15.0.ebuild
new file mode 100644
index 000000000000..ce8210c5ac14
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.15.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="+caps"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwindowsystem)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ x11-libs/libX11
+ caps? ( sys-libs/libcap )
+"
+DEPEND="${RDEPEND}
+ x11-proto/xproto
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package caps Libcap)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index acfacec90a5d..72f329eb35ee 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1 +1,2 @@
DIST kio-5.14.0.tar.xz 2848028 SHA256 2aa35888d93e8f41d0c43c20b6566f918824905676e9d1bce708c239cacb31af SHA512 baae50f33b5bb0907380c1f02c036c076297f8978c19596e890f8bfdb85dd65c47dde0b7af2116d29cc12a4167552658ef048efe2e9718f8575bc442477b0a99 WHIRLPOOL a8085a99fdb2679f85d88a5b31c0736e466e280e46e5648eea4e9f41335a9d3e5dc45fa1212ff7d5104824ce28369c9520bae6f990295f35a472fa1ca343e7e0
+DIST kio-5.15.0.tar.xz 2847504 SHA256 0821731f1c1446a548be18f425de2f0077d31e3c6fc89f7e9c4557c9b232a551 SHA512 4941c5f470bf404b875bdc27b72187458d69fa0ea4103a5055d0e51dbe7d86af3d71a426d7bb2cc12e35525a9bb06b164ed687b5c3a65fdc4650c22532053545 WHIRLPOOL 9d9059e50c4346c10627b3d3da684b54ece5987f5ec62d76b598fb624cd746971ac09022a1f8697198501b786aa27db7a6a181d7ae0fb72150315458d5c31370
diff --git a/kde-frameworks/kio/kio-5.15.0.ebuild b/kde-frameworks/kio/kio-5.15.0.ebuild
new file mode 100644
index 000000000000..2220a2d1bc1d
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.15.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+KDE_PUNT_BOGUS_DEPS=true
+inherit kde5
+
+DESCRIPTION="Framework providing transparent file and data management"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl kerberos X"
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ dev-libs/libxml2
+ dev-libs/libxslt
+ acl? (
+ sys-apps/attr
+ virtual/acl
+ )
+ kerberos? ( virtual/krb5 )
+ X? ( dev-qt/qtx11extras:5 )
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+ dev-qt/qtconcurrent:5
+ test? ( sys-libs/zlib )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXrender
+ x11-proto/xproto
+ )
+"
+PDEPEND="
+ $(add_frameworks_dep kded)
+"
+
+# tests hang
+RESTRICT="test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package acl)
+ $(cmake-utils_use_find_package kerberos GSSAPI)
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index f93f976d699c..c42b6b01ba2a 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1 +1,2 @@
DIST kitemmodels-5.14.0.tar.xz 383696 SHA256 0e23186d2cdee96c4ae76257515bddeecdc11f0af490f1ef8d3e5e878e100e5e SHA512 1e1ebd4003bccc075f7ec1bcc7d2b8538ddaf6e377c3b1a2c1ab86346c1d3c9609c872b88b92732034a9f6806536a3d56cd788ce6fa441ae46d5cf5f57456ac1 WHIRLPOOL a7e61715e83e449d040a0a2aa4790fa9b624d9c6b0d9b2338828aabe0abac8c208db1286d532bbee32decf5ebda9cb89058f06df4db1999a2f9e84460e92d100
+DIST kitemmodels-5.15.0.tar.xz 383756 SHA256 ea7987cecf377e4c456aef706e3e1527ad98a5f8d6ba7e213dfb2fd55b454a84 SHA512 f499442eeb7c4c27065782633aedfe26118fe808ca6334df4ba0034758452a6b49f6fb371309ba0e1e107fea1716460c0c252354ed3f795e5d8ac43c182f10f5 WHIRLPOOL 5246049df982a344e362a80aa3b33a4194460c6a56b7c40056d191dbc80c4d5098973e93b793022c4346eea4bf0bf48c08ac70d0bfd9c57f40d97f51e1f7792e
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.15.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.15.0.ebuild
new file mode 100644
index 000000000000..8aabaeb75509
--- /dev/null
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.15.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing data models that help with tasks such as sorting and filtering"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="test? ( dev-qt/qtwidgets:5 )"
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index f314e919444b..bb745cada2ff 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1 +1,2 @@
DIST kitemviews-5.14.0.tar.xz 74072 SHA256 81297d4d31a99872bc7cf3bd297d60c306eec67f9af3da0f6fe5139ead6c68fa SHA512 9a4127e61b244296e01bee87a7ec62058b331b47fbaa9286fb0a1682c6811c8c58823f6c118feecbece38312739cd78e2884af770e6fbf42d2a923349a2b72a3 WHIRLPOOL f56385072af841d7845fdd8e10606e2ae98d42c0950c715cf06b26aaafe932e14821941a6d92b316483205f497e06b5806d050fc989c69351b7ca63c474b1b3a
+DIST kitemviews-5.15.0.tar.xz 74072 SHA256 d1637a8ccbf1bf349e38682b0615785ab3610807328acc7ed47c73e0e8e92284 SHA512 e476340a9f18c394a428ad9bb183e83c6c32d779bc685a76d039abe6fcc6b2c9f418e5e578c918210df343295f2bad770839c013a960f31c009e5512734b8713 WHIRLPOOL ea7493d588c7da7300932b4d1261d6e9ae9efe97324c49579f96d5a5fc8ab004de5326659dcb738990d1a7279666c80648938d375ec9afa2646865ef608cebf8
diff --git a/kde-frameworks/kitemviews/kitemviews-5.15.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.15.0.ebuild
new file mode 100644
index 000000000000..17785e0f1ecc
--- /dev/null
+++ b/kde-frameworks/kitemviews/kitemviews-5.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing additional widgets for item models"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+"
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 7b9bb01028ef..f61c907202a5 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1 +1,2 @@
DIST kjobwidgets-5.14.0.tar.xz 88964 SHA256 20fa92d5690d131b5852909821a53967da4ab803a0fc014c91689531205c7d45 SHA512 aeb4c3dd9d72fb30cce83147e7ea3cf5c7ba75e5c61f334ed9b91179b80d1004ea5d3280631b8c25020190fd6d6c861fb2a8edc94f86424c5808982f66e9d7a9 WHIRLPOOL 6144f470ea5dacefbc0ca672235bca8038ae3b7757ee02802be87a0a393661768d9b9c9364c4d7b4f6705ef8e4e5614503bdf5a959cd6350249bd9ee919f0e57
+DIST kjobwidgets-5.15.0.tar.xz 88916 SHA256 aa7db4d1440579d784709ecc1f2dda443ef9b22f8f3cdbc0914cd5cd5790238b SHA512 062b6cb778e555244114d45ee0aa12f416df49efa8d6be7434f6aff0002fc33c94fc59b24f8128c939f671eb19c3e463f2999b599181defba6615574632f0e53 WHIRLPOOL 7cf84a6f0ea738f3659683342ed40bc342b202acfcc126bf66ff5bbfa04cc1e32952e94e391660a32ee9b19ffa1080be5fd52a26cbd7132e0782f04a902ce74b
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.15.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.15.0.ebuild
new file mode 100644
index 000000000000..0233c6dacb83
--- /dev/null
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.15.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kwidgetsaddons)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ X? ( dev-qt/qtx11extras:5 )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+ X? (
+ x11-libs/libX11
+ x11-proto/xproto
+ )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index 4104649b00b5..128227322f19 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1 +1,2 @@
DIST kjs-5.14.0.tar.xz 290696 SHA256 844b5af639f7bf0c1b34bf5e1e2c2606ace89c516d99a5728085cdcaaf4c97f7 SHA512 d4c1c4d177d6b6f4bda1fe886aa46b0198cce16825a9ac37f6c7cefd849e47f194c27e6b83676d0dcb23e6b58bfa2139b35bec40dd9a2b25d3c5d5762863f677 WHIRLPOOL 71201678bc794cecd0278d0466bcd864736993eace29d5a83f629b889433996c4b70d498694ef0e0d662967b130345695f911c328c84f803f97ebc3836ce6674
+DIST kjs-5.15.0.tar.xz 290620 SHA256 e3b91b6cc70aa683027daf17c6e5e4c4e314c40f594e76026e0be10400e249aa SHA512 3ab27a0d96273b2fddf692429f061962ec09baa385853d45fe5b84e19230dc08ed4ce747fdf0f91f2e0139188cb55e3771656a81d10d1fea60e531c10d5b1d39 WHIRLPOOL 6cb6208ab10494d23920f98cbe415877b4972650c9cd84e254ab9d3971460296392e70c4c854d47adae630028b31f3db1c86c663b7690badb50ca9df3d16aa1b
diff --git a/kde-frameworks/kjs/kjs-5.15.0.ebuild b/kde-frameworks/kjs/kjs-5.15.0.ebuild
new file mode 100644
index 000000000000..46ac226a0b0e
--- /dev/null
+++ b/kde-frameworks/kjs/kjs-5.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="ECMAScipt compatible parser and engine"
+LICENSE="BSD-2 LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/libpcre
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+ dev-lang/perl
+"
+
+DOCS=( src/README )
diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest
index 52d8ee3ca628..72e9a0247e88 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1 +1,2 @@
DIST kjsembed-5.14.0.tar.xz 164260 SHA256 7483118b4bbe1b72bcc29db8140de39195a07a049cdbe3a30b1c7e0b9ac07427 SHA512 386fd23fa8a60bf16c12bd05c0c2b9b923174d338d13ee74899a8e4430a2c13b2006e0ec7dd9200b65dd34f6287b249f9394e3255d8afe1ed9c9f9c3dff82945 WHIRLPOOL dda6e666b9ebf64a3deeea14199cc22aac74a2860c46aad0467686df9bb4909428257f58f0e2cba86541ff1d748e132ad3591251b77507a61e0dc142b0e94b7f
+DIST kjsembed-5.15.0.tar.xz 164184 SHA256 4456808a6fbc595bd62235085e4aba2f18665e884220159b3cbe4653cd343525 SHA512 a4db3f221fe0cac22c7b7b9ccc8c1b672de5e6fdd7a2194e4858be8c333dc8625ccdc9d8126cbeffb994e274ee14c37fa415aa3568fb95a129ba7f4d4ab55cb6 WHIRLPOOL 2d741e03a58c6f2a5ce92dcd19e39a1d1d4f89eee255d7c61215b48b6a257832aadada232b54003e61ee56df06ca06de07b2345394d3d1b7b0741176a4937f45
diff --git a/kde-frameworks/kjsembed/kjsembed-5.15.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.15.0.ebuild
new file mode 100644
index 000000000000..d62740593177
--- /dev/null
+++ b/kde-frameworks/kjsembed/kjsembed-5.15.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework binding JavaScript objects to QObjects"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kjs)
+ dev-qt/qtgui:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+ dev-qt/designer:5
+"
diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest
index 596e5ff922cb..25cc92b4eab0 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1 +1,2 @@
DIST kmediaplayer-5.14.0.tar.xz 9432 SHA256 f52b747b73fa5c322a420dd6e0a5807f88e2ba6261278d8d87dbd1f49ccb9bd5 SHA512 c04e0494d07d06228a65eae577d457f0371e13c58e1829ecc0ee61440de04a0077526e7a6e22585ff5308825f3de268aa3faf61047477319cb887ff1884b65ef WHIRLPOOL ed5d750ca74eec333d2025ba49c23521a102cc0c8deaac97435e45953609c1c40d6fb9b87909dca7ee2183d938f6bfc4886e9b6335c987acb90da928753e6726
+DIST kmediaplayer-5.15.0.tar.xz 9432 SHA256 b5e7279f0f62ed68b88e50efeccb3a0dc6be8fb28c1acb79adfcc74a274a91e6 SHA512 0884a871a5a01e13f057b45fa9b33a2070764d6440094dae326b175a061b686e4d9899c1af20c7fd8efcbcc10e4361dd2756085f18cd4fadd969fa2f7cd069b4 WHIRLPOOL 041f8348b12fc61afb99313adad489c296ddf53d68f83c7042b21421968c5ed560de89e0c80d02f7e21d4aa6c41e275b22575e5b6552ec1e1d22c109083172bf
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.15.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.15.0.ebuild
new file mode 100644
index 000000000000..4e6faf762e20
--- /dev/null
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a common interface for KParts that can play media files"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index 99b0609c161b..3581da8666b0 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1 +1,2 @@
DIST knewstuff-5.14.0.tar.xz 852164 SHA256 465c89fee307c28fcbad34e107fd4fc26e2d763ab74c5a377bc0970752b1f97a SHA512 a6d3c4b6c121573b5ab3bda2d0afdd8813565f6708d8c6f46cbac3aa5d36cac22c9b9475fbbfcdfbb6ba1ffa658f04fa9c4ab843169801b12e6bb9512bd95e43 WHIRLPOOL cd87d4de3cf3540e00ce0eb233fc83a4d10f4ae085e05eaea678360119d621a947f1ad8aa13ff1a9360de05536b4163b088cda9046eca7150a59217b713a743f
+DIST knewstuff-5.15.0.tar.xz 852092 SHA256 dc4a375093bdc560e3882cf653d667b6e3a56b89b19632039e07008f31501069 SHA512 ec6f369002f86d6877b3b70db06ea4917eb178b10127ca53c9c84a03836b34c8d794f1f602c8bbffd8b7c66b8a88e999f217493ccbaecdf5a05abced0c419da6 WHIRLPOOL 5149b62aef4b1c7697287b25ab82a7db7e0ea15c8d86e25ff760ef7c17771fe261f94897f46a459fda5a2415c54901e1c0354f41360f5bc0ffdf3d459979d27e
diff --git a/kde-frameworks/knewstuff/knewstuff-5.15.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.15.0.ebuild
new file mode 100644
index 000000000000..223f5183c7f9
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.15.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for downloading and sharing additional application data"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep attica)
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index f780644ea378..e734f40dbc71 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1 +1,2 @@
DIST knotifications-5.14.0.tar.xz 92808 SHA256 eb6dc5eb63a2eac45be54f0e374674aa89df1fdb0eb302ef8792df5f164f0b70 SHA512 4679d84ccc24fa837260fdf0c7bec6f23f7c4bfe00029d32a4fd16fb7c85f21f97de56b717015481ce8f1052526460b5ec0c7b3a60b8372ab9a4f8d46bcf93ed WHIRLPOOL 51ae52ee0a018f855adb56c0b9c1456e25ac2d8124d68e38a060745cffa4d2483fd599af1f65ef2cf38db1fd571aadf4f23c9bfd1b673687dd1733fba923cd06
+DIST knotifications-5.15.0.tar.xz 92904 SHA256 958d2c98563e3de0bf49490a931e95100efa06f91647eb1d1523c5a252ef0985 SHA512 ed4c9d5c3c3c1b8e605c24de991237dc7d680ca752e3951b8d55dfa9dd02ed39557bd3c6e7d88d2cad9d9678ac3ae09553a79b58ac8c0c4af2f996430be26954 WHIRLPOOL 817126cfa74124012e5f3aeb1b939b202facd4dc3fc9d132d963f7515c1b32375b424c2909030b9061084ca376fe51042ecc821ebbc8bb6bcb8975bb1ace589b
diff --git a/kde-frameworks/knotifications/knotifications-5.15.0.ebuild b/kde-frameworks/knotifications/knotifications-5.15.0.ebuild
new file mode 100644
index 000000000000..59640302e0f7
--- /dev/null
+++ b/kde-frameworks/knotifications/knotifications-5.15.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for notifying the user of an event, including feedback and persistant events"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus X nls"
+
+RDEPEND="
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kwindowsystem)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ media-libs/phonon[qt5]
+ dbus? ( dev-libs/libdbusmenu-qt[qt5] )
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXtst
+ )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+ X? ( x11-proto/xproto )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ $(cmake-utils_use_find_package dbus DBusMenuQt5)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index edb8ab979fdf..ed45d6f3851a 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1 +1,2 @@
DIST knotifyconfig-5.14.0.tar.xz 82716 SHA256 2b83c9f7d56782d041539486fb8bb79f9ef69b2daa036cd81cd2aeeb9f120711 SHA512 ce98fb11167945739e150fedbe4a10740afa86635e7bc913167d53782b6860d5bf373261d8e4ccabd2a95af4891eac7d8c9ee27a49732b4bce8a3cefe0355581 WHIRLPOOL f538d33268a90629cd511da74317e31530ec10aeaecfe082c7938a621d906ca32a28fa138570159f82242d10e6ee74e24cb3c86c39c5dd527f878e24d3507ba4
+DIST knotifyconfig-5.15.0.tar.xz 82860 SHA256 4aa31548a2cf5b828de60dadb82b8ac47aa4fb6812d0786d15123a8ec34f472c SHA512 cd670321b5dba3e253fba50bf71dae6c97865a6bea26cbe9513b23c57f5f42d03b7ee9d3287732d604a79773e19a2193a4cf9daae55df3099dd6e620355e52d7 WHIRLPOOL 93ce64d3e7e8012cfcd8e2ce92d6863a0d6ec2421c772d3346634acdccef777e173c67afc5be8edbe253b34df9f18273d68bfcb971d32339eef19e160dbfff11
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.15.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.15.0.ebuild
new file mode 100644
index 000000000000..b6754afabd08
--- /dev/null
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.15.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for configuring desktop notifications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="phonon"
+
+RDEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ phonon? ( media-libs/phonon[qt5] )
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index f9d6cfec0672..3db8d71138fa 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1 +1,2 @@
DIST kpackage-5.14.0.tar.xz 98580 SHA256 a57968042d5df8d3d6547f18bf565875802af49e135d2f174763e648f94e7567 SHA512 f0e98135856ad28e68a53717133fe6ac51e75c3124433d64137d8eb1d22130b37671b5b100ee2993fb2cece6a488530ed3f3b42cb64205439bb6fb9845cea081 WHIRLPOOL dd7e61ae2dce17ee4a20b249363a8633428d12183e81ddaf3a56321079de1b73a6f4813913987747b51786fc5f4b966a0ba453890f1e0016fbef4e03e22e7332
+DIST kpackage-5.15.0.tar.xz 98728 SHA256 c3eeca1f1320ceed8bd87617c93b8bb847a915b0a9f6a4fe3d665de129b6ec0f SHA512 5ddd863bc9e3d65ad88a4d39ed84f8644fdf2808c34f3901556fa6364cc6b2c91326a0cffc3146c202fd2beb6d165a20fc5dcc4d26dd8c12a0723eb336e21d88 WHIRLPOOL 6c8f885f50f458a59b7d5fd4669aeb65c729eaae27e0a6d94c28944d38a6a4d115861818b91f1e181718b062c337dd262d5f6ac918f79355eb4108214749f73e
diff --git a/kde-frameworks/kpackage/kpackage-5.15.0.ebuild b/kde-frameworks/kpackage/kpackage-5.15.0.ebuild
new file mode 100644
index 000000000000..fda2eb6e0e3e
--- /dev/null
+++ b/kde-frameworks/kpackage/kpackage-5.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework to install and load packages of non binary content"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+"
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index 4e458ae4aeab..6d0ad1ad5f17 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1 +1,2 @@
DIST kparts-5.14.0.tar.xz 153996 SHA256 e5e7ace5cc0eb7b75559a126d23aba4b4198a3d10bcb5315e07bd14cd0643591 SHA512 0dec79204dcd3eb29aacf8c96a69ae1c38ff58befabeec5a50471cd4fa5152e66508ca32011c355e2f3c80d18cf5884e4131bacecea9e30a49550095c2d7f48c WHIRLPOOL 3f827ed72dc447784b7df9953b8771ac8754d239ee86772d6fc8695c73a47139f87e4f7485f8d8fbea681b90c2bbc60350f23ec4214f87fb36fc4bd4a0f81c55
+DIST kparts-5.15.0.tar.xz 153992 SHA256 bc8aa699fa803b2bd12baa464352874f0a255bafbf1376ecdef3a071d2aa4e5e SHA512 c8526a9c78c3b658224c258f17cf4fb939955dbc419299a8cca1aa4401d3e853c9e7d8ded4fd732f956d15cae44d0f2e46bb013798a57576a4f2ab15edbdf06d WHIRLPOOL 7529740e7c739343eb90e13d403ff298fa5409d5ffdb89bec4d5264569478cbe17c3f43d2f35c621431aa2ec52235996e9ec1a3a0c81e62668188ce2f6f48c3e
diff --git a/kde-frameworks/kparts/kparts-5.15.0.ebuild b/kde-frameworks/kparts/kparts-5.15.0.ebuild
new file mode 100644
index 000000000000..ef8fec1aef9b
--- /dev/null
+++ b/kde-frameworks/kparts/kparts-5.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing elaborate user-interface components"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep ktextwidgets)
+"
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index e679e28cce0b..0c3c5e13bead 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1 +1,2 @@
DIST kpeople-5.14.0.tar.xz 57384 SHA256 e51264ffbedb4ca73f3dee54d753f49460d8f8f994f993dfecc31dc9bdb57022 SHA512 98a85af0d47101883da5608fbd9d78417ebf393ae757b9a545d81b375f615387363efc3f5f5e01f0f9012275b806f205ed39b5ccbb68e8cf44203c1c8cf77393 WHIRLPOOL a25e6117d06d354d89fa40c578d460cf853e49cd5ae1e91436531ebbc69adcd6b9ce0460e946fcdc9648428ec32f216d0aaeb8b66f4c2eea9ff0ad935f9cce5b
+DIST kpeople-5.15.0.tar.xz 57368 SHA256 fa650023b92def431e2dca957dc46bf352c471e6992371715dc2e26cd4aad985 SHA512 0f1406822eb205a0fc3c3b66fb723013a3d1dccb80a4080fb8315893ae9d55ddb8f47dec14b333b886b1256959769901527778acf2b029773c9180046ee8fcb9 WHIRLPOOL 9fbbcfdb83f0aa899b99e9a45545921b5b8ce177be3dd484aafc511f2e09d4e96e7d0d301def4da09c35bf316b07caff631bcec9d7c8b364cf06715c916f41b1
diff --git a/kde-frameworks/kpeople/kpeople-5.15.0.ebuild b/kde-frameworks/kpeople/kpeople-5.15.0.ebuild
new file mode 100644
index 000000000000..24581fb56591
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-5.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="KDE contact person abstraction library"
+HOMEPAGE="https://projects.kde.org/projects/frameworks/kpeople"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtsql:5
+ dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+ !net-libs/kpeople:5
+ !net-libs/libkpeople[-minimal(-)]
+"
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 37e8f55ee829..5216692a2fb4 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1 +1,2 @@
DIST kplotting-5.14.0.tar.xz 29484 SHA256 d73bc1b47fe85f20d32ed5585316163b355e72dae76262d09616c79f508c6eb4 SHA512 7e672bf2b80d7032ebc5e65efb7ac5d37fc5c26670f356e6cae75f2051f094dbd3a21450e51ccf2b0086e711cc609c6acdb4bc25a90d7b0ce5f69641bfa66274 WHIRLPOOL 173c7196bb2c3b14869633837c0ddb7c2cffa1e68dfad0a8579b9e8d7beee5cb13d797b32e40e5a29d6069dd2f70146d8477caf57b6e0d4fc9eeeef0f5c0ecae
+DIST kplotting-5.15.0.tar.xz 29488 SHA256 32cf01e2feca7ec11dd56891652958e57d5e3dd0d9bdd2d22da2390cd4a79873 SHA512 a144e7bae273e6f80c2a7a4f3fe8c4c135b133bd1a8bdb22554beeab7751bc15ca81f5a61c46f7e8aa09aadd91907ea2b938c3936da8076043737e92c9f6a4a8 WHIRLPOOL b67fcbb34751e8078dc71b4d79d39edc26f14d8bb82e5d36eed56e2d447654f00357e735f0fd832f3203beb87e7248a41f84158fc55e4e303ec5e0460b86df88
diff --git a/kde-frameworks/kplotting/kplotting-5.15.0.ebuild b/kde-frameworks/kplotting/kplotting-5.15.0.ebuild
new file mode 100644
index 000000000000..ad4b313c9586
--- /dev/null
+++ b/kde-frameworks/kplotting/kplotting-5.15.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing easy data-plotting functions"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index d4ae6dae1d9b..c4e41865f5c5 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1 +1,2 @@
DIST kpty-5.14.0.tar.xz 57180 SHA256 d2b447874cb09d4621b7c66c1db2a5aa6526449f91de9069b02e28f309f5ca53 SHA512 a7fb4f24e043f61d4f09a73bfd550a0299f13a7098e007b2b60f4fb63d90e500c4b3aad1da5dcf542e956a9476c71501e60800a04de1c6ff7c357d7197d31d09 WHIRLPOOL eaaca9b8e5a1b90f0fa6e8f46caf85e4c213318de10816b607ede788d50cacceb7306e6decc7ef1e3716f2c2d9b3f64e0edf68d3be7fb7904ee590a5538c6efe
+DIST kpty-5.15.0.tar.xz 57196 SHA256 603061da7ec31221ce0cc4dfd809ce5df15110f92571fe16b740550ef924d40f SHA512 02355a66f5bb22c9f98441963267df78fdcb571b3ac247692632688dd4c65664b638da15b815f82b236005bd74ddd168c25459c701d3022e0274bdfc613fe9bd WHIRLPOOL 61bc5ab43c626652e08d7bbb12125f91ae7cbacb4901afe6a86d255216cf4322127da42625156bfb9c5d2ecec891c5d0397f2303476e6f84e01fd204df64ad88
diff --git a/kde-frameworks/kpty/kpty-5.15.0.ebuild b/kde-frameworks/kpty/kpty-5.15.0.ebuild
new file mode 100644
index 000000000000..85b5ba4e9fb5
--- /dev/null
+++ b/kde-frameworks/kpty/kpty-5.15.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for pseudo terminal devices and running child processes"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ sys-libs/libutempter
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index d5243e29ac75..bf088c258797 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1 +1,2 @@
DIST kross-5.14.0.tar.xz 135088 SHA256 9b3299d138d3e89ea47a7df98bfdb4ddec95111c1baa945ed7485add8f64f1e8 SHA512 95590d7677747c81c9d3ed705b84979664bf8369cab1b667b09bb2d258d7be1fe0c9ea366313668c4577783c59505c38380c87a5a3708afc20489c527aab94c3 WHIRLPOOL 6b941fca955845f2d27f031ace419b0245dcfc90a28e5f1747d7412ff5d554370d98a569af122764b59e03349333d795ac2e002bc8ae63a1b96e97725a483b4e
+DIST kross-5.15.0.tar.xz 135068 SHA256 006f0dc6989cdd4a126c6cdcd01ad318163eed781293856baef9d9a132d09bd6 SHA512 abb6bf32347f8e762ac666cfda1aaeabb035635c8514b76dcc5feeff42ca1fdf0c07fc91b4de9e005b515eb3defd7cfc3bd98c76dd95fc9a8dc58cdbeb1ef445 WHIRLPOOL a2deb1e8758a953cb4441c9def552da5fbe8a73921b82580ab2ebfb5acaddfd0c9e17263c5509961fc9e3ad9844cd1e31557cafad0e9faaf851cdccb0316cb19
diff --git a/kde-frameworks/kross/kross-5.15.0.ebuild b/kde-frameworks/kross/kross-5.15.0.ebuild
new file mode 100644
index 000000000000..fc9ac23ce713
--- /dev/null
+++ b/kde-frameworks/kross/kross-5.15.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for embedding scripting into applications"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtgui:5
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+ dev-qt/designer:5
+"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 2054c8bffe54..a6e71d35c787 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1 +1,2 @@
DIST krunner-5.14.0.tar.xz 48132 SHA256 a38bf2db6a4cee985480b06b3b8ebdababef7dd10b31211f4bb84390c95bba53 SHA512 e3e8cf2932d7522b84300183b33243441165593b298d072c2d5c3c0cdaeff98a1a71b25b6dc611d59c4196e07932fca548e500a65c7e30555563a110370dac36 WHIRLPOOL 574dd5a239c51904a3d30fe91b5350ede471c749037d3499d487f4f5262ce89fea1730ea1bb4c3dcf59243077296d6876a6d12ad83930985b126d29b3c8ae8eb
+DIST krunner-5.15.0.tar.xz 48120 SHA256 1bd8bae2880c7c085f76f2b573409143bf18d5a1f51ed849d46915a2ca08cb4f SHA512 cd8a5ec3b8837fbdacc3760dced318074165fbf7641b33cb36c31b2999385db8a8114fcbfc6463d8845c0f1bbd971f0305531464977ae6db34b808471f5f1d0c WHIRLPOOL 7f3b7209e9270a020ed928f18427c6655ece52ea6dff4dbcc7f9aa4263c02a062d8c01553183e6ff42d76bb34fb9f69a2203f3ab4bd1ab13429c7e2a5649bc16
diff --git a/kde-frameworks/krunner/krunner-5.15.0.ebuild b/kde-frameworks/krunner/krunner-5.15.0.ebuild
new file mode 100644
index 000000000000..7ec18185b900
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-5.15.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for providing different actions given a string query"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep plasma)
+ $(add_frameworks_dep solid)
+ $(add_frameworks_dep threadweaver)
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index 31bb3c3e7ea7..ae92b9a5f433 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1 +1,2 @@
DIST kservice-5.14.3.tar.xz 267176 SHA256 e79dd26812ced5a09e37753de9bba3f48890eee26c8e3d60b3beef34f45f7474 SHA512 0d91999e2e2445b3f1a77f50b6a6c3260498df212da6692eeddd945125be71c61054251b8b185bc8591049dd2cfb028a4c8ff69f33b13b23d4489c24fd16fafb WHIRLPOOL ee580985c5bb711c1f857487fdb4f104d99085d70d75c07ff8d3e920d77b29ad305173a69e3893b52a53f5b4a0aa57336aeb9c2e853ebcf43493205e1c71ea98
+DIST kservice-5.15.0.tar.xz 267016 SHA256 a308681479b8d8549674b836889c6e2559356314c14a24af15fecca3537ace8f SHA512 b8ddded5cc3a5297019fec9fdf399e26b9333199cf8a4da893ee758c19c16495921b42f69c803dc86fac94f373c5830ecabb48a6e11cd7426b22933006a478b1 WHIRLPOOL 83d9d8f4e2fb8655f07cd1003cfe5aca9b67e4778148c1058b0eb6a55460d5d6fe65b01295784ec362df1682986e03abc65ef44e0a9b130d05349ffc12a9cbe5
diff --git a/kde-frameworks/kservice/kservice-5.15.0.ebuild b/kde-frameworks/kservice/kservice-5.15.0.ebuild
new file mode 100644
index 000000000000..da82a527bd78
--- /dev/null
+++ b/kde-frameworks/kservice/kservice-5.15.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework providing advanced features for plugins, such as file type association and locating"
+LICENSE="LGPL-2 LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ dev-qt/qtdbus:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+ test? ( dev-qt/qtconcurrent:5 )
+"
+
+# requires running kde environment
+RESTRICT="test"
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 6c8585990542..78f260d07a8e 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1 +1,2 @@
DIST ktexteditor-5.14.0.tar.xz 2851508 SHA256 3f3dab1f0d84972d50a7cd97f9641018954014605cff2f6240ffb86331d47fe4 SHA512 7204c7446a84d41f1ced9fe3b116cdbb30ecd8b834bfdd213867a1460d05237c64ac0f58f08c4fe71695062bb6a704bb60b5bfbd0af91877b498b1cbcef19121 WHIRLPOOL 2ccd0c26076581783a980f9756202a410c3206787d4100beca5421504db1cdf90cca7116da5c1477316e122ab91bc0a2f0170b68525cbeb3caa1a94578ba92e2
+DIST ktexteditor-5.15.0.tar.xz 2857676 SHA256 6855afac82e69214c7494e3f37dd5b4988d3297bbd126abcd69c82a8b49e3398 SHA512 740315ab41a3b796a3d43dd2bbdee74091cc288b8994c260f64761de6b05db476a8af094208493172ea93837f1fd78749fe2c36af5755ee907dc67c8713380ae WHIRLPOOL afe68c8c76a9885527d1375931ceef3870b83126145e2f5eb5904d966f1d8c339cb8292c5619e3d0a989e056dafc5cb455869d988c13e1030a13f61d196e6d0c
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.15.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.15.0.ebuild
new file mode 100644
index 000000000000..dba794148f85
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.15.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing a full text editor component"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="git"
+
+RDEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep sonnet)
+ dev-qt/qtgui:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtscript:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ git? ( dev-libs/libgit2:= )
+"
+DEPEND="${RDEPEND}
+ dev-qt/qtxmlpatterns:5
+ test? ( $(add_frameworks_dep kservice) )
+"
+
+RESTRICT="test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package git LibGit2)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 2a845944d8b8..afe91b50d587 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1 +1,2 @@
DIST ktextwidgets-5.14.0.tar.xz 305616 SHA256 995a1313865abd540c06f890e00cf97b00fa6b9fb7c1a11bae3c4bd1b192a65a SHA512 10305a4064289f44989780c2720bfb2aebbc8a4a2d881df2da6cc0af917a75d4ec1741d27f8277d2a2267bfe9c123fa6fe6c8479d4aabd15df2c287bb7760bb2 WHIRLPOOL 3abef0e03d13e48e3f7cf2b12efb0d2c2f09ec28e1d4988046aac0ed190b85352f589ed5e9c47c366e38135ae6646232f579f3b4b957b79af41254f604934304
+DIST ktextwidgets-5.15.0.tar.xz 305604 SHA256 888a1c5ba0601fba08e5d97f9badcaf3cfea84cc8b6b1b913fbb3c45a5cc2de5 SHA512 9ba0f967f9976a69d1311352d3df2c4b890ee6f6b1a9bc6be80646ff8b8ae54255ae06c712f9cdb419e7b54cbb09bb56af37d661ce73047532450fa517b30cd6 WHIRLPOOL 7295b897e614c0a7713598b17f7736dacb4561e003f3b20c868b429890b9087585518ae8ed5e9f230948e6899303bb35ba33f296b0b19380248fc4030a3b6997
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.15.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.15.0.ebuild
new file mode 100644
index 000000000000..1ff3959c0655
--- /dev/null
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.15.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep sonnet)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 89b7fef734a5..5d67ae776246 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1 +1,2 @@
DIST kunitconversion-5.14.0.tar.xz 619600 SHA256 1813bb9ccef2309b6e7383c5f39fad822c3ad5320b832d21a92dacf73a451e20 SHA512 97e62ec21b4177a7828b6ee2bd18f941f7f81e03c7bcdd46c0598c91cee51fde9530d1a67b7b929134895107877015da14822614a7bd0fb7da8018fc44a8a5c3 WHIRLPOOL 03556262cc4e83c0e6d3b39a7eaf44dc36e182466a41f568a7fc30d5070c9efc49c7d65bb534d5e0f67aaef586042c4a703d0d60e0d9db60031724970d1a6818
+DIST kunitconversion-5.15.0.tar.xz 619824 SHA256 aec7a2d9f3d8e5d4a9b73cb36d68aa9ab26f8adffc98844f3a22c6c18fd177e1 SHA512 fbdc8dbbcd4a4c6191c9c242afd458c762f953cfcfa65727626db046425ada05fb26348643c8456d987ff07d62237fb58da1790d814ff6d2c0b472315657068a WHIRLPOOL 7774de234d31f47f7da59b4fbc27966adfee1aae059da157287434426d705aaef4e9039f5983a8b0777ee36250eeccde702bd0f8eb8a4a8ba07dad1e68bf141d
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.15.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.15.0.ebuild
new file mode 100644
index 000000000000..c055120367b6
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.15.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for converting units"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep ki18n)
+ dev-qt/qtnetwork:5
+ dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index 94fa8a2e2a09..d494f006ed26 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1 +1,2 @@
DIST kwallet-5.14.0.tar.xz 284616 SHA256 9eda8d24256d57caf8eb6bc30c02f6a7ef860b2157e09a4f7f9e9710abaa61ea SHA512 9efc0b767a9a4b714b0c649cf52652d2a284e126c53f15e308dd01d19109694dea8ffdb04aa93fad6572141c53c1fb9b604ef96e6638f0cdfd84277726c86cac WHIRLPOOL 33690717c13a75214093618eaaa27ef8f8d69dc7dc49aa4ff0fb6429f9639d4c10078aad53e845642b01058dfed3b5081d370d55de14380dc38e614b0e8e23a6
+DIST kwallet-5.15.0.tar.xz 285324 SHA256 220d997fdc87c42a1a836d8f39fffafeb384499df113e0aacc9f9ea636d927ad SHA512 824d1c49a78e147a4b75087452709f9d5ac0936feafbfb3f3922e302642e13848983caafbfddd6be17a535347db730e89fdeb9753852718710de61ea74376f17 WHIRLPOOL 8a2bdcf722ad17607779fe63f1dab3955d8e30bb0a8377cafb6c3646d8c4a871f9714dcda675bcd3ebbf32b78fc699f2aaeeec39889fc6bc223c09ee2022bd4d
diff --git a/kde-frameworks/kwallet/kwallet-5.15.0.ebuild b/kde-frameworks/kwallet/kwallet-5.15.0.ebuild
new file mode 100644
index 000000000000..9af54c76a59d
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.15.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework providing desktop-wide storage for passwords"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="gpg"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ dev-libs/libgcrypt:0=
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ gpg? (
+ $(add_kdeapps_dep gpgmepp)
+ app-crypt/gpgme
+ )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package gpg Gpgme)
+ $(cmake-utils_use_find_package gpg KF5Gpgmepp)
+ )
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index d03f136d9c5f..8d3c9d23729f 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1 +1,2 @@
DIST kwidgetsaddons-5.14.0.tar.xz 2129068 SHA256 5bf08e2b4c8454a541be332334a1742dd2f79c8683c7a3a9141f9fe248f9196f SHA512 2dbddea641c9c60c8b8a4a49640065cce5b458dcbbac071bc8dc24abea760b651d6ef1ea588fc31c69ecd6e2ea6c2739cb1dcccff9b99e4408915b500159ea44 WHIRLPOOL 6975bf25f00008487fac2876a216ee4dc50417cfb344af72fcab7f824157b7ade7b2f1b0c60cffc81502f1bf52112ddb43777e04d126779e57a54db421a9af2e
+DIST kwidgetsaddons-5.15.0.tar.xz 2127512 SHA256 c3e0fed862a3053481a526f923e79cdef890cec93105fe95080e7cd78ad36fd9 SHA512 c7dde9890d4e6d97147f688e42dcac7bb3822e2ae557b891c6d12057d5dcb5978962faf179b0b2a83c905fe7afad5677c2aabfd1751cb1f1fa13b631f48faa17 WHIRLPOOL fd8dc60d1b6b907faa306b5bd407d4f038bdefc73977abd01e54f5cb11121f640859d016869ceaaa9df0dbb8bc342461a4b3c7a4dabb4721cd6b6b8f6344d2b0
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.15.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.15.0.ebuild
new file mode 100644
index 000000000000..5381e946714f
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+ test? ( dev-qt/designer:5 )
+"
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index a10be9c2aea4..154510141278 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1 +1,2 @@
DIST kwindowsystem-5.14.0.tar.xz 163072 SHA256 016bc2f5aeda773095c5aa6f58907768a75dc0929b3316c2973a3e1b6a5ef839 SHA512 4994f70cfc751b57026581d761f6073104a17c8e7df52498a2f13a1b08150c7ffb51d4abcd51a343c9601d9f734f108ee8a743a8b2f9f6df4e0a111da81c7bde WHIRLPOOL 0b983133cd2d511ce718597888a8b47505f82cf3abc8199302849edf73503dbee29f24cfce18a27603fb3b6370aa4b3e4bc9c133b5a671261211ec232d302729
+DIST kwindowsystem-5.15.0.tar.xz 162948 SHA256 1db9fcc1a109556cc41896b17427a031bfa7bdaf6bab36b415f348e3d75317f5 SHA512 f0408ea95440801395397391975ff3582c58774a1eb4a672d2dfcd5468b10a4240fdbbece67f21ae84218cc1cc7736465c11482c2c904bb7888ad7e736273cb2 WHIRLPOOL 99778861a94248fb3f76238c917a9b6c31d2e067267d76f5b43d8a953b3937469c6b61ba7036f5d2a97343a5f4a022dfe5ce6053e790cdbc23dfc944ce4ae174
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.15.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.15.0.ebuild
new file mode 100644
index 000000000000..3bf517e0d16f
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.15.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing access to certain properties and features of the window manager"
+LICENSE="LGPL-2+ MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls X"
+
+RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXfixes
+ x11-libs/libxcb
+ x11-libs/xcb-util-keysyms
+ )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+ X? ( x11-proto/xproto )
+"
+
+RESTRICT="test"
+
+DOCS=( "docs/README.kstartupinfo" )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package X X11)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index f0f1d89c936a..477dc6c5fcb0 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1 +1,2 @@
DIST kxmlgui-5.14.0.tar.xz 863108 SHA256 60b0acd3115697ac9185a1f9a102db98667b29a618d329f41a73766ae01975c8 SHA512 201da1b9886c6aeb0bf413d38b4c5d5c7b09c9fa9f32d686825bb2bc564e1b8727689fd344baeb95aaa63ff07afda9ac668e2cb7df67fea4ad07aa3ed5d59255 WHIRLPOOL 240cc5966163b292c0198a379c6dc3b2dc73d1008695d08302cfe12517c5985714c613217a6ccbe93a2772ae1978874c35472b9529111ae4582ef95c1ec7a4c2
+DIST kxmlgui-5.15.0.tar.xz 862992 SHA256 b57d2bcfc27f74556228dabcf914bb82e3bfea40ca1ce85ec222cd3f9da8b5b4 SHA512 244c18303beb4ec38760951af3c3aea5eb287b7868d234ca65f16bfb847f1d47fbe3123f0aaf92a4be5fc72b000546f31d6f78ce009279a4a205f5ff56844559 WHIRLPOOL 0bc784ee6778be2a1b0999ee0863be2e043410b612ce673246042cb7e9d6f8935198b70b4d83ede67ad073033d6cb89523f82ce57a24417e36f61ade6951eff7
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.15.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.15.0.ebuild
new file mode 100644
index 000000000000..089dca8c41ca
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.15.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
+KEYWORDS="~amd64 ~x86"
+LICENSE="LGPL-2+"
+IUSE="attica"
+
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ attica? ( $(add_frameworks_dep attica) )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package attica KF5Attica)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index 77a5c20e7a16..44e23e7f35b1 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1 +1,2 @@
DIST kxmlrpcclient-5.14.0.tar.xz 28120 SHA256 1ae0518f82b45a0e391b47fd8439a900ef3b34fe3a9b5c60b4754aa9cfb5418f SHA512 3c3b53f5d5ee53f4f55759ab2f3e716f67ccb7befe314faaf0eadebf70c362a6464810d6257ed109d2c49789659afaab1417efcb7dc6be0a516db4a6e02600ae WHIRLPOOL f51c361c95a1553f73d6508a9606717528cba24546f900835f88fd617f4f5e54a44fc761df54d69f5d5c04f84e59c2b40efa9fa002ef9d335240a00554852399
+DIST kxmlrpcclient-5.15.0.tar.xz 28124 SHA256 63903b1b934f7234cb3bacedcdbb66368e211b9932bc342378fecb3686c5930d SHA512 3c5c12349299df32ee0ab9ddcd1dcbfe1e84871ce96f290e2dc40092102238b0e79a99e144363c4dd4deb34cf0be50afef29adf59fed46bd60383f654db7cb9b WHIRLPOOL 8c0baefa91c6e5f7056923d5143c5d81e7896a3c09977ae4267b3f165289786621c07c2eca2d6463029fa3762795fc8e2d200f19df900b598f264e78135fb1b1
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.15.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.15.0.ebuild
new file mode 100644
index 000000000000..1cd348469d46
--- /dev/null
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.15.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_DOXYGEN="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ dev-qt/qtxml:5
+ !<kde-plasma/plasma-workspace-5.2.95
+"
+DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index cde2ea387f5e..3da5b6da305c 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1 +1,2 @@
DIST modemmanager-qt-5.14.0.tar.xz 98440 SHA256 9311ceb56534402ccf05530fac3b8a731ddecc23a4c5d30c0fcfc8faeb034fda SHA512 ef084afd3f306453ba6579359e01a2b7ad1884db34992abbb5faa5cdd95cfae2c4d38df2ee9ffc2e7f08188f0bd889d5dbb29a6f24f602e7e1bd5ad7c0addbc5 WHIRLPOOL 7d3e32f58790c98cffd0ca1c31a8d9744744b7ff0892bc2243b651be0cd49a1198d1905eff8a9b3e8698a0da1cdbd5d984b469795f0d115672f34e8566991a88
+DIST modemmanager-qt-5.15.0.tar.xz 98492 SHA256 29e7968ebaa0fe76f3b7430faff0784ee42dbdecfc74366d286d7cdda518b1eb SHA512 c8a733359a6d6bf96087a9577938e22fb480a2f4cfd509a12fdd0dc8f748c066c3f66e05c5a336ce6f6f311202dbca989544351f6929402d5fb1e6ba29b3ba86 WHIRLPOOL ed0a6725637af194229bf5430b77aa49a1b543d56239d9b369224a104606b461d83cfbed10e7ad5336a673238f21947c98b1ed3dafcb680310cacdcc6b883a06
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.15.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.15.0.ebuild
new file mode 100644
index 000000000000..b969818bf951
--- /dev/null
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.15.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="ModemManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtdbus:5
+ dev-qt/qtxml:5
+ net-misc/modemmanager
+ !kde-plasma/libmm-qt
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index 83d23d4b0951..ececf9b93707 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1 +1,2 @@
DIST networkmanager-qt-5.14.0.tar.xz 155372 SHA256 06690249ce6f3343c2109d9f89264c5f82994e92392c1fc1324d8a4ffecb5ac8 SHA512 8ee63ba73ce5999f137e387eb5ba6d4450f425a8599cfc537d0ec94ed1126375f21512f8899c5ee2de9504880bfdafc64b9fedb9b3d163ca6e23baa0b1040384 WHIRLPOOL 6a9484a359197e126952fa681bf9b45010c46258e0a211cb89f657736089d59233a40f8e555490987d7ab08aae88f3b4683c24946ce4ebbbfff9c5542c1a0eea
+DIST networkmanager-qt-5.15.0.tar.xz 155388 SHA256 178df9bc4d84cdc9e4d97e1435d42575530f38f2e78e01c36e9d3f9798490350 SHA512 04cd3c47e00ef181a24fcf0e8d9140b2a58400f1f05f13ae631c92a2ba1a3891c98c801d745d4a0cb3e67ec419ba52b38725363e4a9d9efcba28dca4b6c37ab0 WHIRLPOOL 8b995994d5d8a169b40ee375e8e5db34bfa5c29cc24bead5d3acec922c91e7945e32598236be001a77bb3433853d466953668b42ee4eb7c0298630889218769c
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.15.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.15.0.ebuild
new file mode 100644
index 000000000000..9483dddde667
--- /dev/null
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.15.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="NetworkManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="teamd"
+
+RDEPEND="
+ dev-qt/qtdbus:5
+ dev-qt/qtnetwork:5
+ || (
+ >=net-misc/networkmanager-0.9.10.0[consolekit,teamd=]
+ >=net-misc/networkmanager-0.9.10.0[systemd,teamd=]
+ )
+ !kde-frameworks/libnm-qt
+ !kde-plasma/libnm-qt
+ !net-libs/libnm-qt:5
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 321cf215a216..99c30674893a 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1 +1,2 @@
DIST plasma-framework-5.14.0.tar.xz 4012636 SHA256 b09a2587e2cd957cf77faf2ac180dda6c2ce40184a31cc9bbd2ad151c685cf9b SHA512 6df7bd6ab8c8498c3cddc7e8880b77dc965f9473d9db4f354619e7f1aa330a37eb1c4e1621cc2b6ca6c8e3406c2eb1b61e14cd5dfcbf1fff9dce6ba27181a16c WHIRLPOOL 73598960c6156621bdd6c9085ffbdbd47f6b336e4da647cbd2a8ec04f1eb5f70df8538c2b19938c0573e5b80ed9e4c10c14d635ef013992b0e9a6cc0585a8908
+DIST plasma-framework-5.15.0.tar.xz 4013292 SHA256 1a5dc97d3b8151cc49a4720ef4b63da59adad6a727106212a6c68e258989666c SHA512 0f47a3eb3fb9846bfcdfdeb70f88c07e1ea72d7fd78c1d30491f16be0a20b34f0af26c9d9a88636f4a4dd4fb2e2850c5607e485c44e846e145cb38f8bf64e7c6 WHIRLPOOL d309e5a055494dc2bd7af6dc305df7971800acd9612bdf911fe0ee0c0b31650a78e9793f50ff18781e370de4a489a7e306db9e227da438abab85acf8c219aeec
diff --git a/kde-frameworks/plasma/plasma-5.15.0.ebuild b/kde-frameworks/plasma/plasma-5.15.0.ebuild
new file mode 100644
index 000000000000..22a2bd471419
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.15.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KMNAME="${PN}-framework"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Plasma framework"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="egl opengl X"
+
+RDEPEND="
+ $(add_frameworks_dep kactivities)
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kdeclarative)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kpackage)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtquickcontrols:5
+ dev-qt/qtscript:5
+ dev-qt/qtsql:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ egl? ( media-libs/mesa[egl] )
+ opengl? (
+ dev-qt/qtgui:5[opengl(+),-gles2]
+ virtual/opengl
+ )
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${RDEPEND}
+ $(add_frameworks_dep kdoctools)
+ dev-qt/qtquick1:5
+ X? ( x11-proto/xproto )
+"
+
+RESTRICT="test"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package egl EGL)
+ $(cmake-utils_use_find_package opengl OpenGL)
+ $(cmake-utils_use_find_package X X11)
+ $(cmake-utils_use_find_package X XCB)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index d7359e50f262..395fbe2a2813 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1 +1,2 @@
DIST solid-5.14.0.tar.xz 265616 SHA256 91e8c41ec86e220409340064f7ca09113a3da29a20f7a031635e649bf8add97e SHA512 36f1418674583a3140515ed1b6c895cd89fbc420eade6d9e070ee8a46bc57645197688e72506b739cc9de08032aebf18549b24f4583cb2b1139a04402673e9b4 WHIRLPOOL 66e984936bd581b76caef9da333710a5ac5833d44e3b5ca5effe45f360326ea728cdf46b1480ffe8872cb4c6b6b0068f134da0a598b68a4cfc975c3f3562d0c2
+DIST solid-5.15.0.tar.xz 265228 SHA256 ca715a7f23fe6477fce6cfefc3a63655cd7526406b493ac678fb31ecac5f2804 SHA512 370849c53face423e0feec5884998e0d95e0453a47272cf00d26f90dd0d3dbe9788b04cfc9e184d270749db816d99d9caee2e3088aa50aed0e55c0bce46e38b0 WHIRLPOOL 95fce66e6566c2fc1e38239e1636e4b2a4fddf277da2317b955f87c7f7e6bd9a44e19dba3533f25ee51809b94848dd4e06957f0d190a670b42a358d0de670bf3
diff --git a/kde-frameworks/solid/solid-5.15.0.ebuild b/kde-frameworks/solid/solid-5.15.0.ebuild
new file mode 100644
index 000000000000..0fb737f30c74
--- /dev/null
+++ b/kde-frameworks/solid/solid-5.15.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing platform independent hardware discovery, abstraction, and management"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ sys-fs/udisks:2
+ virtual/udev
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+ test? ( dev-qt/qtconcurrent:5 )
+"
+pkg_postinst() {
+ kde5_pkg_postinst
+
+ if ! has_version "app-misc/media-player-info" ; then
+ einfo "For media player support, install app-misc/media-player-info"
+ fi
+}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index b983b3e28aa4..e45a2ce75934 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1 +1,2 @@
DIST sonnet-5.14.0.tar.xz 277648 SHA256 8993d7baed751f9e443c175168e3124c08e08257bb8cd7ae71fac8ddfb4fd61a SHA512 30b30a856518d1c2b3caa2fb193d68faf02f50eb561aa8b2696233a35f2685e329ea1050de40e271e7d708e72201ef7b11702484f0f80b952d82a4d92e270118 WHIRLPOOL 957d53d14051a4097705ef44a15458c26a8e7ed9196d35e4ad5be998afa1a426a4b785132271da2702e2712995280316d6fe5edb357ef42f47b900b7cac14b35
+DIST sonnet-5.15.0.tar.xz 279080 SHA256 a0be638acbed60a513e1aa086bc86a8e6876341e4f981617e55f6edfbe2e1aa3 SHA512 509fdc58d2cbd12d0207eb9f37cb1a358728c08eb00d284ab2ea1a872dc4693d4d7e43fe1d00989df344e90f868b5dc2d430afa55774dc41668653d11e4c7107 WHIRLPOOL 7a178efbc13082c7b5b17e725786a7d0b58ec1d5d9dfef6588b8ba72199a63547635b91bee0bce01026346924f1de207aa35e2b700c334750488a5b0eecafd6c
diff --git a/kde-frameworks/sonnet/sonnet-5.15.0.ebuild b/kde-frameworks/sonnet/sonnet-5.15.0.ebuild
new file mode 100644
index 000000000000..167ffd7060d8
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-5.15.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for providing spell-checking capabilities through abstraction of popular backends"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE="+aspell hunspell nls"
+
+RDEPEND="
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ aspell? ( app-text/aspell )
+ hunspell? ( app-text/hunspell )
+"
+DEPEND="${RDEPEND}
+ nls? ( dev-qt/linguist-tools:5 )
+"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package aspell)
+ $(cmake-utils_use_find_package hunspell)
+ )
+
+ kde5_src_configure
+}
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index 44f7c649e302..ece74c3de0d5 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1 +1,2 @@
DIST threadweaver-5.14.0.tar.xz 1408632 SHA256 c302ca2d75ebec76c1d57afd040610267198caf0ef5daa6023e1caf228c46d07 SHA512 1624a01d11698445f5cd9bd673eaa927ada9d7b7b7794c60a58973170da261b28ded168d1b8764cc007ba93f2050e1e4186d9837cd09ef133eafa6e77a7f7ccc WHIRLPOOL c3a383009f2acc40ef104bb3b9412c15c652ecabec7a3ecec22a636a1dbe2caf70cef125477bb76185b054078945e6f1361a58f72c4fd2c315df55af37df7753
+DIST threadweaver-5.15.0.tar.xz 1408576 SHA256 f89ec571fe47249956e14d209cb2867d879401554ae60227e12355c94d4e0aa6 SHA512 7febb703766da251ca7db697e4bd636fef0f89db792e902dfe45524464bcd4b92711e0c11ebed1e31e9b5145ae5cc4f0318d1ce21bd9b9a769ec773f81527dcc WHIRLPOOL 14c55b6a4ddf217ab51224606e4fc13add01ce53a37263286e867cb7db391558a88ee8b97a84743e2da79d7f4964bef767a30fc8b924df368dbe9e51f51b30ca
diff --git a/kde-frameworks/threadweaver/threadweaver-5.15.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.15.0.ebuild
new file mode 100644
index 000000000000..9e9bf737c3e2
--- /dev/null
+++ b/kde-frameworks/threadweaver/threadweaver-5.15.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+ comment_add_subdirectory benchmarks
+ kde5_src_prepare
+}
diff --git a/mail-client/alpine/alpine-2.00-r6.ebuild b/mail-client/alpine/alpine-2.00-r6.ebuild
new file mode 100644
index 000000000000..d4855a9c4e5e
--- /dev/null
+++ b/mail-client/alpine/alpine-2.00-r6.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils flag-o-matic autotools multilib toolchain-funcs
+
+CHAPPA_PL=115
+DESCRIPTION="alpine is an easy to use text-based based mail and news client"
+HOMEPAGE="http://www.washington.edu/alpine/ http://patches.freeiz.com/alpine/"
+SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2
+ chappa? ( http://patches.freeiz.com/alpine/patches/alpine-2.00/all.patch.gz
+ -> ${P}-chappa-${CHAPPA_PL}-all.patch.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads topal +chappa"
+
+DEPEND="virtual/pam
+ >=net-libs/c-client-2007f-r4[topal=,chappa=]
+ >=sys-libs/ncurses-5.1
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ ldap? ( net-nds/openldap )
+ kerberos? ( app-crypt/mit-krb5 )
+ spell? ( app-text/aspell )
+ topal? ( >=net-mail/topal-72 )"
+RDEPEND="${DEPEND}
+ app-misc/mime-types
+ !onlyalpine? ( !mail-client/pine )
+ !<=net-mail/uw-imap-2004g"
+
+pkg_setup() {
+ if use smime && use topal ; then
+ ewarn "You can not have USE='smime topal'. Assuming topal is more important."
+ fi
+}
+
+src_prepare() {
+ use chappa && epatch "${DISTDIR}/${P}-chappa-${CHAPPA_PL}-all.patch.gz"
+ use topal && epatch /usr/share/topal/patches/"${P}".patch-{1,2}
+
+ # do not use the bundled c-client
+ ebegin "Unbundling the c-client library"
+ rm -rf "${S}"/imap
+ local f
+ while read f ; do
+ sed -i -e \
+ 's~^#include[[:blank:]]".*/c-client/\(.*\)"~#include <imap/\1>~g' "$f"
+ done < <(find "${S}" -name "*.c" -o -name "*.h")
+ eend $?
+
+ epatch "${FILESDIR}"/2.00-lpam.patch
+ epatch "${FILESDIR}"/2.00-lcrypto.patch
+ epatch "${FILESDIR}"/2.00-c-client.patch
+ epatch "${FILESDIR}"/2.00-qa.patch
+ use chappa && epatch "${FILESDIR}/2.00-qa-chappa-${CHAPPA_PL}.patch"
+
+ eautoreconf
+}
+
+src_configure() {
+ local myconf="--without-tcl
+ --with-system-pinerc=/etc/pine.conf
+ --with-system-fixed-pinerc=/etc/pine.conf.fixed"
+ #--disable-debug"
+ # fixme
+ # --with-system-mail-directory=DIR?
+
+ if use ssl; then
+ myconf+=" --with-ssl
+ --with-ssl-include-dir=/usr
+ --with-ssl-lib-dir=/usr/$(get_libdir)
+ --with-ssl-certs-dir=/etc/ssl/certs"
+ else
+ myconf+="--without-ssl"
+ fi
+ econf \
+ $(use_with ldap) \
+ $(use_with passfile passfile .pinepwd) \
+ $(use_with kerberos krb5) \
+ $(use_with threads pthread) \
+ $(use_with spell interactive-spellcheck /usr/bin/aspell) \
+ $(use_enable nls) \
+ $(use_with ipv6) \
+ $(use topal || use_with smime) \
+ ${myconf}
+}
+
+src_compile() {
+ emake AR=$(tc-getAR)
+}
+
+src_install() {
+ if use onlyalpine ; then
+ dobin alpine/alpine
+ doman doc/alpine.1
+ else
+ emake DESTDIR="${D}" install
+ doman doc/rpdump.1 doc/rpload.1
+ fi
+
+ dodoc NOTICE README*
+
+ if use doc ; then
+ dodoc doc/brochure.txt doc/tech-notes.txt
+
+ docinto html/tech-notes
+ dohtml -r doc/tech-notes/
+ fi
+}
diff --git a/mail-client/balsa/balsa-2.5.2-r1.ebuild b/mail-client/balsa/balsa-2.5.2-r1.ebuild
new file mode 100644
index 000000000000..97b19fd00ae4
--- /dev/null
+++ b/mail-client/balsa/balsa-2.5.2-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Email client for GNOME"
+HOMEPAGE="http://pawsa.fedorapeople.org/balsa/"
+SRC_URI="http://pawsa.fedorapeople.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+IUSE="crypt gnome gtkhtml gnome-keyring +gtkspell kerberos ldap libnotify libressl rubrica sqlite ssl webkit xface"
+REQUIRED_USE="gtkhtml? ( !webkit )"
+
+# TODO: esmtp can be optional, do we want it?
+RDEPEND="
+ >=dev-libs/glib-2.32:2
+ >=x11-libs/gtk+-3.4.0:3
+ dev-libs/gmime:2.6
+ >=net-libs/libesmtp-1.0.3:=
+ net-mail/mailbase
+ media-libs/libcanberra:=[gtk3]
+ x11-themes/hicolor-icon-theme
+ x11-themes/gnome-icon-theme
+ crypt? ( >=app-crypt/gpgme-1.0:= )
+ gnome? ( >=x11-libs/gtksourceview-3.2.0:3.0 )
+ gnome-keyring? ( app-crypt/libsecret )
+ gtkhtml? ( gnome-extra/gtkhtml:4.0 )
+ sqlite? ( >=dev-db/sqlite-2.8:= )
+ libnotify? ( >=x11-libs/libnotify-0.7:= )
+ gtkspell? ( >=app-text/gtkspell-3.0.3:3 )
+ !gtkspell? ( app-text/enchant )
+ kerberos? ( app-crypt/mit-krb5 )
+ ldap? ( net-nds/openldap )
+ rubrica? ( dev-libs/libxml2:2 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ webkit? ( net-libs/webkit-gtk:4 )
+ xface? ( >=media-libs/compface-1.5.1:= )
+"
+DEPEND="${RDEPEND}
+ app-text/yelp-tools
+ dev-util/intltool
+ virtual/pkgconfig
+ sys-devel/gettext
+"
+
+src_prepare() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README TODO docs/*"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=750516
+ sed -i -e 's/@TOOLKIT_CATEGORIES@//' balsa-mailto-handler.desktop.in.in || die
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=750515
+ echo "src/balsa-print-object.c" >> po/POTFILES.in || die
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ local myconf
+
+ if use crypt ; then
+ myconf+=" --with-gpgme=gpgme-config"
+ else
+ myconf+=" --without-gpgme"
+ fi
+
+ if use webkit || use gtkhtml; then
+ if use gtkhtml ; then
+ myconf+=" --with-html-widget=gtkhtml4"
+ else
+ myconf+=" --with-html-widget=webkit2"
+ fi
+ else
+ myconf+=" --with-html-widget=no"
+ fi
+
+ gnome2_src_configure \
+ --disable-pcre \
+ --enable-gregex \
+ --enable-threads \
+ --with-gmime=2.6 \
+ --with-canberra \
+ $(use_with gnome) \
+ $(use_with gnome gtksourceview) \
+ $(use_with gnome-keyring libsecret) \
+ $(use_with gtkspell) \
+ $(use_with kerberos gss) \
+ $(use_with ldap) \
+ $(use_with libnotify) \
+ $(use_with rubrica) \
+ $(use_with sqlite) \
+ $(use_with ssl) \
+ $(use_with xface compface) \
+ ${myconf}
+}
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 9b6e3045b7b2..8038f183ac61 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,5 +1,6 @@
DIST claws-mail-3.10.1.tar.xz 6669376 SHA256 4cb7c42995b1a5d7567a0909ce2080c05eec74a4d966da7a7a872f5eba018459 SHA512 b001683522a9a2bb9b1680f8ff608172a3fe9c4f556c8aa818b4259801bc92f722093850218377aba3a5fe549f0f09164c2e7623042bca0dbf3fd1071436dc80 WHIRLPOOL 0bcf92138081cd6fe0bef18a85acc9939fe61ab87faafc27a0ded24e321b4a35c0a1f6736aee6b0eef7d2d451c037cddcb280fece1a1c38c2e8f20c45ef685f7
DIST claws-mail-3.11.1.tar.xz 6908772 SHA256 d72381b6c9f872638cae2c208925e19bd5d4a9476bb9049742f1ba27c3efd133 SHA512 ae4f0d4299647e201e94111a6eb26cce1d6a72045c317b879a07847cfcc75c35dfdf571f2826d365800586f5798131ce95985f746f7dbdd878f3766370ab3570 WHIRLPOOL 3ddf72a97990e087cd0c8a0417d6f57ee607e62bc5d644c6fb1892f349e9646a76664888a4540b6d22f5afe065e6e1e58d63188387cc829fda6fefe55ea4183d
DIST claws-mail-3.12.0.tar.xz 6615768 SHA256 272ad6aaa066a4f5e0f26ed151b23b836a65190e6b45c049479b5e7677e4d6ca SHA512 f6eb3eb9f252f93aab21305118eca34abab3a75abb6619a7ab4a79338a640de6012eeb9ffb4a1317cc3c1abfc830b8399e82a93b430aa72c131e14f9f630b321 WHIRLPOOL 202da4117b2678a55b06f97b83e2d267719f1dcadcac5d09c1f0224409c53e2a19b6a8c0eea4d5762348c1c9f206a657496c4efb72aa9bc363e25662f21a63ab
+DIST claws-mail-3.13.0.tar.xz 6582288 SHA256 365076806c63dd8a1d6f08ead6a863a01ba05819c1a860ea7bbee8fcda4bf93a SHA512 5682a5e4642870a69374dc304d446db9dfd427bf8bd6f924a1193366098e07ca63623caefa454d62b413b8bb614fc7f1c0853852a1c44908c8541e554f3439e2 WHIRLPOOL 09a1bdcd5ba34a8cc359ec9659e54b3958c59f939b1eca36489b1db3163cb9cedb70c478896e769563781cd2044aaa90ece3c00d6dc90f1ea3533f884ec5999f
DIST claws-mail-3.9.0.tar.bz2 7425870 SHA256 ed70975a5056b3ffc4fe6e977f0d9606febc1499763c090241b029a73ff24e65 SHA512 5cb17106fee4549464eca03c8630fa4c46ee7b236c51eefbeb00f8a3602937cbe6073617f47a94732983ec3bc8838bc80e567f2e55cce1b30db453f350f590e8 WHIRLPOOL 4f2bef9d2240037eb6fd9b62b48c7173fddbd4fcb7258d4c5e0ee0e322894d741532c2ad716fbac96e465f87fe428fa6e926a04e7e8de1beaf68b8cb0a12c9a4
DIST claws-mail-3.9.3.tar.bz2 9463943 SHA256 53aacceab45af6c3ee1f0668956a6e3328d21ac4efcfc0aa8dfd7d7552a62372 SHA512 b9e7a686650bfc496bf7e6b8ca196a890e3c5b2cbce486f7940245e42dc7a9fc53d81f688d88e298f310fd71e378ea4ea29a57c8510cccb6312d4ba1c79e3d42 WHIRLPOOL 58a7c431e214e82f6629e881eaf04b8f587f5aab1f5e990f9e20dff875821e1b0e8e7c0ab7ab47329f20a2e384dd203ea8b3afbe58175f3a48c963917311359e
diff --git a/mail-client/claws-mail/claws-mail-3.13.0.ebuild b/mail-client/claws-mail/claws-mail-3.13.0.ebuild
new file mode 100644
index 000000000000..fc78b6df5788
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.13.0.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils multilib gnome2-utils eutils python-single-r1
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="http://www.claws-mail.org/"
+
+SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
+REQUIRED_USE="libcanberra? ( notification )
+ libindicate? ( notification )
+ libnotify? ( notification )
+ networkmanager? ( dbus )
+ smime? ( pgp )"
+
+# Plugins are all integrated or dropped since 3.9.1
+PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
+ !!mail-client/claws-mail-archive
+ !!mail-client/claws-mail-att-remover
+ !!mail-client/claws-mail-attachwarner
+ !!mail-client/claws-mail-clamd
+ !!mail-client/claws-mail-fancy
+ !!mail-client/claws-mail-fetchinfo
+ !mail-client/claws-mail-gdata
+ !!mail-client/claws-mail-geolocation
+ !!mail-client/claws-mail-gtkhtml
+ !!mail-client/claws-mail-mailmbox
+ !!mail-client/claws-mail-newmail
+ !!mail-client/claws-mail-notification
+ !!mail-client/claws-mail-perl
+ !!mail-client/claws-mail-python
+ !!mail-client/claws-mail-rssyl
+ !!mail-client/claws-mail-spam-report
+ !!mail-client/claws-mail-tnef-parse
+ !!mail-client/claws-mail-vcalendar
+ !!mail-client/claws-mail-address_keeper
+ !!mail-client/claws-mail-pdf-viewer"
+
+COMMONDEPEND=">=sys-devel/gettext-0.12.1
+ gdata? ( >=dev-libs/libgdata-0.17.1 )
+ gtk3? ( x11-libs/gtk+:3 )
+ !gtk3? ( >=x11-libs/gtk+-2.20:2 )
+ pda? ( >=app-pda/jpilot-0.99 )
+ gnutls? ( >=net-libs/gnutls-2.2.0 )
+ ldap? ( >=net-nds/openldap-2.0.7 )
+ pgp? ( >=app-crypt/gpgme-0.4.5 )
+ valgrind? ( dev-util/valgrind )
+ dbus? ( >=dev-libs/dbus-glib-0.60 )
+ spell? ( >=app-text/enchant-1.0.0 )
+ imap? ( >=net-libs/libetpan-0.57 )
+ nntp? ( >=net-libs/libetpan-0.57 )
+ startup-notification? ( x11-libs/startup-notification )
+ session? ( x11-libs/libSM
+ x11-libs/libICE )
+ archive? ( app-arch/libarchive
+ >=net-misc/curl-7.9.7 )
+ bogofilter? ( mail-filter/bogofilter )
+ notification? (
+ libnotify? ( x11-libs/libnotify )
+ libcanberra? ( media-libs/libcanberra[gtk] )
+ libindicate? ( dev-libs/libindicate:3[gtk] )
+ dev-libs/glib:2
+ )
+ smime? ( >=app-crypt/gpgme-0.4.5 )
+ calendar? ( >=net-misc/curl-7.9.7 )
+ pdf? ( app-text/poppler:=[cairo] )
+ spam-report? ( >=net-misc/curl-7.9.7 )
+ webkit? ( >=net-libs/webkit-gtk-1.0:2
+ >=net-libs/libsoup-gnome-2.26:2.4 )
+"
+
+DEPEND="${PLUGINBLOCK}
+ ${COMMONDEPEND}
+ app-arch/xz-utils
+ xface? ( >=media-libs/compface-1.4 )
+ virtual/pkgconfig"
+
+RDEPEND="${COMMONDEPEND}
+ pdf? ( app-text/ghostscript-gpl )
+ clamav? ( app-antivirus/clamav )
+ networkmanager? ( net-misc/networkmanager )
+ perl? ( dev-lang/perl:= )
+ python? ( ${PYTHON_DEPS}
+ >=dev-python/pygtk-2.10.3 )
+ rss? ( net-misc/curl
+ dev-libs/libxml2 )
+ app-misc/mime-types
+ x11-misc/shared-mime-info"
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug crash-dialog)
+ $(use_enable valgrind valgrind)
+ $(use_enable doc manual)
+ $(use_enable gtk3)
+ $(use_enable ipv6)
+ $(use_enable ldap)
+ $(use_enable dbus dbus)
+ $(use_enable networkmanager)
+ $(use_enable pda jpilot)
+ $(use_enable session libsm)
+ $(use_enable spell enchant)
+ $(use_enable gnutls)
+ $(use_enable startup-notification)
+ $(use_enable xface compface)
+ $(use_enable archive archive-plugin)
+ $(use_enable bogofilter bogofilter-plugin)
+ $(use_enable calendar vcalendar-plugin)
+ $(use_enable clamav clamd-plugin)
+ $(use_enable gdata gdata-plugin)
+ $(use_enable notification notification-plugin)
+ $(use_enable pdf pdf_viewer-plugin)
+ $(use_enable perl perl-plugin)
+ $(use_enable pgp pgpmime-plugin)
+ $(use_enable pgp pgpinline-plugin)
+ $(use_enable pgp pgpcore-plugin)
+ $(use_enable python python-plugin)
+ $(use_enable rss rssyl-plugin)
+ $(use_enable spamassassin spamassassin-plugin)
+ $(use_enable sieve managesieve-plugin)
+ $(use_enable smime smime-plugin)
+ $(use_enable spam-report spam_report-plugin)
+ $(use_enable webkit fancy-plugin)
+ --enable-new-addrbook
+ --enable-nls
+ --enable-acpi_notifier-plugin
+ --enable-address_keeper-plugin
+ --enable-att_remover-plugin
+ --enable-attachwarner-plugin
+ --enable-fetchinfo-plugin
+ --enable-mailmbox-plugin
+ --enable-newmail-plugin
+ --enable-tnef_parse-plugin
+ --disable-generic-umpc
+ --disable-bsfilter-plugin
+ )
+
+ # libetpan is needed if user wants nntp or imap functionality
+ if use imap || use nntp; then
+ myeconfargs+=( --enable-libetpan )
+ else
+ myeconfargs+=( --disable-libetpan )
+ fi
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+ autotools-utils_src_install
+
+ # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+ # => also install it in /usr/share/pixmaps for other desktop envs
+ # => also install higher resolution icons in /usr/share/icons/hicolor/...
+ insinto /usr/share/pixmaps
+ doins ${PN}.png
+ local res resdir
+ for res in 64x64 128x128 ; do
+ resdir="/usr/share/icons/hicolor/${res}/apps"
+ insinto ${resdir}
+ newins ${PN}-${res}.png ${PN}.png
+ done
+
+ docinto tools
+ dodoc tools/README*
+
+ domenu ${PN}.desktop
+
+ einfo "Installing extra tools"
+ cd "${S}"/tools
+ exeinto /usr/$(get_libdir)/${PN}/tools
+ doexe *.pl *.py *.conf *.sh
+ doexe tb2claws-mail update-po uudec uuooffice
+
+ # kill useless files
+ rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
+ ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
+ ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
+ ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/mail-client/mail-notification/mail-notification-5.4-r9.ebuild b/mail-client/mail-notification/mail-notification-5.4-r9.ebuild
new file mode 100644
index 000000000000..6458da6adb7c
--- /dev/null
+++ b/mail-client/mail-notification/mail-notification-5.4-r9.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2 eutils multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="Status icon informing about new mail"
+HOMEPAGE="http://www.nongnu.org/mailnotify/ https://github.com/epienbroek/mail-notification"
+
+GIT_REVISION="eab5c13" # Same as Fedora
+SRC_URI="https://github.com/epienbroek/${PN}/tarball/${GIT_REVISION} -> ${PN}-${GIT_REVISION}.tar.gz"
+S="${WORKDIR}/epienbroek-${PN}-${GIT_REVISION}"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-linux"
+SLOT="0"
+LICENSE="GPL-3"
+IUSE="+gnome-keyring libressl sasl +sound ssl sylpheed"
+
+LANGS="bg ca cs de es fr ja nl pl pt pt_BR ru sr sr@Latn sv"
+for lang in ${LANGS}; do
+ IUSE+=" linguas_${lang}"
+done
+
+# gmime is actually optional, but it's used by so much of the package
+# it's pointless making it optional. gnome-keyring is required for
+# several specific access methods, and thus linked to those USE flags
+# instead of adding a keyring USE flag.
+RDEPEND="
+ x11-libs/gtk+:3
+ >=dev-libs/glib-2.14:2
+ >=gnome-base/gconf-2.6
+ >=gnome-base/libgnomeui-2.14
+ dev-libs/dbus-glib
+ dev-libs/gmime:2.6
+ >=x11-libs/libnotify-0.4.1
+ gnome-keyring? ( gnome-base/libgnome-keyring )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ sasl? ( >=dev-libs/cyrus-sasl-2 )
+ sound? ( media-libs/gstreamer:0.10 )
+ sylpheed? ( mail-client/sylpheed )
+"
+DEPEND="${RDEPEND}
+ app-text/scrollkeeper
+ dev-util/gob
+ sys-devel/gettext
+ virtual/pkgconfig
+ >=dev-util/intltool-0.35.0
+"
+# this now uses JB (the Jean-Yves Lefort's Build System) as a build system
+# instead of autotools, this is a little helper function that basically does
+# the same thing as use_enable
+use_var() {
+ echo "${2:-$1}=$(usex $1)"
+}
+
+src_prepare() {
+ sed -i -e '/jb_rule_set_install_message/d' \
+ -e '/jb_rule_add_install_command/d' \
+ jbsrc/jb.c || die
+
+ # Ensure we never append -Werror
+ sed -i -e 's/ -Werror//' jb jbsrc/jb.c || die
+
+ # We are not Ubuntu, and this could be the cause of #215281
+ epatch "${FILESDIR}/${P}-remove-ubuntu-special-case.patch"
+
+ # Apply Fedora patches
+ # Fix gcc warning
+ epatch "${FILESDIR}/${PN}-jb-gcc-format.patch"
+ # Support aarch64
+ epatch "${FILESDIR}/${PN}-aarch64.patch"
+ # Fix build with latest libc
+ epatch "${FILESDIR}/${PN}-dont-link-against-bsd-compat.patch"
+}
+
+src_configure() {
+ set -- \
+ ./jb configure destdir="${D}" prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" \
+ sysconfdir="${EPREFIX}/etc" localstatedir="${EPREFIX}/var" cc="$(tc-getCC)" \
+ cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \
+ scrollkeeper-dir="${EPREFIX}/var/lib/scrollkeeper" \
+ $(use_var gnome-keyring gmail) \
+ $(use_var gnome-keyring imap) \
+ $(use_var gnome-keyring pop3) \
+ $(use_var sasl) \
+ $(use_var ssl) \
+ $(use_var sylpheed)
+ echo "$@"
+ "$@" || die
+}
+
+src_compile() {
+ ./jb build || die
+}
+
+src_install() {
+ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" ./jb install || die
+ dodoc NEWS README AUTHORS TODO TRANSLATING
+ rm -rf "${ED}/var/lib/scrollkeeper"
+
+ einfo "Cleaning up locales..."
+ for lang in ${LANGS}; do
+ use "linguas_${lang}" && {
+ einfo "- keeping ${lang}"
+ continue
+ }
+ rm -Rf "${D}"/usr/share/locale/"${lang}" || die
+ done
+}
diff --git a/mail-client/nail/nail-12.4-r3.ebuild b/mail-client/nail/nail-12.4-r3.ebuild
new file mode 100644
index 000000000000..98b25cdb3d97
--- /dev/null
+++ b/mail-client/nail/nail-12.4-r3.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+HOMEPAGE="http://heirloom.sourceforge.net/"
+DESCRIPTION="an enhanced mailx-compatible mail client"
+LICENSE="BSD"
+
+MY_PN="mailx"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://sourceforge/project/heirloom/heirloom-${MY_PN}/${PV}/${MY_P}.tar.bz2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="libressl ssl net kerberos"
+
+RDEPEND="
+ net? (
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ kerberos? ( virtual/krb5 )
+ )
+ !mail-client/mailx
+ !net-mail/mailutils
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+undef() {
+ sed -i -e "/$1/s:#define:#undef:" config.h || die
+}
+
+droplib() {
+ sed -i -e "/$1/s:^:#:" LIBS || die
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-debian.patch \
+ "${FILESDIR}"/${P}-openssl-1.patch
+ # Do not strip the binary
+ sed -i -e '/STRIP/d' Makefile
+}
+
+src_configure() {
+ # Build config.h and LIBS, neccesary to tweak the config
+ # use -j1 because it will produce bogus output otherwise
+ emake -j1 config.h LIBS || die
+
+ # Logic to 'configure' the package
+
+ if ! use ssl || ! use net ; then
+ undef 'USE_\(OPEN\)\?SSL'
+ droplib -lssl
+ fi
+
+ if ! use kerberos || ! use net ; then
+ undef 'USE_GSSAPI'
+ droplib -lgssapi_krb5
+ fi
+
+ if ! use net ; then
+ undef 'HAVE_SOCKETS'
+ fi
+}
+
+src_compile() {
+ # No configure script to check for and set this
+ tc-export CC
+
+ emake \
+ CPPFLAGS="${CPPFLAGS} -D_GNU_SOURCE" \
+ PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc \
+ SENDMAIL="${EPREFIX}/usr/sbin/sendmail" \
+ MAILSPOOL='/var/spool/mail' \
+ || die "emake failed"
+}
+
+src_install () {
+ # Use /usr/sbin/sendmail by default and provide an example
+ cat <<- EOSMTP >> nail.rc
+
+ # Use the local sendmail (/usr/sbin/sendmail) binary by default.
+ # (Uncomment the following line to use a SMTP server)
+ #set smtp=localhost
+
+ # Ask for CC: list too.
+ set askcc
+ EOSMTP
+
+ emake DESTDIR="${D}" \
+ UCBINSTALL=$(type -p install) \
+ PREFIX="${EPREFIX}"/usr SYSCONFDIR="${EPREFIX}"/etc install \
+ || die
+
+ dodoc AUTHORS README || die
+
+ dodir /bin
+ dosym ../usr/bin/mailx /bin/mail || die
+ dosym mailx /usr/bin/mail || die
+ dosym mailx /usr/bin/Mail || die
+
+ dosym mailx.1 /usr/share/man/man1/mail.1 || die
+ dosym mailx.1 /usr/share/man/man1/Mail.1 || die
+}
diff --git a/mail-client/sylpheed/sylpheed-3.4.3-r1.ebuild b/mail-client/sylpheed/sylpheed-3.4.3-r1.ebuild
new file mode 100644
index 000000000000..febe5932947c
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-3.4.3-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A lightweight email client and newsreader"
+HOMEPAGE="http://sylpheed.sraoss.jp/"
+SRC_URI="http://${PN}.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt ipv6 ldap libressl nls oniguruma pda spell ssl xface"
+
+CDEPEND="x11-libs/gtk+:2
+ crypt? ( app-crypt/gpgme )
+ ldap? ( net-nds/openldap )
+ nls? ( sys-devel/gettext )
+ oniguruma? ( dev-libs/oniguruma )
+ pda? ( app-pda/jpilot )
+ spell? ( app-text/gtkspell:2 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )"
+RDEPEND="${CDEPEND}
+ app-misc/mime-types
+ net-misc/curl"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ xface? ( media-libs/compface )"
+
+src_configure() {
+ local htmldir=/usr/share/doc/${PF}/html
+ econf \
+ $(use_enable crypt gpgme) \
+ $(use_enable ipv6) \
+ $(use_enable ldap) \
+ $(use_enable oniguruma) \
+ $(use_enable pda jpilot) \
+ $(use_enable spell gtkspell) \
+ $(use_enable ssl) \
+ $(use_enable xface compface) \
+ --with-manualdir=${htmldir}/manual \
+ --with-faqdir=${htmldir}/faq \
+ --disable-updatecheck
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog* NEWS* PLUGIN* README* TODO*
+
+ doicon *.png
+ domenu *.desktop
+
+ cd plugin/attachment_tool
+ docinto plugin/attachment_tool
+ emake DESTDIR="${D}" install-plugin
+ dodoc README
+}
diff --git a/mail-client/sylpheed/sylpheed-3.4.3.ebuild b/mail-client/sylpheed/sylpheed-3.4.3.ebuild
index 5bd6d3803ee5..1b53b30d7e68 100644
--- a/mail-client/sylpheed/sylpheed-3.4.3.ebuild
+++ b/mail-client/sylpheed/sylpheed-3.4.3.ebuild
@@ -22,7 +22,7 @@ CDEPEND="x11-libs/gtk+:2
oniguruma? ( dev-libs/oniguruma )
pda? ( app-pda/jpilot )
spell? ( app-text/gtkspell:2 )
- ssl? ( dev-libs/openssl )"
+ ssl? ( dev-libs/openssl:0 )"
RDEPEND="${CDEPEND}
app-misc/mime-types
net-misc/curl"
diff --git a/mail-filter/gld/gld-1.7-r3.ebuild b/mail-filter/gld/gld-1.7-r3.ebuild
new file mode 100644
index 000000000000..cdcff43eba9b
--- /dev/null
+++ b/mail-filter/gld/gld-1.7-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A standalone anti-spam greylisting algorithm on top of Postfix"
+HOMEPAGE="http://www.gasmi.net/gld.html"
+SRC_URI="http://www.gasmi.net/down/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="libressl postgres"
+# Not adding a mysql USE flag. The package defaults to it, so we will too.
+DEPEND="sys-libs/zlib
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ !postgres? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:*[server] )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -i gld.conf \
+ -e 's:^LOOPBACKONLY=.*:LOOPBACKONLY=1:' \
+ -e 's:^#USER=.*:USER=nobody:' \
+ -e 's:^#GROUP=.*:GROUP=nobody:' \
+ || die "sed gld.conf failed"
+
+ sed -i Makefile.in \
+ -e '/ -c /{s|-O2|$(CFLAGS)|g}' \
+ -e '/ -o /{s|-O2|$(CFLAGS) $(LDFLAGS)|g}' \
+ -e '/strip/d' \
+ || die "sed Makefile.in failed"
+
+ sed -i tables.{my,pg}sql \
+ -e '/ip char/s/16/39/' \
+ || die "sed sql tables failed"
+}
+
+src_configure() {
+ tc-export CC
+ # It's kind of weird. $(use_with postgres pgsql) won't work if you don't
+ # use it...
+ if use postgres ; then
+ myconf="${myconf} --with-pgsql"
+ fi
+
+ econf ${myconf}
+}
+
+src_install() {
+ dobin gld
+
+ insinto /etc
+ newins gld.conf gld.conf.example
+
+ dodoc HISTORY README*
+
+ insinto /usr/share/${PN}/sql
+ doins *.pgsql *-whitelist.sql "${FILESDIR}"/tables.sql
+
+ newinitd "${FILESDIR}"/gld.rc gld
+}
+
+pkg_preinst() {
+ elog "Please read the README file in /usr/share/doc/${PF} for"
+ elog "details on how to setup gld."
+ elog
+ elog "The sql files have been installed to /usr/share/${PN}/sql."
+ if [[ $REPLACING_VERSIONS == "1.7-r1" ]]; then
+ elog "You might want to use the ALTER_TABLE command to change the"
+ elog "ip field width to 39 chars to accomodate ipv6 addresses."
+ elog "Please see your sql server documentation."
+ fi
+}
diff --git a/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild b/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild
new file mode 100644
index 000000000000..a91b2c869a1d
--- /dev/null
+++ b/mail-filter/imapfilter/imapfilter-2.5.7-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="An IMAP mail filtering utility"
+HOMEPAGE="http://imapfilter.hellug.gr"
+SRC_URI="https://github.com/lefcha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="libressl"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ dev-libs/libpcre
+ dev-lang/lua:*"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS NEWS README samples/*"
+
+src_prepare() {
+ sed -i -e "/^PREFIX/s:/usr/local:${EPREFIX}/usr:" \
+ -e "/^MANDIR/s:man:share/man:" \
+ -e "/^CFLAGS/s:CFLAGS =:CFLAGS +=:" \
+ -e "/^CFLAGS/s/-O//" \
+ src/Makefile || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ default
+ doman doc/imapfilter.1 doc/imapfilter_config.5
+}
diff --git a/mail-filter/imapfilter/imapfilter-2.5.7.ebuild b/mail-filter/imapfilter/imapfilter-2.5.7.ebuild
index 0fafc178a58e..90abab6786fc 100644
--- a/mail-filter/imapfilter/imapfilter-2.5.7.ebuild
+++ b/mail-filter/imapfilter/imapfilter-2.5.7.ebuild
@@ -14,9 +14,9 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-RDEPEND="dev-libs/openssl
+RDEPEND="dev-libs/openssl:0
dev-libs/libpcre
- >=dev-lang/lua-5.1"
+ dev-lang/lua:*"
DEPEND="${RDEPEND}"
DOCS="AUTHORS NEWS README samples/*"
diff --git a/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild b/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild
new file mode 100644
index 000000000000..4fac329b41ce
--- /dev/null
+++ b/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils eutils toolchain-funcs
+
+DESCRIPTION="DomainKeys Identified Mail library from Alt-N Inc"
+HOMEPAGE="http://libdkim.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="Apache-2.0 yahoo-patent-license-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl static-libs"
+
+DEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ app-arch/unzip"
+RDEPEND="
+ !mail-filter/libdkim-exim
+ dev-libs/openssl"
+
+S="${WORKDIR}/${PN}/src"
+
+src_prepare() {
+ ecvs_clean
+ cp "${FILESDIR}"/debianize/* "${S}"
+ epatch "${FILESDIR}"/patches/*.patch
+ epatch "${FILESDIR}"/libdkim-extra-options.patch
+
+ # Bug 476772
+ if ! use static-libs; then
+ sed -i \
+ -e '/^TARGETS/s/libdkim.a//' \
+ -e '/install -m 644 libdkim.a/d' \
+ Makefile.in || die 'sed on Makefile.in failed'
+ fi
+
+ # Bug 476770
+ tc-export AR
+
+ autotools-utils_src_prepare
+}
+
+src_install() {
+ autotools-utils_src_install
+ dodoc ../README
+}
diff --git a/mail-filter/opensmtpd-extras/opensmtpd-extras-5.7.1-r1.ebuild b/mail-filter/opensmtpd-extras/opensmtpd-extras-5.7.1-r1.ebuild
new file mode 100644
index 000000000000..4249381f9dc6
--- /dev/null
+++ b/mail-filter/opensmtpd-extras/opensmtpd-extras-5.7.1-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="Extra tables, filters, and various other addons for OpenSMTPD"
+HOMEPAGE="https://github.com/OpenSMTPD/OpenSMTPD-extras"
+SRC_URI="https://www.opensmtpd.org/archives/${P}.tar.gz"
+
+LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+MY_COMPONENTS="
+ filter-clamav
+ filter-dkim-signer
+ filter-dnsbl
+ filter-lua
+ filter-monkey
+ filter-pause
+ filter-perl
+ filter-python
+ filter-regex
+ filter-spamassassin
+ filter-stub
+ filter-trace
+ filter-void
+
+ queue-null
+ queue-python
+ queue-ram
+ queue-stub
+
+ scheduler-python
+ scheduler-ram
+ scheduler-stub
+
+ table-ldap
+ table-mysql
+ table-passwd
+ table-postgres
+ table-python
+ table-redis
+ table-socketmap
+ table-sqlite
+ table-stub
+"
+IUSE="${MY_COMPONENTS} libressl luajit"
+
+# Deps:
+# mysql needs -lmysqlclient
+# sqlite needs -lsqlite3
+# redis needs -lhiredis
+# postgres requires -lpq
+# ldap uses internal library and requires no deps
+# spamassassin uses internal library and requires no deps
+# clamav uses internal library and requires no deps
+# dnsbl needs -lasr
+# python requires python, currently pegged at 2.7
+# lua requires any lua version
+
+DEPEND="mail-mta/opensmtpd
+ dev-libs/libevent
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ filter-python? ( dev-lang/python:2.7 )
+ filter-perl? ( dev-lang/perl )
+ filter-lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua:* ) )
+ filter-dnsbl? ( net-libs/libasr )
+ table-sqlite? ( dev-db/sqlite:3 )
+ table-mysql? ( virtual/mysql )
+ table-postgres? ( dev-db/postgresql:* )
+ table-redis? ( dev-libs/hiredis )
+ table-python? ( dev-lang/python:2.7 )
+ scheduler-python? ( dev-lang/python:2.7 )
+ queue-python? ( dev-lang/python:2.7 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ eautoreconf
+}
+src_configure() {
+ econf \
+ --with-privsep-user=smtpd \
+ --with-privsep-path=/var/empty \
+ --sysconfdir=/etc/opensmtpd \
+ --with-lua-type=$(usex luajit luajit lua) \
+ $(for use in $MY_COMPONENTS; do use_with $use; done)
+}
diff --git a/mail-filter/policyd/policyd-1.82-r2.ebuild b/mail-filter/policyd/policyd-1.82-r2.ebuild
new file mode 100644
index 000000000000..55092b84654c
--- /dev/null
+++ b/mail-filter/policyd/policyd-1.82-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Policy daemon for postfix and other MTAs"
+HOMEPAGE="http://policyd.sf.net/"
+
+# This is not available through SF mirrors
+SRC_URI="http://policyd.sourceforge.net/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="libressl"
+DEPEND="virtual/mysql
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-post182.patch"
+ epatch "${FILESDIR}/${PN}-makefile.patch"
+ sed -i -e "s/gcc/$(tc-getCC)/" Makefile
+
+ ebegin "Applying config patches"
+ sed -i -e s:UID=0:UID=65534:g \
+ -e s:GID=0:GID=65534:g \
+ -e s:DAEMON=0:DAEMON=1:g \
+ -e s:DEBUG=3:DEBUG=0:g \
+ -e s:DATABASE_KEEPALIVE=0:DATABASE_KEEPALIVE=1:g \
+ policyd.conf || die "sed failed"
+ eend
+}
+
+src_compile() {
+ emake build || die "emake build failed"
+}
+
+src_install() {
+ insopts -o root -g nobody -m 0750
+ mv cleanup policyd_cleanup
+ mv stats policyd_stats
+
+ dosbin policyd policyd_cleanup policyd_stats
+
+ insopts -o root -g nobody -m 0640
+ insinto /etc
+ doins policyd.conf
+
+ insopts -o root -g nobody -m 0700
+ exeinto /etc/cron.hourly
+ newexe "${FILESDIR}/${PN}-cleanup.cron" ${PN}-cleanup.cron
+
+ dodoc ChangeLog DATABASE.mysql README doc/support.txt
+
+ newinitd "${FILESDIR}/${PN}.rc" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+}
+
+pkg_postinst() {
+ elog "You will need to create the database using the script DATABASE.mysql"
+ elog "in /usr/share/doc/${PF}/"
+ elog "Read the mysql section of the README.txt for details."
+ elog
+ elog "To use policyd with postfix, update your /etc/postfix/main.cf file by adding"
+ elog " check_policy_service inet:127.0.0.1:10031"
+ elog "to your smtpd_recipient_restrictions line, or similar."
+ elog
+ elog "Also remember to start the daemon at boot:"
+ elog " rc-update add policyd default"
+ elog
+ elog "Read the documentation for more info."
+}
diff --git a/mail-filter/popfile/popfile-1.1.3-r1.ebuild b/mail-filter/popfile/popfile-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..ac4e44ba8a35
--- /dev/null
+++ b/mail-filter/popfile/popfile-1.1.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Anti-spam bayesian filter"
+HOMEPAGE="http://getpopfile.org"
+SRC_URI="http://getpopfile.org/downloads/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cjk ipv6 libressl mysql ssl xmlrpc"
+
+RDEPEND="virtual/perl-Digest-MD5
+ virtual/perl-MIME-Base64
+ dev-perl/DBD-SQLite
+ dev-perl/HTML-Tagset
+ dev-perl/HTML-Template
+ dev-perl/TimeDate
+ dev-perl/DBI
+ virtual/perl-Digest
+ cjk? ( dev-perl/Encode-compat
+ dev-perl/Text-Kakasi )
+ mysql? ( dev-perl/DBD-mysql )
+ ipv6? ( dev-perl/IO-Socket-INET6 )
+ ssl? ( !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ dev-perl/IO-Socket-SSL
+ dev-perl/Net-SSLeay )
+ xmlrpc? ( dev-perl/PlRPC )"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+ local f
+ for f in `find ./ -type f`; do
+ edos2unix "${f}"
+ done
+}
+
+src_install() {
+ dodoc *.change*
+ rm -rf *.change* license
+
+ insinto /usr/share/${PN}
+ doins -r *
+
+ fperms 755 /usr/share/${PN}/{popfile,insert,pipe,bayes}.pl
+
+ dosbin "${FILESDIR}"/${PN}
+}
diff --git a/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild b/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild
new file mode 100644
index 000000000000..c38bf17a64ea
--- /dev/null
+++ b/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs user
+
+DESCRIPTION="A milter-based application to provide Sender-ID verification service"
+HOMEPAGE="http://sourceforge.net/projects/sid-milter/"
+SRC_URI="mirror://sourceforge/sid-milter/${P}.tar.gz"
+
+LICENSE="Sendmail-Open-Source"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 libressl"
+
+DEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ >=sys-libs/db-3.2:*
+ || ( mail-filter/libmilter mail-mta/sendmail )"
+RDEPEND="${DEPEND}
+ sys-apps/openrc"
+
+pkg_setup() {
+ enewgroup milter
+ # mail-milter/spamass-milter creates milter user with this home directory
+ # For consistency reasons, milter user must be created here with this home directory
+ # even though this package doesn't need a home directory for this user (#280571)
+ enewuser milter -1 -1 /var/lib/milter milter
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-nopra_on_spf1.patch
+ epatch "${FILESDIR}"/${P}-as-needed.patch
+
+ local CC="$(tc-getCC)"
+ local ENVDEF=""
+ use ipv6 && ENVDEF="${ENVDEF} -DNETINET6"
+ sed -e "s:@@CC@@:${CC}:" \
+ -e "s:@@CFLAGS@@:${CFLAGS}:" \
+ -e "s:@@LDFLAGS@@:${LDFLAGS}:" \
+ -e "s:@@ENVDEF@@:${ENVDEF}:" \
+ "${FILESDIR}/gentoo-config.m4" > "${S}/devtools/Site/site.config.m4" \
+ || die "failed to generate site.config.m4"
+}
+
+src_compile() {
+ emake -j1
+}
+
+src_install() {
+ dodir /usr/bin
+ emake -j1 DESTDIR="${D}" SUBDIRS=sid-filter \
+ SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
+ install
+
+ newinitd "${FILESDIR}/sid-filter.init-r1" sid-filter
+ newconfd "${FILESDIR}/sid-filter.conf" sid-filter
+
+ # man build is broken; do man page installation by hand
+ doman */*.8
+
+ # some people like docs
+ dodoc RELEASE_NOTES *.txt sid-filter/README
+}
diff --git a/mail-filter/spamdyke/metadata.xml b/mail-filter/spamdyke/metadata.xml
index 151d9449c37c..e8a572fa95e4 100644
--- a/mail-filter/spamdyke/metadata.xml
+++ b/mail-filter/spamdyke/metadata.xml
@@ -13,6 +13,6 @@ features to enhance qmail.
Best of all, using spamdyke does not require patching or recompiling qmail!
</longdescription>
<use>
- <flag name='tls'>Enables TLS protocol for spamdyke</flag>
+ <flag name='ssl'>Enables TLS protocol for spamdyke</flag>
</use>
</pkgmetadata>
diff --git a/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild b/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild
new file mode 100644
index 000000000000..a37bc83aa85f
--- /dev/null
+++ b/mail-filter/spamdyke/spamdyke-4.3.0-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils autotools
+
+DESCRIPTION="A drop-in connection-time spam filter for qmail"
+HOMEPAGE="http://www.spamdyke.org/"
+SRC_URI="http://www.spamdyke.org/releases/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +ssl"
+
+DEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )"
+RDEPEND="${DEPEND}
+ virtual/qmail"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc46.patch
+ echo "# Configuration option for ${PN}" > ${PN}.conf
+ if use ssl; then
+ echo "tls-certificate-file=/var/qmail/control/clientcert.pem" \
+ >> ${PN}.conf
+ fi
+ echo "graylist-level=always-create-dir" >> ${PN}.conf
+ echo "graylist-dir=/var/tmp/${PN}/graylist" >> ${PN}.conf
+ echo "reject-empty-rdns" >> ${PN}.conf
+ echo "reject-unresolvable-rdns" >> ${PN}.conf
+ echo "dns-blacklist-entry=zen.spamhaus.org" >> ${PN}.conf
+ echo "local-domains-file=/var/qmail/control/rcpthosts" >> ${PN}.conf
+ sed -i \
+ -e "/STRIP_CMD/d" \
+ Makefile.in || die "sed on Makefile.in failed"
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable ssl tls) || die "econf failed"
+ cd ../utils
+ econf || die "econf failed in utils"
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}" || die "emake failed"
+ cd ../utils
+ emake CFLAGS="${CFLAGS}" || die "emake in utils died"
+}
+
+src_install() {
+ dobin ${PN} || die "Installing ${PN} binary failed"
+ insinto /etc/${PN}
+ doins ${PN}.conf || die "Installing ${PN} configuration file failed"
+ dodir /var/tmp/${PN}/graylist
+ fowners -R qmaild /var/tmp/${PN}/graylist
+ cd ../utils
+ dobin domain2path || die "Installing domain2path binary failed"
+ cd ../documentation
+ dodoc {Changelog,INSTALL,UPGRADING}.txt
+ dohtml FAQ.html \
+ README.html \
+ README_ip_file_format.html \
+ README_rdns_directory_format.html \
+ README_rdns_file_format.html
+}
+
+pkg_postinst() {
+ elog "In /var/qmail/control/conf-smtpd insert the line:"
+ elog "QMAIL_SMTP_PRE=\"${QMAIL_SMTP_PRE} spamdyke -f /etc/${PN}/${PN}.conf\""
+ elog "Run spamdyke with the '-h' flag to see the available options and"
+ elog "update /etc/spamdyke/spamdyke.conf accordingly"
+}
diff --git a/mail-filter/spamdyke/spamdyke-4.3.0.ebuild b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
index e3491cace8b0..18dbbc7848c4 100644
--- a/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
+++ b/mail-filter/spamdyke/spamdyke-4.3.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="2"
+EAPI="5"
+
inherit eutils autotools
DESCRIPTION="A drop-in connection-time spam filter for qmail"
@@ -12,9 +13,9 @@ SRC_URI="http://www.spamdyke.org/releases/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="+tls"
+IUSE="+ssl"
-DEPEND="tls? ( dev-libs/openssl )"
+DEPEND="ssl? ( dev-libs/openssl )"
RDEPEND="${DEPEND}
virtual/qmail"
@@ -23,7 +24,7 @@ S=${WORKDIR}/${P}/${PN}
src_prepare() {
epatch "${FILESDIR}"/${P}-gcc46.patch
echo "# Configuration option for ${PN}" > ${PN}.conf
- if use tls; then
+ if use ssl; then
echo "tls-certificate-file=/var/qmail/control/clientcert.pem" \
>> ${PN}.conf
fi
@@ -41,7 +42,7 @@ src_prepare() {
src_configure() {
econf \
- $(use_enable tls) || die "econf failed"
+ $(use_enable ssl tls) || die "econf failed"
cd ../utils
econf || die "econf failed in utils"
}
diff --git a/mail-mta/netqmail/netqmail-1.06-r3.ebuild b/mail-mta/netqmail/netqmail-1.06-r3.ebuild
new file mode 100644
index 000000000000..08dd2eb6b677
--- /dev/null
+++ b/mail-mta/netqmail/netqmail-1.06-r3.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENQMAIL_PV=20080406
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20070417
+QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_CVE=vu555316.patch
+
+QMAIL_BIGTODO_PV=103
+QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+
+QMAIL_LARGE_DNS='qmail-103.patch'
+
+inherit eutils qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer agent"
+HOMEPAGE="
+ http://netqmail.org
+ http://cr.yp.to/qmail.html
+ http://qmail.org
+"
+SRC_URI="mirror://qmail/${P}.tar.gz
+ https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
+ http://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+ http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
+ !vanilla? (
+ highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+ qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+ ssl? ( http://shupp.org/patches/${QMAIL_TLS_F} )
+ )
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
+REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
+RESTRICT="test"
+
+DEPEND="
+ !mail-mta/qmail
+ net-mail/queue-repair
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ sys-apps/groff
+"
+RDEPEND="
+ !mail-mta/courier
+ !mail-mta/esmtp
+ !mail-mta/exim
+ !mail-mta/mini-qmail
+ !mail-mta/msmtp[mta]
+ !mail-mta/nullmailer
+ !mail-mta/postfix
+ !mail-mta/qmail-ldap
+ !mail-mta/sendmail
+ !<mail-mta/ssmtp-2.64-r2
+ !>=mail-mta/ssmtp-2.64-r2[mta]
+ >=sys-apps/ucspi-tcp-0.88-r17
+ ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
+ virtual/daemontools
+ >=net-mail/dot-forward-0.71-r3
+ virtual/checkpassword
+ authcram? ( >=net-mail/cmd5checkpw-0.30 )
+ ${DEPEND}
+"
+
+pkg_setup() {
+ if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
+ eerror
+ eerror "The QMAIL_PATCH_DIR variable for custom patches"
+ eerror "has been removed from ${PN}. If you need custom patches"
+ eerror "you should create a copy of this ebuild in an overlay."
+ eerror
+ die "QMAIL_PATCH_DIR is not supported anymore"
+ fi
+
+ qmail_create_users
+}
+
+src_unpack() {
+ genqmail_src_unpack
+ use qmail-spp && qmail_spp_src_unpack
+
+ unpack ${P}.tar.gz
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PV}-exit.patch
+ epatch "${FILESDIR}"/${PV}-readwrite.patch
+ epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
+ epatch "${FILESDIR}"/${PV}-fbsd-utmpx.patch
+
+ ht_fix_file Makefile*
+
+ if ! use vanilla; then
+ # This patch contains relative paths and needs to be cleaned up.
+ sed 's~^--- ../../~--- ~g' \
+ <"${DISTDIR}"/${QMAIL_TLS_F} \
+ >"${T}"/${QMAIL_TLS_F}
+ use ssl && epatch "${T}"/${QMAIL_TLS_F}
+ use ssl && epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+ use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
+
+ if use qmail-spp; then
+ if use ssl; then
+ epatch "${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
+ else
+ epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
+ fi
+ cd "${WORKDIR}"
+ epatch "${FILESDIR}"/genqmail-20080406-ldflags.patch
+ cd -
+ fi
+ fi
+
+ qmail_src_postunpack
+
+ # Fix bug #33818 but for netqmail (Bug 137015)
+ if ! use authcram; then
+ einfo "Disabled CRAM_MD5 support"
+ sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c
+ else
+ einfo "Enabled CRAM_MD5 support"
+ fi
+}
+
+src_compile() {
+ qmail_src_compile
+ use qmail-spp && qmail_spp_src_compile
+}
+
+src_install() {
+ qmail_src_install
+}
+
+pkg_postinst() {
+ qmail_queue_setup
+ qmail_rootmail_fixup
+ qmail_tcprules_build
+
+ qmail_config_notice
+ qmail_supervise_config_notice
+ elog
+ elog "If you are looking for documentation, check those links:"
+ elog "https://www.gentoo.org/doc/en/qmail-howto.xml"
+ elog " -- qmail/vpopmail Virtual Mail Hosting System Guide"
+ elog "http://www.lifewithqmail.com/"
+ elog " -- Life with qmail"
+ elog
+}
+
+pkg_preinst() {
+ qmail_tcprules_fixup
+}
+
+pkg_config() {
+ # avoid some weird locale problems
+ export LC_ALL=C
+
+ qmail_config_fast
+ qmail_tcprules_config
+ qmail_tcprules_build
+
+ use ssl && qmail_ssl_generate
+}
diff --git a/mail-mta/opensmtpd/opensmtpd-5.7.3_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.7.3_p1-r1.ebuild
new file mode 100644
index 000000000000..ef9a28680ae7
--- /dev/null
+++ b/mail-mta/opensmtpd/opensmtpd-5.7.3_p1-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator
+
+DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD"
+HOMEPAGE="http://www.opensmtpd.org/"
+MY_P="${P}"
+if [ $(get_last_version_component_index) -eq 4 ]; then
+ MY_P="${PN}-$(get_version_component_range 4-)"
+fi
+SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz"
+
+LICENSE="ISC BSD BSD-1 BSD-2 BSD-4"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl pam +mta"
+
+DEPEND="!libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ sys-libs/zlib
+ pam? ( virtual/pam )
+ sys-libs/db:=
+ dev-libs/libevent
+ app-misc/ca-certificates
+ net-mail/mailbase
+ net-libs/libasr
+ !mail-mta/courier
+ !mail-mta/esmtp
+ !mail-mta/exim
+ !mail-mta/mini-qmail
+ !mail-mta/msmtp[mta]
+ !mail-mta/netqmail
+ !mail-mta/nullmailer
+ !mail-mta/postfix
+ !mail-mta/qmail-ldap
+ !mail-mta/sendmail
+ !mail-mta/ssmtp[mta]
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P/_}
+
+src_prepare() {
+ # Use /run instead of /var/run
+ sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die
+
+ epatch_user
+ eautoreconf
+}
+
+src_configure() {
+ tc-export AR
+ AR="$(which "$AR")" econf \
+ --enable-table-db \
+ --with-privsep-user=smtpd \
+ --with-queue-user=smtpq \
+ --with-privsep-path=/var/empty \
+ --with-sock-dir=/run \
+ --sysconfdir=/etc/opensmtpd \
+ --with-ca-file=/etc/ssl/certs/ca-certificates.crt \
+ $(use_with pam)
+}
+
+src_install() {
+ default
+ newinitd "${FILESDIR}"/smtpd.initd smtpd
+ systemd_dounit "${FILESDIR}"/smtpd.{service,socket}
+ use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd
+ if use mta ; then
+ dodir /usr/sbin
+ dosym /usr/sbin/smtpctl /usr/sbin/sendmail
+ dosym /usr/sbin/smtpctl /usr/bin/sendmail
+ dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail
+ fi
+}
+
+pkg_preinst() {
+ enewgroup smtpd 25
+ enewuser smtpd 25 -1 /var/empty smtpd
+ enewgroup smtpq 252
+ enewuser smtpq 252 -1 /var/empty smtpq
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps,"
+ einfo "Redis, and many other useful addons and filters are"
+ einfo "available in the mail-filter/opensmtpd-extras package."
+ einfo
+}
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index e109db0ac164..c1bf4141486a 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,7 +1,6 @@
-DIST postfix-2.10.8.tar.gz 3819748 SHA256 2fb5af2f1e0add13a9b20c58f8a84c0d76a7a3aa85719cb3e580617fc14d48e6 SHA512 72984e9cf9557f2f1050e12ca7033f9dadd15ae4e7d07b49df455eff8a9d3b8ebbc1cc56013bcf2918526f7764f6d3a7cc87c268041d157138d3e255c03fe5f1 WHIRLPOOL 35db7b5c090ab9e99c96634db821be5b3f1c7578281a1bd3efa4ff2427b5d6686a9eeea3d6db59ff8832fd5ab0af51c6c151e95810730943aa3cdd93134781cf
-DIST postfix-2.11.6.tar.gz 4030414 SHA256 77f35574c78cf5ac468061c38037c4f858ead7554e2314e7760c30328f08591e SHA512 8bb318b2e2e1611b764889f2c263e24fb81dc3cb324682a0debee0d7babb85560245962da9a528b69715425a5b5f8d0402e14652b32ad99b76f2860c0110064e WHIRLPOOL ac5ebabdfcc6af0dfb6b2c5aaee45626c254bcfc401bf4a84db1c536a9316434692d3884ab46019ea841120a7d0f66c1d3008d4b03d7053d2e94b9f7793de5fc
-DIST postfix-3.0.0.tar.gz 4239248 SHA256 c2f2f10aa3e6b7090ba979e9c515e42b3140c5c1c17a33d58787569df7ae0955 SHA512 ba5b67a8f03c6fe6bbb62e2aad981a6f3ba8266ea2fa93abfa5d31cdb20b2d5a47fc373f401b247ca2cb5a19e654f86b2a65fe906c102d729e472b6c5ff1cd7a WHIRLPOOL 1510a17f3376d77eb503b3adf47639f6466a38e20a06ebf7ae0ec6849dc2ea332377c82af816f298a2719bccc4917d14132ee9e11c14cbafa3ea53ec40056f50
-DIST postfix-3.0.1.tar.gz 4265677 SHA256 cd2bd6447fe3368bb1a39f482f8dd1eec87c63067a0eb75f9aec8e4eadd21328 SHA512 17916f6dc7113589b011dbf6a6bb54cb9f6d0d5f176fb3c877d4a5a09ac62c4faf088bf1eba0b41c6d2b9d55660fd4c52d4ba2a01f82db3679322756b6da6f37 WHIRLPOOL 3e0f28350a42428b7deae460d2312c90f84f82aaa7755207e1eba04ee7c3b276eaddbd8c8b705a38923ad29625a36aa06c80849ecc9201f4aa99e44811913790
+DIST postfix-2.10.9.tar.gz 3820525 SHA256 e47eb56db2d238b9c5a5147a516fa406ab6afb102cedb4bd08273e979ae95d82 SHA512 c77df7ccc051bd72271dc5298da0ca4e45397b1ba96fc8be31e095f5b15cd30ebc0b29cf638e76efc65503cb241efd937f2d64aaa97243402c35e2927b7a7b91 WHIRLPOOL 3a7acb90ae03366e2ed24dfbd2e07619f0694abe098a621c6f9202e4d43a968376b5a52f2a65223634cf921af0a7156b0272ca15ad188a1b61fe4fb9cc97cab7
+DIST postfix-2.11.7.tar.gz 4031689 SHA256 05828b5b846e48fdc80db67d85409066010614af521070df4733459fbf447e20 SHA512 a1e146db6d2d71abb1dd7c70cde24e6410b599458ffa8061a0161be9475452034d9dcc7ec3976042b379cd84f5ebdba2f9d8d829637ff376ccaf7e87bcabe7a3 WHIRLPOOL 990cf17bc8d0cb8c8de0aa42f16125b1393feb42ed2eca3cb66ddd4d0b5d9425f619ee22047745fdd2f0069dc321e942ecc326bfbb88519fccf4931f95b1c483
DIST postfix-3.0.2.tar.gz 4239235 SHA256 68256314202f5f0f24022d64f7ac664d28fa1394d07c84a37c3fc7a2d040be80 SHA512 b097ff5cb1707361af568bbcf8b9d264dfefe7a9fd5c2fb4ce731a2ff6a632c3341ace43afe7f1600f2096592535cf9a300322f78c92000e752e0df7d3c39021 WHIRLPOOL 3fd230321577c0226926701a17803b038a281b46abe884899ca38ea18c5fd9c13ef90900e5fdd17db20ecf8dc63b373cb9f378f1402660be2908192900cba47a
-DIST postfix-3.1-20150924.tar.gz 4305500 SHA256 069f7e257c459babd3938ccd6e9422be89dab163edd6d5321e5fc5263b4f6e68 SHA512 8283137587703a82e58520e60b49f88052be6033df2b5daa61b221f8d2f41e76c51c4264353027df943c6575b801cba91282112fae53a15027f99f52e82c83aa WHIRLPOOL 7784635d33ed077de9b5c8d358086e5a8668561a145767b58fa9ac7ed8cd07ab5216cec249f11f05d80a171e6d2b35b3cf6a79ad295d4a83be7d35d77de84d58
+DIST postfix-3.0.3.tar.gz 4240588 SHA256 401e46ec3450569dcce60d1d8ca22a19ab1f7f817b0cc730cdf4875ba608ac02 SHA512 b6cd091a8cdda9678fa2979082e47a363dd086e4376effc0a427d1beb5eb35bd7dc28003ad28323c42318d7f630e0d8b105c56fd1a63bd5b5a20501db68ac524 WHIRLPOOL b013164f12e2adde464052f37584320687716f18c65cdd01344848bbcdd5a08be16c741234a063d717474a50be0d14d7b5574ccb69dc56e00f30b619d148c9f9
+DIST postfix-3.1-20151011.tar.gz 4306494 SHA256 afa2dcb6bcf6f6b101edb6a3cba3fd36742f18cd43bd069ac93febe1c95f988a SHA512 06718820d4b9db85a8d8596c89ba1cdc976f963e74d67e6056d70ef8f8bcf3372828d41f73759c6b5a07d2699ef410fc8273f3f45426c94c7b553beb682548d3 WHIRLPOOL fb49dc4ace947f22bfa8adfdde4c3412dbc3ad7ae14a2339627bd83049e2ecd2c09bc58c2b9efcdb58c088d2ba6c4f34d8b378750fc113cb87f8116887e94f61
DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
diff --git a/mail-mta/postfix/postfix-2.10.8.ebuild b/mail-mta/postfix/postfix-2.10.9.ebuild
index a18ee74d5af7..a7d5a07d7893 100644
--- a/mail-mta/postfix/postfix-2.10.8.ebuild
+++ b/mail-mta/postfix/postfix-2.10.9.ebuild
@@ -33,7 +33,7 @@ DEPEND=">=dev-libs/libpcre-3.4
postgres? ( dev-db/postgresql:* )
sasl? ( >=dev-libs/cyrus-sasl-2 )
sqlite? ( dev-db/sqlite:3 )
- ssl? ( >=dev-libs/openssl-0.9.6g:* )"
+ ssl? ( dev-libs/openssl:0 )"
RDEPEND="${DEPEND}
dovecot-sasl? ( net-mail/dovecot )
diff --git a/mail-mta/postfix/postfix-2.11.6.ebuild b/mail-mta/postfix/postfix-2.11.7.ebuild
index af0dc781069e..e2c0dab45bf1 100644
--- a/mail-mta/postfix/postfix-2.11.6.ebuild
+++ b/mail-mta/postfix/postfix-2.11.7.ebuild
@@ -34,7 +34,7 @@ DEPEND=">=dev-libs/libpcre-3.4
postgres? ( dev-db/postgresql:* )
sasl? ( >=dev-libs/cyrus-sasl-2 )
sqlite? ( dev-db/sqlite:3 )
- ssl? ( >=dev-libs/openssl-0.9.6g:* )"
+ ssl? ( dev-libs/openssl:0 )"
RDEPEND="${DEPEND}
dovecot-sasl? ( net-mail/dovecot )
diff --git a/mail-mta/postfix/postfix-3.0.0.ebuild b/mail-mta/postfix/postfix-3.0.0.ebuild
deleted file mode 100644
index 438bfc8c6acf..000000000000
--- a/mail-mta/postfix/postfix-3.0.0.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=5
-inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.10.0"
-VDA_P="${PN}-vda-v13-${VDA_PV}"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
- vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=dev-libs/libpcre-3.4
- dev-lang/perl
- berkdb? ( >=sys-libs/db-3.2:* )
- cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
- eai? ( dev-libs/icu:= )
- ldap? ( net-nds/openldap )
- ldap-bind? ( net-nds/openldap[sasl] )
- lmdb? ( >=dev-db/lmdb-0.9.11 )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( >=dev-libs/openssl-0.9.6g:* )"
-
-RDEPEND="${DEPEND}
- dovecot-sasl? ( net-mail/dovecot )
- memcached? ( net-misc/memcached )
- net-mail/mailbase
- !mail-mta/courier
- !mail-mta/esmtp
- !mail-mta/exim
- !mail-mta/mini-qmail
- !mail-mta/msmtp[mta]
- !mail-mta/netqmail
- !mail-mta/nullmailer
- !mail-mta/qmail-ldap
- !mail-mta/sendmail
- !mail-mta/opensmtpd
- !<mail-mta/ssmtp-2.64-r2
- !>=mail-mta/ssmtp-2.64-r2[mta]
- !net-mail/fastforward
- selinux? ( sec-policy/selinux-postfix )"
-
-# No vda support for postfix-3.0
-REQUIRED_USE="ldap-bind? ( ldap sasl )
- !vda"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
- # Add postfix, postdrop user/group (bug #77565)
- enewgroup postfix 207
- enewgroup postdrop 208
- enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-linux4.patch"
- if use vda; then
- epatch "${DISTDIR}"/${VDA_P}.patch
- fi
-
- sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
- src/util/sys_defs.h || die "sed failed"
-
- # change default paths to better comply with portage standard paths
- sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-
- epatch_user
-}
-
-src_configure() {
- for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
- do
- local AUXLIBS_${name}=""
- done
-
- # Make sure LDFLAGS get passed down to the executables.
- local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
- AUXLIBS_PCRE="$(pcre-config --libs)"
-
- use pam && mylibs="${mylibs} -lpam"
-
- if use ldap; then
- mycc="${mycc} -DHAS_LDAP"
- AUXLIBS_LDAP="-lldap -llber"
- fi
-
- if use mysql; then
- mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
- AUXLIBS_MYSQL="$(mysql_config --libs)"
- fi
-
- if use postgres; then
- mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
- AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
- fi
-
- if use sqlite; then
- mycc="${mycc} -DHAS_SQLITE"
- AUXLIBS_SQLITE="-lsqlite3 -lpthread"
- fi
-
- if use ssl; then
- mycc="${mycc} -DUSE_TLS"
- mylibs="${mylibs} -lssl -lcrypto"
- fi
-
- if use lmdb; then
- mycc="${mycc} -DHAS_LMDB"
- AUXLIBS_LMDB="-llmdb -lpthread"
- fi
-
- if ! use eai; then
- mycc="${mycc} -DNO_EAI"
- fi
-
- # broken. and "in other words, not supported" by upstream.
- # Use inet_protocols setting in main.cf
- #if ! use ipv6; then
- # mycc="${mycc} -DNO_IPV6"
- #fi
-
- if use sasl; then
- if use dovecot-sasl; then
- # Set dovecot as default.
- mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
- fi
- if use ldap-bind; then
- mycc="${mycc} -DUSE_LDAP_SASL"
- fi
- mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
- mylibs="${mylibs} -lsasl2"
- elif use dovecot-sasl; then
- mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
- fi
-
- if ! use nis; then
- mycc="${mycc} -DNO_NIS"
- fi
-
- if ! use berkdb; then
- mycc="${mycc} -DNO_DB"
- if use cdb; then
- # change default hash format from Berkeley DB to cdb
- mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
- fi
- fi
-
- if use cdb; then
- mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
- # Tinycdb is preferred.
- if has_version dev-db/tinycdb ; then
- einfo "Building with dev-db/tinycdb"
- AUXLIBS_CDB="-lcdb"
- else
- einfo "Building with dev-db/cdb"
- CDB_PATH="/usr/$(get_libdir)"
- for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
- AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
- done
- fi
- fi
-
- # Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
- # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
- mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
- filter-lfs-flags
-
- # Workaround for bug #76512
- if use hardened; then
- [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
- fi
-
- # Remove annoying C++ comment style warnings - bug #378099
- append-flags -Wno-comment
-
- sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
- sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
- emake makefiles shared=yes dynamicmaps=no \
- shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
- DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
- AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
- AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
- AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
- AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install () {
- local myconf
- use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
- html_directory=\"/usr/share/doc/${PF}/html\""
-
- LD_LIBRARY_PATH="${S}/lib" \
- /bin/sh postfix-install \
- -non-interactive \
- install_root="${D}" \
- config_directory="/etc/postfix" \
- manpage_directory="/usr/share/man" \
- command_directory="/usr/sbin" \
- mailq_path="/usr/bin/mailq" \
- newaliases_path="/usr/bin/newaliases" \
- sendmail_path="/usr/sbin/sendmail" \
- ${myconf} \
- || die "postfix-install failed"
-
- # Fix spool removal on upgrade
- rm -Rf "${D}"/var
- keepdir /var/spool/postfix
-
- # Install rmail for UUCP, closes bug #19127
- dobin auxiliary/rmail/rmail
-
- # Provide another link for legacy FSH
- dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-
- # Install qshape tool and posttls-finger
- dobin auxiliary/qshape/qshape.pl
- doman man/man1/qshape.1
- dobin bin/posttls-finger
- doman man/man1/posttls-finger.1
-
- # Performance tuning tools and their manuals
- dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
- doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
- # Set proper permissions on required files/directories
- dodir /var/lib/postfix
- keepdir /var/lib/postfix
- fowners -R postfix:postfix /var/lib/postfix
- fperms 0750 /var/lib/postfix
- fowners root:postdrop /usr/sbin/post{drop,queue}
- fperms 02711 /usr/sbin/post{drop,queue}
-
- keepdir /etc/postfix
- if use mbox; then
- mypostconf="mail_spool_directory=/var/spool/mail"
- else
- mypostconf="home_mailbox=.maildir/"
- fi
- LD_LIBRARY_PATH="${S}/lib" \
- "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
- -e ${mypostconf} || die "postconf failed"
-
- insinto /etc/postfix
- newins "${FILESDIR}"/smtp.pass saslpass
- fperms 600 /etc/postfix/saslpass
-
- newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
- # do not start mysql/postgres unnecessarily - bug #359913
- use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
- use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
- dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
- mv "${D}"/etc/postfix/{*.default,makedefs.out,*.proto} "${D}"/usr/share/doc/${PF}/
- use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
- pamd_mimic_system smtp auth account
-
- if use sasl; then
- insinto /etc/sasl2
- newins "${FILESDIR}"/smtp.sasl smtpd.conf
- fi
-
- # header files
- insinto /usr/include/postfix
- doins include/*.h
-
- # Remove unnecessary files
- rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
- rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-
- if has_version mail-mta/postfix; then
- # let the sysadmin decide when to change the compatibility_level
- sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
- fi
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
- # Do not install server.{key,pem) SSL certificates if they already exist
- if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
- && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
- install_cert /etc/ssl/postfix/server
- chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
- fi
-
- if [[ ! -e /etc/mail/aliases.db ]] ; then
- ewarn
- ewarn "You must edit /etc/mail/aliases to suit your needs"
- ewarn "and then run /usr/bin/newaliases. Postfix will not"
- ewarn "work correctly without it."
- ewarn
- fi
-}
diff --git a/mail-mta/postfix/postfix-3.0.1-r1.ebuild b/mail-mta/postfix/postfix-3.0.1-r1.ebuild
deleted file mode 100644
index 438bfc8c6acf..000000000000
--- a/mail-mta/postfix/postfix-3.0.1-r1.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=5
-inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
-
-MY_PV="${PV/_rc/-RC}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.10.0"
-VDA_P="${PN}-vda-v13-${VDA_PV}"
-RC_VER="2.7"
-
-DESCRIPTION="A fast and secure drop-in replacement for sendmail"
-HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
- vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
-
-LICENSE="IBM"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
-
-DEPEND=">=dev-libs/libpcre-3.4
- dev-lang/perl
- berkdb? ( >=sys-libs/db-3.2:* )
- cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
- eai? ( dev-libs/icu:= )
- ldap? ( net-nds/openldap )
- ldap-bind? ( net-nds/openldap[sasl] )
- lmdb? ( >=dev-db/lmdb-0.9.11 )
- mysql? ( virtual/mysql )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- sqlite? ( dev-db/sqlite:3 )
- ssl? ( >=dev-libs/openssl-0.9.6g:* )"
-
-RDEPEND="${DEPEND}
- dovecot-sasl? ( net-mail/dovecot )
- memcached? ( net-misc/memcached )
- net-mail/mailbase
- !mail-mta/courier
- !mail-mta/esmtp
- !mail-mta/exim
- !mail-mta/mini-qmail
- !mail-mta/msmtp[mta]
- !mail-mta/netqmail
- !mail-mta/nullmailer
- !mail-mta/qmail-ldap
- !mail-mta/sendmail
- !mail-mta/opensmtpd
- !<mail-mta/ssmtp-2.64-r2
- !>=mail-mta/ssmtp-2.64-r2[mta]
- !net-mail/fastforward
- selinux? ( sec-policy/selinux-postfix )"
-
-# No vda support for postfix-3.0
-REQUIRED_USE="ldap-bind? ( ldap sasl )
- !vda"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
- # Add postfix, postdrop user/group (bug #77565)
- enewgroup postfix 207
- enewgroup postdrop 208
- enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-linux4.patch"
- if use vda; then
- epatch "${DISTDIR}"/${VDA_P}.patch
- fi
-
- sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
- src/util/sys_defs.h || die "sed failed"
-
- # change default paths to better comply with portage standard paths
- sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
-
- epatch_user
-}
-
-src_configure() {
- for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
- do
- local AUXLIBS_${name}=""
- done
-
- # Make sure LDFLAGS get passed down to the executables.
- local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
- AUXLIBS_PCRE="$(pcre-config --libs)"
-
- use pam && mylibs="${mylibs} -lpam"
-
- if use ldap; then
- mycc="${mycc} -DHAS_LDAP"
- AUXLIBS_LDAP="-lldap -llber"
- fi
-
- if use mysql; then
- mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
- AUXLIBS_MYSQL="$(mysql_config --libs)"
- fi
-
- if use postgres; then
- mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
- AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
- fi
-
- if use sqlite; then
- mycc="${mycc} -DHAS_SQLITE"
- AUXLIBS_SQLITE="-lsqlite3 -lpthread"
- fi
-
- if use ssl; then
- mycc="${mycc} -DUSE_TLS"
- mylibs="${mylibs} -lssl -lcrypto"
- fi
-
- if use lmdb; then
- mycc="${mycc} -DHAS_LMDB"
- AUXLIBS_LMDB="-llmdb -lpthread"
- fi
-
- if ! use eai; then
- mycc="${mycc} -DNO_EAI"
- fi
-
- # broken. and "in other words, not supported" by upstream.
- # Use inet_protocols setting in main.cf
- #if ! use ipv6; then
- # mycc="${mycc} -DNO_IPV6"
- #fi
-
- if use sasl; then
- if use dovecot-sasl; then
- # Set dovecot as default.
- mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
- fi
- if use ldap-bind; then
- mycc="${mycc} -DUSE_LDAP_SASL"
- fi
- mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
- mylibs="${mylibs} -lsasl2"
- elif use dovecot-sasl; then
- mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
- fi
-
- if ! use nis; then
- mycc="${mycc} -DNO_NIS"
- fi
-
- if ! use berkdb; then
- mycc="${mycc} -DNO_DB"
- if use cdb; then
- # change default hash format from Berkeley DB to cdb
- mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
- fi
- fi
-
- if use cdb; then
- mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
- # Tinycdb is preferred.
- if has_version dev-db/tinycdb ; then
- einfo "Building with dev-db/tinycdb"
- AUXLIBS_CDB="-lcdb"
- else
- einfo "Building with dev-db/cdb"
- CDB_PATH="/usr/$(get_libdir)"
- for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
- AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
- done
- fi
- fi
-
- # Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
- # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
- mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
- filter-lfs-flags
-
- # Workaround for bug #76512
- if use hardened; then
- [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
- fi
-
- # Remove annoying C++ comment style warnings - bug #378099
- append-flags -Wno-comment
-
- sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
- sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
- emake makefiles shared=yes dynamicmaps=no \
- shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
- DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
- AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
- AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
- AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
- AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
-}
-
-src_install () {
- local myconf
- use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
- html_directory=\"/usr/share/doc/${PF}/html\""
-
- LD_LIBRARY_PATH="${S}/lib" \
- /bin/sh postfix-install \
- -non-interactive \
- install_root="${D}" \
- config_directory="/etc/postfix" \
- manpage_directory="/usr/share/man" \
- command_directory="/usr/sbin" \
- mailq_path="/usr/bin/mailq" \
- newaliases_path="/usr/bin/newaliases" \
- sendmail_path="/usr/sbin/sendmail" \
- ${myconf} \
- || die "postfix-install failed"
-
- # Fix spool removal on upgrade
- rm -Rf "${D}"/var
- keepdir /var/spool/postfix
-
- # Install rmail for UUCP, closes bug #19127
- dobin auxiliary/rmail/rmail
-
- # Provide another link for legacy FSH
- dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
-
- # Install qshape tool and posttls-finger
- dobin auxiliary/qshape/qshape.pl
- doman man/man1/qshape.1
- dobin bin/posttls-finger
- doman man/man1/posttls-finger.1
-
- # Performance tuning tools and their manuals
- dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
- doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
-
- # Set proper permissions on required files/directories
- dodir /var/lib/postfix
- keepdir /var/lib/postfix
- fowners -R postfix:postfix /var/lib/postfix
- fperms 0750 /var/lib/postfix
- fowners root:postdrop /usr/sbin/post{drop,queue}
- fperms 02711 /usr/sbin/post{drop,queue}
-
- keepdir /etc/postfix
- if use mbox; then
- mypostconf="mail_spool_directory=/var/spool/mail"
- else
- mypostconf="home_mailbox=.maildir/"
- fi
- LD_LIBRARY_PATH="${S}/lib" \
- "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
- -e ${mypostconf} || die "postconf failed"
-
- insinto /etc/postfix
- newins "${FILESDIR}"/smtp.pass saslpass
- fperms 600 /etc/postfix/saslpass
-
- newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
- # do not start mysql/postgres unnecessarily - bug #359913
- use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
- use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
- dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
- mv "${D}"/etc/postfix/{*.default,makedefs.out,*.proto} "${D}"/usr/share/doc/${PF}/
- use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
-
- pamd_mimic_system smtp auth account
-
- if use sasl; then
- insinto /etc/sasl2
- newins "${FILESDIR}"/smtp.sasl smtpd.conf
- fi
-
- # header files
- insinto /usr/include/postfix
- doins include/*.h
-
- # Remove unnecessary files
- rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
- rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
-
- if has_version mail-mta/postfix; then
- # let the sysadmin decide when to change the compatibility_level
- sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
- fi
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
- # Do not install server.{key,pem) SSL certificates if they already exist
- if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
- && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
- install_cert /etc/ssl/postfix/server
- chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
- fi
-
- if [[ ! -e /etc/mail/aliases.db ]] ; then
- ewarn
- ewarn "You must edit /etc/mail/aliases to suit your needs"
- ewarn "and then run /usr/bin/newaliases. Postfix will not"
- ewarn "work correctly without it."
- ewarn
- fi
-}
diff --git a/mail-mta/postfix/postfix-3.1_pre20150924.ebuild b/mail-mta/postfix/postfix-3.0.3.ebuild
index 14d5902a4b86..b66e09cb25e4 100644
--- a/mail-mta/postfix/postfix-3.1_pre20150924.ebuild
+++ b/mail-mta/postfix/postfix-3.0.3.ebuild
@@ -5,9 +5,9 @@
EAPI=5
inherit eutils flag-o-matic multilib pam ssl-cert systemd toolchain-funcs user versionator
-MY_PV="${PV/_pre/-}"
+MY_PV="${PV/_rc/-RC}"
MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
VDA_PV="2.10.0"
VDA_P="${PN}-vda-v13-${VDA_PV}"
RC_VER="2.7"
@@ -20,7 +20,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
LICENSE="IBM"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
DEPEND=">=dev-libs/libpcre-3.4
dev-lang/perl
@@ -35,7 +35,10 @@ DEPEND=">=dev-libs/libpcre-3.4
postgres? ( dev-db/postgresql:* )
sasl? ( >=dev-libs/cyrus-sasl-2 )
sqlite? ( dev-db/sqlite:3 )
- ssl? ( >=dev-libs/openssl-0.9.6g:* )"
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )"
RDEPEND="${DEPEND}
dovecot-sasl? ( net-mail/dovecot )
diff --git a/mail-mta/postfix/postfix-3.1_pre20150924-r1.ebuild b/mail-mta/postfix/postfix-3.1_pre20151011.ebuild
index 951e81591a3f..72ad0b53ab6b 100644
--- a/mail-mta/postfix/postfix-3.1_pre20150924-r1.ebuild
+++ b/mail-mta/postfix/postfix-3.1_pre20151011.ebuild
@@ -36,7 +36,7 @@ DEPEND=">=dev-libs/libpcre-3.4
sasl? ( >=dev-libs/cyrus-sasl-2 )
sqlite? ( dev-db/sqlite:3 )
ssl? (
- !libressl? ( >=dev-libs/openssl-0.9.6g:0 )
+ !libressl? ( dev-libs/openssl:0 )
libressl? ( dev-libs/libressl )
)"
diff --git a/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild b/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild
index 371f4b9d5848..24cd31bbeb16 100644
--- a/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild
+++ b/media-fonts/Humor-Sans/Humor-Sans-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="http://www.antiyawn.com/uploads/${P}.ttf"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
S="${WORKDIR}"
@@ -20,5 +20,5 @@ FONT_S="${S}"
FONT_SUFFIX="ttf"
src_unpack() {
- cp "${DISTDIR}/${A}" "${S}/${A//-${PV}}"
+ cp "${DISTDIR}/${A}" "${FONT_S}/${PN}.${FONT_SUFFIX}"
}
diff --git a/media-fonts/nanum/Manifest b/media-fonts/nanum/Manifest
new file mode 100644
index 000000000000..3721c5f20fc0
--- /dev/null
+++ b/media-fonts/nanum/Manifest
@@ -0,0 +1 @@
+DIST nanum-3.0.tar.gz 37345484 SHA256 b6d057112076ba36d7c476f291424d292d222ad4effd3300a779565d2ebc5f7b SHA512 f2fcb765910a5cc1e04d18c0007d84e2ec970e286f09d4cf212a13b6c6c8838e4932e37e15ad0801d3b596ea7ce2605f93826968c940ffa50707d9e7aa313200 WHIRLPOOL ca47c54cbd893083ff6a5b3fbdf1d110e1ee1d53ea7c47c18326ee528aede320ad1824d18cd6a809334d32d7291adb89f8661e77dde36b234ffb5935d52e6450
diff --git a/media-fonts/nanum/metadata.xml b/media-fonts/nanum/metadata.xml
new file mode 100644
index 000000000000..64cc0b687d48
--- /dev/null
+++ b/media-fonts/nanum/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>fonts</herd>
+</pkgmetadata>
diff --git a/media-fonts/nanum/nanum-3.0.ebuild b/media-fonts/nanum/nanum-3.0.ebuild
new file mode 100644
index 000000000000..b5248f58af0c
--- /dev/null
+++ b/media-fonts/nanum/nanum-3.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit font
+
+DESCRIPTION="The Nanum Korean fonts distributed by Naver"
+HOMEPAGE="http://hangeul.naver.com/2014/nanum"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="binchecks strip"
+
+DEPEND=""
+RDEPEND=""
+
+FONT_SUFFIX="ttf"
diff --git a/media-fonts/symbola/Manifest b/media-fonts/symbola/Manifest
index 06b5da724dc9..0a4e0216c205 100644
--- a/media-fonts/symbola/Manifest
+++ b/media-fonts/symbola/Manifest
@@ -1,3 +1,4 @@
DIST symbola-7.12.docx 220068 SHA256 84ad42f1839fbd03cc520399290ae71b97cdd258dbbd882c8066cd31e4c42b4e SHA512 68ed54d1a3c335016077eba90c91b530d95618f4bd241596083fbca82acba5a23c5ebfdf1c870c8183a357094635642aa3f17542cec946b3489a2f3b63ac6a29 WHIRLPOOL 35193049991b5c47f61b76025b5cd791eced8dc046c4a29da24856f99dc53e59a63783aebc7417017b53ffa1aca450336f0213b76d9f01a227b1f557345b1338
DIST symbola-7.12.pdf 2720033 SHA256 8a1183ade50a0ebd6a68ed8d7650f979cc11f956ebb192694aa8d60c112767d8 SHA512 eab7727c3ce5727c16aed62b115e4a864ec57ad60726e6ef98f7f8d3e24944e0837b59f801bbd371b465b5e1f8eee83f4c137d8d80743a08e84288f26a218851 WHIRLPOOL f24d281b5340b8abb3bc60df7683ff15ecdf568eba8ee35cc508a6c8dbf8134775718bc36da5552faff94e47ba12de7c2aa4b651d470717462eb83fde2f5b750
DIST symbola-7.12.ttf 2093772 SHA256 7acc058bd4e56cc986b2a46420520f59be402c3565c202b5dcebca7f3bfd8b5a SHA512 72d81c69cf723fd53460b977a6df99f789a950011dddbc27f60a09f3540d9e89bd524468033c9e8fe2fa14ccfe631b15aca26ade33c0a5ae461cadda958d036f WHIRLPOOL 56965f49ee774151073b7c34732fc42843b3eb6c180cf3a5d288b85087d5e3a7dea4d1581ba7315b1d9f318d79356d1b61f358a4397e5810fa57b1cdeda693a7
+DIST symbola-8.00.zip 4668110 SHA256 0d568882ca4f38a8e7d487367c75f4d8d7cb9f902b9675b7f6620c139014dad1 SHA512 f496be58660c5d07fd0a9422eef1dad3d0aa06e350e37f84a547496a6a9c6abf6fa4609e9051e40772e952cd4f71a7dd02ad0ba16cf3aa2b51f31fee09ef9b84 WHIRLPOOL 54f2bd82669be4a54dbb365eb083e241c8cf50f1f827319564875eefdf6d346245759857d87e1c393456d3e8bfd094a5a977f30d3a5e405b22f7d75f2f5ec766
diff --git a/media-fonts/symbola/symbola-8.00.ebuild b/media-fonts/symbola/symbola-8.00.ebuild
new file mode 100644
index 000000000000..a3fce54130b2
--- /dev/null
+++ b/media-fonts/symbola/symbola-8.00.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN/s/S}"
+
+inherit font
+
+DESCRIPTION="Unicode font for Basic Latin, IPA Extensions, Greek, Cyrillic and many Symbol Blocks"
+HOMEPAGE="http://users.teilar.gr/~g1951d/"
+SRC_URI="http://users.teilar.gr/~g1951d/${MY_PN}.zip -> ${P}.zip"
+LICENSE="Unicode_Fonts_for_Ancient_Scripts"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="doc"
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
+
+src_prepare() {
+ if use doc; then
+ DOCS="${MY_PN}.docx ${MY_PN}.pdf"
+ fi
+}
diff --git a/media-gfx/optipng/files/optipng-0.7.5-gifread.patch b/media-gfx/optipng/files/optipng-0.7.5-gifread.patch
new file mode 100644
index 000000000000..14b37190405d
--- /dev/null
+++ b/media-gfx/optipng/files/optipng-0.7.5-gifread.patch
@@ -0,0 +1,12 @@
+diff --git a/src/gifread/gifread.c b/src/gifread/gifread.c
+index b24aa6e..2896493 100644
+--- a/src/gifread/gifread.c
++++ b/src/gifread/gifread.c
+@@ -357,6 +357,7 @@ static int LZWGetCode(int code_size, int init_flag, FILE *stream)
+ {
+ curbit = 0;
+ lastbit = 0;
++ last_byte = 2;
+ done = LZW_FALSE;
+ return 0;
+ }
diff --git a/media-gfx/optipng/optipng-0.7.5-r1.ebuild b/media-gfx/optipng/optipng-0.7.5-r1.ebuild
new file mode 100644
index 000000000000..b3b452856b30
--- /dev/null
+++ b/media-gfx/optipng/optipng-0.7.5-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Compress PNG files without affecting image quality"
+HOMEPAGE="http://optipng.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+ media-libs/libpng:0"
+DEPEND="${RDEPEND}
+ sys-apps/findutils"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gifread.patch # bug #561882
+ epatch "${FILESDIR}"/${P}-estonian.patch
+
+ rm -R src/{libpng,zlib} || die
+ find . -type d -name build -exec rm -R {} + || die
+
+ # next release is almost a complete rewrite, so plug this compilation
+ # problem in anticipation of the much (c)leaner(?) rewrite
+ sed -i \
+ -e 's/^#ifdef AT_FDCWD/#if defined(AT_FDCWD) \&\& !(defined (__SVR4) \&\& defined (__sun))/' \
+ src/optipng/osys.c || die
+
+ tc-export CC AR RANLIB
+ export LD=$(tc-getCC)
+}
+
+src_configure() {
+ ./configure \
+ -with-system-libpng \
+ -with-system-zlib \
+ || die "configure failed"
+}
+
+src_compile() {
+ emake -C src/optipng
+}
+
+src_install() {
+ dodoc README.txt doc/*.txt
+ dohtml doc/*.html
+ doman src/${PN}/man/${PN}.1
+
+ dobin src/${PN}/${PN}
+}
diff --git a/media-gfx/photoqt/Manifest b/media-gfx/photoqt/Manifest
index 2057b17a24f8..43dbbb25e56b 100644
--- a/media-gfx/photoqt/Manifest
+++ b/media-gfx/photoqt/Manifest
@@ -1,5 +1 @@
-DIST photo-0.8.tar.gz 241142 SHA256 123f8cfa8e86dd131147b58e1c94a138bb9d3e5873f29b550cc960e83b2c4f5f SHA512 b5b8700a4f15e4ce880c5558247cc0e96e59df21c0674f57e202b5d6474e1ef0a251d5be391e795b230c4959251e194ec4a1c87e75075ee9ae501d3e18c4e32f WHIRLPOOL c6ff5a3a41cdfac0c54593dfbabb35bcb903b592809f698cf7d7c56bce05b1a29c31d8db7031392819481188f563bcf67e997cec24acd0a0842a311efaa76529
-DIST photoqt-1.0.tar.gz 709752 SHA256 e7f866540a03e95463dacdf2769a954f601ac3cd1507655793f9f231ab8689ce SHA512 2badf4e6e6694460fb8d1c8a9f8cb73fdcbcc20868588beec7da01e86ee906f81ed4f5154050960cb5000c40ef1efc03684872c35b352fe4246a880e03ee1bd7 WHIRLPOOL c33eae430c34e0e1c9dbf3d7721fa52af44dbc825060e804b42eeeec64bfc8c59bcf056e3f79227c4cd4a03823efc8716b9f5d172cb6a552165131f2600cdf2a
-DIST photoqt-1.1.0.1.tar.gz 1201723 SHA256 3727ec58a243586d367dc609793ad043cc78d4e67d9e7d3454f7cad782f6a9f8 SHA512 024c4fa1212d773b53b0bd7dd0a15bda961c33bd01ed9b8199f555e94339f97bb2d56a2928f68440f3de7f3ebaf539585be044cd5ba9f6e6b0f284d0c744ff6a WHIRLPOOL be35177b1b8587130f8728be6f44d5dc657b4d188dc947a514bcac344700fcec58db99e36c85163ddb22460331b64b2c1d3f7dab643d1c42beea5e5a58542655
-DIST photoqt-1.2.tar.gz 1452897 SHA256 4a293136c82c075c2f87bb1d8c6be384e8e8ca00f3d32e1783271439a090d6b6 SHA512 13b34a5511bebe9e2845b4fb9949472af2a75e358d836d05521f3efd848c8cc36f0d977a1c1a5ed16df9e0333ce8082f1b4fa4984a3318b4cb1012c44c6237e4 WHIRLPOOL 2fa599a5d1ff550253607a13a05bf67e5c3fc81152238be4a208f1d6bcd3939d1eaf4af398818cea728fb778955e3a6d5a3ef6191b757b5cb0b134b65b7b5220
DIST photoqt-1.3.tar.gz 1382474 SHA256 81baba387538f62a24af1e69ec26b2a62aafd9b4c1841dd952a9ddb25cdf5348 SHA512 6fdc0c00449519304e0e0da09cabee6f096100ce8054213ca48f5093629328b5f2b6d45215edbbf5419e34189b456eac1389b561840077b3b8320461a1591762 WHIRLPOOL 7989d53468e5f94a4ae5d160feb928c11790d381c5395e97eea2e5e715f76a7c95bfff34f3879cfc5bed2a5d29a3140cd8c978c3a08757cd5efd933363fc9489
diff --git a/media-gfx/photoqt/files/photo-0.7.1.1-install-desktop.patch b/media-gfx/photoqt/files/photo-0.7.1.1-install-desktop.patch
deleted file mode 100644
index 4814a4199b07..000000000000
--- a/media-gfx/photoqt/files/photo-0.7.1.1-install-desktop.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -burN photo-0.7.1.1-orig/CMakeLists.txt photo-0.7.1.1/CMakeLists.txt
---- photo-0.7.1.1-orig/CMakeLists.txt 2012-04-29 20:38:49.374650243 +0800
-+++ photo-0.7.1.1/CMakeLists.txt 2012-04-29 21:00:03.237838770 +0800
-@@ -28,7 +28,7 @@
- if(UNIX)
-
- # find xdg-desktop-menu and xdg-mime
-- find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
-+ #find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu)
-
- # Set the install prefix to /usr/
- SET(PRODUCT_INSTALL_PREFIX /usr)
-@@ -41,7 +41,8 @@
-
- # Install desktop file
- INSTALL(
-- CODE "execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/photo.desktop)"
-+ FILES photo.desktop
-+ DESTINATION share/applications/
- )
-
- # And install all the icons
diff --git a/media-gfx/photoqt/photoqt-0.8-r1.ebuild b/media-gfx/photoqt/photoqt-0.8-r1.ebuild
deleted file mode 100644
index 0328224dd1c3..000000000000
--- a/media-gfx/photoqt/photoqt-0.8-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="http://photoqt.org/"
-SRC_URI="http://photoqt.org/oldRel/photo-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsql:4
- media-gfx/exiv2:="
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/photo-0.7.1.1-install-desktop.patch"
-)
-
-S=${WORKDIR}/photo-${PV}
diff --git a/media-gfx/photoqt/photoqt-1.0.ebuild b/media-gfx/photoqt/photoqt-1.0.ebuild
deleted file mode 100644
index 2f1eb8ca4da8..000000000000
--- a/media-gfx/photoqt/photoqt-1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="http://photoqt.org/"
-SRC_URI="http://photoqt.org/oldRel/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="exiv2 graphicsmagick" # phonon"
-
-DEPEND="dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsql:4
- exiv2? ( media-gfx/exiv2:= )
- graphicsmagick? ( media-gfx/graphicsmagick:= )"
-# phonon? ( || ( media-libs/phonon dev-qt/qtphonon ) )" # fails to compile
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- # make desktop file validate; needs more work
- echo ';' >> "${S}"/${PN}.desktop || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use exiv2 EXIV2)
- $(cmake-utils_use graphicsmagick GM)
- -DPHONON=OFF
- )
- cmake-utils_src_configure
-}
diff --git a/media-gfx/photoqt/photoqt-1.1.0.1.ebuild b/media-gfx/photoqt/photoqt-1.1.0.1.ebuild
deleted file mode 100644
index 2b2336e58333..000000000000
--- a/media-gfx/photoqt/photoqt-1.1.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="http://photoqt.org/"
-SRC_URI="http://photoqt.org/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphicsmagick exiv2"
-
-RDEPEND="dev-qt/qtgui:5
- dev-qt/qtimageformats:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtsql:5
- dev-qt/qtwidgets:5
- exiv2? ( media-gfx/exiv2:= )
- graphicsmagick? ( media-gfx/graphicsmagick )"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use graphicsmagick GM)
- $(cmake-utils_use exiv2 EXIV2)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- MAKEOPTS+=" -j1" cmake-utils_src_compile
-}
diff --git a/media-gfx/photoqt/photoqt-1.2.ebuild b/media-gfx/photoqt/photoqt-1.2.ebuild
deleted file mode 100644
index a24f72df62b6..000000000000
--- a/media-gfx/photoqt/photoqt-1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="Simple but powerful Qt-based image viewer"
-HOMEPAGE="http://photoqt.org/"
-SRC_URI="http://photoqt.org/pkgs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="graphicsmagick exiv2"
-
-RDEPEND="dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtimageformats:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- exiv2? ( media-gfx/exiv2:= )
- graphicsmagick? ( media-gfx/graphicsmagick )"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use graphicsmagick GM)
- $(cmake-utils_use exiv2 EXIV2)
- )
- cmake-utils_src_configure
-}
-
-src_compile() {
- MAKEOPTS+=" -j1" cmake-utils_src_compile
-}
diff --git a/media-gfx/shotwell/shotwell-0.22.0-r1.ebuild b/media-gfx/shotwell/shotwell-0.22.0-r1.ebuild
new file mode 100644
index 000000000000..8d0369b88754
--- /dev/null
+++ b/media-gfx/shotwell/shotwell-0.22.0-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.26"
+VALA_MAX_API_VERSION="0.26"
+
+inherit eutils gnome2 multilib toolchain-funcs vala versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="Open source photo manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell"
+SRC_URI="
+ mirror://gnome/sources/${PN}/$(get_version_component_range 1-2)/${P}.tar.xz
+ http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell.1
+ http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell-icons.tar.bz2
+ "
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+CORE_SUPPORTED_LANGUAGES="
+ af ar as ast bg bn bn_IN bs ca cs da de el en_GB eo es et eu fi fr gd gl gu
+ he hi hr hu ia id it ja kk km kn ko ky lt lv mk ml mr nb nl nn or pa pl pt
+ pt_BR ro ru sk sl sr sr@latin sv ta te th tr uk vi zh_CN zh_HK zh_TW"
+
+for x in ${CORE_SUPPORTED_LANGUAGES}; do
+ IUSE+="linguas_${x} "
+done
+
+RDEPEND="
+ app-text/gnome-doc-utils
+ >=dev-db/sqlite-3.5.9:3
+ >=dev-libs/dbus-glib-0.80
+ >=dev-libs/glib-2.30.0:2
+ >=dev-libs/json-glib-0.7.6
+ >=dev-libs/libgee-0.8.5:0.8
+ >=dev-libs/libxml2-2.6.32:2
+ >=dev-util/desktop-file-utils-0.13
+ gnome-base/dconf
+ >=media-libs/gexiv2-0.4.90
+ media-libs/gst-plugins-base:1.0
+ media-libs/gst-plugins-good:1.0
+ media-libs/gstreamer:1.0
+ media-libs/lcms:2
+ >=media-libs/libexif-0.6.16:=
+ >=media-libs/libgphoto2-2.4.2:=
+ >=media-libs/libraw-0.13.2:=
+ >=net-libs/libsoup-2.26.0:2.4
+ >=net-libs/rest-0.7:0.7
+ >=net-libs/webkit-gtk-1.4:3
+ virtual/libgudev:=[introspection]
+ >=x11-libs/gtk+-3.12.2:3[X]"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ >=sys-devel/m4-1.4.13"
+
+DOCS=( AUTHORS MAINTAINERS NEWS README THANKS )
+
+# This probably comes from libraries that
+# shotwell-video-thumbnailer links to.
+# Nothing we can do at the moment. #435048
+QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer"
+
+pkg_setup() {
+ tc-export CC
+ G2CONF="${G2CONF}
+ --disable-schemas-compile
+ --disable-desktop-update
+ --disable-icon-update
+ --prefix=/usr
+ --lib=$(get_libdir)"
+}
+
+src_prepare() {
+ local x
+ local linguas="en_GB ${LINGUAS}"
+ vala_src_prepare
+ sed \
+ -e 's|CFLAGS :|CFLAGS +|g' \
+ -i plugins/Makefile.plugin.mk || die
+ epatch \
+ "${FILESDIR}"/${PN}-0.13.1-ldflags.patch
+
+ # remove disabled lenguages from build
+ for x in ${CORE_SUPPORTED_LANGUAGES}; do
+ if ! has ${x} ${linguas}; then
+ sed -i "/^${x}$/d" "${S}"/po/LINGUAS || die
+ fi
+ done
+}
+
+src_configure() {
+ ./configure \
+ ${G2CONF} \
+ || die
+}
+
+src_compile() {
+ local valaver="$(vala_best_api_version)"
+ emake VALAC="$(type -p valac-${valaver})"
+}
+
+src_install() {
+ local res
+ gnome2_src_install
+
+ doman "${DISTDIR}"/${PN}.1
+ for res in 16 22 24 32 48 256; do
+ doicon -s ${res} "${WORKDIR}"/${res}x${res}/*
+ done
+}
diff --git a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
index e658f29e075e..043933169ffa 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.3.ebuild
@@ -8,8 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
-DESCRIPTION="svg2rlg is a python tool to convert SVG files to reportlab
-graphics"
+DESCRIPTION="python tool to convert SVG files to reportlab graphics"
HOMEPAGE="https://code.google.com/p/svg2rlg/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
@@ -22,19 +21,18 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}
dev-python/reportlab[${PYTHON_USEDEP}]"
-PATCHES=( "${FILESDIR}/${PN}-issue-3.patch" "${FILESDIR}/${PN}-issue-6.patch"
- "${FILESDIR}/${PN}-issue-7.patch")
+PATCHES=(
+ "${FILESDIR}/${PN}-issue-3.patch"
+ "${FILESDIR}/${PN}-issue-6.patch"
+ "${FILESDIR}/${PN}-issue-7.patch"
+)
python_test() {
${EPYTHON} test_svg2rlg.py
}
python_prepare_all() {
- tmp=`mktemp` || die "mktemp failed"
- for i in `find -name '*.py'`; do
- tr -d '\r' < $i >$tmp || die "tr failed"
- mv $tmp $i || die "mv failed"
- done
+ find -name '*.py' -exec sed -i 's:\r::' {} + || die
distutils-r1_python_prepare_all
}
diff --git a/media-libs/jasper/jasper-1.900.1-r9.ebuild b/media-libs/jasper/jasper-1.900.1-r9.ebuild
index f7a4d565040f..8e9129e1f04d 100644
--- a/media-libs/jasper/jasper-1.900.1-r9.ebuild
+++ b/media-libs/jasper/jasper-1.900.1-r9.ebuild
@@ -45,6 +45,11 @@ PATCHES=(
DOCS=( NEWS README doc/. )
+src_prepare() {
+ chmod -R o-w "${S}" || die
+ autotools-multilib_src_prepare
+}
+
src_configure() {
local myeconfargs=(
$(use_enable jpeg libjpeg)
diff --git a/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch b/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch
new file mode 100644
index 000000000000..3688aad4a4d7
--- /dev/null
+++ b/media-libs/libass/files/0.13.0-configure-Set-the-correct-x32-machine-option-for-yas.patch
@@ -0,0 +1,26 @@
+From 4778001b673c73133d7d1dd48a385d0ca424ccfc Mon Sep 17 00:00:00 2001
+From: Luke Dashjr <luke-jr+git@utopios.org>
+Date: Sat, 10 Oct 2015 08:11:38 +0000
+Subject: [PATCH] configure: Set the correct x32 machine option for yasm
+
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 117b23b..d6fbe34 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,6 +56,12 @@ AS_IF([test x$enable_asm != xno], [
+ X86=true
+ BITS=32
+ ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -m x86" ],
++ [x86_64-*-gnux32|amd64-*-gnux32], [
++ AS=yasm
++ INTEL=true
++ X64=true
++ BITS=64
++ ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -m x32" ],
+ [x86_64-*|amd64-*], [
+ AS=yasm
+ INTEL=true
diff --git a/media-libs/libass/libass-0.13.0.ebuild b/media-libs/libass/libass-0.13.0.ebuild
index 20df06146ee7..3646359d0d5f 100644
--- a/media-libs/libass/libass-0.13.0.ebuild
+++ b/media-libs/libass/libass-0.13.0.ebuild
@@ -31,6 +31,11 @@ done
DOCS="Changelog"
+src_prepare() {
+ # bug #509460
+ epatch "${FILESDIR}/${PV}-configure-Set-the-correct-x32-machine-option-for-yas.patch"
+}
+
multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
$(use_enable fontconfig) \
diff --git a/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild b/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild
index a462ec95d1a3..066cbb9a3d37 100644
--- a/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-5.0.3.ebuild
@@ -12,10 +12,10 @@ HOMEPAGE="http://dvdnav.mplayerhq.hu/"
if [[ ${PV} = 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="git://git.videolan.org/libdvdnav.git"
- KEYWORDS="alpha hppa ia64 ppc ppc64 sparc"
+ KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
else
SRC_URI="http://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
- KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild b/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild
index 5ed4f27f7daf..6ece1b9db11c 100644
--- a/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild
+++ b/media-libs/libhdhomerun/libhdhomerun-20150826.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.silicondust.com/hdhomerun/${PN}_${PV}.tgz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND=""
diff --git a/media-libs/libpng/libpng-1.6.18.ebuild b/media-libs/libpng/libpng-1.6.18.ebuild
index 31dfe3001e24..1b0c3cefe330 100644
--- a/media-libs/libpng/libpng-1.6.18.ebuild
+++ b/media-libs/libpng/libpng-1.6.18.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="libpng"
SLOT="0/16"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng neon static-libs"
RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/libraw/libraw-0.16.2.ebuild b/media-libs/libraw/libraw-0.16.2.ebuild
index b233eda35fc2..c5337c592e33 100644
--- a/media-libs/libraw/libraw-0.16.2.ebuild
+++ b/media-libs/libraw/libraw-0.16.2.ebuild
@@ -23,7 +23,7 @@ SRC_URI="http://www.libraw.org/data/${MY_P}.tar.gz
# http://www.libraw.org/data/LICENSE.LibRaw.pdf
LICENSE="LGPL-2.1 CDDL GPL-2 GPL-3"
SLOT="0/10" # subslot = libraw soname version
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="demosaic examples jpeg jpeg2k +lcms openmp"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libvisio/files/libvisio-0.1.3-boost-1.59.patch b/media-libs/libvisio/files/libvisio-0.1.3-boost-1.59.patch
new file mode 100644
index 000000000000..a0102e8edcb4
--- /dev/null
+++ b/media-libs/libvisio/files/libvisio-0.1.3-boost-1.59.patch
@@ -0,0 +1,22 @@
+From: David Tardon <dtardon@redhat.com>
+Date: Sun, 30 Aug 2015 11:59:23 +0000 (+0200)
+Subject: fix build with boost 1.59
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libvisio.git;a=commitdiff_plain;h=2968c3dff8572b4734cb42c7bd5b00222f7fb288;hp=4b03893826bcc5f859b0ac3bea6a98269499d99f
+
+fix build with boost 1.59
+
+Change-Id: I21eebdfa99d379e57949bfe4bf7eb83aec16f916
+---
+
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index dc0f8fd..6946b0a 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -22,6 +22,7 @@ generated_files = \
+ $(top_builddir)/src/lib/tokens.h \
+ $(top_builddir)/src/lib/tokenhash.h
+
++libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
+ libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LIBADD = $(LIBVISIO_LIBS) @LIBVISIO_WIN32_RESOURCE@
+ libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_DEPENDENCIES = @LIBVISIO_WIN32_RESOURCE@
+ libvisio_@VSD_MAJOR_VERSION@_@VSD_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
diff --git a/media-libs/libvisio/files/libvisio-0.1.3-fix-tests.patch b/media-libs/libvisio/files/libvisio-0.1.3-fix-tests.patch
new file mode 100644
index 000000000000..19104a143c3c
--- /dev/null
+++ b/media-libs/libvisio/files/libvisio-0.1.3-fix-tests.patch
@@ -0,0 +1,49 @@
+From 75a02c586f6ec49d4316f79004834250ef42b0e0 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 25 Jul 2015 15:11:19 +0200
+Subject: [PATCH] fix test
+
+The previous version only worked with libxml2 < 2.9.2, because of a bug
+in handling nested elements of the same name.
+
+Change-Id: I1368cedf5845895154806d4ecf427bfbed19165f
+---
+ configure.ac | 4 ++++
+ src/test/importtest.cpp | 6 +++---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1611dcb..a075e73 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -128,6 +128,10 @@ AS_IF([test "x$enable_tools" = "xyes"], [
+ PKG_CHECK_MODULES([REVENGE_STREAM],[
+ librevenge-stream-0.0
+ ])
++ PKG_CHECK_EXISTS([libxml-2.0 >= 2.9.2],
++ [],
++ [AC_MSG_ERROR([libxml2 >= 2.9.2 is needed to run tests])]
++ )
+ ])
+ AC_SUBST([REVENGE_GENERATORS_CFLAGS])
+ AC_SUBST([REVENGE_GENERATORS_LIBS])
+diff --git a/src/test/importtest.cpp b/src/test/importtest.cpp
+index 8554309..0296380 100644
+--- a/src/test/importtest.cpp
++++ b/src/test/importtest.cpp
+@@ -272,9 +272,9 @@ void ImportTest::testVsdxImportBgColorFromTheme()
+ void ImportTest::testVsdxCharBgColor()
+ {
+ m_doc = parse("bgcolor.vsdx", m_buffer);
+- assertXPathNoAttribute(m_doc, "/document/page/layer/textObject/paragraph/span", "background-color");
+- assertXPath(m_doc, "/document/page/layer/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61");
+- assertXPath(m_doc, "/document/page/layer/layer[2]/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61");
++ assertXPathNoAttribute(m_doc, "/document/page/layer[1]/textObject/paragraph/span", "background-color");
++ assertXPath(m_doc, "/document/page/layer[2]/textObject/paragraph/span", "background-color", "#9dbb61");
++ assertXPath(m_doc, "/document/page/layer[3]/textObject/paragraph/span", "background-color", "#9dbb61");
+ }
+
+ CPPUNIT_TEST_SUITE_REGISTRATION(ImportTest);
+--
+1.7.9.5
+
diff --git a/media-libs/libvisio/libvisio-0.1.3-r1.ebuild b/media-libs/libvisio/libvisio-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..0770f0fd1d4a
--- /dev/null
+++ b/media-libs/libvisio/libvisio-0.1.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/libvisio/"
+inherit base eutils
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing the visio documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+IUSE="doc static-libs test tools"
+
+RDEPEND="
+ dev-libs/icu:=
+ dev-libs/librevenge
+ dev-libs/libxml2
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.46
+ dev-util/gperf
+ sys-devel/libtool
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-fix-tests.patch" \
+ "${FILESDIR}/${P}-boost-1.59.patch"
+ [[ -d m4 ]] || mkdir "m4"
+ base_src_prepare
+ [[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+ econf \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ $(use_enable static-libs static) \
+ --disable-werror \
+ $(use_with doc docs) \
+ $(use_enable test tests) \
+ $(use_enable tools)
+}
+
+src_install() {
+ default
+ prune_libtool_files --all
+}
diff --git a/media-libs/lilv/Manifest b/media-libs/lilv/Manifest
index 54e92e238595..a393ccf8cfe0 100644
--- a/media-libs/lilv/Manifest
+++ b/media-libs/lilv/Manifest
@@ -1,2 +1,3 @@
DIST lilv-0.18.0.tar.bz2 201334 SHA256 55995dd966df233337d80ff59c7b2a7ed0df56e82ec06d179feb518f00733ccd SHA512 a4892446220f642fb555eed39ce50a8235546c4415e979fe7f54acdc89fca6e437632b714e179806f3cbb80c81c0988978b8e1bcaa904c5e23ca789f6cb39206 WHIRLPOOL b36bbf7ce471e5cac4da7cb3fee3eea59dc85d494f745aec1a2fd8cc34289bd24c4c77302ea2613292847a65c4d84440b1a4780b4f45b6fac9585ceb005716ad
DIST lilv-0.20.0.tar.bz2 207948 SHA256 428a39f1265d44c55f2604829a12ade0ea13e1a1022ff937ca2a9ad227bd422a SHA512 bbc8b9154339cd145a61c5e4613fd31a2e457df8242c55371f3245564d3b23d028a0bc0ffafac393119bb47171b7c735f0c3a55cf5bffc6920ae89aa877240e5 WHIRLPOOL 1e71e553f1b969d40042633c9eb63b96ef1f9d72d8087326414f840ffe8ee38094f63cabf0efc57dece04471e7d4897140fbb886bad21f11a6282d420530d51c
+DIST lilv-0.22.0.tar.bz2 217207 SHA256 cd279321223ef11ca01551767d3c16d68cb31f689e02320a0b2e37b4f7d17ab4 SHA512 6c2827c1658437bd00f66f81d87c55c9dc26b575dd42f6dcce04c58f4a924fd6fa1499730f1b5ab4703d0537d722e6fd0d841fce065660b37540d257cf13024a WHIRLPOOL acc86bef9e3e2b1153aefa5c0c15f57594c898c43be9eb9e77219eacb57baf9dc284da1fe7990b79c7627c26f624ee3a8d369963f59f8635a32112d2a7417558
diff --git a/media-libs/lilv/lilv-0.22.0.ebuild b/media-libs/lilv/lilv-0.22.0.ebuild
new file mode 100644
index 000000000000..da5a8e7571ce
--- /dev/null
+++ b/media-libs/lilv/lilv-0.22.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit base python-any-r1 waf-utils bash-completion-r1
+
+DESCRIPTION="Library to make the use of LV2 plugins as simple as possible for applications"
+HOMEPAGE="http://drobilla.net/software/lilv/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc +dyn-manifest static-libs test"
+
+RDEPEND="media-libs/lv2
+ >=media-libs/sratom-0.4.0
+ >=dev-libs/serd-0.14.0
+ >=dev-libs/sord-0.13.0"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ doc? ( app-doc/doxygen )
+ virtual/pkgconfig"
+
+DOCS=( "AUTHORS" "NEWS" "README" )
+
+src_prepare() {
+ sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+}
+
+src_configure() {
+ waf-utils_src_configure \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --no-bash-completion \
+ $(use test && echo "--test") \
+ $(use doc && echo "--docs") \
+ $(use static-libs && echo "--static") \
+ $(use dyn-manifest && echo "--dyn-manifest")
+}
+
+src_test() {
+ ./waf test || die
+}
+
+src_install() {
+ waf-utils_src_install
+ newbashcomp utils/lilv.bash_completion ${PN}
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index b0e462ac0645..0bc5c956f4c5 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,9 +3,6 @@ DIST MesaLib-10.3.7.tar.bz2 7287153 SHA256 43c6ced15e237cbb21b3082d7c0b42777c50c
DIST MesaLib-10.4.6.tar.bz2 7520024 SHA256 d8baedd20e79ccd98a5a7b05e23d59a30892e68de1fcc057ca6873dafca02735 SHA512 1a379de8471f9154aa1348c15d24a56788e42b666094d63aa5dc8bffd1ed87c1ab50fb95adac010a92d832be4ec1be60b712179ad1ec99869ee653ccb576f50e WHIRLPOOL 45ff4f46a9c165c2cd3f49696f9d972216fdbc27051287d4eea4210f25631fb1faca517a714cc50229c463be1628dfbf71ba689d02ed3b3d52bfc71683fe667e
DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc
DIST mesa-10.5.8.tar.xz 6993084 SHA256 2866b855c5299a4aed066338c77ff6467c389b2c30ada7647be8758663da2b54 SHA512 d7fc441b4cdad8a2905f03091af26ca7b01573bf4d0d928e950270981e4c6e7d20dba6aa97a60500b9a335a3c5cabc7f388a5338d43d391eed3f09dea60b77b2 WHIRLPOOL 68cc3d8490da9759b9d790053c70429be4c529c63b114f65f411112f76cd4daccc3490120a85a84d01cdcb989c0a0e58016b4d80f2238f2320b1caff797f3390
-DIST mesa-10.6.6.tar.xz 7040744 SHA256 570f2154b7340ff5db61ff103bc6e85165b8958798b78a50fa2df488e98e5778 SHA512 a251dc258ccf2fbeccbff3447a23c0f417722244322c8887fe4a50b0013d3da3705ffbfe412b61717d2c3370cb6a88bec51b91e1b77a5b987d6fbf0fdbfe4a5e WHIRLPOOL 6f441a5b19b496d14b659b1ba3b70d2ead685ab1eb7d77b77c24d69127bd69ce6453feed1e042840bdb6cf47f68caa61c73c07ec2259a697acc3393e42111be6
-DIST mesa-10.6.8.tar.xz 7042260 SHA256 e36ee5ceeadb3966fb5ce5b4cf18322dbb76a4f075558ae49c3bba94f57d58fd SHA512 ebb2daff1afcc5f6808c5c9948814014c0570b18fb91481c9d09b2c28776ce6e4fd8bba650e559ac5d87d30fe06b38032c78828c13b95d5f9a0338d44b75f61e WHIRLPOOL e94395c0954875c9b1eaa6692385593a24242c3915012dcf8fcfa7b0d16cff33fc80421234dccdfafa4ecb9b82a176f177cf7ec622f6b80eac6de4cfcb5c7552
DIST mesa-10.6.9.tar.xz 7041588 SHA256 b04c4de6280b863babc2929573da17218d92e9e4ba6272d548d135415723e8c3 SHA512 32abcf167312dea06482e46da6f15b1c6902696a7dff759561f099eb12a6748673a5d6bb084c12ef57e6f13d3ec1b456541611a710519da87b11fd622f453344 WHIRLPOOL d3bf4627bdf7a576343bd2701948d5872e5d05a43b2980ce4e4915e8d95bd85eadb563cb3588918c55307769132a0cc8592361b4c9fbdf4831c181604d79028b
-DIST mesa-11.0.0.tar.xz 7257112 SHA256 e095a3eb2eca9dfde7efca8946527c8ae20a0cc938a8c78debc7f158ad44af32 SHA512 9938010f3d5e72bb8dea371e3502622e2ff6eae14e0265011df8fc81ec915d632abda9be7e772828adb8f0c7c12c830d89dce42e196ca18489fb1386a766220f WHIRLPOOL 454466396fac029450b619c842fa1e34906e5c529a67a575e9096f9e9b1584ad5b00f9ada2656e0469d5cf6d94e966709d4e0253484eb03d32f93e3e7d521f78
-DIST mesa-11.0.2.tar.xz 7263112 SHA256 fce11fb27eb87adf1e620a76455d635c6136dfa49ae58c53b34ef8d0c7b7eae4 SHA512 5b388c7464a97259b43f0c95114ddb6ea8d748a53a495202a01aa757baf5784c66c57e1f462a909bb9b3bf1239aa4fcbefbfc9fad2376a8288493304a2988ec4 WHIRLPOOL b4dd696c6135dd5f9711727ab57d042941a8b949010192544138f184086d90f1e9da1408ea937c95e831788c0797317d938e40948ae25226928ea14f77503859
+DIST mesa-11.0.3.tar.xz 7264824 SHA256 ab2992eece21adc23c398720ef8c6933cb69ea42e1b2611dc09d031e17e033d6 SHA512 7cec13749a600e589794c4b7c082bcbe47d708d3e4a670160a09b07a0c5afc301b984ac4e26519ed3acda6171f936f700eb62c0977cc392343822603ff6c7c15 WHIRLPOOL edcef9df038384cace1b650efbd0245dc6b7ecdd6e22d35a57590d919b1bceb73ff5b531b441b06da806ff1efe357872d1f16d3d0364fbd85000a2d7b406391f
DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
diff --git a/media-libs/mesa/mesa-10.6.6.ebuild b/media-libs/mesa/mesa-10.6.6.ebuild
deleted file mode 100644
index 4386f87e2577..000000000000
--- a/media-libs/mesa/mesa-10.6.6.ebuild
+++ /dev/null
@@ -1,463 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999* ]]; then
- SRC_URI=""
-else
- SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
- +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
- wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm )
- openmax? ( gallium )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_ilo? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium llvm )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vmware? ( gallium )
- ${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.60"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
- !<x11-base/xorg-server-1.7
- !<=x11-proto/xf86driproto-2.0.3
- abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
- classic? ( app-eselect/eselect-mesa )
- gallium? ( app-eselect/eselect-mesa )
- >=app-eselect/eselect-opengl-1.3.0
- udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- llvm? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- !video_cards_r600? (
- video_cards_radeon? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- )
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- )
- )
- openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- "
-done
-
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-
-DEPEND="${RDEPEND}
- llvm? (
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
- )
- opencl? (
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
- dri3? (
- >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
- >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
- )
- >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == "9999" ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- ${PYTHON_DEPS}
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- )
-)"
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # fix for hardened pax_kernel, bug 240956
- [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm gallium-llvm)
- $(use_enable openmax omx)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+="--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_i915 i915
- gallium_enable video_cards_ilo ilo
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if use pax_kernel; then
- myconf+="
- $(use_enable x86 glx-rts)
- "
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable osmesa) \
- $(use_enable !udev sysfs) \
- --enable-llvm-shared-libs \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use classic || use gallium; then
- ebegin "Moving DRI/Gallium drivers for dynamic switching"
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
- keepdir /usr/$(get_libdir)/dri
- dodir /usr/$(get_libdir)/mesa
- for x in ${gallium_drivers[@]}; do
- if [ -f "$(get_libdir)/gallium/${x}" ]; then
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
- || die "Failed to move ${x}"
- fi
- done
- if use classic; then
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
- fi
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${x/dri/mesa}" \
- || die "Failed to move ${x}"
- fi
- done
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
- ln -s ../mesa/*.so . || die "Creating symlink failed"
- # remove symlinks to drivers known to eselect
- for x in ${gallium_drivers[@]}; do
- if [ -f ${x} -o -L ${x} ]; then
- rm "${x}" || die "Failed to remove ${x}"
- fi
- done
- popd
- eend $?
- fi
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-
- if use openmax; then
- echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
- doenvd "${T}"/99mesaxdgomx
- keepdir /usr/share/mesa/xdg
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-
- # Install config file for eselect mesa
- insinto /usr/share/mesa
- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Select classic/gallium drivers
- if use classic || use gallium; then
- eselect mesa set --auto
- fi
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # run omxregister-bellagio to make the OpenMAX drivers known system-wide
- if use openmax; then
- ebegin "Registering OpenMAX drivers"
- BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
- OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
- omxregister-bellagio
- eend $?
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
- elog "enabled. Please see patents.txt for an explanation."
- fi
-
- if ! has_version media-libs/libtxc_dxtn; then
- elog "Note that in order to have full S3TC support, it is necessary to install"
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
- elog "textures in some apps, and some others even require this to run."
- fi
-}
-
-pkg_prerm() {
- if use openmax; then
- rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/mesa-10.6.8.ebuild b/media-libs/mesa/mesa-10.6.8.ebuild
deleted file mode 100644
index 4386f87e2577..000000000000
--- a/media-libs/mesa/mesa-10.6.8.ebuild
+++ /dev/null
@@ -1,463 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999* ]]; then
- SRC_URI=""
-else
- SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
- +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
- wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm )
- openmax? ( gallium )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_ilo? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium llvm )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vmware? ( gallium )
- ${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.60"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
- !<x11-base/xorg-server-1.7
- !<=x11-proto/xf86driproto-2.0.3
- abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
- classic? ( app-eselect/eselect-mesa )
- gallium? ( app-eselect/eselect-mesa )
- >=app-eselect/eselect-opengl-1.3.0
- udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- llvm? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- !video_cards_r600? (
- video_cards_radeon? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- )
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- )
- )
- openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- "
-done
-
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-
-DEPEND="${RDEPEND}
- llvm? (
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
- )
- opencl? (
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
- dri3? (
- >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
- >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
- )
- >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == "9999" ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- ${PYTHON_DEPS}
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- )
-)"
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # fix for hardened pax_kernel, bug 240956
- [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm gallium-llvm)
- $(use_enable openmax omx)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+="--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_i915 i915
- gallium_enable video_cards_ilo ilo
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if use pax_kernel; then
- myconf+="
- $(use_enable x86 glx-rts)
- "
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable osmesa) \
- $(use_enable !udev sysfs) \
- --enable-llvm-shared-libs \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use classic || use gallium; then
- ebegin "Moving DRI/Gallium drivers for dynamic switching"
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
- keepdir /usr/$(get_libdir)/dri
- dodir /usr/$(get_libdir)/mesa
- for x in ${gallium_drivers[@]}; do
- if [ -f "$(get_libdir)/gallium/${x}" ]; then
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
- || die "Failed to move ${x}"
- fi
- done
- if use classic; then
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
- fi
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${x/dri/mesa}" \
- || die "Failed to move ${x}"
- fi
- done
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
- ln -s ../mesa/*.so . || die "Creating symlink failed"
- # remove symlinks to drivers known to eselect
- for x in ${gallium_drivers[@]}; do
- if [ -f ${x} -o -L ${x} ]; then
- rm "${x}" || die "Failed to remove ${x}"
- fi
- done
- popd
- eend $?
- fi
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-
- if use openmax; then
- echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
- doenvd "${T}"/99mesaxdgomx
- keepdir /usr/share/mesa/xdg
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-
- # Install config file for eselect mesa
- insinto /usr/share/mesa
- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Select classic/gallium drivers
- if use classic || use gallium; then
- eselect mesa set --auto
- fi
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # run omxregister-bellagio to make the OpenMAX drivers known system-wide
- if use openmax; then
- ebegin "Registering OpenMAX drivers"
- BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
- OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
- omxregister-bellagio
- eend $?
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
- elog "enabled. Please see patents.txt for an explanation."
- fi
-
- if ! has_version media-libs/libtxc_dxtn; then
- elog "Note that in order to have full S3TC support, it is necessary to install"
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
- elog "textures in some apps, and some others even require this to run."
- fi
-}
-
-pkg_prerm() {
- if use openmax; then
- rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/mesa-11.0.0.ebuild b/media-libs/mesa/mesa-11.0.0.ebuild
deleted file mode 100644
index 309e8824f24f..000000000000
--- a/media-libs/mesa/mesa-11.0.0.ebuild
+++ /dev/null
@@ -1,466 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999* ]]; then
- SRC_URI=""
-else
- SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
- +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
- wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm )
- openmax? ( gallium )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_ilo? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium llvm )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vmware? ( gallium )
- ${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.64"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
- !<x11-base/xorg-server-1.7
- !<=x11-proto/xf86driproto-2.0.3
- abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
- classic? ( app-eselect/eselect-mesa )
- gallium? ( app-eselect/eselect-mesa )
- >=app-eselect/eselect-opengl-1.3.0
- udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- llvm? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- !video_cards_r600? (
- video_cards_radeon? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- )
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- )
- )
- openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- "
-done
-
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
- llvm? (
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
- )
- opencl? (
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
- dri3? (
- >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
- >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
- )
- >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == "9999" ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- ${PYTHON_DEPS}
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- )
-)"
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # fix for hardened pax_kernel, bug 240956
- [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm gallium-llvm)
- $(use_enable openmax omx)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+="--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_i915 i915
- gallium_enable video_cards_ilo ilo
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if use pax_kernel; then
- myconf+="
- $(use_enable x86 glx-rts)
- "
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable osmesa) \
- $(use_enable !udev sysfs) \
- --enable-llvm-shared-libs \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use classic || use gallium; then
- ebegin "Moving DRI/Gallium drivers for dynamic switching"
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
- keepdir /usr/$(get_libdir)/dri
- dodir /usr/$(get_libdir)/mesa
- for x in ${gallium_drivers[@]}; do
- if [ -f "$(get_libdir)/gallium/${x}" ]; then
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
- || die "Failed to move ${x}"
- fi
- done
- if use classic; then
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
- fi
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${x/dri/mesa}" \
- || die "Failed to move ${x}"
- fi
- done
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
- ln -s ../mesa/*.so . || die "Creating symlink failed"
- # remove symlinks to drivers known to eselect
- for x in ${gallium_drivers[@]}; do
- if [ -f ${x} -o -L ${x} ]; then
- rm "${x}" || die "Failed to remove ${x}"
- fi
- done
- popd
- eend $?
- fi
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-
- if use openmax; then
- echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
- doenvd "${T}"/99mesaxdgomx
- keepdir /usr/share/mesa/xdg
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-
- # Install config file for eselect mesa
- insinto /usr/share/mesa
- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Select classic/gallium drivers
- if use classic || use gallium; then
- eselect mesa set --auto
- fi
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # run omxregister-bellagio to make the OpenMAX drivers known system-wide
- if use openmax; then
- ebegin "Registering OpenMAX drivers"
- BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
- OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
- omxregister-bellagio
- eend $?
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
- elog "enabled. Please see patents.txt for an explanation."
- fi
-
- if ! has_version media-libs/libtxc_dxtn; then
- elog "Note that in order to have full S3TC support, it is necessary to install"
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
- elog "textures in some apps, and some others even require this to run."
- fi
-}
-
-pkg_prerm() {
- if use openmax; then
- rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mesa/mesa-11.0.2.ebuild b/media-libs/mesa/mesa-11.0.3.ebuild
index 38d52d0732cd..38d52d0732cd 100644
--- a/media-libs/mesa/mesa-11.0.2.ebuild
+++ b/media-libs/mesa/mesa-11.0.3.ebuild
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 0dc2a5a2c59f..c8c49eb3688f 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,8 +1,3 @@
-DIST x264-snapshot-20111220-2245.tar.bz2 532402 SHA256 c360b0320cc72a77c5f2ececbd100bbbdd0461227f7c4bc06212e86f5aa0fb8a SHA512 d6801f326f9848672f889cb9fe43da865b2351143b8f31f17341c62b89ac01f430cdc56c12d8bf9cf9f041e8381494915a84508eaf41898ef87631385ee6f3c2 WHIRLPOOL 6aed824854947435819d157c2c371ca358ce05d518adcfea9ec6c47a74bdd97d9c527e989b9eb0a6d2f00060c45186d3a3ade22af21d450c9e2c25be9aa46b34
-DIST x264-snapshot-20120327-2245.tar.bz2 551101 SHA256 065ffdbd7c9f9dcc7194bd6a4943b0d4b2e99b5dd68979fb3634644c725c2cbe SHA512 915e2933596f4809a7cba25a6eb7f8a555daaeeb3a5a95a314cb947940d562e12d164f52ab6b94d7abd52e66ee986d3414c54685390a619357eef22ba0cd6a6a WHIRLPOOL e61b779d9eba7cad48899bc7eb88e9b5e140013d016792ddd4d2c149f7447d8bbf528615b751c095813519218bc7e3072ded407c386043dff8270d2c43a7ecb9
-DIST x264-snapshot-20120707-2245.tar.bz2 554243 SHA256 52fdc8b558fa7dcb6419fef73fb07e771cdc2544f7652cde42968d640139eedb SHA512 5e263dfe4b4defd66a8a855467692473723ada9c34ab8da7042f2d10327f944914d0c8103f22edd4dc7a1c4664db5bfbf42052652c9f57b392db32f4ab77081b WHIRLPOOL 1a9061e5940e22071390b579abf859fec49f8da51f31e241b65513566eda66178c46b4b4c20318bb981230a16511e84b89e6174bc7f9ccbd48915a909cef3b5b
-DIST x264-snapshot-20130506-2245.tar.bz2 608013 SHA256 da7055a457d19b97ff35a2830e7caae665ea06d22ddc28393168983d1cd21f61 SHA512 6ba35f6b39fefbda6990dc0fd674efbe403b0616f2f02d71ae3e7bbc6ce2bab8878a963dd5f306f8a2b3b9a74c5c0b4dbf9dfb9dc0e602b807f726cf072905b5 WHIRLPOOL bfb4b7dd0e865cd9305ac177f5c544555004039209dda695fcc932aab647b87c96f0bae4fa040276bd3dbee64dcf982f3c2447efdbc01c1d42f040c9d5d0af85
-DIST x264-snapshot-20130731-2245.tar.bz2 625052 SHA256 caa39660f2ddc9dc53033af709452a21479c7b7c715c5f9d744d0d452c2d9e67 SHA512 2abcab4013dee9ac58779afd89fc558a8286cf33affda037e95a7e10cf00387cee1ad461ac59c5020fd9b72d303170f16d4e4b5593ec21528a33b0f530878d9d WHIRLPOOL 6f7fcc1c05c47a0d31578fbd0268b84ba458a968b087fb7d1050f67739bec140a1c3ded288cd0000180b5be921b469357ec9cdc363fc1eec82d82bd795557b56
-DIST x264-snapshot-20130912-2245.tar.bz2 628862 SHA256 87142cf15b7d7052f2e046a4b80adc3176fd6421889ab3bae83afc10d57ec648 SHA512 3e2223ca465b1ac214a421c512477524309694f321baabcd62b84bc341de34ecf196c8c91a931bbda0d7538dc138b924dc22ed7f242e135e4b53b387638b40c0 WHIRLPOOL b795a91511994761e9cf6e3a279708e4536ebc281b9ca1d18f0bceb93c89c062608d2e5c779a0f924d2dc005f90921223b42b22e409eaaca8a0041aae354213f
DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c
DIST x264-snapshot-20150820-2245.tar.bz2 718209 SHA256 0ea86849d1a9b0a5b88fe6e0281359d7f5675c68fb83f6397b3e02896ccd77e3 SHA512 6b85f96f7cc85e1e938dad06c01b777aaf866796fb1763a02b4b7fa9c44f70bf15fc1bef123f7b24bb2c58b23f7276d4eb2b8f99b2e4fef3c716ed7f66d66e44 WHIRLPOOL daf5a63dbe2cb77a496a3eec1b1687ef6c4a008328064c46bd0e90139d328a6ff4e7dbd17b8dad57c357717c0b665293c86883213b483e85d25a06ec93c81024
+DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512 a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3 WHIRLPOOL 520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3
diff --git a/media-libs/x264/files/x264-0.0.20120707-gcc48.patch b/media-libs/x264/files/x264-0.0.20120707-gcc48.patch
deleted file mode 100644
index 16cb4bff0018..000000000000
--- a/media-libs/x264/files/x264-0.0.20120707-gcc48.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 6129dbe86484393a2ea520be94ef9b550b0bd113 Mon Sep 17 00:00:00 2001
-From: Jason Garrett-Glaser <jason@x264.com>
-Date: Wed, 27 Feb 2013 13:30:22 -0800
-Subject: [PATCH] Fix array overreads that caused miscompilation in gcc 4.8
-
----
- common/common.h | 1 +
- common/set.c | 78 +++++++++++++++++++++++++++++++-------------------------
- tools/checkasm.c | 2 +-
- 3 files changed, 45 insertions(+), 36 deletions(-)
-
-diff --git a/common/common.h b/common/common.h
-index 39ad5cb..0da1d43 100644
---- a/common/common.h
-+++ b/common/common.h
-@@ -40,6 +40,7 @@
- #define IS_DISPOSABLE(type) ( type == X264_TYPE_B )
- #define FIX8(f) ((int)(f*(1<<8)+.5))
- #define ALIGN(x,a) (((x)+((a)-1))&~((a)-1))
-+#define ARRAY_ELEMS(a) ((sizeof(a))/(sizeof(a[0])))
-
- #define CHECKED_MALLOC( var, size )\
- do {\
-diff --git a/common/set.c b/common/set.c
-index 4c72125..fa8b158 100644
---- a/common/set.c
-+++ b/common/set.c
-@@ -85,44 +85,49 @@ int x264_cqm_init( x264_t *h )
- int max_qp_err = -1;
- int max_chroma_qp_err = -1;
- int min_qp_err = QP_MAX+1;
-- int num_8x8_lists = h->sps->i_chroma_format_idc == CHROMA_444 ? 4 : 2; /* Checkasm may segfault if optimized out by --chroma-format */
-+ int num_8x8_lists = h->sps->i_chroma_format_idc == CHROMA_444 ? 4
-+ : h->param.analyse.b_transform_8x8 ? 2 : 0; /* Checkasm may segfault if optimized out by --chroma-format */
-
-- for( int i = 0; i < 4 + num_8x8_lists; i++ )
-- {
-- int size = i<4 ? 16 : 64;
-- int j;
-- for( j = (i<4 ? 0 : 4); j < i; j++ )
-- if( !memcmp( h->pps->scaling_list[i], h->pps->scaling_list[j], size*sizeof(uint8_t) ) )
-- break;
-- if( j < i )
-- {
-- h-> quant4_mf[i] = h-> quant4_mf[j];
-- h->dequant4_mf[i] = h->dequant4_mf[j];
-- h->unquant4_mf[i] = h->unquant4_mf[j];
-- }
-- else
-- {
-- CHECKED_MALLOC( h-> quant4_mf[i], (QP_MAX+1)*size*sizeof(udctcoef) );
-- CHECKED_MALLOC( h->dequant4_mf[i], 6*size*sizeof(int) );
-- CHECKED_MALLOC( h->unquant4_mf[i], (QP_MAX+1)*size*sizeof(int) );
-- }
--
-- for( j = (i<4 ? 0 : 4); j < i; j++ )
-- if( deadzone[j&3] == deadzone[i&3] &&
-- !memcmp( h->pps->scaling_list[i], h->pps->scaling_list[j], size*sizeof(uint8_t) ) )
-- break;
-- if( j < i )
-- {
-- h->quant4_bias[i] = h->quant4_bias[j];
-- h->quant4_bias0[i] = h->quant4_bias0[j];
-- }
-- else
-- {
-- CHECKED_MALLOC( h->quant4_bias[i], (QP_MAX+1)*size*sizeof(udctcoef) );
-- CHECKED_MALLOC( h->quant4_bias0[i], (QP_MAX+1)*size*sizeof(udctcoef) );
-- }
-+#define CQM_ALLOC( w, count )\
-+ for( int i = 0; i < count; i++ )\
-+ {\
-+ int size = w*w;\
-+ int start = w == 8 ? 4 : 0;\
-+ int j;\
-+ for( j = 0; j < i; j++ )\
-+ if( !memcmp( h->pps->scaling_list[i+start], h->pps->scaling_list[j+start], size*sizeof(uint8_t) ) )\
-+ break;\
-+ if( j < i )\
-+ {\
-+ h-> quant##w##_mf[i] = h-> quant##w##_mf[j];\
-+ h->dequant##w##_mf[i] = h->dequant##w##_mf[j];\
-+ h->unquant##w##_mf[i] = h->unquant##w##_mf[j];\
-+ }\
-+ else\
-+ {\
-+ CHECKED_MALLOC( h-> quant##w##_mf[i], (QP_MAX+1)*size*sizeof(udctcoef) );\
-+ CHECKED_MALLOC( h->dequant##w##_mf[i], 6*size*sizeof(int) );\
-+ CHECKED_MALLOC( h->unquant##w##_mf[i], (QP_MAX+1)*size*sizeof(int) );\
-+ }\
-+ for( j = 0; j < i; j++ )\
-+ if( deadzone[j] == deadzone[i] &&\
-+ !memcmp( h->pps->scaling_list[i+start], h->pps->scaling_list[j+start], size*sizeof(uint8_t) ) )\
-+ break;\
-+ if( j < i )\
-+ {\
-+ h->quant##w##_bias[i] = h->quant##w##_bias[j];\
-+ h->quant##w##_bias0[i] = h->quant##w##_bias0[j];\
-+ }\
-+ else\
-+ {\
-+ CHECKED_MALLOC( h->quant##w##_bias[i], (QP_MAX+1)*size*sizeof(udctcoef) );\
-+ CHECKED_MALLOC( h->quant##w##_bias0[i], (QP_MAX+1)*size*sizeof(udctcoef) );\
-+ }\
- }
-
-+ CQM_ALLOC( 4, 4 )
-+ CQM_ALLOC( 8, num_8x8_lists )
-+
- for( int q = 0; q < 6; q++ )
- {
- for( int i = 0; i < 16; i++ )
-@@ -204,6 +209,9 @@ int x264_cqm_init( x264_t *h )
- for( int cat = 0; cat < 3 + CHROMA444; cat++ )
- {
- int dct8x8 = cat&1;
-+ if( !h->param.analyse.b_transform_8x8 && dct8x8 )
-+ continue;
-+
- int size = dct8x8 ? 64 : 16;
- udctcoef *nr_offset = h->nr_offset_emergency[q][cat];
- /* Denoise chroma first (due to h264's chroma QP offset), then luma, then DC. */
-diff --git a/tools/checkasm.c b/tools/checkasm.c
-index 9135b70..441687b 100644
---- a/tools/checkasm.c
-+++ b/tools/checkasm.c
-@@ -309,7 +309,7 @@ static int check_pixel( int cpu_ref, int cpu_new )
-
- #define TEST_PIXEL( name, align ) \
- ok = 1, used_asm = 0; \
-- for( int i = 0; i < 8; i++ ) \
-+ for( int i = 0; i < ARRAY_ELEMS(pixel_c.name); i++ ) \
- { \
- int res_c, res_asm; \
- if( pixel_asm.name[i] != pixel_ref.name[i] ) \
---
-1.8.1.5
-
diff --git a/media-libs/x264/files/x264-0.0.20130731-cflags.patch b/media-libs/x264/files/x264-0.0.20130731-cflags.patch
deleted file mode 100644
index 3014b47eca8e..000000000000
--- a/media-libs/x264/files/x264-0.0.20130731-cflags.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://bugs.gentoo.org/420241 for x32 stuff
-initial x32 support -- no asm code, just pure C
-
-avoid messing too much with CFLAGS.
-https://bugs.gentoo.org/show_bug.cgi?id=351219
-https://bugs.gentoo.org/show_bug.cgi?id=413661
-
-
-Index: x264-9999/configure
-===================================================================
---- x264-9999.orig/configure
-+++ x264-9999/configure
-@@ -553,11 +553,6 @@ case $host_cpu in
- if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
- CFLAGS="$CFLAGS -march=i686"
- fi
-- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
-- CFLAGS="$CFLAGS -mfpmath=sse -msse"
-- fi
-- CFLAGS="-m32 $CFLAGS"
-- LDFLAGS="-m32 $LDFLAGS"
- else
- # icc on linux has various degrees of mod16 stack support
- if [ $SYS = LINUX ]; then
-@@ -588,13 +583,8 @@ case $host_cpu in
- x86_64)
- ARCH="X86_64"
- AS="yasm"
-- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
- if [ "$SYS" = MACOSX ]; then
- ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX"
-- if cc_check '' "-arch x86_64"; then
-- CFLAGS="$CFLAGS -arch x86_64"
-- LDFLAGS="$LDFLAGS -arch x86_64"
-- fi
- elif [ "$SYS" = WINDOWS ]; then
- ASFLAGS="$ASFLAGS -f win32 -m amd64"
- # only the GNU toolchain is inconsistent in prefixing function names with _
-@@ -602,7 +592,11 @@ case $host_cpu in
- [ $compiler = GNU ] && LDFLAGS="$LDFLAGS -Wl,--nxcompat -Wl,--dynamicbase"
- [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS"
- else
-- ASFLAGS="$ASFLAGS -f elf -m amd64"
-+ if cpp_check "" "" "__ILP32__" ; then
-+ ASFLAGS="$ASFLAGS -f elf -m x32"
-+ else
-+ ASFLAGS="$ASFLAGS -f elf -m amd64"
-+ fi
- fi
- ;;
- powerpc|powerpc64)
-@@ -964,10 +958,6 @@ if [ "$pic" = "yes" ] ; then
- [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
- fi
-
--if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
-- CFLAGS="$CFLAGS -fomit-frame-pointer"
--fi
--
- if [ "$strip" = "yes" ]; then
- CFLAGS="$CFLAGS -s"
- LDFLAGS="$LDFLAGS -s"
diff --git a/media-libs/x264/files/x264-0.0.20151011-cflags.patch b/media-libs/x264/files/x264-0.0.20151011-cflags.patch
new file mode 100644
index 000000000000..851e3f045719
--- /dev/null
+++ b/media-libs/x264/files/x264-0.0.20151011-cflags.patch
@@ -0,0 +1,51 @@
+Index: x264-snapshot-20151011-2245/configure
+===================================================================
+--- x264-snapshot-20151011-2245.orig/configure
++++ x264-snapshot-20151011-2245/configure
+@@ -672,11 +672,6 @@ case $host_cpu in
+ if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
+ CFLAGS="$CFLAGS -march=i686"
+ fi
+- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
+- CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
+- fi
+- CFLAGS="-m32 $CFLAGS"
+- LDFLAGS="-m32 $LDFLAGS"
+ fi
+ if [ "$SYS" = MACOSX ]; then
+ ASFLAGS="$ASFLAGS -f macho32 -DPREFIX"
+@@ -695,13 +690,8 @@ case $host_cpu in
+ AS_EXT=".asm"
+ ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/"
+ stack_alignment=16
+- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
+ if [ "$SYS" = MACOSX ]; then
+ ASFLAGS="$ASFLAGS -f macho64 -DPIC -DPREFIX"
+- if cc_check '' "-arch x86_64"; then
+- CFLAGS="$CFLAGS -arch x86_64"
+- LDFLAGS="$LDFLAGS -arch x86_64"
+- fi
+ elif [ "$SYS" = WINDOWS -o "$SYS" = CYGWIN ]; then
+ ASFLAGS="$ASFLAGS -f win64"
+ # only the GNU toolchain is inconsistent in prefixing function names with _
+@@ -1148,20 +1138,10 @@ if [ "$pic" = "yes" ] ; then
+ [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text"
+ fi
+
+-if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
+- CFLAGS="$CFLAGS -fomit-frame-pointer"
+-fi
+-
+ if [ "$strip" = "yes" ]; then
+ LDFLAGS="$LDFLAGS -s"
+ fi
+
+-if [ "$debug" = "yes" ]; then
+- CFLAGS="-O1 -g $CFLAGS"
+-else
+- CFLAGS="-O3 -ffast-math $CFLAGS"
+-fi
+-
+ if cc_check '' -fno-tree-vectorize ; then
+ CFLAGS="$CFLAGS -fno-tree-vectorize"
+ fi
diff --git a/media-libs/x264/files/x264-nostrip.patch b/media-libs/x264/files/x264-nostrip.patch
deleted file mode 100644
index b4e2689a18e6..000000000000
--- a/media-libs/x264/files/x264-nostrip.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: x264-svn/configure
-===================================================================
---- x264-svn.orig/configure
-+++ x264-svn/configure
-@@ -374,11 +374,6 @@ if [ "$pic" = "yes" ] ; then
- ASFLAGS="$ASFLAGS -D__PIC__"
- fi
-
--if [ "$debug" != "yes" -a "$gprof" != "yes" ]; then
-- CFLAGS="$CFLAGS -s -fomit-frame-pointer"
-- LDFLAGS="$LDFLAGS -s"
--fi
--
- if [ "$debug" = "yes" ]; then
- CFLAGS="-O1 -g $CFLAGS"
- else
diff --git a/media-libs/x264/files/x264-onlylib-20110425.patch b/media-libs/x264/files/x264-onlylib-20110425.patch
deleted file mode 100644
index 6f216b92fa8e..000000000000
--- a/media-libs/x264/files/x264-onlylib-20110425.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: x264-snapshot-20110425-2245/Makefile
-===================================================================
---- x264-snapshot-20110425-2245.orig/Makefile
-+++ x264-snapshot-20110425-2245/Makefile
-@@ -137,7 +137,7 @@ DEP = depend
-
- .PHONY: all default fprofiled clean distclean install uninstall dox test testclean
-
--default: $(DEP) x264$(EXE)
-+default: $(DEP)
-
- $(LIBX264): .depend $(OBJS) $(OBJASM)
- $(AR)$@ $(OBJS) $(OBJASM)
-@@ -207,7 +207,7 @@ distclean: clean
- rm -f config.mak x264_config.h config.h config.log x264.pc x264.def
- rm -rf test/
-
--install: x264$(EXE) $(SONAME)
-+install: $(LIBX264) $(SONAME)
- install -d $(DESTDIR)$(bindir)
- install -d $(DESTDIR)$(includedir)
- install -d $(DESTDIR)$(libdir)
-@@ -216,7 +216,6 @@ install: x264$(EXE) $(SONAME)
- install -m 644 x264_config.h $(DESTDIR)$(includedir)
- install -m 644 $(LIBX264) $(DESTDIR)$(libdir)
- install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
-- install x264$(EXE) $(DESTDIR)$(bindir)
- $(if $(RANLIB), $(RANLIB) $(DESTDIR)$(libdir)/$(LIBX264))
- ifeq ($(SYS),WINDOWS)
- $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
diff --git a/media-libs/x264/files/x264-x32.patch b/media-libs/x264/files/x264-x32.patch
deleted file mode 100644
index 7af4405a8472..000000000000
--- a/media-libs/x264/files/x264-x32.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/420241
-
-initial x32 support -- no asm code, just pure C
-
---- a/configure
-+++ b/configure
-@@ -567,7 +567,13 @@ case $host_cpu in
- x86_64)
- ARCH="X86_64"
- AS="yasm"
-- [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
-+ if [ $compiler = GNU ]; then
-+ if cpp_check "" "" "__ILP32__" ; then
-+ CFLAGS="-mx32 $CFLAGS" && LDFLAGS="-mx32 $LDFLAGS"
-+ else
-+ CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS"
-+ fi
-+ fi
- if [ "$SYS" = MACOSX ]; then
- ASFLAGS="$ASFLAGS -f macho64 -m amd64 -DPIC -DPREFIX"
- if cc_check '' "-arch x86_64"; then
-@@ -580,7 +586,11 @@ case $host_cpu in
- [ $compiler = GNU ] && cc_check "" "-S" && grep -q "_main:" conftest && ASFLAGS="$ASFLAGS -DPREFIX"
- [ $compiler = GNU ] && RCFLAGS="--target=pe-x86-64 $RCFLAGS"
- else
-- ASFLAGS="$ASFLAGS -f elf -m amd64"
-+ if cpp_check "" "" "__ILP32__" ; then
-+ AS="${cross_prefix}as"
-+ else
-+ ASFLAGS="$ASFLAGS -f elf -m amd64"
-+ fi
- fi
- ;;
- powerpc|powerpc64)
diff --git a/media-libs/x264/x264-0.0.20111220.ebuild b/media-libs/x264/x264-0.0.20111220.ebuild
deleted file mode 100644
index a54e600713fd..000000000000
--- a/media-libs/x264/x264-0.0.20111220.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- V_ECLASS="git-2"
-else
- V_ECLASS="versionator"
-fi
-
-inherit multilib toolchain-funcs flag-o-matic ${V_ECLASS}
-
-if [ "${PV#9999}" = "${PV}" ]; then
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-fi
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [ "${PV#9999}" != "${PV}" ] ; then
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SRC_URI=""
-else
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ]; then
- KEYWORDS=""
-else
- KEYWORDS="alpha amd64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-fi
-IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads"
-
-RDEPEND=""
-DEPEND="amd64? ( >=dev-lang/yasm-1 )
- x86? ( >=dev-lang/yasm-1 )
- x86-fbsd? ( >=dev-lang/yasm-1 )"
-
-if [ "${PV#9999}" = "${PV}" ]; then
- S="${WORKDIR}/${MY_P}"
-fi
-
-DOCS="AUTHORS doc/*.txt"
-
-src_configure() {
- tc-export CC
-
- local myconf=""
- use 10bit && myconf+=" --bit-depth=10"
- use debug && myconf+=" --enable-debug"
- use interlaced || myconf+=" --disable-interlaced"
- use static-libs && myconf+=" --enable-static"
- use threads || myconf+=" --disable-thread"
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- if use x86 && use pic; then
- myconf+=" --disable-asm"
- fi
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-cli \
- --disable-avs \
- --disable-lavf \
- --disable-swscale \
- --disable-ffms \
- --disable-gpac \
- --enable-pic \
- --enable-shared \
- --host="${CHOST}" \
- ${myconf} || die
-
- # this is a nasty workaround for bug #376925 as upstream doesn't like us
- # fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
diff --git a/media-libs/x264/x264-0.0.20120327.ebuild b/media-libs/x264/x264-0.0.20120327.ebuild
deleted file mode 100644
index 4c099cedd68d..000000000000
--- a/media-libs/x264/x264-0.0.20120327.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- V_ECLASS="git-2"
-else
- V_ECLASS="versionator"
-fi
-
-inherit multilib toolchain-funcs flag-o-matic ${V_ECLASS}
-
-if [ "${PV#9999}" = "${PV}" ]; then
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-fi
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [ "${PV#9999}" != "${PV}" ] ; then
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SRC_URI=""
-else
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads"
-
-RDEPEND=""
-DEPEND="amd64? ( >=dev-lang/yasm-1 )
- x86? ( >=dev-lang/yasm-1 )
- x86-fbsd? ( >=dev-lang/yasm-1 )"
-
-if [ "${PV#9999}" = "${PV}" ]; then
- S="${WORKDIR}/${MY_P}"
-fi
-
-DOCS="AUTHORS doc/*.txt"
-
-src_configure() {
- tc-export CC
-
- local myconf=""
- use 10bit && myconf+=" --bit-depth=10"
- use debug && myconf+=" --enable-debug"
- use interlaced || myconf+=" --disable-interlaced"
- use static-libs && myconf+=" --enable-static"
- use threads || myconf+=" --disable-thread"
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- if use x86 && use pic; then
- myconf+=" --disable-asm"
- fi
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-cli \
- --disable-avs \
- --disable-lavf \
- --disable-swscale \
- --disable-ffms \
- --disable-gpac \
- --enable-pic \
- --enable-shared \
- --host="${CHOST}" \
- ${myconf} || die
-
- # this is a nasty workaround for bug #376925 as upstream doesn't like us
- # fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
diff --git a/media-libs/x264/x264-0.0.20120707.ebuild b/media-libs/x264/x264-0.0.20120707.ebuild
deleted file mode 100644
index 49c91fb3381f..000000000000
--- a/media-libs/x264/x264-0.0.20120707.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- V_ECLASS="git-2"
-else
- V_ECLASS="versionator"
-fi
-
-inherit multilib toolchain-funcs flag-o-matic ${V_ECLASS}
-
-if [ "${PV#9999}" = "${PV}" ]; then
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
-fi
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [ "${PV#9999}" != "${PV}" ] ; then
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SRC_URI=""
-else
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-if [ "${PV#9999}" != "${PV}" ]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads"
-
-RDEPEND=""
-DEPEND="amd64? ( >=dev-lang/yasm-1 )
- amd64-fbsd? ( >=dev-lang/yasm-1 )
- x86? ( >=dev-lang/yasm-1 )
- x86-fbsd? ( >=dev-lang/yasm-1 )"
-
-if [ "${PV#9999}" = "${PV}" ]; then
- S="${WORKDIR}/${MY_P}"
-fi
-
-DOCS="AUTHORS doc/*.txt"
-
-src_prepare() {
- # Solaris' /bin/sh doesn't grok the syntax in these files
- sed -i -e '1c\#!/usr/bin/env sh' configure version.sh || die
- # for sparc-solaris
- if [[ ${CHOST} == sparc*-solaris* ]] ; then
- sed -i -e 's:-DPIC::g' configure || die
- fi
- # for OSX
- sed -i -e "s|-arch x86_64||g" configure || die
- epatch "${FILESDIR}"/x264-x32.patch #420241
-
- # fix crashes when compiled with gcc 4.8
- epatch "${FILESDIR}"/${P}-gcc48.patch
-}
-
-src_configure() {
- tc-export CC
-
- local myconf=""
- use 10bit && myconf+=" --bit-depth=10"
- use debug && myconf+=" --enable-debug"
- use interlaced || myconf+=" --disable-interlaced"
- use static-libs && myconf+=" --enable-static"
- use threads || myconf+=" --disable-thread"
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- if use x86 && use pic || [[ ${ABI} == "x32" ]] ; then
- myconf+=" --disable-asm"
- fi
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-cli \
- --disable-avs \
- --disable-lavf \
- --disable-swscale \
- --disable-ffms \
- --disable-gpac \
- --enable-pic \
- --enable-shared \
- --host="${CHOST}" \
- ${myconf} || die
-
- # this is a nasty workaround for bug #376925 as upstream doesn't like us
- # fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
diff --git a/media-libs/x264/x264-0.0.20130506.ebuild b/media-libs/x264/x264-0.0.20130506.ebuild
deleted file mode 100644
index 11e10b0d330e..000000000000
--- a/media-libs/x264/x264-0.0.20130506.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SLOT="0"
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
- SONAME="132"
- SLOT="0/${SONAME}"
-
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-IUSE="10bit custom-cflags +interlaced pic static-libs +threads"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="amd64? ( ${ASM_DEP} )
- amd64-fbsd? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )"
-
-DOCS="AUTHORS doc/*.txt"
-
-src_prepare() {
- # Initial support for x32 ABI, bug #420241
- epatch "${FILESDIR}"/x264-x32.patch
-}
-
-src_configure() {
- tc-export CC
- local asm_conf=""
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- if use x86 && use pic || [[ ${ABI} == "x32" ]]; then
- asm_conf=" --disable-asm"
- fi
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-cli \
- --disable-avs \
- --disable-lavf \
- --disable-swscale \
- --disable-ffms \
- --disable-gpac \
- --enable-pic \
- --enable-shared \
- --host="${CHOST}" \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex static-libs "" "--enable-static") \
- $(usex threads "" "--disable-thread") \
- ${asm_conf} || die
-
- # this is a nasty workaround for bug #376925 as upstream doesn't like us
- # fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
diff --git a/media-libs/x264/x264-0.0.20130731.ebuild b/media-libs/x264/x264-0.0.20130731.ebuild
deleted file mode 100644
index 0f1ce85f718c..000000000000
--- a/media-libs/x264/x264-0.0.20130731.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
-
-DESCRIPTION="A free library for encoding X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
- S="${WORKDIR}/${MY_P}"
-fi
-
-SONAME="135"
-SLOT="0/${SONAME}"
-
-LICENSE="GPL-2"
-IUSE="10bit +interlaced pic static-libs cpu_flags_x86_sse +threads"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="abi_x86_32? ( ${ASM_DEP} )
- abi_x86_64? ( ${ASM_DEP} )"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
- !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-DOCS="AUTHORS doc/*.txt"
-
-src_prepare() {
- # Initial support for x32 ABI, bug #420241
- # Avoid messing too much with CFLAGS.
- epatch "${FILESDIR}"/${P}-cflags.patch
-}
-
-multilib_src_configure() {
- tc-export CC
- local asm_conf=""
-
- if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
- asm_conf=" --disable-asm"
- fi
-
- # Upstream uses this, see the cflags patch
- use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
-
- "${S}/configure" \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --disable-cli \
- --disable-avs \
- --disable-lavf \
- --disable-swscale \
- --disable-ffms \
- --disable-gpac \
- --enable-pic \
- --enable-shared \
- --host="${CHOST}" \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex interlaced "" "--disable-interlaced") \
- --disable-opencl \
- $(usex static-libs "--enable-static" "") \
- $(usex threads "" "--disable-thread") \
- ${asm_conf} || die
-}
diff --git a/media-libs/x264/x264-0.0.20130912.ebuild b/media-libs/x264/x264-0.0.20151011.ebuild
index c5613425973a..f097db63aed7 100644
--- a/media-libs/x264/x264-0.0.20130912.ebuild
+++ b/media-libs/x264/x264-0.0.20151011.ebuild
@@ -19,16 +19,18 @@ else
S="${WORKDIR}/${MY_P}"
fi
-SONAME="138"
+SONAME="148"
SLOT="0/${SONAME}"
LICENSE="GPL-2"
-IUSE="10bit +interlaced pic static-libs cpu_flags_x86_sse +threads"
+IUSE="10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
ASM_DEP=">=dev-lang/yasm-1.2.0"
DEPEND="abi_x86_32? ( ${ASM_DEP} )
- abi_x86_64? ( ${ASM_DEP} )"
-RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
+ abi_x86_64? ( ${ASM_DEP} )
+ opencl? ( dev-lang/perl )"
+RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
DOCS="AUTHORS doc/*.txt"
@@ -36,7 +38,7 @@ DOCS="AUTHORS doc/*.txt"
src_prepare() {
# Initial support for x32 ABI, bug #420241
# Avoid messing too much with CFLAGS.
- epatch "${FILESDIR}"/${P}-cflags.patch
+ epatch "${FILESDIR}"/x264-0.0.20151011-cflags.patch
}
multilib_src_configure() {
@@ -49,6 +51,7 @@ multilib_src_configure() {
# Upstream uses this, see the cflags patch
use cpu_flags_x86_sse && append-flags "-msse" "-mfpmath=sse"
+ append-flags "-ffast-math"
"${S}/configure" \
--prefix="${EPREFIX}"/usr \
@@ -64,7 +67,7 @@ multilib_src_configure() {
--host="${CHOST}" \
$(usex 10bit "--bit-depth=10" "") \
$(usex interlaced "" "--disable-interlaced") \
- --disable-opencl \
+ $(usex opencl "" "--disable-opencl") \
$(usex static-libs "--enable-static" "") \
$(usex threads "" "--disable-thread") \
${asm_conf} || die
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index 4dc50414bc78..f097db63aed7 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -38,7 +38,7 @@ DOCS="AUTHORS doc/*.txt"
src_prepare() {
# Initial support for x32 ABI, bug #420241
# Avoid messing too much with CFLAGS.
- epatch "${FILESDIR}"/x264-cflags.patch
+ epatch "${FILESDIR}"/x264-0.0.20151011-cflags.patch
}
multilib_src_configure() {
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index ff456413d5c6..154e98a00b77 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -1,2 +1,3 @@
DIST x265-1.5.tar.bz2 588263 SHA256 da226cbe56938f85d5a3d123d1f5ca895795f2eac794e45af4b70047e03d8648 SHA512 e5db8c3428b7b393c5c3049041de152b43821a083bc1988903ade8d6ce5fdc71a2fe0ad9efa0564aa3c2c6f1ec31659fcd2b338f6b53d22a202811be7071f077 WHIRLPOOL 9e1256832a3ece06d68a872b44337285afbbeebbd149ac71fda25524d60310f595adedce1b28f0ed5a59feadef39848d797bd58f4b0d7c7d707bcddca7520f6d
DIST x265_1.7.tar.gz 844212 SHA256 a52ca95e8e64219c1e8e73a9abf0bb7151ced2c93756a623cf2b7e5cf8226585 SHA512 cf6fce24b008d36bbc79e2488ab5fb3010aa588113645597ffc66959088a73b3ba72f6bb81bd16e36847a73b50b8f264cff0899162552418ae499170c286eb89 WHIRLPOOL 9c932fd85fbc06a63802f8aabdbb5f44fe4bee6bc2d0996df8788acad30be965bde7b56f562e4ca8ae87856fbcf728b6938a701afb397ef2195437b73a60c744
+DIST x265_1.8.tar.gz 918469 SHA256 760e6280c688f1ea90c492d19fc6d4084ca1c4b0ea9b2e3c736d32565c30d857 SHA512 498c25ff6e5c68849db11d1509cc6f7e96d3a2e6594542589ac5b9f6d65a09ab3af590dcc3357f985f218f8d54af364c998cfedfbe95644747835c059214935c WHIRLPOOL ef5c1a31e8ab45c2918e24e97c09809eda735df354d9000e3935b054ca01fd60ef1d1afad6c161c7c62b8b016c2a80155665448a18e4037fab8c56a841488eeb
diff --git a/media-libs/x265/x265-1.8.ebuild b/media-libs/x265/x265-1.8.ebuild
new file mode 100644
index 000000000000..ee4a32fe9fae
--- /dev/null
+++ b/media-libs/x265/x265-1.8.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-multilib multilib flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+ inherit mercurial
+ EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+else
+ SRC_URI="
+ https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz
+ http://ftp.videolan.org/pub/videolan/x265/${PN}_${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/"
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/68"
+IUSE="+10bit test"
+
+ASM_DEPEND=">=dev-lang/yasm-1.2.0"
+RDEPEND=""
+DEPEND="${RDEPEND}
+ abi_x86_32? ( ${ASM_DEPEND} )
+ abi_x86_64? ( ${ASM_DEPEND} )"
+
+src_unpack() {
+ if [[ ${PV} = 9999* ]]; then
+ mercurial_src_unpack
+ # Can't set it at global scope due to mercurial.eclass limitations...
+ export S=${WORKDIR}/${P}/source
+ else
+ unpack ${A}
+ export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
+ fi
+}
+
+multilib_src_configure() {
+ append-cflags -fPIC
+ append-cxxflags -fPIC
+ local mycmakeargs=(
+ $(cmake-utils_use_enable test TESTS)
+ $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+ -DHIGH_BIT_DEPTH=$(usex 10bit "ON" "OFF")
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ if [ "${ABI}" = x86 ] ; then
+ use 10bit && ewarn "Disabling 10bit support on x86 as it does not build (or requires to disable assembly optimizations)"
+ mycmakeargs+=( -DHIGH_BIT_DEPTH=OFF )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_configure() {
+ multilib_parallel_foreach_abi multilib_src_configure
+}
+
+multilib_src_test() {
+ if has ${MULTILIB_ABI_FLAG} abi_x86_32 abi_x86_64 ; then
+ cd "${BUILD_DIR}/test" || die
+ for i in TestBench ; do
+ ./${i} || die
+ done
+ fi
+}
+
+src_test() {
+ multilib_foreach_abi multilib_src_test
+}
+
+src_install() {
+ cmake-multilib_src_install
+ dodoc -r "${S}/../doc/"*
+}
diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 008e9cb26a54..8a3e36f86b72 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="http://x265.org/"
LICENSE="GPL-2"
# subslot = libx265 soname
-SLOT="0/59"
+SLOT="0/75"
IUSE="+10bit test"
ASM_DEPEND=">=dev-lang/yasm-1.2.0"
@@ -37,7 +37,7 @@ src_unpack() {
export S=${WORKDIR}/${P}/source
else
unpack ${A}
- export S="${WORKDIR}/${PN}_${PV}/source"
+ export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
fi
}
diff --git a/media-plugins/vdr-remote/vdr-remote-0.6.0-r1.ebuild b/media-plugins/vdr-remote/vdr-remote-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..5eec3a98bde7
--- /dev/null
+++ b/media-plugins/vdr-remote/vdr-remote-0.6.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: use various devices for controlling vdr (keyboards, lirc, remotes bundled with tv-cards)"
+HOMEPAGE="http://www.escape-edv.de/endriss/vdr/"
+SRC_URI="http://www.escape-edv.de/endriss/vdr/${P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="systemd"
+
+DEPEND=">=media-video/vdr-2.0.0"
+
+pkg_setup() {
+ vdr-plugin-2_pkg_setup
+
+ if use systemd; then
+ if ! getent group input | grep -q vdr; then
+ einfo "add user 'vdr' to group 'input' for full access to remote control device"
+ gpasswd -a vdr input
+ fi
+ fi
+}
diff --git a/media-sound/mp3diags/metadata.xml b/media-sound/mp3diags/metadata.xml
index 3159078fa42f..32a4a36c9c56 100644
--- a/media-sound/mp3diags/metadata.xml
+++ b/media-sound/mp3diags/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>mrueg@gentoo.org</email>
- <name>Manuel Rüger</name>
- </maintainer>
<herd>qt</herd>
<upstream>
<remote-id type="sourceforge">mp3diags</remote-id>
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index c78a1a501e9a..4d247cc007ea 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -3,3 +3,5 @@ DIST qmmp-0.8.4.tar.bz2 990768 SHA256 aef9f7685b5b5d79949bf501ac5420883ad2bceeeb
DIST qmmp-0.8.5.tar.bz2 991464 SHA256 7fe9347ad6c66e8013b73f2c5cf628037c58151e0cfcb926a8f27b93ad2d7c0d SHA512 07659ea7421079da77f6caa77c1e5f007664b1732a8bae160c154e3a687f330e476d5b2fec2e1b79da512ca1b68fdf6d462975821ced76f4f4c87799e6d79c39 WHIRLPOOL a46264d2886953f924fae40bd43cd5e23a59592ae8456a6120f6e41cd2d9572fa94a8c68f212dabfa97b8534f723ab9c91f26a0d98e0b6109266802ecb18d7f4
DIST qmmp-0.8.8.tar.bz2 993992 SHA256 23e422ef43e216f2d71f7d323d8345df2f3b6f46647e0ac0e03d4d69fbf62e57 SHA512 7882bfbc13ace5cca670a51b5f890b431163c4c0712222c16018b84080d7b42bed1f4cbe327ff767ececbf984193af7b0601be083ac1f0da1681d83e31f188de WHIRLPOOL 68f0a1f71dfe058226e4a4230c68fb48ac04935e16e326380ff3f0c6658c73921831ec5ced29073d3ce06de15cd7168cd7c6c7749db25ded6a092032b6bae025
DIST qmmp-0.9.1.tar.bz2 1112342 SHA256 9314f8b019689fa9f3f1bc8df4076a4b32d384ad992d578fd437284a5c86918b SHA512 1797662cb4b219c784ac591ff90eac05b66d43abed11021a9080aad5f709e0cb7b890bceeff3f5736500571154ba368cbec0611fa8143a313dae18b9989586e3 WHIRLPOOL 15c6c3af52bab35bd8208bef4597910fdfa5ea5eea434149c215c76d30bcd465df423934bca9e50a3fab43f94a610c049a192d38de921d6aacb309135dc5ee99
+DIST qmmp-0.9.2.tar.bz2 1112974 SHA256 90ac69a21779df5073efe71b25f28a7461d6a928deb1afbaa1ef8268f62ae9c5 SHA512 fc6cb0ec4bbf52e2ceb9e87a3585f25bd58b3a323ef07ddb9fd9f21a065ef0f5deb0b014f29b9648fe9e0a8b412f3b04643f8128638558089a25d867577690ad WHIRLPOOL 47a596b0f7d9e516737bfeb10a962f79edb74f61e2985b01f2cee80c8ff252a1709459f5712700784faef824e24ff3567d73f0d5759e2cd2c0c53c267cc6a026
+DIST qmmp-1.0.0.tar.bz2 1092970 SHA256 25cd86c67f287e9e7d062b364202831bb25c0930cdc7fbda759fd9287fb24220 SHA512 cdaeaf0202c03e745e9f32ff1068830410691d827a9775588d5679ac551960565df9125014549a7fc1b5f59a99bcbd86db901289d87675b642b84928f4dd1bd0 WHIRLPOOL ee843ca3a4a45c9bf7306a65c28c1dced8f33bc97c59783475e0052c991ba6ef37fdf294da6acaff6ee62d5f28fe5d997f7e1b43d4c03df2733850ed9c08557b
diff --git a/media-sound/qmmp/qmmp-0.9.2.ebuild b/media-sound/qmmp/qmmp-0.9.2.ebuild
new file mode 100644
index 000000000000..5f82a4d0c164
--- /dev/null
+++ b/media-sound/qmmp/qmmp-0.9.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [ "$PV" != "9999" ]; then
+ SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~ppc ~x86"
+else
+ SRC_URI=""
+ ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
+
+RDEPEND="media-libs/taglib
+ dev-qt/qtgui:4
+ alsa? ( media-libs/alsa-lib )
+ bs2b? ( media-libs/libbs2b )
+ cdda? ( dev-libs/libcdio-paranoia )
+ cue? ( media-libs/libcue )
+ curl? ( net-misc/curl )
+ dbus? ( sys-apps/dbus )
+ aac? ( media-libs/faad2 )
+ enca? ( app-i18n/enca )
+ flac? ( media-libs/flac )
+ game? ( media-libs/game-music-emu )
+ ladspa? ( media-libs/ladspa-cmt )
+ libsamplerate? ( media-libs/libsamplerate )
+ mad? ( media-libs/libmad )
+ midi? ( media-sound/wildmidi )
+ mms? ( media-libs/libmms )
+ mplayer? ( media-video/mplayer )
+ mpris? ( dev-qt/qtdbus:4 )
+ musepack? ( >=media-sound/musepack-tools-444 )
+ modplug? ( >=media-libs/libmodplug-0.8.4 )
+ vorbis? ( media-libs/libvorbis
+ media-libs/libogg )
+ jack? ( media-sound/jack-audio-connection-kit
+ media-libs/libsamplerate )
+ ffmpeg? ( virtual/ffmpeg )
+ opus? ( media-libs/opusfile )
+ projectm? ( media-libs/libprojectm
+ dev-qt/qtopengl:4 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+ wavpack? ( media-sound/wavpack )
+ scrobbler? ( net-misc/curl )
+ sndfile? ( media-libs/libsndfile )
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+REQUIRED_USE="kde? ( dbus ) "
+
+src_prepare() {
+ if has_version dev-libs/libcdio-paranoia; then
+ sed -i \
+ -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+ src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use aac)
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use analyzer)
+ $(cmake-utils_use_use bs2b)
+ $(cmake-utils_use_use cdda CDA)
+ $(cmake-utils_use_use crossfade)
+ $(cmake-utils_use_use cover)
+ $(cmake-utils_use_use cue)
+ $(cmake-utils_use_use curl)
+ $(cmake-utils_use_use dbus)
+ $(cmake-utils_use_use enca)
+ $(cmake-utils_use_use ffmpeg)
+ -DUSE_FFMPEG_LEGACY=OFF
+ $(cmake-utils_use_use flac)
+ $(cmake-utils_use_use game GME)
+ -DUSE_HAL=OFF
+ $(cmake-utils_use_use jack)
+ $(cmake-utils_use_use kde KDENOTIFY)
+ $(cmake-utils_use_use ladspa)
+ $(cmake-utils_use_use lyrics)
+ $(cmake-utils_use_use mad)
+ $(cmake-utils_use_use midi MIDI_WILDMIDI)
+ $(cmake-utils_use_use mplayer)
+ $(cmake-utils_use_use mms)
+ $(cmake-utils_use_use modplug)
+ $(cmake-utils_use_use mpris)
+ $(cmake-utils_use_use musepack MPC)
+ $(cmake-utils_use_use notifier)
+ $(cmake-utils_use_use opus)
+ $(cmake-utils_use_use oss)
+ $(cmake-utils_use_use projectm)
+ $(cmake-utils_use_use pulseaudio PULSE)
+ $(cmake-utils_use_use qsui)
+ $(cmake-utils_use_use scrobbler)
+ $(cmake-utils_use_use sndfile)
+ $(cmake-utils_use_use stereo)
+ $(cmake-utils_use_use tray STATICON)
+ $(cmake-utils_use_use udisks UDISKS2)
+ -DUSE_UDISKS=OFF
+ $(cmake-utils_use_use libsamplerate SRC)
+ $(cmake-utils_use_use vorbis)
+ $(cmake-utils_use_use wavpack)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-1.0.0.ebuild b/media-sound/qmmp/qmmp-1.0.0.ebuild
new file mode 100644
index 000000000000..f91be1d98a10
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.0.0.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit cmake-utils
+[ "$PV" == "9999" ] && inherit subversion
+
+DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [ "$PV" != "9999" ]; then
+ SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+else
+ SRC_URI=""
+ ESVN_REPO_URI="https://qmmp.googlecode.com/svn/trunk/qmmp/"
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="analyzer aac +alsa +dbus bs2b cdda cover crossfade cue curl enca ffmpeg flac jack game kde ladspa
+libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus oss
+projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
+
+RDEPEND="media-libs/taglib
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ alsa? ( media-libs/alsa-lib )
+ bs2b? ( media-libs/libbs2b )
+ cdda? ( dev-libs/libcdio-paranoia )
+ cue? ( media-libs/libcue )
+ curl? ( net-misc/curl )
+ dbus? ( sys-apps/dbus )
+ aac? ( media-libs/faad2 )
+ enca? ( app-i18n/enca )
+ flac? ( media-libs/flac )
+ game? ( media-libs/game-music-emu )
+ ladspa? ( media-libs/ladspa-cmt )
+ libsamplerate? ( media-libs/libsamplerate )
+ mad? ( media-libs/libmad )
+ midi? ( media-sound/wildmidi )
+ mms? ( media-libs/libmms )
+ mplayer? ( media-video/mplayer )
+ mpris? ( dev-qt/qtdbus:5 )
+ musepack? ( >=media-sound/musepack-tools-444 )
+ modplug? ( >=media-libs/libmodplug-0.8.4 )
+ vorbis? ( media-libs/libvorbis
+ media-libs/libogg )
+ jack? ( media-sound/jack-audio-connection-kit
+ media-libs/libsamplerate )
+ ffmpeg? ( virtual/ffmpeg )
+ opus? ( media-libs/opusfile )
+ projectm? ( media-libs/libprojectm
+ dev-qt/qtopengl:5 )
+ pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+ wavpack? ( media-sound/wavpack )
+ scrobbler? ( net-misc/curl )
+ sndfile? ( media-libs/libsndfile )
+ udisks? ( sys-fs/udisks:2 )"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5"
+
+DOCS="AUTHORS ChangeLog README"
+
+CMAKE_IN_SOURCE_BUILD="1"
+
+REQUIRED_USE="kde? ( dbus ) "
+
+src_prepare() {
+ if has_version dev-libs/libcdio-paranoia; then
+ sed -i \
+ -e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+ src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use aac)
+ $(cmake-utils_use_use alsa)
+ $(cmake-utils_use_use analyzer)
+ $(cmake-utils_use_use bs2b)
+ $(cmake-utils_use_use cdda CDA)
+ $(cmake-utils_use_use crossfade)
+ $(cmake-utils_use_use cover)
+ $(cmake-utils_use_use cue)
+ $(cmake-utils_use_use curl)
+ $(cmake-utils_use_use dbus)
+ $(cmake-utils_use_use enca)
+ $(cmake-utils_use_use ffmpeg)
+ $(cmake-utils_use_use flac)
+ $(cmake-utils_use_use game GME)
+ -DUSE_HAL=OFF
+ $(cmake-utils_use_use jack)
+ $(cmake-utils_use_use kde KDENOTIFY)
+ $(cmake-utils_use_use ladspa)
+ $(cmake-utils_use_use lyrics)
+ $(cmake-utils_use_use mad)
+ $(cmake-utils_use_use midi MIDI_WILDMIDI)
+ $(cmake-utils_use_use mplayer)
+ $(cmake-utils_use_use mms)
+ $(cmake-utils_use_use modplug)
+ $(cmake-utils_use_use mpris)
+ $(cmake-utils_use_use musepack MPC)
+ $(cmake-utils_use_use notifier)
+ $(cmake-utils_use_use opus)
+ $(cmake-utils_use_use oss)
+ $(cmake-utils_use_use projectm)
+ $(cmake-utils_use_use pulseaudio PULSE)
+ $(cmake-utils_use_use qsui)
+ $(cmake-utils_use_use scrobbler)
+ $(cmake-utils_use_use sndfile)
+ $(cmake-utils_use_use stereo)
+ $(cmake-utils_use_use tray STATICON)
+ $(cmake-utils_use_use udisks UDISKS2)
+ $(cmake-utils_use_use libsamplerate SRC)
+ $(cmake-utils_use_use vorbis)
+ $(cmake-utils_use_use wavpack)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 810ebe84f997..317b46f89f79 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1 +1,2 @@
DIST qtractor-0.7.0.tar.gz 1447905 SHA256 5cda28d210e0301dfd1c426b015c0568dab29b8d27f8b5f0a7d0a4ae7eed22e4 SHA512 daa04b477d261ebd6d2af62db7cc708ab03960202332294ac7f62b475cbde5cb94db931674bd693ea4374aff489234ed0cefc5fc191d8ab079685b8039e03399 WHIRLPOOL 11d741a5799c352125f56a7ebcafec49442ffa4103c1be96d9e034ec0025ccbc681d26ea234e835b05d9d252e26d584810fa9dd1f05bd6adf1a866d734f65ec6
+DIST qtractor-0.7.1.tar.gz 1438633 SHA256 d0425f7d48f0032fd6ae4fc4b3d8f97d3dd21d08653fb4e26be5c8471da1cd89 SHA512 fa2210426388d0efdf920f591ad776c582867e9a556efaad3a03b575cd1f5702b686d347ad6a3991db07fcd7142b227d4b812095d91e280a01dc3f8dddfc8ede WHIRLPOOL af69a1e4c77a58961b63d431fa09eff8a7a5082dd35b8887f173c462e967b4be0843e203d4ca1cc9df9b869fbe3695e3f2187bc052dcbdc3ba7b39669a1f7bd5
diff --git a/media-sound/qtractor/qtractor-0.7.1.ebuild b/media-sound/qtractor/qtractor-0.7.1.ebuild
new file mode 100644
index 000000000000..387a50eb1a7b
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.7.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit qmake-utils flag-o-matic eutils
+
+DESCRIPTION="Qtractor is an Audio/MIDI multi-track sequencer"
+HOMEPAGE="http://qtractor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug dssi libsamplerate mad osc qt5 rubberband vorbis cpu_flags_x86_sse zlib"
+
+RDEPEND="
+ !qt5? (
+ >=dev-qt/qtcore-4.2:4
+ >=dev-qt/qtgui-4.7:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
+ media-libs/alsa-lib
+ media-libs/libsndfile
+ media-sound/jack-audio-connection-kit
+ media-libs/ladspa-sdk
+ >=media-libs/lilv-0.16.0
+ media-libs/lv2
+ media-libs/suil
+ dssi? ( media-libs/dssi )
+ mad? ( media-libs/libmad )
+ libsamplerate? ( media-libs/libsamplerate )
+ osc? ( media-libs/liblo )
+ rubberband? ( media-libs/rubberband )
+ vorbis? ( media-libs/libvorbis )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ qt5? ( dev-qt/linguist-tools:5 )"
+
+DOCS="README ChangeLog TODO AUTHORS"
+
+src_configure() {
+ econf \
+ $(use_enable mad libmad) \
+ $(use_enable libsamplerate) \
+ $(use_enable vorbis libvorbis) \
+ $(use_enable osc liblo) \
+ --enable-ladspa \
+ $(use_enable dssi) \
+ --enable-lilv \
+ $(use_enable qt5) \
+ $(use_with qt5 qt5 "$(qt5_get_libdir)/qt5") \
+ $(use_enable rubberband librubberband) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable zlib libz) \
+ $(use_enable debug)
+
+ if use qt5 ; then
+ eqmake5 ${PN}.pro -o ${PN}.mak
+ else
+ eqmake4 ${PN}.pro -o ${PN}.mak
+ fi
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ einstalldocs
+}
diff --git a/media-tv/tvheadend/Manifest b/media-tv/tvheadend/Manifest
index a40c11b49b91..8d82a28e6104 100644
--- a/media-tv/tvheadend/Manifest
+++ b/media-tv/tvheadend/Manifest
@@ -1,3 +1,3 @@
-DIST hts-tvheadend_2.12.tar.gz 1475053 SHA256 c2e33384b24356be036bf8e58a026efeed247b001d3674929dc0016bf2b0e11b SHA512 87808a57454b58f458e8e7db6d381e34917064a0f196ed4e91f2ee912575282e121ada72d11ce6c3f8c5e2913dc4510b0b1e6a7d252b702946c033ef35e85c68 WHIRLPOOL 953735a6796972dbf5a7b2f541fc07c7dc2666e4a15f007fdefd92b7445055c227ce8b570088e4fd0810ffebd3271a19af7fd023eb58dfd046b24d45be5053cc
-DIST tvheadend-3.2.tar.gz 2155532 SHA256 4bda0da2488c2078c6bd7e92ea5099c7c1e6c52fd361af965c83e82070cfb651 SHA512 f4f87a42c10bf9989606ca932ba916f9c70d0adfc1c0f6ee1f1dd3c23545de8e1699c4f519c56a7f5df0b27521d7f714c02ea5d30432756511baefb00ddd8d22 WHIRLPOOL 8dbf8c7eeff31b132f61d7ff8cf5412659e430e3fe47733ec54e7e804b8be608bd9886d8149975a91653608edeb641781e08c6f3df819dc08a4f7d96abe41dfb
+DIST dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 123415 SHA256 83ed1b669009ef325e5d9ccb897e48b31e15e71e81bff442b3d0bbd650131c77 SHA512 aedf0429c2ec0a4692e19c0b4ae1e8c063a5a0fb8695359aa8f716a7f40fd88435ed8b1d2aec2461de3f49b533d6cd012c2a54d06058a5291781da4adf82d609 WHIRLPOOL afaef58cdf2ce1ca03c0a695dbf13192b544e3c5a0012cc70a55834d0b1034d509174684fd0fe3f2111becbe32aac16cad5d467adc278a4b6b16c7dbd384757f
DIST tvheadend-3.4.27.tar.gz 2201905 SHA256 50438809ff43ab332d255248096e9531ac85e6c51511206a3f68cfc1697f4ead SHA512 fb6dc59fbaf5ea43f69452ff6b034ed80b040bb15f5c43f26a3f8075601066354f82e5cf15f7c5215adf1387edfa57468f71605aacfc0824a996aee108a0f11a WHIRLPOOL b0c92d8368cf7643a238d918752f8b1816ddcfde28372fecad228ab133d4e1dd6219d5b436c396fa4013af5269b2fd05b62bb6ce6180553d835204c8c38029ca
+DIST tvheadend-4.0.6.tar.gz 15826173 SHA256 348c6890a3721217c159a8cdce746686e7a8c75bc14740ac5a75a82acf6b5116 SHA512 b5b9a39a9b6f4f1aa653b0d58b311d3580d5c10b2185a96bf73619b912385bece76fdd0d1e8327d97a2f5e3888729f10cfbfd395660d12749fb7a5d586fde266 WHIRLPOOL 6584d30b4f8f3a17cd79e74b7dc9a892c27a0c214258ff146247b342a58a8eba52ffc4ded9d35d761434671b600daec09e8df05c3b7f4f54db7116fb3a79946b
diff --git a/media-tv/tvheadend/files/glibc_iconv.patch b/media-tv/tvheadend/files/glibc_iconv.patch
new file mode 100644
index 000000000000..91187869a209
--- /dev/null
+++ b/media-tv/tvheadend/files/glibc_iconv.patch
@@ -0,0 +1,40 @@
+From 984bcbb1acadd2957d7fc79dc4ec72e2e07a3572 Mon Sep 17 00:00:00 2001
+From: Olliver Schinagl <oliver@schinagl.nl>
+Date: Sat, 26 Sep 2015 22:36:08 +0200
+Subject: [PATCH] Use glibc version iconv
+
+Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
+---
+ Makefile | 2 +-
+ configure | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 07d6965..0ec0259 100644
+--- a/Makefile
++++ b/Makefile
+@@ -39,7 +39,7 @@ else
+ LDFLAGS += -ldl -lpthread -lm
+ endif
+ ifeq ($(CONFIG_LIBICONV),yes)
+-LDFLAGS += -liconv
++LDFLAGS +=
+ endif
+ ifeq ($(PLATFORM), darwin)
+ LDFLAGS += -framework CoreServices
+diff --git a/configure b/configure
+index 487456b..a6cce11 100755
+--- a/configure
++++ b/configure
+@@ -214,7 +214,7 @@ int test(void)
+ iconv_t ic = iconv_open("ASCII", "ASCII");
+ return 0;
+ }
+-' -liconv
++'
+
+ if enabled_or_auto dvben50221; then
+ check_cc_snippet libdvben50221 '
+--
+2.4.6
+
diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index e6ede4196eb1..8cda002d31f2 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -1,16 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
- <email>leho@kraav.com</email>
- <name>Leho Kraav</name>
- </maintainer>
- <use>
- <flag name='xmltv'>Use <pkg>media-tv/xmltv</pkg></flag>
- <flag name='ccache'>Use <pkg>dev-util/ccache</pkg></flag>
- <flag name='dvbscan'>Use <pkg>media-tv/linuxtv-dvb-apps</pkg></flag>
- <flag name='imagecache'>Enable support for image caching</flag>
- <flag name='uriparser'>Use <pkg>dev-libs/uriparser</pkg></flag>
- </use>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>wraeth@wraeth.id.au</email>
+ <name>Sam Jorna</name>
+ <description>Proxy maintaner, to be assugned to bugs</description>
+ </maintainer>
+ <use>
+ <flag name='capmt'>Enable support for capmt (dvbapi) protocol</flag>
+ <flag name='constcw'>Enable support for the constcw protocol</flag>
+ <flag name='cwc'>Enable support for the cwc (newcamd) protocol</flag>
+ <flag name='epoll'>Enable epoll Linux system call</flag>
+ <flag name='hdhomerun'>Enable support for the HDHomeRun device</flag>
+ <flag name='iptv'>Enable support for Internet Protocol TV</flag>
+ <flag name='satip'>Enable support for IP-based Satellite TV</flag>
+ <flag name='timeshift'>Enable TimeShift support</flag>
+ <flag name='xmltv'>Use <pkg>media-tv/xmltv</pkg></flag>
+ <flag name='ccache'>Use <pkg>dev-util/ccache</pkg></flag>
+ <flag name='dvbscan'>Use <pkg>media-tv/linuxtv-dvb-apps</pkg></flag>
+ <flag name='imagecache'>Enable support for image caching</flag>
+ <flag name='uriparser'>Use <pkg>dev-libs/uriparser</pkg></flag>
+ </use>
</pkgmetadata>
diff --git a/media-tv/tvheadend/tvheadend-2.12.ebuild b/media-tv/tvheadend/tvheadend-2.12.ebuild
deleted file mode 100644
index aa19691e71b3..000000000000
--- a/media-tv/tvheadend/tvheadend-2.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs user
-
-MY_PN="hts-${PN}"
-
-DESCRIPTION="A combined DVB receiver, Digital Video Recorder and Live TV streaming server"
-HOMEPAGE="http://www.lonelycoder.com/hts/"
-SRC_URI="http://www.lonelycoder.com/debian/dists/hts/main/source/${MY_PN}_${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi xmltv"
-
-DEPEND="virtual/linuxtv-dvb-headers"
-RDEPEND="${DEPEND}
- avahi? ( net-dns/avahi )
- xmltv? ( media-tv/xmltv )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
- enewuser tvheadend -1 -1 /dev/null video
-}
-
-src_prepare() {
- # set version number to avoid subversion and git dependencies
- sed -e 's:\$(shell support/version.sh):${PV}:' \
- -i Makefile || die "sed failed!"
-
- # remove stripping
- sed -e 's:install -s:install:' \
- -i support/posix.mk || die "sed failed!"
-
- # remove '-Werror' wrt bug #438424
- sed -i 's:-Werror::' Makefile || die "sed on removing '-Werror' failed!"
-}
-
-src_configure() {
- econf $(use_enable avahi) --release
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- dodoc ChangeLog README
- doman man/tvheadend.1
-
- newinitd "${FILESDIR}/tvheadend.initd" tvheadend
- newconfd "${FILESDIR}/tvheadend.confd" tvheadend
-
- dodir /etc/tvheadend
- fperms 0700 /etc/tvheadend
- fowners tvheadend:video /etc/tvheadend
-}
-
-pkg_postinst() {
- elog "The Tvheadend web interface can be reached at:"
- elog "http://localhost:9981/"
- elog
- elog "Make sure that you change the default username"
- elog "and password via the Configuration / Access control"
- elog "tab in the web interface."
-}
diff --git a/media-tv/tvheadend/tvheadend-3.2.ebuild b/media-tv/tvheadend/tvheadend-3.2.ebuild
deleted file mode 100644
index 7d9b290d1824..000000000000
--- a/media-tv/tvheadend/tvheadend-3.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils toolchain-funcs user
-
-DESCRIPTION="A combined DVB receiver, Digital Video Recorder and Live TV streaming server"
-HOMEPAGE="https://www.lonelycoder.com/redmine/projects/tvheadend/"
-SRC_URI="mirror://github/tvheadend/tvheadend/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="avahi xmltv zlib"
-
-DEPEND="dev-libs/openssl
- virtual/linuxtv-dvb-headers
- avahi? ( net-dns/avahi )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
- xmltv? ( media-tv/xmltv )"
-
-DOCS=( README )
-
-pkg_setup() {
- enewuser tvheadend -1 -1 /dev/null video
-}
-
-src_prepare() {
- # set the correct version number
- sed -e "s:(3.1.694):(${PV}):" -i debian/changelog || die 'sed failed!'
-
- # remove '-Werror' wrt bug #438424
- sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
-}
-
-src_configure() {
- econf --prefix="${EPREFIX}"/usr \
- --datadir="${EPREFIX}"/usr/share/"${PN}" \
- --mandir="${EPREFIX}"/usr/share/man/man1 \
- --release \
- --disable-dvbscan \
- $(use_enable avahi) \
- $(use_enable zlib)
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}/tvheadend.initd" tvheadend
- newconfd "${FILESDIR}/tvheadend.confd" tvheadend
-
- dodir /etc/tvheadend
- fperms 0700 /etc/tvheadend
- fowners tvheadend:video /etc/tvheadend
-}
-
-pkg_postinst() {
- elog "The Tvheadend web interface can be reached at:"
- elog "http://localhost:9981/"
- elog
- elog "Make sure that you change the default username"
- elog "and password via the Configuration / Access control"
- elog "tab in the web interface."
-}
diff --git a/media-tv/tvheadend/tvheadend-3.4.27.ebuild b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
index b5e760f74882..0a8d85fee552 100644
--- a/media-tv/tvheadend/tvheadend-3.4.27.ebuild
+++ b/media-tv/tvheadend/tvheadend-3.4.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,7 +20,7 @@ IUSE="avahi +dvb +dvbscan ffmpeg imagecache inotify xmltv zlib"
REQUIRED_USE="dvbscan? ( dvb )"
-DEPEND="dev-libs/openssl
+DEPEND="dev-libs/openssl:0=
avahi? ( net-dns/avahi )
dvb? ( virtual/linuxtv-dvb-headers )
ffmpeg? ( virtual/ffmpeg )
diff --git a/media-tv/tvheadend/tvheadend-4.0.6.ebuild b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
new file mode 100644
index 000000000000..512a53dfd777
--- /dev/null
+++ b/media-tv/tvheadend/tvheadend-4.0.6.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils linux-info systemd toolchain-funcs user
+
+DESCRIPTION="Tvheadend is a TV streaming server and digital video recorder"
+HOMEPAGE="https://tvheadend.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ dvbscan? ( http://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-2015-02-08-f2053b3.tar.bz2 )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="avahi ccache capmt constcw +cwc dbus +dvb +dvbscan epoll ffmpeg hdhomerun libav iconv imagecache inotify iptv satip +timeshift uriparser xmltv zlib"
+
+RDEPEND="dev-libs/openssl:=
+ avahi? ( net-dns/avahi )
+ capmt? ( virtual/linuxtv-dvb-headers )
+ ccache? ( dev-util/ccache sys-libs/zlib )
+ dbus? ( sys-apps/dbus )
+ dvb? ( virtual/linuxtv-dvb-headers )
+ ffmpeg? ( virtual/ffmpeg )
+ hdhomerun? ( media-libs/libhdhomerun )
+ iconv? ( virtual/libiconv )
+ libav? ( media-video/libav )
+ imagecache? ( net-misc/curl )
+ uriparser? ( dev-libs/uriparser )
+ zlib? ( sys-libs/zlib )
+ xmltv? ( media-tv/xmltv )"
+
+DEPEND="${DEPEND}
+ virtual/pkgconfig"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+DOCS=( README.md )
+
+src_unpack() {
+ unpack "${P}.tar.gz"
+
+ if use dvbscan; then
+ mkdir "${S}/data/dvb-scan" || die
+ cd "${T}" || die
+ unpack dtv-scan-tables-2015-02-08-f2053b3.tar.bz2
+ rmdir "${S}/data/dvb-scan" || die
+ mv "${T}/usr/share/dvb" "${S}/data/dvb-scan" || die
+
+ # This is needed to prevent make from removing files
+ touch "${S}/data/dvb-scan/.stamp" || die
+ fi
+}
+
+pkg_setup() {
+ enewuser tvheadend -1 -1 /dev/null video
+}
+
+src_prepare() {
+ # remove '-Werror' wrt bug #438424
+ sed -e 's:-Werror::' -i Makefile || die 'sed failed!'
+ epatch "${FILESDIR}/${PV}-use-glibc-version-iconv.patch"
+}
+
+src_configure() {
+ econf --prefix="${EPREFIX}"/usr \
+ --datadir="${EPREFIX}"/usr/share \
+ --mandir="${EPREFIX}"/usr/share/man/man1 \
+ $(use_enable avahi) \
+ $(use_enable ccache) \
+ $(use_enable capmt) \
+ $(use_enable constcw) \
+ $(use_enable cwc) \
+ $(use_enable dbus) \
+ $(use_enable dvb linuxdvb) \
+ $(use_enable dvbscan) \
+ $(use_enable epoll) \
+ --disable-kqueue \
+ $(use_enable ffmpeg libav) \
+ $(use_enable hdhomerun hdhomerun_client) \
+ $(use_enable libav) \
+ $(use_enable imagecache) \
+ $(use_enable inotify) \
+ $(use_enable iptv) \
+ $(use_enable satip satip_server) \
+ $(use_enable satip satip_client) \
+ $(use_enable timeshift) \
+ $(use_enable uriparser) \
+ $(use_enable zlib)
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}/tvheadend.initd" tvheadend
+ newconfd "${FILESDIR}/tvheadend.confd" tvheadend
+
+ systemd_dounit "${FILESDIR}/tvheadend.service"
+
+ dodir /etc/tvheadend
+ fperms 0700 /etc/tvheadend
+ fowners tvheadend:video /etc/tvheadend
+}
+
+pkg_postinst() {
+ elog "The Tvheadend web interface can be reached at:"
+ elog "http://localhost:9981/"
+ elog
+ elog "Make sure that you change the default username"
+ elog "and password via the Configuration / Access control"
+ elog "tab in the web interface."
+}
diff --git a/media-tv/tvheadend/tvheadend-9999.ebuild b/media-tv/tvheadend/tvheadend-9999.ebuild
index 1744e4722b9f..495a3d139734 100644
--- a/media-tv/tvheadend/tvheadend-9999.ebuild
+++ b/media-tv/tvheadend/tvheadend-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ KEYWORDS=""
IUSE="avahi ccache +dvb +dvbscan ffmpeg imagecache inotify uriparser xmltv zlib"
-DEPEND="dev-libs/openssl
+DEPEND="dev-libs/openssl:0=
avahi? ( net-dns/avahi )
ccache? ( dev-util/ccache )
dvb? ( virtual/linuxtv-dvb-headers )
diff --git a/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch
new file mode 100644
index 000000000000..392ef2583075
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/files/v4l-dvb-saa716x-4.2-fix-compile.patch
@@ -0,0 +1,34 @@
+diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c
+--- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-09-03 00:30:08.662553247 +0200
++++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_budget.c 2015-09-03 00:31:03.899206845 +0200
+@@ -306,7 +306,7 @@
+ #define SAA716x_MODEL_TWINHAN_VP1028 "Twinhan/Azurewave VP-1028"
+ #define SAA716x_DEV_TWINHAN_VP1028 "DVB-S"
+
+-static int vp1028_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
++static int vp1028_dvbs_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage)
+ {
+ struct saa716x_dev *saa716x = fe->dvb->priv;
+
+diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c
+--- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c 2014-11-09 15:44:55.000000000 +0100
++++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_hybrid.c 2015-09-03 00:31:03.899206845 +0200
+@@ -321,7 +321,7 @@
+ .request_firmware = tda1004x_vp6090_request_firmware,
+ };
+
+-static int vp6090_dvbs_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
++static int vp6090_dvbs_set_voltage(struct dvb_frontend *fe, enum fe_sec_voltage voltage)
+ {
+ struct saa716x_dev *saa716x = fe->dvb->priv;
+
+diff -urN powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c
+--- powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c 2014-11-09 15:44:55.000000000 +0100
++++ v4l-dvb-saa716x-0.0.1_p20141109-r1/work/powARman-v4l-dvb-saa716x-d7e98fc59230/linux/drivers/media/common/saa716x/saa716x_pci.c 2015-09-03 00:31:03.900206839 +0200
+@@ -1,3 +1,5 @@
++#include <asm/atomic.h>
++#include <linux/spinlock_types.h>
+ #include <asm/io.h>
+ #include <asm/pgtable.h>
+ #include <asm/page.h>
+
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild
new file mode 100644
index 000000000000..7904dece5f36
--- /dev/null
+++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20141109-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit linux-info linux-mod
+
+DESCRIPTION="driver for saa716x based dvb cards like Technotrend S2-6400 or Technisat Skystar 2 eXpress HD"
+HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview"
+
+HG_REVISION="d7e98fc59230"
+HG_REVISION_DATE="20141109"
+
+SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz
+-> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+firmware"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ firmware? ( sys-firmware/tt-s2-6400-firmware )"
+
+S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
+
+BUILD_TARGETS="modules"
+MODULE_NAMES="saa716x_ff(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+ saa716x_core(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+ saa716x_budget(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+ saa716x_hybrid(misc:${ROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
+
+CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x"
+
+src_prepare() {
+ epatch "${FILESDIR}/OSD_RAW_CMD_patch_2.diff"
+ epatch "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff"
+ kernel_is ge 3 19 0 && epatch "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch"
+ kernel_is ge 4 2 0 && epatch "${FILESDIR}/v4l-dvb-saa716x-4.2-fix-compile.patch"
+}
+
+src_compile() {
+ BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
+ CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
+ CONFIG_DVB_SAA716X_HYBRID=m"
+ addpredict "${ROOT}"/usr/src/linux/
+ linux-mod_src_compile
+}
diff --git a/media-video/handbrake/handbrake-0.10.2.ebuild b/media-video/handbrake/handbrake-0.10.2-r1.ebuild
index d9c83086e599..adb5fc3076a9 100644
--- a/media-video/handbrake/handbrake-0.10.2.ebuild
+++ b/media-video/handbrake/handbrake-0.10.2-r1.ebuild
@@ -64,7 +64,7 @@ RDEPEND="
virtual/libgudev:=
)
fdk? ( media-libs/fdk-aac )
- x265? ( =media-libs/x265-1.7 )
+ x265? ( >=media-libs/x265-1.7 )
"
DEPEND="${RDEPEND}
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index d9c83086e599..adb5fc3076a9 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -64,7 +64,7 @@ RDEPEND="
virtual/libgudev:=
)
fdk? ( media-libs/fdk-aac )
- x265? ( =media-libs/x265-1.7 )
+ x265? ( >=media-libs/x265-1.7 )
"
DEPEND="${RDEPEND}
diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest
index 203faf62c0e3..91c698a64ab8 100644
--- a/media-video/x264-encoder/Manifest
+++ b/media-video/x264-encoder/Manifest
@@ -1,2 +1,2 @@
DIST x264-snapshot-20140308-2245.tar.bz2 624712 SHA256 b179cb1e1d4f51418d292011a7494d5b62145571c05c22007f28d8fd89d2ebbe SHA512 42dc8183aa7af2bd4c360edc0349193cf69a119450880af0c1586e8f27490d7c6784c464b29c9f07ae972aaf661672ab4f2094a46a3d19b6df35be1f9d9a1629 WHIRLPOOL b1ac3341647d9d8d8ff6177f179ee8b5d6a49a38a48791748c24d5cd3c53858758785a0d21d42fbe373ec74465d947b69526a487da15fbca1a1f9aa50064288c
-DIST x264-snapshot-20150820-2245.tar.bz2 718209 SHA256 0ea86849d1a9b0a5b88fe6e0281359d7f5675c68fb83f6397b3e02896ccd77e3 SHA512 6b85f96f7cc85e1e938dad06c01b777aaf866796fb1763a02b4b7fa9c44f70bf15fc1bef123f7b24bb2c58b23f7276d4eb2b8f99b2e4fef3c716ed7f66d66e44 WHIRLPOOL daf5a63dbe2cb77a496a3eec1b1687ef6c4a008328064c46bd0e90139d328a6ff4e7dbd17b8dad57c357717c0b665293c86883213b483e85d25a06ec93c81024
+DIST x264-snapshot-20151011-2245.tar.bz2 725627 SHA256 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 SHA512 a326d724f5a28268a6dca2e75f39d10f0d9cd137e6477cb8c1be377a8c3fe9de384f74498f7c6b785377bb43024526e72ff8363b67a7e17717b176e5249df5e3 WHIRLPOOL 520dd79b2f3dfdd9e4629bd810fe8560205f4e3581d03854bd2aea35fbac565520cec336f214da688428c320bab3dea0d692a9cb816f9f53fc89520b54e200e3
diff --git a/media-video/x264-encoder/files/ffmpeg29.patch b/media-video/x264-encoder/files/ffmpeg29.patch
deleted file mode 100644
index d840c87d9623..000000000000
--- a/media-video/x264-encoder/files/ffmpeg29.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: x264-snapshot-20150820-2245/x264.c
-===================================================================
---- x264-snapshot-20150820-2245.orig/x264.c
-+++ x264-snapshot-20150820-2245/x264.c
-@@ -442,7 +442,7 @@ static void print_csp_names( int longhel
- printf( " - valid csps for `lavf' demuxer:\n" );
- printf( INDENT );
- size_t line_len = strlen( INDENT );
-- for( enum PixelFormat i = AV_PIX_FMT_NONE+1; i < AV_PIX_FMT_NB; i++ )
-+ for( enum AVPixelFormat i = AV_PIX_FMT_NONE+1; i < AV_PIX_FMT_NB; i++ )
- {
- const char *pfname = av_get_pix_fmt_name( i );
- if( pfname )
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20150820.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20150820.ebuild
deleted file mode 100644
index 64e7ddc531fc..000000000000
--- a/media-video/x264-encoder/x264-encoder-0.0.20150820.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="A free commandline encoder for X264/AVC streams"
-HOMEPAGE="http://www.videolan.org/developers/x264.html"
-if [[ ${PV} == 9999 ]]; then
- inherit git-2
- EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SRC_URI=""
-else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
- SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="10bit avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
-
-REQUIRED_USE="ffmpegsource? ( ffmpeg )"
-
-RDEPEND="ffmpeg? ( virtual/ffmpeg )
- ~media-libs/x264-${PV}[10bit=,interlaced=,threads=]
- ffmpegsource? ( media-libs/ffmpegsource )
- mp4? ( >=media-video/gpac-0.4.1_pre20060122 )"
-
-ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="${RDEPEND}
- amd64? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
- virtual/pkgconfig"
-
-src_configure() {
- tc-export CC
-
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --system-libx264 \
- --host="${CHOST}" \
- --disable-lsmash \
- $(usex 10bit "--bit-depth=10" "") \
- $(usex avs "" "--disable-avs") \
- $(usex ffmpeg "" "--disable-lavf --disable-swscale") \
- $(usex ffmpegsource "" "--disable-ffms") \
- $(usex interlaced "" "--disable-interlaced") \
- $(usex mp4 "" "--disable-gpac") \
- $(usex threads "" "--disable-thread") || die
-
- # this is a nasty workaround for bug #376925 for x264 that also applies
- # here, needed because as upstream doesn't like us fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
-}
diff --git a/media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20151011.ebuild
index a837041813e2..71259d770424 100644
--- a/media-video/x264-encoder/x264-encoder-0.0.20150820-r1.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20151011.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
- epatch "${FILESDIR}/gpac.patch" "${FILESDIR}/ffmpeg29.patch"
+ epatch "${FILESDIR}/gpac.patch"
}
src_configure() {
diff --git a/net-analyzer/speedtest-cli/Manifest b/net-analyzer/speedtest-cli/Manifest
index ef0b97c0120a..1660cb53384b 100644
--- a/net-analyzer/speedtest-cli/Manifest
+++ b/net-analyzer/speedtest-cli/Manifest
@@ -1,2 +1 @@
-DIST speedtest-cli-0.2.4.tar.gz 10573 SHA256 be53386d0ea697aff192984a4f06bcf9b5c4e287b8ac13d68f5fb8d0fc5317f1 SHA512 d85ec7036ae183ef0906f4bf8ebec54ae2f27878a60165153602d7eff8b2b036aa343a91f94edc6777131c36fceed83901ee6a565ecb3ad6a46a2a96c158f352 WHIRLPOOL f0493907a51e1879f3d4df9a00dcb4ef181f0b2465d635d618075854ce6a0c61e4adb5adf95a4f5dff5dcdbacf982e4b578d53b087995b230b3898407aedd9e0
-DIST speedtest-cli-0.2.5.tar.gz 11786 SHA256 1fafa6d808823da17a6f4c75d802f13b42ad954d60f4cd18ba30d2bb1424e538 SHA512 d844fed185af9ace7fb6ec1b3ea33f4dcd841a47e0bc0e75577d5e40be57a4cbfeedc4180b5bf68649c8242ab5749c778c9941c056fe17d0cb9f6597d14c50ac WHIRLPOOL d179a7793a4a8e985e537e6bc5df9253fc16ccc68480d0c6231a016df4b71acdfb42cd23e0c6ebe0d35664d20d4aa2d4fb1b24baaa5afa85ac4b1b2e7c967e43
+DIST speedtest-cli-0.3.4.tar.gz 14452 SHA256 e50646e245ea3c80c9653a532db0dbaef72f1c439330bcc22c381074c17b719d SHA512 fb22ba9e17a30c172b8f751020d7117caf8b573dee112506917f24c5173e2901e0f0198b4946798daf3a27839519025f4a7f8f8942034bc19356b32d6a0f6851 WHIRLPOOL c5700ec9bc513274056b870c781782ceeea4441282564d18d8ed9fbc7f7c9d3d7099ffcfc5193efec37b823e8da10a953391919c8330f454540dc24ae9e517ea
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-0.2.4.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-0.2.4.ebuild
deleted file mode 100644
index d823fd5597ad..000000000000
--- a/net-analyzer/speedtest-cli/speedtest-cli-0.2.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3} )
-inherit distutils-r1
-
-DESCRIPTION="Command line interface for testing internet bandwidth using speedtest.net"
-HOMEPAGE="https://github.com/sivel/speedtest-cli"
-SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-0.2.5.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4.ebuild
index fbbd2a78180c..fb3a5b4b88cf 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-0.2.5.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/sivel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-dialup/freeradius-client/Manifest b/net-dialup/freeradius-client/Manifest
index c33927d38c62..6f355e678bd6 100644
--- a/net-dialup/freeradius-client/Manifest
+++ b/net-dialup/freeradius-client/Manifest
@@ -1 +1 @@
-DIST freeradius-client-1.1.6.tar.bz2 297916 SHA256 a3c9522ed6d9bc795794595a8f3eebada868ea11a0c046637500faf257f9688f SHA512 883ea38f4c13113d76a1ee8d85993bdadbe031a1ef1a1d731f809b36d1a0570395bb3ac749a7c71d7f4471ef2079e54f8bfddf3f695b5c4cc14ab43a234098d8 WHIRLPOOL 36a5f76351d3097a3d149574adeacdd0f00dec464783646ce4360fd7d47119323dadcebab29f94205ba0b5747e1af2bc433a77060aa8f536166a55f5c7f8aacb
+DIST freeradius-client-1.1.7.tar.gz 433141 SHA256 eada2861b8f4928e3ac6b5bbfe11e92cd6cdcacfce40cae1085e77c1b6add0e9 SHA512 20e79ec97da79f46b334e1c2880803a692885a4038196a4d016094d349f675e2d0521d921140c5ab06703008619417f7a20d3e90cdfc7b3578faccbd232be0ce WHIRLPOOL f8c9f2875bb6bf8ba3ccb45bdc75f30a1708ee5a4966d48c533827400a417c440bf6ba3a356f774ef9d450b78ac1728737ed30932ceb1e1e4ff225876724ea11
diff --git a/net-dialup/freeradius-client/freeradius-client-1.1.6.ebuild b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
index 4105214a8277..8b0aa5696092 100644
--- a/net-dialup/freeradius-client/freeradius-client-1.1.6.ebuild
+++ b/net-dialup/freeradius-client/freeradius-client-1.1.7.ebuild
@@ -1,33 +1,39 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="2"
+EAPI="5"
+
+inherit autotools-utils
DESCRIPTION="FreeRADIUS Client framework"
HOMEPAGE="http://wiki.freeradius.org/Radiusclient"
-SRC_URI="ftp://ftp.freeradius.org/pub/freeradius/${P}.tar.bz2"
+SRC_URI="ftp://ftp.freeradius.org/pub/freeradius/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="scp shadow"
+
+IUSE="scp shadow static-libs"
DEPEND="!net-dialup/radiusclient
!net-dialup/radiusclient-ng"
RDEPEND="${DEPEND}"
+DOCS=( BUGS doc/ChangeLog doc/login.example doc/release-method.txt )
+
src_configure() {
- econf \
- $(use_enable scp) \
- $(use_enable shadow) \
- --with-secure-path || die "econf failed"
+ local myeconfargs=(
+ $(use_enable scp)
+ $(use_enable shadow)
+ --with-secure-path
+ )
+ autotools-utils_src_configure
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc BUGS README* doc/ChangeLog doc/login.example doc/release-method.txt
+ autotools-utils_src_install
+ dodoc README*
newdoc doc/README README.login.example
dohtml doc/instop.html
}
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index dc729f420554..5b7de2d21d0d 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -6,3 +6,4 @@ DIST pdns-3.4.1.tar.bz2 1237002 SHA256 13e32a31759e7fd341b98c89fe551723a5c6a7683
DIST pdns-3.4.2.tar.bz2 1331062 SHA256 a6ab05459a0118cb921092deee06362722c45fa69ed0166ebc3696d526014b5b SHA512 e04e0d0a9d6a10f6104a1b4e399e1b84b66aaa5561696281f85898f900bcbcbd41e49a110cddffc12e1f5043d60663ce679af91e4b76f8e1823528a5f38098ed WHIRLPOOL 84d8cd1ec0604e2dd7cb80ef8c7b0379569576e0a48541fcfa0eaaf31fc1d976129bf4d4cb0fb055940236bdcc8a791d56f78d68a94dd9a2e563f5faaeb7eb73
DIST pdns-3.4.4.tar.bz2 1336624 SHA256 ec49f5a0b55b69ba057bf9ce28ab81e5258fc60c8d4954d9100fe3bb3efd09c8 SHA512 c4567c5e09c3396af99263cbe370ffd8409a90e2583d968d7fa4760d0867ecb1696904e9ba8f6551d815b11b20b5862d789edfb599b9c5571110d3b785f2e08a WHIRLPOOL 4e744dd75a712a9928fda2d09339e7cc922ba63e8ebb11fee88d08d8e5046730d4ea23417bcc4251dc91edb3ec7aefaa480f832fc8167cc50c685435faee4256
DIST pdns-3.4.5.tar.bz2 1337222 SHA256 f3e1441532b0af05a6b5efe5346f02d0c55f252fbed62d5b4f2e4a80997c507d SHA512 cdf6496a832cff05519a02714aaab4b689541b01a83fe2415d360f8653db4e51a00b90ea86103dd535b22881420337b32ab8a33bb0d405df590cbed322b0827c WHIRLPOOL ee3287e2ac0c3d82e60daed2021b081fbb1e78a63847e98bfddef5fab5ce5ef43d6fea8ba5583a5f70ecc104b77814a7911b77b754492169c72bdbbec5ccb377
+DIST pdns-3.4.6.tar.bz2 1336760 SHA256 80a6a43cabd14db844bce84482ba56d03d46ebfbf96c88689fb3e2185ac286d8 SHA512 6ab4bef0482041d511ce0ea15e92cd12b0b331d3199c01463fa9150d04aca428c7b90fe25e53251f76a8809331cf32830240961dbf887e6b7c4e0a7fe07c8089 WHIRLPOOL a9541dce672e36b6f05f3a6c2b740f308af3c4b4ee3f96a5940f7ee5f2d9e017a9832604d29069e24f07925dd346f9f99a770779bccf35d14e7803fe34df8d46
diff --git a/net-dns/pdns/pdns-3.4.6.ebuild b/net-dns/pdns/pdns-3.4.6.ebuild
new file mode 100644
index 000000000000..77d6d55f103d
--- /dev/null
+++ b/net-dns/pdns/pdns-3.4.6.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multilib systemd user toolchain-funcs versionator
+
+DESCRIPTION="The PowerDNS Daemon"
+HOMEPAGE="http://www.powerdns.com/"
+SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# other possible flags:
+# db2: we lack the dep
+# oracle: dito (need Oracle Client Libraries)
+# xdb: (almost) dead, surely not supported
+
+IUSE="botan cryptopp debug doc geoip ldap lua mydns mysql opendbx postgres remote sqlite static tools tinydns test"
+
+REQUIRED_USE="mydns? ( mysql )"
+
+RDEPEND="!static? (
+ net-libs/polarssl
+ >=dev-libs/boost-1.34:=
+ botan? ( =dev-libs/botan-1.10* )
+ cryptopp? ( dev-libs/crypto++ )
+ lua? ( dev-lang/lua:= )
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:= )
+ ldap? ( >=net-nds/openldap-2.0.27-r4 )
+ sqlite? ( dev-db/sqlite:3 )
+ opendbx? ( dev-db/opendbx )
+ geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip )
+ tinydns? ( >=dev-db/tinycdb-0.77 )
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ static? (
+ >=net-libs/polarssl-1.3.0[static-libs(+)]
+ >=dev-libs/boost-1.34[static-libs(+)]
+ botan? ( =dev-libs/botan-1.10*[static-libs(+)] )
+ cryptopp? ( dev-libs/crypto++[static-libs(+)] )
+ lua? ( dev-lang/lua:=[static-libs(+)] )
+ mysql? ( virtual/mysql[static-libs(+)] )
+ postgres? ( dev-db/postgresql[static-libs(+)] )
+ ldap? ( >=net-nds/openldap-2.0.27-r4[static-libs(+)] )
+ sqlite? ( dev-db/sqlite:3[static-libs(+)] )
+ opendbx? ( dev-db/opendbx[static-libs(+)] )
+ geoip? ( >=dev-cpp/yaml-cpp-0.5.1 dev-libs/geoip[static-libs(+)] )
+ tinydns? ( >=dev-db/tinycdb-0.77 )
+ )
+ doc? ( app-doc/doxygen )"
+
+src_configure() {
+ local dynmodules="pipe geo bind" # the default backends, always enabled
+ local modules=""
+
+ #use db2 && dynmodules+=" db2"
+ use ldap && dynmodules+=" ldap"
+ use lua && dynmodules+=" lua"
+ use mydns && dynmodules+=" mydns"
+ use mysql && dynmodules+=" gmysql"
+ use opendbx && dynmodules+=" opendbx"
+ #use oracle && dynmodules+=" goracle oracle"
+ use postgres && dynmodules+=" gpgsql"
+ use remote && dynmodules+=" remote"
+ use sqlite && dynmodules+=" gsqlite3"
+ use tinydns && dynmodules+=" tinydns"
+ use geoip && dynmodules+=" geoip"
+ #use xdb && dynmodules+=" xdb"
+
+ if use static ; then
+ modules="${dynmodules}"
+ dynmodules=""
+ fi
+
+ use botan && myconf+=" --enable-botan1.10"
+ use cryptopp && myconf+=" --enable-cryptopp"
+ use debug && myconf+=" --enable-verbose-logging"
+
+ CRYPTOPP_CFLAGS=" " \
+ CRYPTOPP_LIBS="-lcrypto++" \
+ econf \
+ --with-system-polarssl \
+ --disable-static \
+ --sysconfdir=/etc/powerdns \
+ --libdir=/usr/$(get_libdir)/powerdns \
+ --with-modules="${modules}" \
+ --with-dynmodules="${dynmodules}" \
+ --with-pgsql-includes=/usr/include \
+ --with-pgsql-lib=/usr/$(get_libdir) \
+ --with-mysql-lib=/usr/$(get_libdir) \
+ $(use_enable test unit-tests) \
+ $(use_with lua) \
+ $(use_enable static static-binaries) \
+ $(use_enable tools) \
+ ${myconf}
+}
+
+src_compile() {
+ default
+ use doc && emake -C codedocs codedocs
+}
+
+src_install () {
+ default
+
+ mv "${D}"/etc/powerdns/pdns.conf{-dist,}
+
+ fperms 0700 /etc/powerdns
+ fperms 0600 /etc/powerdns/pdns.conf
+
+ # set defaults: setuid=pdns, setgid=pdns
+ sed -i \
+ -e 's/^# set\([ug]\)id=$/set\1id=pdns/g' \
+ "${D}"/etc/powerdns/pdns.conf
+
+ doinitd "${FILESDIR}"/pdns
+ systemd_newunit contrib/systemd-pdns.service pdns.service
+
+ keepdir /var/empty
+
+ use doc && dohtml -r codedocs/html/.
+
+ # Install development headers
+ insinto /usr/include/pdns
+ doins pdns/*.hh
+ insinto /usr/include/pdns/backends/gsql
+ doins pdns/backends/gsql/*.hh
+
+ if use ldap ; then
+ insinto /etc/openldap/schema
+ doins "${FILESDIR}"/dnsdomain2.schema
+ fi
+
+ prune_libtool_files --all
+}
+
+pkg_preinst() {
+ enewgroup pdns
+ enewuser pdns -1 -1 /var/empty pdns
+}
+
+pkg_postinst() {
+ elog "PowerDNS provides multiple instances support. You can create more instances"
+ elog "by symlinking the pdns init script to another name."
+ elog
+ elog "The name must be in the format pdns.<suffix> and PowerDNS will use the"
+ elog "/etc/powerdns/pdns-<suffix>.conf configuration file instead of the default."
+
+ if use ldap ; then
+ ewarn "The official LDAP backend module is only compile-tested by upstream."
+ ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
+ fi
+
+ local fix_perms=0
+
+ for rv in ${REPLACING_VERSIONS} ; do
+ version_compare ${rv} 3.2
+ [[ $? -eq 1 ]] && fix_perms=1
+ done
+
+ if [[ $fix_perms -eq 1 ]] ; then
+ ewarn "To fix a security bug (bug #458018) had the following"
+ ewarn "files/directories the world-readable bit removed (if set):"
+ ewarn " ${EPREFIX}/etc/pdns"
+ ewarn " ${EPREFIX}/etc/pdns/pdns.conf"
+ ewarn "Check if this is correct for your setup"
+ ewarn "This is a one-time change and will not happen on subsequent updates."
+ chmod o-rwx "${EPREFIX}"/etc/pdns/{,pdns.conf}
+ fi
+
+}
diff --git a/net-firewall/firehol/firehol-2.0.3.ebuild b/net-firewall/firehol/firehol-2.0.3.ebuild
index 3026dd703f8f..182c9eb1013a 100644
--- a/net-firewall/firehol/firehol-2.0.3.ebuild
+++ b/net-firewall/firehol/firehol-2.0.3.ebuild
@@ -44,7 +44,8 @@ src_configure() {
--with-autosave6="${EPREFIX}/var/lib/ip6tables/rules-save" \
$(use_enable doc) \
IP6TABLES_CMD=/bin/false \
- IP6TABLES_SAVE_CMD=/bin/false
+ IP6TABLES_SAVE_CMD=/bin/false \
+ IP6TABLES_RESTORE_CMD=/bin/false
}
src_install() {
diff --git a/net-firewall/nftables/nftables-0.5.ebuild b/net-firewall/nftables/nftables-0.5.ebuild
index 2162672f95f6..fdefe0046b08 100644
--- a/net-firewall/nftables/nftables-0.5.ebuild
+++ b/net-firewall/nftables/nftables-0.5.ebuild
@@ -4,16 +4,16 @@
EAPI=5
-inherit autotools linux-info
+inherit autotools linux-info eutils
DESCRIPTION="Linux kernel (3.13+) firewall, NAT and packet mangling tools"
HOMEPAGE="http://netfilter.org/projects/nftables/"
+SRC_URI="http://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="debug gmp +readline"
-SRC_URI="http://git.netfilter.org/nftables/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
RDEPEND=">=net-libs/libmnl-1.0.3
>=net-libs/libnftnl-1.0.5
diff --git a/net-ftp/tnftp/Manifest b/net-ftp/tnftp/Manifest
index 32de70758b51..a2b3e7e7e521 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,3 +1,4 @@
DIST tnftp-20100108.tar.gz 614438 SHA256 31d9f9ae333cdf99290c30b1f409e4fff79824cd2498464a8cade881c9b5511a SHA512 fa6dd4fc421af54004523e837bd8361dacf3d0e7862567141f4d822337d295215afae3a5df37fb4a08fc36879bb9b017eb2771bb600b0636663142a976a9651b WHIRLPOOL a62f4dd56cd7b45bb844187355466e1f77f8e41f7493be83ae6981955d164f7488d527f67f2fb986d8b344e60c173f2fde588d5dfdfd4818132ff6bccad89613
DIST tnftp-20130505.tar.gz 612475 SHA256 6f650e25f6fd51538f677b789b49379f367ae9f1dee74c94cfe24d92abc2cffb SHA512 cbae2d77a681e24d59d36c81922b122fd33eb54218bc6c132829c1b5ba2a344eef01ea30a6c09244f5b1ac8d347c2e62d30d23d4ed4def6b10848a97dfa85357 WHIRLPOOL f20803b23bc1e35676baf26da25547a4743183e36a3fe31089a4f2fec5270b869a194fd4d71ee9aa4bcbb742f9d88bd6096f85f97d4bbab9a723e141a94f4ef3
DIST tnftp-20141104.tar.gz 613180 SHA256 124e9f263c01600acb4072f936d2d0ab5120e68cd8598b86ff4b1d15c87af7b8 SHA512 e3d99215d36d27d3d841d946975c2a2723c6ca227cc7d9469f30dbc398f32bdd5c0922933dd12d9e822d7e85826a74619fb7712a6c5a97d1ee721c79d5728d55 WHIRLPOOL aa793e70f235627cf8540bbbe6decaaacee0f137fa22b23ed2fe17999fd1859449a21d392bcc5edd7fe276b673ed5eef5d70c9bf8ccc5c14bc119772bd996f0a
+DIST tnftp-20151004.tar.gz 613482 SHA256 c94a8a49d3f4aec1965feea831d4d5bf6f90c65fd8381ee0863d11a5029a43a0 SHA512 0702dc26c072599eebbe8731924452575eab93ab72245d4703497daa6e5e4a2c050b28278c0a20b4dbb86cee25949f216fc80a581ed73457a78c1616f484ed6e WHIRLPOOL 3bb888e9ccc2912b793a8e5e80416d8fe2f74dae4f85f53e42e416d21b5ac377807485beaf8be8e0f3c366f8ab61bc2fa7e67778e82a9ce529da34b40c39ab51
diff --git a/net-ftp/tnftp/tnftp-20141104.ebuild b/net-ftp/tnftp/tnftp-20141104.ebuild
index 8ed1dd8daa9f..470396b0be1b 100644
--- a/net-ftp/tnftp/tnftp-20141104.ebuild
+++ b/net-ftp/tnftp/tnftp-20141104.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
SLOT="0"
LICENSE="BSD-4 BSD ISC"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="ipv6 socks5"
DEPEND=">=sys-libs/ncurses-5.1
diff --git a/net-ftp/tnftp/tnftp-20151004.ebuild b/net-ftp/tnftp/tnftp-20151004.ebuild
new file mode 100644
index 000000000000..8ed1dd8daa9f
--- /dev/null
+++ b/net-ftp/tnftp/tnftp-20151004.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="NetBSD FTP client with several advanced features"
+SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/${P}.tar.gz
+ ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/old/${P}.tar.gz"
+HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
+
+SLOT="0"
+LICENSE="BSD-4 BSD ISC"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="ipv6 socks5"
+
+DEPEND=">=sys-libs/ncurses-5.1
+ socks5? ( net-proxy/dante )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf \
+ --enable-editcomplete \
+ $(use_enable ipv6) \
+ $(use_with socks5 socks) \
+ || die "econf failed"
+}
+
+src_install() {
+ emake install DESTDIR="${D}" || die "emake install failed"
+ dodoc ChangeLog README THANKS || die "dodoc failed"
+}
diff --git a/net-im/corebird/Manifest b/net-im/corebird/Manifest
index f4ffd33643b3..40ca2b49dcae 100644
--- a/net-im/corebird/Manifest
+++ b/net-im/corebird/Manifest
@@ -1,2 +1,3 @@
DIST corebird-0.8.tar.gz 1655839 SHA256 4e68e174edc40b49d70a11c1b0a1b196ca9517daa8eae6ce2da3e8004acda611 SHA512 308bc0ade8ddda0b0be0949e5199bf6ac1b3658bf6e181821a205a602b2a22a97e77583cd5ca63ba272926810095104ae4117e54ccda10234d143c3377b9384d WHIRLPOOL 2e014590c0d9222a6a53d78d855ff9017fa9b3c68c2c354bc2acad1b028bd6253fa9510fbc5ce391bc65319829e14c5447b4be4cbcc8427faace790767e6d98c
DIST corebird-1.0.tar.gz 1697452 SHA256 0ca4ca20b0281b2901382810ef8bd1682bb896c3915ad3bea3f2a41461118001 SHA512 098dd764a3aecaeda90ad5b0e24a4bf172025ce1a4105b713a1a73385d1de9cca028d7a34a39e9682ad4e2b2b22d4bf2889668c587e363cdfa6053136b1f4c39 WHIRLPOOL e033988b94632ad6b8d4e8c79a6125311466e81d746dd434801451f71e4590558b1797e8690ff033c1c04aeb4a299191993421a64e9d3a925409cda663478ab8
+DIST corebird-1.1.tar.gz 1757414 SHA256 f6109cc2bdc7ee5893c28861a73df4eeaec4b76b99222a90aec381b03b19c8a7 SHA512 b753a22ea9f597cb44df367852c27c94972f8747dfc3541826745c29a44c7b25237d40a7927b2be6002651efdd63f5e4bb6bd2b51edf6b66c3a436963be814bc WHIRLPOOL f01ee9e6452dc4f84f93c73c571033c64a4affdfb67c185e45cf1908101966075d2d310575ebfd8e340ba4fc10a8070af869b54b071a4ed6d95fc60cdb387144
diff --git a/net-im/corebird/corebird-1.1.ebuild b/net-im/corebird/corebird-1.1.ebuild
new file mode 100644
index 000000000000..ee141807a405
--- /dev/null
+++ b/net-im/corebird/corebird-1.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+VALA_MIN_API_VERSION=0.26
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils gnome2 vala
+
+DESCRIPTION="Native GTK+3 Twitter client"
+HOMEPAGE="http://corebird.baedert.org/"
+SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gstreamer"
+
+RDEPEND="
+ dev-db/sqlite:3
+ >=dev-libs/glib-2.44:2
+ dev-libs/json-glib
+ dev-libs/libgee:0.8
+ gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] )
+ >=net-libs/libsoup-2.42.3.1
+ >=net-libs/rest-0.7.93:0.7
+ >=x11-libs/gtk+-3.16:3
+"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ >=dev-util/intltool-0.40
+ sys-apps/sed
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
+ autotools-utils_src_prepare
+ gnome2_src_prepare
+ vala_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(usex gstreamer "" --disable-video)
+ )
+ gnome2_src_configure "${myeconfargs[@]}"
+}
diff --git a/net-im/gajim/gajim-0.16.4.ebuild b/net-im/gajim/gajim-0.16.4.ebuild
index 3493262e02ee..3ba671c37322 100644
--- a/net-im/gajim/gajim-0.16.4.ebuild
+++ b/net-im/gajim/gajim-0.16.4.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd"
IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
REQUIRED_USE="
diff --git a/net-libs/czmq/czmq-3.0.2.ebuild b/net-libs/czmq/czmq-3.0.2.ebuild
index c69664d75bae..b0d18198ed14 100644
--- a/net-libs/czmq/czmq-3.0.2.ebuild
+++ b/net-libs/czmq/czmq-3.0.2.ebuild
@@ -45,6 +45,7 @@ src_test() {
src_install() {
autotools-utils_src_install
mv "${ED}"/usr/bin/makecert{,-czmq} || die
+ mv "${ED}"/usr/share/man/man1/makecert{,-cmzq}.1 || die
}
pkg_postinst() {
diff --git a/net-libs/libbtbb/Manifest b/net-libs/libbtbb/Manifest
index 222fa65d64e7..952fe8d5c434 100644
--- a/net-libs/libbtbb/Manifest
+++ b/net-libs/libbtbb/Manifest
@@ -1,2 +1,3 @@
DIST libbtbb-2015-09-R2.tar.gz 222045 SHA256 35ce44636649163f0d9a4de5905f686470f54c79b408959760db8c8182853161 SHA512 e300ec09de34644a0cd2f4aba2fe0b03021aaa0b0fe5035022f1e698ff10867adfd84850d0d40e9c070fbd622efee1b614221c1f5b1818f1d4f5d58cc3f31919 WHIRLPOOL 99d8c621b263cd3cd82e423eabff21d4979b0407c31430aa26424d273c9e3ed802e68833e3a100588a46a9a2126a84d0be56e41c1b609ea2eed4a3d64203c995
+DIST libbtbb-2015-10-R1.tar.gz 221859 SHA256 95f493d379a53ec1134cfb36349cc9aac95d77260db4fdb557313b0dbb5c1d5a SHA512 550d793326cfb4d31ed00d46faf3521ccafc133614f866961ba6226dff41d3deda428b45f01178e0dea7925635a64e843f0510049408c3f299ad427f2c0832ac WHIRLPOOL 4ac8697150ff5215765a5331695bfc6d2967ff61a4fc89820dd8e3c72f52f51f3d5aff2b4f020de6c728cd368a295a90bbd0bb1cebb60d895c84d5219cc70e77
DIST libbtbb-2015.09.2-rename-plugins.patch.xz 15636 SHA256 391a51ef542deecbb680d7d14f1649e8190096bce38a38965bc00fe1e97ad038 SHA512 40af251835fae9031a28720bf15ec9a903eac5fc42f38a0edf234021861e3c64e3fb77c03675ac7623b6dae901988d28f3ef90d53ea9e2b62b2d692ca0bf2d2f WHIRLPOOL eb15206c66f6293d509affa855f186ccfbb32c9d745675217c1228e7d07c0ef587bd6f997f664c1141e9fa0f4c453faefed3b82982b4099b53b81ec233b2dfec
diff --git a/net-libs/libbtbb/libbtbb-2015.10.1.ebuild b/net-libs/libbtbb/libbtbb-2015.10.1.ebuild
new file mode 100644
index 000000000000..3d12be1e26ff
--- /dev/null
+++ b/net-libs/libbtbb/libbtbb-2015.10.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib cmake-utils
+
+DESCRIPTION="A library to decode Bluetooth baseband packets"
+HOMEPAGE="http://libbtbb.sourceforge.net/"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/greatscottgadgets/libbtbb.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ MY_PV=${PV/\./-}
+ MY_PV=${MY_PV/./-R}
+ S=${WORKDIR}/${PN}-${MY_PV}
+ SRC_URI="https://github.com/greatscottgadgets/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE="+pcap +wireshark-plugins"
+
+RDEPEND="
+ pcap? ( net-libs/libpcap )
+ wireshark-plugins? (
+ >=net-analyzer/wireshark-1.8.3-r1:=
+ !>net-analyzer/wireshark-1.98
+ )
+"
+DEPEND="${RDEPEND}
+ wireshark-plugins? ( dev-libs/glib
+ virtual/pkgconfig )"
+
+get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
+
+which_plugins() {
+ if has_version '>=net-analyzer/wireshark-1.12.0'; then
+ plugins="btbb btbredr"
+ elif has_version '<net-analyzer/wireshark-1.12.0'; then
+ plugins="btbb btle btsm"
+ fi
+}
+
+src_prepare(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_prepare
+
+ if use wireshark-plugins; then
+ which_plugins
+ for i in ${plugins}
+ do
+ sed -i 's#column_info#packet#' wireshark/plugins/${i}/cmake/FindWireshark.cmake || die
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_prepare
+ done
+ fi
+}
+
+src_configure() {
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ local mycmakeargs=(
+ -DDISABLE_PYTHON=true
+ -DPACKAGE_MANAGER=true
+ $(cmake-utils_use pcap PCAPDUMP)
+ $(cmake-utils_use pcap USE_PCAP)
+ )
+ cmake-utils_src_configure
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)/wireshark/plugins/$(get_PV net-analyzer/wireshark)"
+ )
+ cmake-utils_src_configure
+ done
+ fi
+}
+
+src_compile(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_compile
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_compile
+ done
+ fi
+}
+
+src_test(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_test
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_test
+ done
+ fi
+}
+
+src_install(){
+ CMAKE_USE_DIR="${S}"
+ BUILD_DIR="${S}"_build
+ cmake-utils_src_install
+
+ if use wireshark-plugins; then
+ for i in ${plugins}
+ do
+ CMAKE_USE_DIR="${S}"/wireshark/plugins/${i}
+ BUILD_DIR="${WORKDIR}"/${i}_build
+ cmake-utils_src_install
+ done
+ fi
+}
diff --git a/net-libs/libnftnl/libnftnl-1.0.5.ebuild b/net-libs/libnftnl/libnftnl-1.0.5.ebuild
index 4961da175c38..a95373c8ffec 100644
--- a/net-libs/libnftnl/libnftnl-1.0.5.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.0.5.ebuild
@@ -4,16 +4,16 @@
EAPI=5
-inherit base linux-info toolchain-funcs
+inherit base linux-info toolchain-funcs eutils
DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
HOMEPAGE="http://netfilter.org/projects/nftables/"
+SRC_URI="http://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0/4"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="examples json static-libs test xml"
-SRC_URI="http://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
RDEPEND=">=net-libs/libmnl-1.0.0
xml? ( >=dev-libs/mini-xml-2.6 )
diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest
index 2f635953c3c1..ed73af2fe6ff 100644
--- a/net-mail/dovecot/Manifest
+++ b/net-mail/dovecot/Manifest
@@ -1,6 +1,8 @@
DIST dovecot-2.2-pigeonhole-0.4.2.tar.gz 1159311 SHA256 0499f07037b86489fdc1d48fb19e298d5360ec41273bccaec230eb1bcf5a3e13 SHA512 3b66d00a8462ee668b8671f5eaa48bb91d47ed8bf8b331f7d879ba8c581e2bef11e236b06a8c5da9f1248572348ad0b3e2b867fd0a17badf32152fedbe61c1ed WHIRLPOOL 4d86bd5c010434620d0741156d4b7b24c60252de76958c0fc774418abff4bebeb4a8a78b5490ee34b20d48f61fb2ee75c4ff04202108ecdd33e1eaa9e2763ad9
DIST dovecot-2.2-pigeonhole-0.4.7.tar.gz 1271959 SHA256 04a13ec11652cbff812519eacf4db7dda648ab5c4c5f63b43a437d1fb0cc8d2a SHA512 df1b4c5591ce36dc99a9e5fb0281d1d11e95b7bf37594910c5730ac611dafb744f057dc87416ff638d582191376d210bca63cc548bf34612144cae2ac6e9448d WHIRLPOOL 76b500f935ae2133e70affaf12a3fd3c158b60bd5903b160f7f3a63478b092b57cee6046d0b9afb10bf83ec4b869592ea632031cca75c4bff00f5c58b7fe23f6
DIST dovecot-2.2-pigeonhole-0.4.8.tar.gz 1567528 SHA256 d73c1c5a11cdfdcb58304a1c1272cce6c8e1868e3f61d393b3b8a725f3bf665b SHA512 34b0bbe2015f8a9558daa9ae8feebfb42437f99578b551cc15d0d5ac04cafc15bf9c5a8395d6903a013639936a5868e39bbebe6432a989da1411b3dfab351c32 WHIRLPOOL a6ba9fdf03c6c80e3e03c79475a283d4c99011c9763869894e53e84d4f556f1484d6eac9d6482f31972f12b7261afa89e21ea432bf01f9407fa50cf0f7543b4c
+DIST dovecot-2.2-pigeonhole-0.4.9.tar.gz 1577127 SHA256 82892f876d26008a076973dfddf1cffaf5a0451825fd44e06287e94b89078649 SHA512 9e7a18b43d59ed955b142d16696ca221822a547ea59ac70c1bb374eedb28b6ed99ea49f34ead1f9a16ded4573605e410a5cc8e038e1bdf5f943a65588b5d3af2 WHIRLPOOL be309436b43af82a7cb8eff205e1638b2c59751927fdab187e6fde72330e4abd99878cbfa94ca50440ec8de1f9b569bf334d426891ddc73d5f647ee2040c193f
DIST dovecot-2.2.16.tar.gz 4830169 SHA256 56ce1287a17fa88a2083116db00200deff1a5390af5eac1c8ae3f59a2079cff0 SHA512 7e910a58cae6d215169a815423bffd1677663ccb1eb400f7f1e733167c29989f3c6786a2d6cea0ef07e64cb08aa1402adb451e0adbbb999f57b3754c0962dbf8 WHIRLPOOL 22b3911e7efa336da792c2af0dde4e556d6c398d9b9f8127e53b13081777b40846a0324b92bc0b41bfd66b6957c6baaeb4e79bd39bf9ba6e91f9e2726a9575a4
DIST dovecot-2.2.18.tar.gz 5100040 SHA256 b6d8468cea47f1227f47b80618f7fb872e2b2e9d3302adc107a005dd083865bb SHA512 227fa9c55070ce305d41faebb0fe15df86cb70427dd4043a01837095228b5504121fccaecfbf47fab3426334449b637bffdfe9a93ee2322bb8ff8d69de4967c7 WHIRLPOOL 117116bd436690613adaf51031fb371a82c55818a9d32f58d098c9d53fe52d27ecfe7466a3ce51ab8cd29c952b72b55586f3cd41e13784a7d614a23eabecab9c
+DIST dovecot-2.2.19.tar.gz 5256627 SHA256 759e1e3f9d907cdaabad1f5fbacc793ca191d234c084bec3bba42966952a4e9f SHA512 1b9d605a6a5862ade9d1ca634a9e0171b7c212ab025fc2059051c3795470685b66516fa9fbe5ad91d84388268ea15795f2dcd70ffdf81736ce4d80fd284835e9 WHIRLPOOL 30dbe70bfeef10dbe414ebf3f091041ad66926a8748cd401ecaf9ed5c7602939e86943d98bfb839f32c0aa1d0081ab71adacf23bb4adba34e828ee296e9a7278
DIST dovecot-2.2.9.tar.gz 4540858 SHA256 7c3b6b8a05f6ebcc9fd01736fdcac0de12158959f5b99d1f7077f7a8626ee2d5 SHA512 41f826df22d3b34116de7abaa4543cbcf9362d7db1348e3b685019263b89d0ffe8bf0c1ddf21e4baa3bb7e98c87047b85b6fec78873df7f0db18ccecf63cea55 WHIRLPOOL 775cdbca9be788b1d20cd7f45e4d9a6265936b39a780b2232efa84958fa75a11f0984f680249e2af5faf40c9c91fa5c57026b55865dcaeddabcc90d44e3b6fae
diff --git a/net-mail/dovecot/dovecot-2.2.19.ebuild b/net-mail/dovecot/dovecot-2.2.19.ebuild
new file mode 100644
index 000000000000..3c2689d49946
--- /dev/null
+++ b/net-mail/dovecot/dovecot-2.2.19.ebuild
@@ -0,0 +1,306 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib ssl-cert systemd user versionator
+
+MY_P="${P/_/.}"
+major_minor="$(get_version_component_range 1-2)"
+sieve_version="0.4.9"
+if [[ ${PV} == *_rc* ]] ; then
+ rc_dir="rc/"
+else
+ rc_dir=""
+fi
+SRC_URI="http://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz
+ sieve? (
+ http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+ )
+ managesieve? (
+ http://pigeonhole.dovecot.org/releases/${major_minor}/${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz
+ ) "
+DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
+HOMEPAGE="http://www.dovecot.org/"
+
+SLOT="0"
+LICENSE="LGPL-2.1 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE_DOVECOT_AUTH="kerberos ldap mysql pam postgres sqlite vpopmail"
+IUSE_DOVECOT_STORAGE="cydir imapc +maildir mbox mdbox pop3c sdbox"
+IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib"
+IUSE_DOVECOT_OTHER="caps doc ipv6 libressl lucene managesieve selinux sieve solr +ssl static-libs suid tcpd"
+
+IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+ caps? ( sys-libs/libcap )
+ kerberos? ( virtual/krb5 )
+ ldap? ( net-nds/openldap )
+ lucene? ( >=dev-cpp/clucene-2.3 )
+ lzma? ( app-arch/xz-utils )
+ lz4? ( app-arch/lz4 )
+ mysql? ( virtual/mysql )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] )
+ selinux? ( sec-policy/selinux-dovecot )
+ solr? ( net-misc/curl dev-libs/expat )
+ sqlite? ( dev-db/sqlite:* )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ tcpd? ( sys-apps/tcp-wrappers )
+ vpopmail? ( net-mail/vpopmail )
+ zlib? ( sys-libs/zlib )
+ virtual/libiconv
+ dev-libs/icu:="
+
+RDEPEND="${DEPEND}
+ net-mail/mailbase"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ if use managesieve && ! use sieve; then
+ ewarn "managesieve USE flag selected but sieve USE flag unselected"
+ ewarn "sieve USE flag will be turned on"
+ fi
+ # default internal user
+ enewgroup dovecot 97
+ enewuser dovecot 97 -1 /dev/null dovecot
+ # default login user
+ enewuser dovenull -1 -1 /dev/null
+ # add "mail" group for suid'ing. Better security isolation.
+ if use suid; then
+ enewgroup mail
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-10-ssl.patch"
+ epatch_user
+}
+
+src_configure() {
+ local conf=""
+
+ if use postgres || use mysql || use sqlite; then
+ conf="${conf} --with-sql"
+ fi
+
+ local storages=""
+ for storage in ${IUSE_DOVECOT_STORAGE//+/}; do
+ use ${storage} && storages="${storage} ${storages}"
+ done
+ [ "${storages}" ] || storages="maildir"
+
+ # turn valgrind tests off. Bug #340791
+ VALGRIND=no econf \
+ --localstatedir="${EPREFIX}/var" \
+ --runstatedir="${EPREFIX}/run" \
+ --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \
+ --without-stemmer \
+ --with-storages="${storages}" \
+ --disable-rpath \
+ --with-icu \
+ $( systemd_with_unitdir ) \
+ $( use_with bzip2 bzlib ) \
+ $( use_with caps libcap ) \
+ $( use_with kerberos gssapi ) \
+ $( use_with ldap ) \
+ $( use_with lucene ) \
+ $( use_with lz4 ) \
+ $( use_with lzma ) \
+ $( use_with mysql ) \
+ $( use_with pam ) \
+ $( use_with postgres pgsql ) \
+ $( use_with sqlite ) \
+ $( use_with solr ) \
+ $( use_with ssl ) \
+ $( use_with tcpd libwrap ) \
+ $( use_with vpopmail ) \
+ $( use_with zlib ) \
+ $( use_enable static-libs static ) \
+ ${conf}
+
+ if use sieve || use managesieve ; then
+ # The sieve plugin needs this file to be build to determine the plugin
+ # directory and the list of libraries to link to.
+ emake dovecot-config
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ econf \
+ $( use_enable static-libs static ) \
+ --localstatedir="${EPREFIX}/var" \
+ --enable-shared \
+ --with-dovecot="../${MY_P}" \
+ $( use_with managesieve )
+ fi
+}
+
+src_compile() {
+ default
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+ fi
+}
+
+src_test() {
+ default
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ default
+ fi
+}
+
+src_install () {
+ default
+
+ # insecure:
+ # use suid && fperms u+s /usr/libexec/dovecot/deliver
+ # better:
+ if use suid;then
+ einfo "Changing perms to allow deliver to be suided"
+ fowners root:mail "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+ fperms 4750 "${EPREFIX}/usr/libexec/dovecot/dovecot-lda"
+ fi
+
+ newinitd "${FILESDIR}"/dovecot.init-r4 dovecot
+
+ rm -rf "${ED}"/usr/share/doc/dovecot
+
+ dodoc AUTHORS NEWS README TODO
+ dodoc doc/*.{txt,cnf,xml,sh}
+ docinto example-config
+ dodoc doc/example-config/*.{conf,ext}
+ docinto example-config/conf.d
+ dodoc doc/example-config/conf.d/*.{conf,ext}
+ docinto wiki
+ dodoc doc/wiki/*
+ doman doc/man/*.{1,7}
+
+ # Create the dovecot.conf file from the dovecot-example.conf file that
+ # the dovecot folks nicely left for us....
+ local conf="${ED}/etc/dovecot/dovecot.conf"
+ local confd="${ED}/etc/dovecot/conf.d"
+
+ insinto /etc/dovecot
+ doins doc/example-config/*.{conf,ext}
+ insinto /etc/dovecot/conf.d
+ doins doc/example-config/conf.d/*.{conf,ext}
+ fperms 0600 "${EPREFIX}"/etc/dovecot/dovecot-{ldap,sql}.conf.ext
+ rm -f "${confd}/../README"
+
+ # .maildir is the Gentoo default
+ local mail_location="maildir:~/.maildir"
+ if ! use maildir; then
+ if use mbox; then
+ mail_location="mbox:/var/spool/mail/%u:INDEX=/var/dovecot/%u"
+ keepdir /var/dovecot
+ sed -i -e 's|#mail_privileged_group =|mail_privileged_group = mail|' \
+ "${confd}/10-mail.conf" || die "sed failed"
+ elif use mdbox ; then
+ mail_location="mdbox:~/.mdbox"
+ elif use sdbox ; then
+ mail_location="sdbox:~/.sdbox"
+ fi
+ fi
+ sed -i -e \
+ "s|#mail_location =|mail_location = ${mail_location}|" \
+ "${confd}/10-mail.conf" \
+ || die "failed to update mail location settings in 10-mail.conf"
+
+ # We're using pam files (imap and pop3) provided by mailbase
+ if use pam; then
+ sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \
+ "${confd}/auth-system.conf.ext" \
+ || die "failed to update PAM settings in auth-system.conf.ext"
+ # mailbase does not provide a sieve pam file
+ use managesieve && dosym imap /etc/pam.d/sieve
+ sed -i -e \
+ 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update PAM settings in 10-auth.conf"
+ fi
+
+ # Disable ipv6 if necessary
+ if ! use ipv6; then
+ sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \
+ || die "failed to update listen settings in dovecot.conf"
+ fi
+
+ # Update ssl cert locations
+ if use ssl; then
+ sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \
+ || die "ssl conf failed"
+ sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \
+ -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \
+ "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf"
+ fi
+
+ # Install SQL configuration
+ if use mysql || use postgres; then
+ sed -i -e \
+ 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \
+ "${confd}/10-auth.conf" || die "failed to update SQL settings in \
+ 10-auth.conf"
+ fi
+
+ # Install LDAP configuration
+ if use ldap; then
+ sed -i -e \
+ 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update ldap settings in 10-auth.conf"
+ fi
+
+ if use vpopmail; then
+ sed -i -e \
+ 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \
+ "${confd}/10-auth.conf" \
+ || die "failed to update vpopmail settings in 10-auth.conf"
+ fi
+
+ if use sieve || use managesieve ; then
+ cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed"
+ emake DESTDIR="${ED}" install
+ sed -i -e \
+ 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \
+ || die "failed to update sieve settings in 15-lda.conf"
+ rm -rf "${ED}"/usr/share/doc/dovecot
+ docinto example-config/conf.d
+ dodoc doc/example-config/conf.d/*.conf
+ insinto /etc/dovecot/conf.d
+ doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf
+ use managesieve && doins doc/example-config/conf.d/20-managesieve.conf
+ docinto sieve/rfc
+ dodoc doc/rfc/*.txt
+ docinto sieve/devel
+ dodoc doc/devel/DESIGN
+ docinto plugins
+ dodoc doc/plugins/*.txt
+ docinto extensions
+ dodoc doc/extensions/*.txt
+ docinto locations
+ dodoc doc/locations/*.txt
+ doman doc/man/*.{1,7}
+ fi
+
+ use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete
+}
+
+pkg_postinst() {
+ if use ssl; then
+ # Let's not make a new certificate if we already have one
+ if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \
+ -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then
+ einfo "Creating SSL certificate"
+ SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}"
+ install_cert /etc/ssl/dovecot/server
+ fi
+ fi
+
+ elog "Please read http://wiki2.dovecot.org/Upgrading/ for upgrade notes."
+}
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index e24ccb55e7cd..3d470ebe7357 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,2 +1,3 @@
DIST chrony-2.1.1.tar.gz 391037 SHA256 b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4 SHA512 bbb6d4b3436b7c3c7d45628500678ce31291aaa7f59df0f616268fcdb9285f21a79b085d232773ce732eea82f28fa87f4c56ac5b6a7388275c67889daf641499 WHIRLPOOL a431253f173fb8c52f417c0a074c66e3125bb46247b3a177d6ad4c96d953a4557fb159e5940f03d39a83ad1b5a92dd73f84333e3d2274a42a5e93337ca2f6d7e
DIST chrony-2.2-pre1.tar.gz 339418 SHA256 6a850a5d278ee2f28936baeb880f2bcd6774064302c58edff2577b16082de8e5 SHA512 eb77bd681ef4d1133ccfdf9d59b8ee1d161d5816b99e3ec58db9240181ac023f7d6950a7adeb37582abcd1a27f51df6964d41ff0fb2e095f7f0a5b3231386277 WHIRLPOOL 0cb671cabc31b8dfe4ebf4b3635e6591a31f2c7431e5a476d57f108b43b318f23bf8107eeb2038dcd194d574784dac1854f3537432c4ebe81f2d29d61653deec
+DIST chrony-2.2-pre2.tar.gz 339752 SHA256 dd5c9a90b00db399a6199d63a337ee23f4552034fb1697f4cf9903781a49d858 SHA512 86d13831e19d26780b55bb77c5b7b5d57c2136ce5f36cb6d837f0afbeab33999cd8c111c16013e1166c82fe95cd30d7901de491d014d423c88a917692a3a2780 WHIRLPOOL 01ebcf50b7a5e412dbc11ea51115862419a78b34515bdf589ad6b23b5948997c5d13b6244de595358b813f41f10294fe22da18f236a34be6ed0a10b0c258a8ce
diff --git a/net-misc/chrony/chrony-2.2_pre1.ebuild b/net-misc/chrony/chrony-2.2_pre1-r1.ebuild
index f745441b0286..3b219f232e7b 100644
--- a/net-misc/chrony/chrony-2.2_pre1.ebuild
+++ b/net-misc/chrony/chrony-2.2_pre1-r1.ebuild
@@ -107,7 +107,7 @@ src_install() {
keepdir /var/{lib,log}/chrony
insinto /etc/logrotate.d
- newins "${FILESDIR}"/chrony.logrotate chrony
+ newins "${FILESDIR}"/chrony-2.2.logrotate chrony
systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
systemd_enable_ntpunit 50-chrony chronyd.service
diff --git a/net-misc/chrony/chrony-2.2_pre2.ebuild b/net-misc/chrony/chrony-2.2_pre2.ebuild
new file mode 100644
index 000000000000..3b219f232e7b
--- /dev/null
+++ b/net-misc/chrony/chrony-2.2_pre2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="http://chrony.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
+REQUIRED_USE="
+ ?? ( libedit readline )
+"
+
+CDEPEND="
+ caps? ( sys-libs/libcap )
+ libedit? ( dev-libs/libedit )
+ readline? ( >=sys-libs/readline-4.1-r4:= )
+"
+DEPEND="
+ ${CDEPEND}
+ sys-apps/texinfo
+"
+RDEPEND="
+ ${CDEPEND}
+ selinux? ( sec-policy/selinux-chronyd )
+"
+
+RESTRICT=test
+
+S="${WORKDIR}/${P/_/-}"
+
+src_prepare() {
+ sed -i \
+ -e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
+ -e 's:/var/run:/run:g' \
+ conf.c chrony.texi.in examples/* || die
+}
+
+src_configure() {
+ tc-export CC
+
+ local CHRONY_EDITLINE
+ # ./configure legend:
+ # --disable-readline : disable line editing entirely
+ # --without-readline : do not use sys-libs/readline (enabled by default)
+ # --without-editline : do not use dev-libs/libedit (enabled by default)
+ if ! use readline && ! use libedit; then
+ CHRONY_EDITLINE='--disable-readline'
+ else
+ CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
+ CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
+ fi
+
+ # not an autotools generated script
+ local CHRONY_CONFIGURE="
+ ./configure \
+ $(usex caps '' --disable-linuxcaps) \
+ $(usex cmdmon '' --disable-cmdmon) \
+ $(usex ipv6 '' --disable-ipv6) \
+ $(usex ntp '' --disable-ntp) \
+ $(usex phc '' --disable-phc) \
+ $(usex pps '' --disable-pps) \
+ $(usex rtc '' --disable-rtc) \
+ $(usex refclock '' --disable-refclock) \
+ $(usex adns '' --disable-asyncdns) \
+ ${CHRONY_EDITLINE} \
+ ${EXTRA_ECONF} \
+ --docdir=/usr/share/doc/${PF} \
+ --chronysockdir=/run/chrony \
+ --infodir=/usr/share/info \
+ --mandir=/usr/share/man \
+ --prefix=/usr \
+ --sysconfdir=/etc/chrony \
+ --disable-sechash \
+ --without-nss \
+ --without-tomcrypt
+ "
+
+ # print the ./configure call to aid in future debugging
+ einfo ${CHRONY_CONFIGURE}
+ bash ${CHRONY_CONFIGURE} || die
+}
+
+src_compile() {
+ emake all docs
+}
+
+src_install() {
+ default
+
+ doinfo chrony.info*
+
+ newinitd "${FILESDIR}"/chronyd.init chronyd
+ newconfd "${FILESDIR}"/chronyd.conf chronyd
+
+ insinto /etc/${PN}
+ newins examples/chrony.conf.example1 chrony.conf
+
+ dodoc examples/*.example*
+
+ keepdir /var/{lib,log}/chrony
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/chrony-2.2.logrotate chrony
+
+ systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
+ systemd_enable_ntpunit 50-chrony chronyd.service
+}
diff --git a/net-misc/chrony/files/chrony-2.2.logrotate b/net-misc/chrony/files/chrony-2.2.logrotate
new file mode 100644
index 000000000000..ae76c8de6af6
--- /dev/null
+++ b/net-misc/chrony/files/chrony-2.2.logrotate
@@ -0,0 +1,7 @@
+/var/log/chrony/*.log {
+ missingok
+ sharedscripts
+ postrotate
+ /usr/bin/chronyc cyclelogs
+ endscript
+}
diff --git a/net-misc/dibbler/Manifest b/net-misc/dibbler/Manifest
index e8f71fb453db..92042eed1110 100644
--- a/net-misc/dibbler/Manifest
+++ b/net-misc/dibbler/Manifest
@@ -1,3 +1,4 @@
DIST dibbler-0.8.4.tar.gz 4292008 SHA256 90382709200b6f1c4d403aceeedb52fd5633cfb71c7df3742062ddfe8b71c013 SHA512 7d0323abd42d0ab57fcaecb30c1354a831f2b8b8b300a9a20678062ef52743b5724569d1885f3866d517abbfae48651966734d47a6c5f43d19fd65332ebeca6c WHIRLPOOL f1d9c2219daebe3f69fbcde956a164902fa2b6ba1448d95a00aaada0423a995d013256fc35fbc8c860efd11f28b0dd42f97de4761a31f0b7662dec23bb36b25a
DIST dibbler-1.0.0.tar.gz 4372693 SHA256 51283702a1e56c1bfe56fb95469ec7b1fc56ecb8e9a2c6d296b81d43bec14048 SHA512 38eae78e5d5dab2484c6467eb91e7e8eed62067a1f375a9a0e0ed3639c1bd9db7230bc7a33ee41ffd785d031994c6bec4a6b2eb75bb5c0d4645c7e669f568434 WHIRLPOOL 80a9deb26802b0d26a108abffb09a9b3e81faf1e2fda1f25f5a71b855741ee967b82486e0f7e79f9d1560abd43dfe6934e2d69c486c6302f0154972041e98d46
DIST dibbler-1.0.0RC2.tar.gz 4331108 SHA256 206a27421db7ae5298805d00f9adcafcf6aef7496a5fb23640f6fa99a6ee2d68 SHA512 b0384629a4139bc95609eaf19df6d0c57daebfd0ecd063981271153e3c3cd1658376fd8a473a6568f8b782e58c08c44a101209b49ea3ac39436a3aac4cb27259 WHIRLPOOL 6377ad56bbe61eb7e88f0e92814fd4cbceb4518419b0ec74bceaa7fd09d8de8b00061d73d8d2dead2c3b4389b058ab968586d8373e9b47f1eede0e18b91784f4
+DIST dibbler-1.0.1.tar.gz 4375118 SHA256 27869877e060c039cbc24a5f6a9dd69006bf67de0ffdf29a645a80aef6e476a1 SHA512 2369d4a3ca50a1c60bd5a47bf4168d4c113e2fdcb1ae4d937a3bf226c057142f2e81f6c46bf4e1dfa9ca0d2e92f7f857572a4bfb0d0dd721c35efe762e6c3ea0 WHIRLPOOL dafc1663b487bc62068ef86be6261484729cf8da966f5572b1e459fb3a902c9474d9a8bea361dba683111f9f7994b86a3a7484333c77c9f977ec54169653898d
diff --git a/net-misc/dibbler/dibbler-1.0.1.ebuild b/net-misc/dibbler/dibbler-1.0.1.ebuild
new file mode 100644
index 000000000000..93b9c87e7bd1
--- /dev/null
+++ b/net-misc/dibbler/dibbler-1.0.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+inherit eutils readme.gentoo systemd
+
+DESCRIPTION="Portable DHCPv6 implementation (server, client and relay)"
+HOMEPAGE="http://klub.com.pl/dhcpv6/"
+SRC_URI="http://klub.com.pl/dhcpv6/dibbler/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( || (
+ dev-texlive/texlive-latexextra
+ dev-tex/floatflt )
+ )"
+RDEPEND=""
+
+DOC_CONTENTS="Make sure that you modify client.conf, server.conf and/or relay.conf
+to suit your needs. They are stored in /etc/dibbler"
+
+src_prepare() {
+ epatch_user
+}
+
+src_compile() {
+ emake
+ # devel documentation is broken and users should consult the online version
+ # http://klub.com.pl/dhcpv6/doxygen/
+ use doc && emake -C doc/ user
+}
+
+src_install() {
+ readme.gentoo_create_doc
+
+ dosbin dibbler-{client,relay,server}
+ doman doc/man/*.8
+
+ insinto /etc/dibbler
+ doins doc/examples/*.conf
+ dodir /var/lib/dibbler
+
+ dodoc AUTHORS CHANGELOG RELNOTES TODO
+ use doc && dodoc doc/dibbler-user.pdf
+
+ doinitd "${FILESDIR}"/dibbler-{client,relay,server}
+ systemd_dounit "${FILESDIR}"/dibbler-client.service
+}
diff --git a/net-misc/openvpn/openvpn-2.3.8.ebuild b/net-misc/openvpn/openvpn-2.3.8.ebuild
index 7df6370b0211..0f81333efbcb 100644
--- a/net-misc/openvpn/openvpn-2.3.8.ebuild
+++ b/net-misc/openvpn/openvpn-2.3.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://openvpn.net/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE="examples down-root iproute2 +lzo pam passwordsave pkcs11 +plugins polarssl selinux socks +ssl static systemd userland_BSD"
REQUIRED_USE="static? ( !plugins !pkcs11 )
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index f0849803ab23..ce426f9d4657 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,3 +1,2 @@
-DIST putty-0.64.tar.gz 1977448 SHA256 2a46c97a184144e3ec2392aca9acc64d062317a3a38b9a5f623a147eda5f3821 SHA512 ba4d4086b8edcb6388924bf3d9b018841be36a9dbf298271c9d2ed063aae9854093e9ff6808bd1f65669d78369548639eb3c95fdec5e3f0daee4b1c7bb603051 WHIRLPOOL 9f91dd80e9fa92e6c7957b5797158d8f5ff8162ef04f76c26e044ff4a421444c30ca1089111a448f307dc9f060c80bfb1b5616abf9ca88dd16808680ce86d253
DIST putty-0.65.tar.gz 1937861 SHA256 d543c1fd4944ea51d46d4abf31bfb8cde9bd1c65cb36dc6b83e51ce875660ca0 SHA512 cfb3e5437a920aa11bccedf1bd43a538a51ec3777a6d1dba9e9714c3b3699eaf1f4eb027a8f5fd6425f9909564a28b607f465b1f2b2e1250059b04b9a9d40569 WHIRLPOOL 15eff58a0cec37516daf67cef56772602f5bcbcb39ba09d3d8fdba31fadb77734c404a9d85e674e17c17e53db8c0deaad906b56b3bce302ec08adc9a44850c2b
DIST putty-icons.tar.bz2 4878 SHA256 960b189069dbfb20a1f49e378ab88bed716c6457593815e414d51ad7a3fa93a7 SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71 WHIRLPOOL ec96fe682582bfa58ce73c3e5cb7bb61d2363b7a5e9d3259dfd11cd6396512b5b9ed954f6a431baab36b1f17963714b30c239cdf4c08191d27b5abb858f54a57
diff --git a/net-misc/putty/putty-0.64.ebuild b/net-misc/putty/putty-0.64.ebuild
deleted file mode 100644
index 43bfb687a466..000000000000
--- a/net-misc/putty/putty-0.64.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils gnome2-utils toolchain-funcs
-
-DESCRIPTION="A Free Telnet/SSH Client"
-HOMEPAGE="http://www.chiark.greenend.org.uk/~sgtatham/putty/"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86"
-IUSE="doc +gtk ipv6 kerberos"
-SRC_URI="
- https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
- http://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
-"
-
-RDEPEND="
- !net-misc/pssh
- gtk? (
- dev-libs/glib:2
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/pango
- )
- kerberos? ( virtual/krb5 )
-"
-DEPEND="
- ${RDEPEND}
- dev-lang/perl
- virtual/pkgconfig
-"
-
-src_prepare() {
- sed -i \
- -e '/AM_PATH_GTK(/d' \
- -e 's|-Werror||g' \
- configure.ac || die
-
- eautoreconf
-}
-
-src_configure() {
- cd "${S}"/unix || die
- econf \
- $(use_with kerberos gssapi) \
- $(use_with gtk)
-}
-
-src_compile() {
- cd "${S}"/unix || die
- emake AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
-}
-
-src_install() {
- dodoc doc/puttydoc.txt
-
- if use doc; then
- dohtml doc/*.html
- fi
-
- cd "${S}"/unix || die
- default
-
- if use gtk ; then
- for i in 16 22 24 32 48 64 128 256; do
- newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
- done
-
- # install desktop file provided by Gustav Schaffter in #49577
- make_desktop_entry ${PN} PuTTY ${PN} Network
- fi
-}
-
-pkg_preinst() {
- use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
- use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- use gtk && gnome2_icon_cache_update
-}
diff --git a/net-misc/spiped/spiped-1.5.0-r1.ebuild b/net-misc/spiped/spiped-1.5.0-r1.ebuild
index caf32dac1ce1..ae0cb1014fed 100644
--- a/net-misc/spiped/spiped-1.5.0-r1.ebuild
+++ b/net-misc/spiped/spiped-1.5.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.tarsnap.com/${PN}/${P}.tgz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
MY_PN="${PN/d/}"
diff --git a/net-misc/stunnel/Manifest b/net-misc/stunnel/Manifest
index 8c82a6f1d58e..512fc7c49136 100644
--- a/net-misc/stunnel/Manifest
+++ b/net-misc/stunnel/Manifest
@@ -1,4 +1,3 @@
-DIST stunnel-5.17.tar.gz 613840 SHA256 c3e79e582621a0827125e35e1c00450190104fc02dc3c5274cb02b05859fd472 SHA512 07064bda6978d94f783fd1c125485f46eadcba0e4a419366149e91cf88333b875eeb86f63848b5dd774f9f01d41206f93905fa5a51a08ade915b4b0bce777419 WHIRLPOOL 832b3cef06ec945d2dae33d3bdba048d93ca85757f149f705d6ff5bf03440dd3d3857a73f1167ae792aedceefcb7df4ea6c31164fa5d7ee8857f5e589b08e257
DIST stunnel-5.20.tar.gz 625091 SHA256 4a36a3729a7287d9d82c4b38bf72c4d3496346cb969b86129c5deac22b20292b SHA512 59262aacf866cac25bac707b94c5a6185aa868b5fdfab38a9ef03a00b80f106d92e2872c0b0fecbc5d13adb7bdea7f922768fb78f38355dbf67eb34a148441e4 WHIRLPOOL fc890dff4ddeb00df9e8ea84fae8f0f23609d1356c91d4cdeade55f164bad322a8a2df72955b710e46e1f74a33bbc7f5c8d734efc190d0835056926d7c902b26
DIST stunnel-5.23.tar.gz 630943 SHA256 0fc4a702afd2e857bae8ad1f39c51546eb282c3d0ff4f4d55d62aece7328ddea SHA512 f312b5feff78548a7d1e7785068f0a0e3dd3785541f09d5850f9f5c5ee6bdf63b30761d68c3ba17465e87b048acd47e613aab139aab540873a38594f68669cb9 WHIRLPOOL dd32db35f2b09c3414471dd45d74369156a909429cf2becf34e08854d838d8c3c3979fb0b7e9e524a2e01abe7740ea0ac320985bb6dd813081296168ed7f1819
DIST stunnel-5.24.tar.gz 631730 SHA256 ab2e5a1034d422951ddad21b572eb7fa8efb4c4ce04bc86536c6845f3d02b07e SHA512 d9a1ef9cdd3ffafc2a3d1b3383bcf3dfc1a52cdd5a0bcfd64f50addf78a0fd0ce0def6b32ed801f8dfcabbecd64284454b1c90a18435b5d603ecba594d840340 WHIRLPOOL b625adbc9299c04308733bb5ee732350084b603128734214ec3079f58c02b58d08bfc53bf604468cd83cc5dc1bf5d968a4d5139cd98d7b2219303fdd3d6eae64
diff --git a/net-misc/stunnel/stunnel-5.23.ebuild b/net-misc/stunnel/stunnel-5.23.ebuild
index 29080ccb350c..ba38b4ad468d 100644
--- a/net-misc/stunnel/stunnel-5.23.ebuild
+++ b/net-misc/stunnel/stunnel-5.23.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~am
IUSE="ipv6 selinux stunnel3 tcpd"
DEPEND="tcpd? ( sys-apps/tcp-wrappers )
- dev-libs/openssl:="
+ dev-libs/openssl:0"
RDEPEND="${DEPEND}
stunnel3? ( dev-lang/perl )
selinux? ( sec-policy/selinux-stunnel )"
diff --git a/net-misc/stunnel/stunnel-5.17.ebuild b/net-misc/stunnel/stunnel-5.24-r1.ebuild
index 6a82286e9e66..d75157cf5747 100644
--- a/net-misc/stunnel/stunnel-5.17.ebuild
+++ b/net-misc/stunnel/stunnel-5.24-r1.ebuild
@@ -18,14 +18,18 @@ SRC_URI="ftp://ftp.stunnel.org/stunnel/archive/${PV%%.*}.x/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha"
-IUSE="ipv6 selinux tcpd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="ipv6 libressl selinux stunnel3 tcpd"
DEPEND="tcpd? ( sys-apps/tcp-wrappers )
- dev-libs/openssl:="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )"
RDEPEND="${DEPEND}
+ stunnel3? ( dev-lang/perl )
selinux? ( sec-policy/selinux-stunnel )"
+RESTRICT="test"
+
pkg_setup() {
enewgroup stunnel
enewuser stunnel -1 -1 -1 stunnel
@@ -51,8 +55,9 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install
rm -rf "${ED}"/usr/share/doc/${PN}
- rm -f "${ED}"/etc/stunnel/stunnel.conf-sample "${ED}"/usr/bin/stunnel3 \
+ rm -f "${ED}"/etc/stunnel/stunnel.conf-sample \
"${ED}"/usr/share/man/man8/stunnel.{fr,pl}.8
+ use stunnel3 || rm -f "${ED}"/usr/bin/stunnel3
# The binary was moved to /usr/bin with 4.21,
# symlink for backwards compatibility
diff --git a/net-misc/stunnel/stunnel-5.24.ebuild b/net-misc/stunnel/stunnel-5.24.ebuild
index 29080ccb350c..ba38b4ad468d 100644
--- a/net-misc/stunnel/stunnel-5.24.ebuild
+++ b/net-misc/stunnel/stunnel-5.24.ebuild
@@ -22,7 +22,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~am
IUSE="ipv6 selinux stunnel3 tcpd"
DEPEND="tcpd? ( sys-apps/tcp-wrappers )
- dev-libs/openssl:="
+ dev-libs/openssl:0"
RDEPEND="${DEPEND}
stunnel3? ( dev-lang/perl )
selinux? ( sec-policy/selinux-stunnel )"
diff --git a/net-misc/wget/wget-1.16.3-r1.ebuild b/net-misc/wget/wget-1.16.3-r1.ebuild
index 2303854305c4..99874fd57b5d 100644
--- a/net-misc/wget/wget-1.16.3-r1.ebuild
+++ b/net-misc/wget/wget-1.16.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug gnutls idn ipv6 nls ntlm pcre +ssl static test uuid zlib"
LIB_DEPEND="idn? ( net-dns/libidn[static-libs(+)] )
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index ca92414fa535..75dd35089617 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,3 @@
DIST youtube-dl-2015.04.03.tar.gz 1472296 SHA256 0521a15a24a9b620728a2f45ea9163ca74660ed443781b6e69b4e06d36d7bf59 SHA512 6b2c85cfa222a31f3462aab583fa98bb92544cd5fb0d395ca0b69a26c24ab174870d02264e058281f09305752d50aa5a06d0d747205499a530b275e3194fc6f9 WHIRLPOOL 391e06ea261f92e03a0b38618307f1c9d53a2dfb9f2062fe0cd3ded1ea0c411033a17ded581616032c74a9e4fb398a57e565bf847196a23a9f89433f861362ae
-DIST youtube-dl-2015.10.06.2.tar.gz 1753731 SHA256 5907be4d930ce68c3ed4b555e1c2f1f7a47069cfe7638300c4f124afca0fb25f SHA512 1114e5a65f204110f71890a6fe95a29fb5561bd60a928b9c198e921b153fd4e5b5b9cfd7cf87fcb377f1cc7878c6cbd9033108b932c36512cd9051090ba4162c WHIRLPOOL 6a0bb93f9ec9cc7381a5e9c0d60bfb617a29992b9f545882c827129a58d5c53bdc1da93f35af6e5a4442702364285c2c7f36f3b003e0881405e110233fe9f2db
-DIST youtube-dl-2015.10.09.tar.gz 1754748 SHA256 33103a3197ee1bfa5e9fa78449ed19de888d6b36cc27f46f5c2e76ea11aee0ab SHA512 5e1c9e2344bd4b02834310be8cfae27f734a846d995a5890522ad9d2908832127ab20b76557a7986b146bb2ad7c278815c50523a946ee8a3eb2b5cd76db31290 WHIRLPOOL bd6f1b1525b5b2fae35490ba7823dde878d88f20f13d3f6de4a95a677ec03ed1b527ff8845406cdee658f6d6c668bd528f20863fb753616caab3fa3dfd8b0e44
+DIST youtube-dl-2015.10.12.tar.gz 1758938 SHA256 3e620a6d7edb656b48eef913d3350e925679ccdb959184c5fa88f4e55604289f SHA512 810ac5ad45c1fb7f01b09636f9fc1bfef1dc4bd4d00f8b6c50393e380e291a18b2410050c111f9f08f8a467df111afc7714043c5f766301aa2955e7d9a9e2168 WHIRLPOOL 6957b6a2bf883632087b4bd3830e1cf9ea12e91f90a08d334b0eda93a72b2c6f8a89a22f8df3fbdf90d1208af425b663bb258f5ddc7d3308d12ad3040ed3e8cf
+DIST youtube-dl-2015.10.13.tar.gz 1758950 SHA256 4588f98ecd082ac4d1574c6bbc386eaf625fe1b2b321f4f84a2eb6bea45b41f9 SHA512 c9bc2a0a7786467720d31c60d2b8319640d0e724ed1b2dd584553380f19714ad4351ea6051ad689252473aeb15524c096f2f2d89931dafdfd76d45bdca4d7fdb WHIRLPOOL 08c9652e606a7710a050aafdf5eadd3c183e9039d2a7947a766a6fd67696337d5156918f16e5341d3e1662798d1148e7dee1311c5626c845b2f11a89167f0d44
diff --git a/net-misc/youtube-dl/youtube-dl-2015.10.06.2.ebuild b/net-misc/youtube-dl/youtube-dl-2015.10.12.ebuild
index db29af284def..db29af284def 100644
--- a/net-misc/youtube-dl/youtube-dl-2015.10.06.2.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.10.12.ebuild
diff --git a/net-misc/youtube-dl/youtube-dl-2015.10.09.ebuild b/net-misc/youtube-dl/youtube-dl-2015.10.13.ebuild
index db29af284def..db29af284def 100644
--- a/net-misc/youtube-dl/youtube-dl-2015.10.09.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.10.13.ebuild
diff --git a/net-p2p/classified-ads/Manifest b/net-p2p/classified-ads/Manifest
index 8cf07eb8b18a..72b768392c9f 100644
--- a/net-p2p/classified-ads/Manifest
+++ b/net-p2p/classified-ads/Manifest
@@ -1,4 +1,6 @@
DIST classified-ads-0.07.tar.gz 2194177 SHA256 882874da2d1610d64c952969222b9295bab59b519de8a7da69790805fecca394 SHA512 a42e9604ce922968b0d7f345d623b250dae39fad2f43648b996ab10f3e7941ec3de95e89d94f4ec28bba882cf2bd38ea28aac88885522a7375926aee3c5d0843 WHIRLPOOL a797387e0f8537ab5366c55554c8909d656436122c3cbf2b35c7c8cc989a8cf76c3f0d6d39a99ac54e0b7cbcd8063dd1a4ec3a99b320f243338081f665f3b933
DIST classified-ads-0.07_p20150728.tar.gz 2197413 SHA256 e8d488b6c44b198bf1150c7a33ae698887cfb345cb4473d91a5949abeb846d95 SHA512 1cb42252ab695e90212d05144255a66b0d8dc63d8d010b5781e470a4c5e9cdf9c4dce1b9e44cba83d5fb2fef99e3d46fd5cc1b9880db69c9c163475b7e4349fc WHIRLPOOL 458d3947f00709c633d652b753b7801496479f610da0d249e8e2f5f7ddecb341fb885184c027b453aa2f9db7998a74fcbd60bbb9d0bb5765b7b7e45bcdcfc2c0
+DIST classified-ads-0.09.tar.gz 2288561 SHA256 c6c0809c269e7596386b612f0a43c705801bad71c64a23a81f763656b22db125 SHA512 3639854cb797830f71261097ba315426be74f0dbcb5190522d50f4507d488d309c0793d1cad5bbc29bc43bd06de16392afc82172cefa766458764b4ac5b90357 WHIRLPOOL 7149c2772ca61a5067722f6aa5066e4dee3aec758b1998633d129cd4704723e6c633522a241cc4332dca94cac0bb59ada9a5472c750d335a764e1ff2f09c9d8f
DIST classified-ads-graphics-0.07.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad
DIST classified-ads-graphics-0.07_p20150728.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad
+DIST classified-ads-graphics-0.09.tar.gz 340476 SHA256 12bd4f581f82c4c805bbf19cc794f7462f9ec0e71358fbc1628fd872169295e2 SHA512 c59f65f37a8e4dddb753dbcdec835e946d9de021c5273319b3cd95ef1c3343715ce4b87d76b2d96264acc791a6cced32967521c74978131bd76fbcfc37bb344d WHIRLPOOL 2535170cdc4cc1d4ad2e204e85b546089b3aa404e4cee0e2ab9d094d6cda869043f24fba29d6f68b37f450ff947c13f02336e63b3236b404cbae528f801cc1ad
diff --git a/net-p2p/classified-ads/classified-ads-0.09.ebuild b/net-p2p/classified-ads/classified-ads-0.09.ebuild
new file mode 100644
index 000000000000..780b04d7afae
--- /dev/null
+++ b/net-p2p/classified-ads/classified-ads-0.09.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PLOCALES="en fi sv"
+PLOCALE_BACKUP="en"
+inherit qt4-r2
+
+DESCRIPTION="Program for displaying classified advertisement items"
+HOMEPAGE="http://katiska.org/classified-ads/"
+SRC_URI="https://github.com/operatornormal/classified-ads/archive/${PV}.tar.gz \
+ -> classified-ads-${PV}.tar.gz \
+ https://github.com/operatornormal/classified-ads/blob/graphics/preprocessed.tar.gz?raw=true \
+ -> classified-ads-graphics-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug doc test"
+
+RDEPEND="dev-libs/openssl:0
+ dev-libs/qjson
+ >=net-libs/libnatpmp-20130911
+ <=net-libs/libnatpmp-20140401-r1
+ >=net-libs/miniupnpc-1.8
+ sys-apps/file
+ sys-devel/gettext
+ dev-qt/qtcore:4[ssl]
+ dev-qt/qtsql:4[sqlite]
+ dev-qt/qtgui:4[debug?]"
+
+DEPEND="${RDEPEND}
+ dev-qt/qttest:4
+ sys-devel/gdb:0
+ doc? ( app-doc/doxygen[dot] )
+ test? ( dev-libs/libgcrypt:0 )
+ "
+
+src_prepare() {
+ # preprocessed graphics are unpacked into wrong directory
+ # so lets move them into correct location:
+ mv ../ui/* ui/ || die
+ # then just run qmake
+ qt4-r2_src_prepare
+}
+
+src_compile() {
+ qt4-r2_src_compile
+ if use doc; then
+ cd doc || die
+ doxygen || die
+ fi
+}
+
+src_test() {
+ cd test || die "test suite missing"
+ qmake || die "test suite configure failed"
+ emake
+
+ if [ -e $HOME/.classified_ads/sqlite_db ]; then
+ mv $HOME/.classified_ads/sqlite_db $HOME/.classified_ads/sqlite_db.backup \
+ || die "datafile backup failed"
+ fi
+ ./testca
+ result=$?
+ rm $HOME/.classified_ads/sqlite_db || true
+
+ if [ -e $HOME/.classified_ads/sqlite_db.backup ]; then
+ mv $HOME/.classified_ads/sqlite_db.backup $HOME/.classified_ads/sqlite_db \
+ || die "datafile restore failed"
+ fi
+
+ if [ $result != "0" ]; then
+ die "test failed with code $result"
+ fi
+
+ return $result
+}
+
+src_install() {
+ emake install INSTALL_ROOT="${D}" DESTDIR="${D}"
+ use doc && dodoc -r doc/doxygen.generated/html/
+}
diff --git a/net-proxy/squidguard/metadata.xml b/net-proxy/squidguard/metadata.xml
index 19dd2fb3c842..8de62f57f1f0 100644
--- a/net-proxy/squidguard/metadata.xml
+++ b/net-proxy/squidguard/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-<longdescription>Combined filter, redirector and access controller plugin for Squid</longdescription>
+ <maintainer>
+ <email>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+ <longdescription>Combined filter, redirector and access controller plugin for Squid</longdescription>
</pkgmetadata>
diff --git a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild b/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
index 917df472986f..4fbf1b3233d2 100644
--- a/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
+++ b/net-proxy/squidguard/squidguard-1.5_beta-r1.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
IUSE="ldap"
-RDEPEND=">=sys-libs/db-2
+RDEPEND=">=sys-libs/db-2:*
ldap? ( net-nds/openldap:0 )"
DEPEND="${RDEPEND}
diff --git a/net-proxy/squidguard/squidguard-1.5_beta.ebuild b/net-proxy/squidguard/squidguard-1.5_beta.ebuild
deleted file mode 100644
index 1e6d39109877..000000000000
--- a/net-proxy/squidguard/squidguard-1.5_beta.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-WANT_AUTOMAKE=none
-
-inherit eutils autotools user
-
-MY_P="squidGuard-${PV/_/-}"
-
-DESCRIPTION="Combined filter, redirector and access controller plugin for Squid"
-HOMEPAGE="http://www.squidguard.org"
-SRC_URI="http://www.squidguard.org/Downloads/Devel/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="ldap"
-
-RDEPEND=">=sys-libs/db-2
- ldap? ( net-nds/openldap:0 )"
-
-DEPEND="${RDEPEND}
- sys-devel/bison:0
- sys-devel/flex:0"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- enewgroup squid
- enewuser squid -1 -1 /var/cache/squid squid
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_with ldap) \
- --with-sg-config=/etc/squidGuard/squidGuard.conf \
- --with-sg-logdir=/var/log/squidGuard
-}
-
-src_install() {
- emake prefix="/usr" INSTDIR="${D}" install
-
- keepdir /var/log/squidGuard
- fowners squid:squid /var/log/squidGuard
-
- insinto /etc/squidGuard/sample
- doins "${FILESDIR}"/squidGuard.conf.*
- insinto /etc/squidGuard/sample/db
- doins "${FILESDIR}"/blockedsites
-
- dodoc ANNOUNCE CHANGELOG README
- dohtml doc/*.html
- docinto text
- dodoc doc/*.txt
-}
-
-pkg_postinst() {
- einfo "To enable squidGuard, add the following lines to /etc/squid/squid.conf:"
- einfo " url_rewrite_program /usr/bin/squidGuard"
- einfo " url_rewrite_children 10"
- einfo ""
- einfo "Remember to edit /etc/squidGuard/squidGuard.conf first!"
- einfo "Examples can be found in /etc/squidGuard/sample/"
-}
diff --git a/net-wireless/kismet-ubertooth/Manifest b/net-wireless/kismet-ubertooth/Manifest
index 22b1af36eae8..fdbdd182bc20 100644
--- a/net-wireless/kismet-ubertooth/Manifest
+++ b/net-wireless/kismet-ubertooth/Manifest
@@ -1 +1,2 @@
DIST ubertooth-2015-09-R2.tar.xz 1706712 SHA256 f2088c8c0e754df47dd8dbf604d5822bf5894b91e4505276c6f9e26b6a23b56d SHA512 240f6d682fe0addc05bb8ccf7eec931534449adfa9c1369b484aeac73d9bcaf75c211aeede21c6c219e363773ce3d63e4aa0ee6b662acc83409587bd7ac7e4da WHIRLPOOL 9fba78d1740efd342f3892ffc3cf914d1919ef1c7d282786a64afb72d6ed306dec3600363e3f85f2f70d9ccfba6b62f826a72942cb7c9316d151dd2718f79b09
+DIST ubertooth-2015-10-R1.tar.xz 1716840 SHA256 bc37e7978d137a64d918d7c8f1e7ca9cff093f9921d805e9809b12e5ab12ae35 SHA512 ad7229c9509db4b4230ec28d1c16200f0780dd7ce55224528ced6d8969f342a79b7317b69e7b9e49d03e93f973203801f4f703dd80dc115400366b0984c965b1 WHIRLPOOL 5f46bdc8746481d68fd5c8e3ce04aadbcc1bc704c95b1b5a3d389376704a2a3e702faf819c749f98cb737578e9ccfa3ac01887081bceeceed2e4804493b2c2a8
diff --git a/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.10.1.ebuild b/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.10.1.ebuild
new file mode 100644
index 000000000000..3c32ca25ce9a
--- /dev/null
+++ b/net-wireless/kismet-ubertooth/kismet-ubertooth-2015.10.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ MY_PV=${PV/\./-}
+ MY_PV=${MY_PV/./-R}
+ S="${WORKDIR}/ubertooth-${MY_PV}"
+ SRC_URI="https://github.com/greatscottgadgets/ubertooth/releases/download/${MY_PV}/ubertooth-${MY_PV}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Provides basic bluetooth support in kismet"
+HOMEPAGE="http://ubertooth.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+IUSE=""
+
+DEPEND=">=net-wireless/kismet-2011.03.2-r1:= \
+ >=net-wireless/ubertooth-${PV}:= \
+ >=net-libs/libbtbb-${PV}:= \
+ virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+ if has_version =net-wireless/kismet-9999; then
+ cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
+ else
+ cd "${S}/host/kismet/plugin-ubertooth" || die
+ fi
+ emake KIS_SRC_DIR="/usr/include/kismet/"
+}
+
+src_install() {
+ if has_version =net-wireless/kismet-9999; then
+ cd "${S}/host/kismet/plugin-ubertooth-phyneutral" || die
+ else
+ cd "${S}/host/kismet/plugin-ubertooth" || die
+ fi
+ emake DESTDIR="${ED}" LIBDIR="/$(get_libdir)" KIS_SRC_DIR="/usr/include/kismet/" install
+}
+
+pkg_postinst() {
+ ewarn "This package must be rebuilt every time kismet is rebuilt. Or else."
+}
diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index 0c78e62c2b3c..40da1f62471c 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,2 +1,3 @@
DIST ubertooth-2015-09-R2.tar.xz 1706712 SHA256 f2088c8c0e754df47dd8dbf604d5822bf5894b91e4505276c6f9e26b6a23b56d SHA512 240f6d682fe0addc05bb8ccf7eec931534449adfa9c1369b484aeac73d9bcaf75c211aeede21c6c219e363773ce3d63e4aa0ee6b662acc83409587bd7ac7e4da WHIRLPOOL 9fba78d1740efd342f3892ffc3cf914d1919ef1c7d282786a64afb72d6ed306dec3600363e3f85f2f70d9ccfba6b62f826a72942cb7c9316d151dd2718f79b09
+DIST ubertooth-2015-10-R1.tar.xz 1716840 SHA256 bc37e7978d137a64d918d7c8f1e7ca9cff093f9921d805e9809b12e5ab12ae35 SHA512 ad7229c9509db4b4230ec28d1c16200f0780dd7ce55224528ced6d8969f342a79b7317b69e7b9e49d03e93f973203801f4f703dd80dc115400366b0984c965b1 WHIRLPOOL 5f46bdc8746481d68fd5c8e3ce04aadbcc1bc704c95b1b5a3d389376704a2a3e702faf819c749f98cb737578e9ccfa3ac01887081bceeceed2e4804493b2c2a8
DIST ubertooth_one_rx_only.dfu 32060 SHA256 fefc034ff19fa8b4b307d77c875bfeaa639e2aa0ecf8b8337e6424618480b1b5 SHA512 daeaeae90cb2aa591db2787466cbdc7365ce4e74ce5f7af4f61c9c1a22af93e846ea9230acca64f88a85a959d0db447b19da4dc4d213601db8dd1ad3d9978fa7 WHIRLPOOL 3069bf540c87d317e4f612b25ef4af10c3a9197ec9ead69082021442e0cc70d4b381488ba4bd509f75535a43f8f7b5fcebae313b96623513de846edb51cf63a0
diff --git a/net-wireless/ubertooth/ubertooth-2015.10.1.ebuild b/net-wireless/ubertooth/ubertooth-2015.10.1.ebuild
new file mode 100644
index 000000000000..c35791d555cb
--- /dev/null
+++ b/net-wireless/ubertooth/ubertooth-2015.10.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+
+inherit multilib distutils-r1 cmake-utils udev
+
+HOMEPAGE="http://ubertooth.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+bluez +specan +pcap +ubertooth1-firmware +udev"
+REQUIRED_USE=" specan? ( ${PYTHON_REQUIRED_USE} )"
+DEPEND="bluez? ( net-wireless/bluez:= )
+ >=net-libs/libbtbb-${PV}:=
+ pcap? ( net-libs/libbtbb[pcap] )
+ specan? ( ${PYTHON_DEPS} )
+ virtual/libusb:1="
+RDEPEND="${DEPEND}
+ specan? ( >=dev-qt/qtgui-4.7.2:4
+ >=dev-python/pyside-1.0.2[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.3[${PYTHON_USEDEP}] )
+ udev? ( virtual/udev )"
+
+MY_PV=${PV/\./-}
+MY_PV=${MY_PV/./-R}
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/greatscottgadgets/ubertooth.git"
+ inherit git-r3
+ KEYWORDS=""
+ S="${WORKDIR}/${P}/host"
+else
+ S="${WORKDIR}/${PN}-${MY_PV}/host"
+ SRC_URI="https://github.com/greatscottgadgets/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+DESCRIPTION="An open source wireless development platform suitable for Bluetooth experimentation"
+
+#readd firmware building, but do it right
+#USE="-fortran -mudflap -nls -openmp -multilib" crossdev --without-headers --genv 'EXTRA_ECONF="--with-mode=thumb --with-cpu=cortex-m3 --with-float=soft"' -s4 -t arm-cortexm3-eabi
+
+src_prepare() {
+ cmake-utils_src_prepare
+ if use specan; then
+ pushd python/specan_ui || die
+ distutils-r1_src_prepare
+ popd
+ fi
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_enable bluez USE_BLUEZ)
+ $(cmake-utils_use pcap USE_PCAP)
+ $(cmake-utils_use_enable udev INSTALL_UDEV_RULES)
+ -DDISABLE_PYTHON=true
+ )
+ if use udev; then
+ mycmakeargs+=(
+ -DUDEV_RULES_GROUP=usb
+ -DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
+ )
+ fi
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+
+ if use specan; then
+ pushd python/specan_ui || die
+ distutils-r1_src_compile
+ popd
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ insinto /usr/share/${PN}
+ pushd "${WORKDIR}/${PN}-${MY_PV}" || die
+ if [[ ${PV} == "9999" ]] ; then
+ ewarn "Firmware isn't available for git releases, we assume you are already"
+ ewarn "on the latest and/or can build your own."
+ else
+ use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
+ use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu
+ fi
+ popd
+
+ if use specan; then
+ pushd python/specan_ui || die
+ distutils-r1_src_install
+ popd
+ fi
+
+ elog "Everyone can read from the ubertooth, but to talk to it"
+ elog "your user needs to be in the usb group."
+}
diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild
index ae358ea08dad..c35791d555cb 100644
--- a/net-wireless/ubertooth/ubertooth-9999.ebuild
+++ b/net-wireless/ubertooth/ubertooth-9999.ebuild
@@ -87,7 +87,8 @@ src_install() {
ewarn "Firmware isn't available for git releases, we assume you are already"
ewarn "on the latest and/or can build your own."
else
- use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
+ use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rxtx.dfu ${PN}-one-${PV}-bluetooth_rxtx.dfu
+ use ubertooth1-firmware && newins ubertooth-one-firmware-bin/bluetooth_rx_only.dfu ${PN}-one-${PV}-bluetooth_rx_only.dfu
fi
popd
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index f93ee4d6626b..4abfbedd0d3f 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -15,6 +15,7 @@ cuda
ruby_targets_ruby18
ruby_targets_jruby
ruby_targets_ree18
+ruby_targets_ruby19
# masking here and unmasking in default/linux/
kmod
@@ -194,6 +195,7 @@ psyco
userland_BSD
elibc_AIX
+elibc_bionic
elibc_Cygwin
elibc_Darwin
elibc_DragonFly
diff --git a/profiles/desc/elibc.desc b/profiles/desc/elibc.desc
index 6b8fbda75912..70929ed3e18a 100644
--- a/profiles/desc/elibc.desc
+++ b/profiles/desc/elibc.desc
@@ -7,6 +7,7 @@
# Keep it sorted.
AIX - ELIBC setting for systems that use the AIX C library
+bionic - ELIBC setting for systems that use Android's Bionic C library
Cygwin - ELIBC setting for systems that use Cygwin
Darwin - ELIBC setting for systems that use the Darwin C library
DragonFly - ELIBC setting for systems that use the DragonFly C library
diff --git a/profiles/package.mask b/profiles/package.mask
index 15edd8fbc345..689fbf8d0844 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,12 @@
#--- END OF EXAMPLES ---
+# Hans de Graaff <graaff@gentoo.org> (11 Oct 2015)
+# Ruby 1.9 is no longer maintained upstream since January
+# 2015, bug 536852.
+# Masked for removal in 30 days.
+=dev-lang/ruby-1.9*
+
# Michael Palimaka <kensington@gentoo.org (9 Oct 2015)
# Dead upstream. No consumers. Collides with other packages.
# Bug #560932 and bug #557006. Masked for removal in 30 days.
diff --git a/profiles/prefix/darwin/macos/10.11/eapi b/profiles/prefix/darwin/macos/10.11/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/10.11/make.defaults b/profiles/prefix/darwin/macos/10.11/make.defaults
new file mode 100644
index 000000000000..033c3077b280
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/make.defaults
@@ -0,0 +1,9 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+MACOSX_DEPLOYMENT_TARGET="10.11"
+
+# sandbox is working with use of Mac OS X's seatbelt (since 10.5)
+# but it generates problems, #456234
+#FEATURES="sandbox"
diff --git a/profiles/prefix/darwin/macos/10.11/package.mask b/profiles/prefix/darwin/macos/10.11/package.mask
new file mode 100644
index 000000000000..1164f69c27e6
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/package.mask
@@ -0,0 +1,8 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Fabian Groffen <grobian@gentoo.org> (30 Sep 2012)
+# Requires XQuartz, since Apple dropped much of X-support in 10.8
+# (a.k.a. Mountain Lion), bug #431182
+<=media-libs/opengl-apple-4.9999
diff --git a/profiles/prefix/darwin/macos/10.11/package.provided b/profiles/prefix/darwin/macos/10.11/package.provided
new file mode 100644
index 000000000000..a27ff1e8b050
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/package.provided
@@ -0,0 +1,5 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+sys-darwin/libsystem-71
diff --git a/profiles/prefix/darwin/macos/10.11/package.unmask b/profiles/prefix/darwin/macos/10.11/package.unmask
new file mode 100644
index 000000000000..b20523d4160c
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/package.unmask
@@ -0,0 +1,8 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
+# Recent releases are supported in >10.10.
+dev-java/oracle-jdk-bin
+dev-java/oracle-jre-bin
diff --git a/profiles/prefix/darwin/macos/10.11/package.use.mask b/profiles/prefix/darwin/macos/10.11/package.use.mask
new file mode 100644
index 000000000000..24f749c3e127
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/package.use.mask
@@ -0,0 +1,8 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Fabian Groffen <grobian@gentoo.org> (10 Apr 2011)
+# as long as util-linux installs uuid.h which breaks the system headers
+# (hence we don't) we can't do uuid support here
+x11-libs/libSM -uuid
diff --git a/profiles/prefix/darwin/macos/10.11/parent b/profiles/prefix/darwin/macos/10.11/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/prefix/darwin/macos/10.11/profile.bashrc b/profiles/prefix/darwin/macos/10.11/profile.bashrc
new file mode 100644
index 000000000000..012e1228bf8f
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/profile.bashrc
@@ -0,0 +1,5 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+export MACOSX_DEPLOYMENT_TARGET=10.11
diff --git a/profiles/prefix/darwin/macos/10.11/x64/eapi b/profiles/prefix/darwin/macos/10.11/x64/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x64/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/10.11/x64/make.defaults b/profiles/prefix/darwin/macos/10.11/x64/make.defaults
new file mode 100644
index 000000000000..bc129813548d
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x64/make.defaults
@@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+ARCH="x64-macos"
+CHOST="x86_64-apple-darwin15"
+ACCEPT_KEYWORDS="~x64-macos"
+
+USE="mmx mmxext sse sse2"
+CPU_FLAGS_X86="mmx mmxext sse sse2"
+# set arch to nocona for all MacTel users, as this enables SSE and MMX
+# support in GCC, nocona = Core2Duo = 64-bits
+CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.11/x64/package.mask b/profiles/prefix/darwin/macos/10.11/x64/package.mask
new file mode 100644
index 000000000000..445a68b5ea0f
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x64/package.mask
@@ -0,0 +1,3 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
diff --git a/profiles/prefix/darwin/macos/10.11/x64/package.use.force b/profiles/prefix/darwin/macos/10.11/x64/package.use.force
new file mode 100644
index 000000000000..05bc3b7690c8
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x64/package.use.force
@@ -0,0 +1,7 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
+# compiles with -aqua, doesn't work, though
+media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.11/x64/package.use.mask b/profiles/prefix/darwin/macos/10.11/x64/package.use.mask
new file mode 100644
index 000000000000..4bccb5fc89da
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x64/package.use.mask
@@ -0,0 +1,5 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+
diff --git a/profiles/prefix/darwin/macos/10.11/x64/parent b/profiles/prefix/darwin/macos/10.11/x64/parent
new file mode 100644
index 000000000000..fc24616eeda4
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x64/parent
@@ -0,0 +1,2 @@
+../../arch/x64
+..
diff --git a/profiles/prefix/darwin/macos/10.11/x64/use.mask b/profiles/prefix/darwin/macos/10.11/x64/use.mask
new file mode 100644
index 000000000000..f1549ec0ec6e
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x64/use.mask
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# This file masks out USE flags that are simply NOT allowed in the default
+# x86 profile. This works, for example, if another architecture's
+# profile have a USE flag associated with (such as altivec, mmx, etc).
+
+# Unmask x86 instruction sets
+-icc
+-icc-pgo
+-ifc
+-mmx
+-mmxext
+-sse
+-sse2
+-ssse3
+-cpu_flags_x86_mmx
+-cpu_flags_x86_mmxext
+-cpu_flags_x86_sse
+-cpu_flags_x86_sse2
+-cpu_flags_x86_ssse3
+-svga
+-kqemu
+
+# Unmask nvidia XvMC support
+-nvidia
+
+# Unmask dev-db/oracle-instantclient-basic support
+-oci8-instant-client
+
+# Unmask osp, used by asterisk; bug 115798
+-osp
+
+# Modular X: unmask for architectures on which they are available
+-input_devices_synaptics
+-input_devices_vmmouse
+-input_devices_wacom
+-video_cards_nvidia
+-video_cards_fglrx
+-video_cards_vmware
+
+# Modular X: mask for architectures on which they aren't available
+video_cards_newport
+
+#codec support
+-x264
+
+# lvm2 cluster
+-gulm
+
+# ibm is only used for ppc64 stuff
+ibm
+
+# psyco works on x86
+-psyco
+
+# Adobe FDF toolkit is x86 only.
+-fdftk
diff --git a/profiles/prefix/darwin/macos/10.11/x86/eapi b/profiles/prefix/darwin/macos/10.11/x86/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x86/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/darwin/macos/10.11/x86/make.defaults b/profiles/prefix/darwin/macos/10.11/x86/make.defaults
new file mode 100644
index 000000000000..918b7eb99708
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x86/make.defaults
@@ -0,0 +1,13 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+ARCH="x86-macos"
+CHOST="i686-apple-darwin15"
+ACCEPT_KEYWORDS="~x86-macos"
+
+USE="mmx mmxext sse sse2"
+CPU_FLAGS_X86="mmx mmxext sse sse2"
+# normally we set arch to prescott for all MacTel users, as this enables
+# SSE and MMX support in GCC
+CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.mask b/profiles/prefix/darwin/macos/10.11/x86/package.mask
new file mode 100644
index 000000000000..d1b293c01fd8
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x86/package.mask
@@ -0,0 +1,10 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# The Carbon interface has been removed entirely in Lion, only tk-8.6
+# will come with Cocoa support. If you must have tk, you'll have to
+# force USE=-aqua, but don't report bugs for incompatabilities you might
+# encounter.
+# NOTE: keep this mask synced with arch/x64
+<dev-lang/tk-8.6
diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.use.force b/profiles/prefix/darwin/macos/10.11/x86/package.use.force
new file mode 100644
index 000000000000..05bc3b7690c8
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x86/package.use.force
@@ -0,0 +1,7 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
+# compiles with -aqua, doesn't work, though
+media-video/mplayer aqua
diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.use.mask b/profiles/prefix/darwin/macos/10.11/x86/package.use.mask
new file mode 100644
index 000000000000..4bccb5fc89da
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x86/package.use.mask
@@ -0,0 +1,5 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+
diff --git a/profiles/prefix/darwin/macos/10.11/x86/parent b/profiles/prefix/darwin/macos/10.11/x86/parent
new file mode 100644
index 000000000000..4a6aa36b18d9
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x86/parent
@@ -0,0 +1,2 @@
+../../arch/x86
+..
diff --git a/profiles/prefix/darwin/macos/10.11/x86/use.mask b/profiles/prefix/darwin/macos/10.11/x86/use.mask
new file mode 100644
index 000000000000..f1549ec0ec6e
--- /dev/null
+++ b/profiles/prefix/darwin/macos/10.11/x86/use.mask
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# This file masks out USE flags that are simply NOT allowed in the default
+# x86 profile. This works, for example, if another architecture's
+# profile have a USE flag associated with (such as altivec, mmx, etc).
+
+# Unmask x86 instruction sets
+-icc
+-icc-pgo
+-ifc
+-mmx
+-mmxext
+-sse
+-sse2
+-ssse3
+-cpu_flags_x86_mmx
+-cpu_flags_x86_mmxext
+-cpu_flags_x86_sse
+-cpu_flags_x86_sse2
+-cpu_flags_x86_ssse3
+-svga
+-kqemu
+
+# Unmask nvidia XvMC support
+-nvidia
+
+# Unmask dev-db/oracle-instantclient-basic support
+-oci8-instant-client
+
+# Unmask osp, used by asterisk; bug 115798
+-osp
+
+# Modular X: unmask for architectures on which they are available
+-input_devices_synaptics
+-input_devices_vmmouse
+-input_devices_wacom
+-video_cards_nvidia
+-video_cards_fglrx
+-video_cards_vmware
+
+# Modular X: mask for architectures on which they aren't available
+video_cards_newport
+
+#codec support
+-x264
+
+# lvm2 cluster
+-gulm
+
+# ibm is only used for ppc64 stuff
+ibm
+
+# psyco works on x86
+-psyco
+
+# Adobe FDF toolkit is x86 only.
+-fdftk
diff --git a/ros-meta/calibration/Manifest b/ros-meta/calibration/Manifest
new file mode 100644
index 000000000000..389070489594
--- /dev/null
+++ b/ros-meta/calibration/Manifest
@@ -0,0 +1 @@
+DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
diff --git a/ros-meta/calibration/calibration-0.10.13.ebuild b/ros-meta/calibration/calibration-0.10.13.ebuild
new file mode 100644
index 000000000000..f74bee3ae2c2
--- /dev/null
+++ b/ros-meta/calibration/calibration-0.10.13.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Provides a toolchain running through the robot calibration process"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/calibration_estimation
+ dev-ros/calibration_launch
+ dev-ros/calibration_msgs
+ dev-ros/calibration_setup_helper
+ dev-ros/image_cb_detector
+ dev-ros/interval_intersection
+ dev-ros/joint_states_settler
+ dev-ros/laser_cb_detector
+ dev-ros/monocam_settler
+ dev-ros/settlerlib
+"
+DEPEND=""
diff --git a/ros-meta/calibration/calibration-9999.ebuild b/ros-meta/calibration/calibration-9999.ebuild
new file mode 100644
index 000000000000..f74bee3ae2c2
--- /dev/null
+++ b/ros-meta/calibration/calibration-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/calibration"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Provides a toolchain running through the robot calibration process"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/calibration_estimation
+ dev-ros/calibration_launch
+ dev-ros/calibration_msgs
+ dev-ros/calibration_setup_helper
+ dev-ros/image_cb_detector
+ dev-ros/interval_intersection
+ dev-ros/joint_states_settler
+ dev-ros/laser_cb_detector
+ dev-ros/monocam_settler
+ dev-ros/settlerlib
+"
+DEPEND=""
diff --git a/ros-meta/calibration/metadata.xml b/ros-meta/calibration/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/ros-meta/calibration/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/ros-meta/geometry_tutorials/Manifest b/ros-meta/geometry_tutorials/Manifest
new file mode 100644
index 000000000000..9605317b0592
--- /dev/null
+++ b/ros-meta/geometry_tutorials/Manifest
@@ -0,0 +1 @@
+DIST geometry_tutorials-0.2.2.tar.gz 15148 SHA256 4b3fdc98bf4cb97ba2f1c40666901fa7d08eb3dfed0d3323de4841de2e3a22cc SHA512 5a6fe2e26d11d3fe8c1fc6979d1d76b13b01df23ef1f0d5e5df094aa0441e1ded33d2402b88be1143a88002ecde2a6bddc3b03efca713bd5521c68de2e054548 WHIRLPOOL b9ce88950911e87d008a19de08fb829e59f0c6e81711859125b3bf377fff907e6054d2229d8dd13c39baf395c3da3d749fcf62144c88caf9eab0d7d76026e518
diff --git a/ros-meta/geometry_tutorials/geometry_tutorials-0.2.2.ebuild b/ros-meta/geometry_tutorials/geometry_tutorials-0.2.2.ebuild
new file mode 100644
index 000000000000..f9d0fbb7651a
--- /dev/null
+++ b/ros-meta/geometry_tutorials/geometry_tutorials-0.2.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage of geometry tutorials ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/turtle_tf
+ dev-ros/turtle_tf2
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/geometry_tutorials/geometry_tutorials-9999.ebuild b/ros-meta/geometry_tutorials/geometry_tutorials-9999.ebuild
new file mode 100644
index 000000000000..f9d0fbb7651a
--- /dev/null
+++ b/ros-meta/geometry_tutorials/geometry_tutorials-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros/geometry_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage of geometry tutorials ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/turtle_tf
+ dev-ros/turtle_tf2
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/geometry_tutorials/metadata.xml b/ros-meta/geometry_tutorials/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/ros-meta/geometry_tutorials/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/ros-meta/imu_pipeline/Manifest b/ros-meta/imu_pipeline/Manifest
new file mode 100644
index 000000000000..dc8ff723c39d
--- /dev/null
+++ b/ros-meta/imu_pipeline/Manifest
@@ -0,0 +1 @@
+DIST imu_pipeline-0.2.1.tar.gz 7962 SHA256 91e0d491bd08dce8629876bf6005a1aaabcb130413ed749c4ab168e17f0118fa SHA512 43c990e3b5a813661111f15bbaf6101794480de0f5bd9af663ce48ebbcf75ee79fa388cf228216427e7ffcbc575a317f3b0ee3ae5b8e6cca2cc0cab736c139e4 WHIRLPOOL 189279d535c11add08df686ca84598f4e1c5a6a9835416b4f10bef2a85c192359da1795d52171d083d19cfee7e43ef011a676304046893d7f75d4a33a72c204c
diff --git a/ros-meta/imu_pipeline/imu_pipeline-0.2.1.ebuild b/ros-meta/imu_pipeline/imu_pipeline-0.2.1.ebuild
new file mode 100644
index 000000000000..b20cc3d21c03
--- /dev/null
+++ b/ros-meta/imu_pipeline/imu_pipeline-0.2.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for processing and pre-processing IMU messages for easier use by later subscribers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/imu_processors
+ dev-ros/imu_transformer
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/imu_pipeline/imu_pipeline-9999.ebuild b/ros-meta/imu_pipeline/imu_pipeline-9999.ebuild
new file mode 100644
index 000000000000..b20cc3d21c03
--- /dev/null
+++ b/ros-meta/imu_pipeline/imu_pipeline-9999.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for processing and pre-processing IMU messages for easier use by later subscribers"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/imu_processors
+ dev-ros/imu_transformer
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/imu_pipeline/metadata.xml b/ros-meta/imu_pipeline/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/ros-meta/imu_pipeline/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/ros-meta/rosbridge_suite/Manifest b/ros-meta/rosbridge_suite/Manifest
new file mode 100644
index 000000000000..901d1ece339e
--- /dev/null
+++ b/ros-meta/rosbridge_suite/Manifest
@@ -0,0 +1 @@
+DIST rosbridge_suite-0.7.13.tar.gz 367051 SHA256 c26130590ed36d899dc4a2f3282caec96fadc75732cd5c3364e3210139d85820 SHA512 f5a6abddfa768c43685ad16f20d1351e63b268c69f239aa3ff2e30f656c6a81686461185e21be88a5a0badcbc473bc7faa308540c1a14ca15fce11e9b23b9d7e WHIRLPOOL c45da51149bacd246e1c18ef34a0e56b6698ff0c7a1fe6380f581134cb0f9a432b31d96280872b92ec1accd021fb7dae38c7fe708501d5597a170f3def209aed
diff --git a/ros-meta/rosbridge_suite/metadata.xml b/ros-meta/rosbridge_suite/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/ros-meta/rosbridge_suite/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/ros-meta/rosbridge_suite/rosbridge_suite-0.7.13.ebuild b/ros-meta/rosbridge_suite/rosbridge_suite-0.7.13.ebuild
new file mode 100644
index 000000000000..90f4ccec34cf
--- /dev/null
+++ b/ros-meta/rosbridge_suite/rosbridge_suite-0.7.13.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="JSON API to ROS functionality for non-ROS programs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosapi
+ dev-ros/rosbridge_library
+ dev-ros/rosbridge_server
+ "
+DEPEND=""
diff --git a/ros-meta/rosbridge_suite/rosbridge_suite-9999.ebuild b/ros-meta/rosbridge_suite/rosbridge_suite-9999.ebuild
new file mode 100644
index 000000000000..90f4ccec34cf
--- /dev/null
+++ b/ros-meta/rosbridge_suite/rosbridge_suite-9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/RobotWebTools/rosbridge_suite"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="JSON API to ROS functionality for non-ROS programs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosapi
+ dev-ros/rosbridge_library
+ dev-ros/rosbridge_server
+ "
+DEPEND=""
diff --git a/ros-meta/rosserial/Manifest b/ros-meta/rosserial/Manifest
new file mode 100644
index 000000000000..2af16836775c
--- /dev/null
+++ b/ros-meta/rosserial/Manifest
@@ -0,0 +1 @@
+DIST rosserial-0.7.1.tar.gz 102204 SHA256 203aeb4b1440da89f8e571372766f099d5d950901f0fa6991cc3b780aeca3331 SHA512 f63cdc674e2510e8d2990894fe21fcce7760cef18a7ce42951a07898d089a185c137d6643ff062a5bb4dfd2da0bd1571c077811ea67e8aee84bc2ad66d3160c5 WHIRLPOOL 8fddee9f232fff9d463855649c16fb01b3c85e8576481b7ca90fd22b00d95ca243b28d59df82d51643354f8219a8c7cad429aaa4b8822fe07cf3be54cdf0dfc7
diff --git a/ros-meta/rosserial/metadata.xml b/ros-meta/rosserial/metadata.xml
new file mode 100644
index 000000000000..c42ea5b15cf6
--- /dev/null
+++ b/ros-meta/rosserial/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ros</herd>
+</pkgmetadata>
diff --git a/ros-meta/rosserial/rosserial-0.7.1.ebuild b/ros-meta/rosserial/rosserial-0.7.1.ebuild
new file mode 100644
index 000000000000..82cbc9b9f03d
--- /dev/null
+++ b/ros-meta/rosserial/rosserial-0.7.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage for core of rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosserial_arduino
+ dev-ros/rosserial_client
+ dev-ros/rosserial_embeddedlinux
+ dev-ros/rosserial_msgs
+ dev-ros/rosserial_python
+ dev-ros/rosserial_server
+ dev-ros/rosserial_windows
+ dev-ros/rosserial_xbee
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/rosserial/rosserial-9999.ebuild b/ros-meta/rosserial/rosserial-9999.ebuild
new file mode 100644
index 000000000000..82cbc9b9f03d
--- /dev/null
+++ b/ros-meta/rosserial/rosserial-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-drivers/rosserial"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Metapackage for core of rosserial"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rosserial_arduino
+ dev-ros/rosserial_client
+ dev-ros/rosserial_embeddedlinux
+ dev-ros/rosserial_msgs
+ dev-ros/rosserial_python
+ dev-ros/rosserial_server
+ dev-ros/rosserial_windows
+ dev-ros/rosserial_xbee
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-chemistry/platon/Manifest b/sci-chemistry/platon/Manifest
index 8b5d3da11303..c14475177992 100644
--- a/sci-chemistry/platon/Manifest
+++ b/sci-chemistry/platon/Manifest
@@ -1 +1 @@
-DIST platon-20150921.tar.gz 12019784 SHA256 a667ce5ae4c60edc12776f0da9f8c481bee451d1c78b4a9edc2bd2df18ee7612 SHA512 59786d3978c11167f5f12f8f487e6e478d0bc1f070a443ca4626d830e4014122ad974d6e1e1debc2c6c6bbc37d82b7b6b6bb89ad0c74fbd061af26a639db9448 WHIRLPOOL e42d651310da8ae4108b1ec8dfaa3d556236e55889fa153fdfd90d7abbe33b70931fe78a559b0e86afc5d07cc8eb47356d91e9bf0d90a168238d8ce14875c52c
+DIST platon-20151001.tar.gz 12076455 SHA256 0f693de9b8ef601bc502d56a203c851ee350185e0816ede4b1b4d154917fa5b2 SHA512 fc93e4c425c25ddc9ae634c82b63e95c5ce99bcbada43976478a58783e3b369f082e08e2ee24ff7d9ebe2d9d2d730cd42f6361276a53bed9edd0c0476cfb5148 WHIRLPOOL 458e6a263958473bf39d460524fb98963e701d96050db5c622a6cb934796271bb45313526614b3bd28ce372e7bd6a60d76cb6aaa8e80d1e18d7fdc436a03b702
diff --git a/sci-chemistry/platon/platon-20150921.ebuild b/sci-chemistry/platon/platon-20151001.ebuild
index 70f0828dea8b..f4b0aaeb4407 100644
--- a/sci-chemistry/platon/platon-20150921.ebuild
+++ b/sci-chemistry/platon/platon-20151001.ebuild
@@ -36,10 +36,6 @@ src_unpack() {
gunzip platon.f.gz xdrvr.c.gz || die
}
-src_prepare() {
- epatch "${FILESDIR}"/${PV}-buffer-overflow.patch
-}
-
src_compile() {
# easy to ICE, at least on gcc 4.3
strip-flags
diff --git a/sci-chemistry/prody/Manifest b/sci-chemistry/prody/Manifest
new file mode 100644
index 000000000000..df88491d4cbf
--- /dev/null
+++ b/sci-chemistry/prody/Manifest
@@ -0,0 +1 @@
+DIST prody-1.6.tar.gz 5333629 SHA256 db5f2223005640e64b5bfd5ef147744381b9b170ced61db7bc8f3a0fdb583c86 SHA512 d913ad45b034f1b0e7e36428a6f8f199b365b94bd85bee5ade8eb9eb2b04a18c93d894a2abd18b3a1342597725ffbf96f8ce8a49191fc27e5608f3d2c9a3c49a WHIRLPOOL a6435d88046970cca53290b258017d09b19457c4bbd5530743a3dc9cbc023ee78a28a4df81b190a5499df114d9909afff0697e571ef5bc4726311f4ea287c4be
diff --git a/sci-chemistry/prody/metadata.xml b/sci-chemistry/prody/metadata.xml
new file mode 100644
index 000000000000..ae9ec7c5f6a4
--- /dev/null
+++ b/sci-chemistry/prody/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-chemistry</herd>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/sci-chemistry/prody/prody-1.6.ebuild b/sci-chemistry/prody/prody-1.6.ebuild
new file mode 100644
index 000000000000..a2ece4dfd984
--- /dev/null
+++ b/sci-chemistry/prody/prody-1.6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Protein Dynamics Analysis"
+HOMEPAGE="http://prody.csb.pitt.edu/ https://github.com/prody/ProDy"
+SRC_URI="https://github.com/prody/ProDy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+ dev-python/ipython[${PYTHON_USEDEP}]
+ dev-python/matplotlib[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ sci-biology/biopython[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}"/ProDy-${PV}
+
+DISTUTILS_IN_SOURCE_BUILD=true
+
+python_prepare_all() {
+ emake remove
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ cd "${BUILD_DIR}" || die
+ PATH="${S}"/scripts:${PATH} \
+ nosetests --verbose || die
+}
diff --git a/sci-chemistry/pymol-plugins-dynamics/Manifest b/sci-chemistry/pymol-plugins-dynamics/Manifest
index a607e37c50b4..258493d5b263 100644
--- a/sci-chemistry/pymol-plugins-dynamics/Manifest
+++ b/sci-chemistry/pymol-plugins-dynamics/Manifest
@@ -1 +1,2 @@
DIST pymol-plugins-dynamics-1.2.0.tar.gz 725163 SHA256 edf9bddbbce41ee5319bfd0b28d6e0b0eba56e8b2d8a300d510be8ff5894704f SHA512 7e8d62ea58cb88348136fccd132d9a1faaa3474c0a0f821e729ced777620e2083b1b0606d79fc75802755c96c5eb0b90e08b00e5c865ecbaaee2b837f56987de WHIRLPOOL 07061d3b0840fef0025be55b90fca013afc1ea58308d6ee11a8b74321de4f1c24760b1cf141b0a86678c5cf652c8890cdf2c4e0da60403c8454e04b003e20aaa
+DIST pymol-plugins-dynamics-2.0.4.tar.gz 821563 SHA256 358452e0d8589ffae28fe486eeca0be353f17f1fdde9f05f548025b241afabe5 SHA512 befad8b5c09ddba89b9e00bd712a2af7202e312b2ebee7722cbeec5698125dd7614463465d79c17c805714ba23ca1188c64610789e90c93bb0ad7572841ebf25 WHIRLPOOL 039e40c7c57a242476e72a351ecc099201021f479762c2eb29bdad25b72c11c33295e8f9707ece486235efb1b205524e479cd4ae57639d1410515a75d2221989
diff --git a/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.0.4.ebuild b/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.0.4.ebuild
new file mode 100644
index 000000000000..1111c6110436
--- /dev/null
+++ b/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.0.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+MY_PN="Dynamics"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Molecular dynamics in Pymol"
+HOMEPAGE="https://github.com/tomaszmakarewicz/Dynamics"
+SRC_URI="https://github.com/tomaszmakarewicz/Dynamics/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+ ${PYTHON_DEPS}
+ sci-chemistry/prody[${PYTHON_USEDEP}]
+ "
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS=( manual.odt )
+
+src_install() {
+ python_moduleinto pmg_tk/startup
+ python_parallel_foreach_impl python_domodule pymol_plugin_dynamics.py
+}
diff --git a/sci-chemistry/relax/Manifest b/sci-chemistry/relax/Manifest
index 789564f5ef98..42f7f7f33e2b 100644
--- a/sci-chemistry/relax/Manifest
+++ b/sci-chemistry/relax/Manifest
@@ -1,5 +1,2 @@
-DIST relax-3.3.4.src.tar.bz2 89206485 SHA256 03ecc20353126d155c7d5c9ab45e3bb146a87243472711c937befced2db333c0 SHA512 78ae5778ef0fe84fc3a26648dd2192d529fb1e5241728f7c06a5a2cec2ce849a2c75c19a931123a17d5c210acc4f4c2401574b10a1fbbe0307d2d9867567352d WHIRLPOOL 4fcdec36e8df412091ab1a99a6b017ebc72f8e5c400429e698221f22e4ef7ae35713a6e2a05f6f1b573e5223f8eccc7cb0d2a20b1171e5bc483fd3ef1a0242bc
-DIST relax-3.3.5.src.tar.bz2 90164368 SHA256 d9e3668221dba7589ba1d12ab40df517b5b6f742ee413864cc87ab636546e2ef SHA512 c8c248abf0edb54af631c11b102b641d41a106036bbdb88d8f1563c9750d3c7d402ee150d7afd770b845d3a421e431afcf95e6222197f9dc1afec61ddcd0bf37 WHIRLPOOL d9070bed833ef063c22fec5e55b1968c65b672ee100247b1af9a25d3149eb57475aeb94a4f125fc3cd278d97ac248e7826b083c840b47f9db83bae7e1aaae710
-DIST relax-3.3.6.src.tar.bz2 90005292 SHA256 2b1994626a910036c63d67c609c49b3bde8c754b60763de62c2ac8f6c3f589c3 SHA512 cda773a4af259d25550e4e4dbd8500594afd9df051ba06130355058347f308b804726acafaa76957e062c78d1d8fb26f843b3ac97d5aecd534b53c1a5155cafb WHIRLPOOL 0bf0f51664a132653fbd981ee6776cb16dd6371504df2167658027325d632cda8a6f4a21d4a530c46dc75c93b3ffb87f5189d4986acadb344154cd7420361e0b
-DIST relax-3.3.7.src.tar.bz2 90268061 SHA256 a32508bd55fa124f6472e08d89ec0fa9f3837efcceb2be681404eb998457381f SHA512 3724a51ef9177f9bd78b3c92add7b88d559f21f5166eaf62b865586c061d17ce0a1af61a794db324d0f792eece04d8f1d037f9e982c858768da1d3fc208e9270 WHIRLPOOL e4446c7ccbe1e8f3caa450a3d747fb8dfcc33d9d336386572b72481544101199150e7938b0e5319a70ef3a5a7f4ad53c143d4a6c01cc7553f435fbc0d00fe952
DIST relax-3.3.8.src.tar.bz2 90271667 SHA256 176d4e9f0f1c6cf6e6c93b12070a50ff31e10c8dbe2c05cfc2b253e51425b12d SHA512 ddc9df4a8da4ec563403003ae5bc9ecdf5f3bb7341e2306c405fcf7953ab67cab93e9f64139465b05acfa2c842da1624d941b481ef77c20804cabe7c9df811f9 WHIRLPOOL 1a7f77fc9cd712b7ca459a1943dffde4e154fa2d5e06b77ec42568b012c4319dd43eb0b85cdfd6116b9ba2584e5bd58e1b0d8ea8524d462ab4e18e33d4fa315e
+DIST relax-3.3.9.src.tar.bz2 93403953 SHA256 5bfa0fc774cfafd30e9f593f6b5f368b6bd79faf0ca2e7ae064a8bd3b6923685 SHA512 0af93497acd91e6e4be0cf07efe09198c1234e70641835668a94714d58ad225d5ef94df3225d4d6809aa456e340c05829520f4aa6215cb83f7315ccca2053461 WHIRLPOOL 4ea5bb6582a020df902b9ac28cf5e025456607ddb50b1a6c1915db421ac6ea415781cb9d361fd34b2240500e7d0b74af131984dddcea6b0548dfb76d8b2be378
diff --git a/sci-chemistry/relax/relax-3.3.4.ebuild b/sci-chemistry/relax/relax-3.3.4.ebuild
deleted file mode 100644
index e394217054c8..000000000000
--- a/sci-chemistry/relax/relax-3.3.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/"
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-python/Numdifftools[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
- sci-chemistry/molmol
- sci-chemistry/pymol[${PYTHON_USEDEP}]
- sci-chemistry/vmd
- >=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
- >=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- sci-visualization/grace
- sci-visualization/opendx
- x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
- media-gfx/pngcrush"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- rm -rf minfx bmrblib extern/numdifftools || die
- tc-export CC
-}
-
-src_compile() {
- escons
-}
-
-src_test() {
- VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
- virtualmake
-}
-
-src_install() {
- dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
- python_moduleinto ${PN}
- python_domodule *
-
- rm ${PN} README || die
-
- make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py $@"
-}
diff --git a/sci-chemistry/relax/relax-3.3.5.ebuild b/sci-chemistry/relax/relax-3.3.5.ebuild
deleted file mode 100644
index 154bc9af2c0b..000000000000
--- a/sci-chemistry/relax/relax-3.3.5.ebuild
+++ /dev/null
@@ -1,69 +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 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/"
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-python/Numdifftools[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
- sci-chemistry/molmol
- sci-chemistry/pymol[${PYTHON_USEDEP}]
- sci-chemistry/vmd
- >=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
- >=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- sci-visualization/grace
- sci-visualization/opendx
- x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
- media-gfx/pngcrush"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- rm -rf minfx bmrblib extern/numdifftools || die
- tc-export CC
-}
-
-src_compile() {
- escons
-}
-
-src_test() {
- VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
- virtualmake
-}
-
-src_install() {
- dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
- python_moduleinto ${PN}
- python_domodule *
-
- rm ${PN} README || die
-
- make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py $@"
-}
diff --git a/sci-chemistry/relax/relax-3.3.7.ebuild b/sci-chemistry/relax/relax-3.3.7.ebuild
deleted file mode 100644
index b8a571cbdc2a..000000000000
--- a/sci-chemistry/relax/relax-3.3.7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-WX_GTK_VER="2.9"
-
-inherit eutils multiprocessing python-single-r1 scons-utils toolchain-funcs wxwidgets virtualx
-
-DESCRIPTION="Molecular dynamics by NMR data analysis"
-HOMEPAGE="http://www.nmr-relax.com/"
-SRC_URI="http://download.gna.org/relax/${P}.src.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-python/Numdifftools[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/wxpython:${WX_GTK_VER}[${PYTHON_USEDEP}]
- sci-chemistry/molmol
- sci-chemistry/pymol[${PYTHON_USEDEP}]
- sci-chemistry/vmd
- >=sci-libs/bmrblib-1.0.3[${PYTHON_USEDEP}]
- >=sci-libs/minfx-1.0.11[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
- sci-visualization/grace
- sci-visualization/opendx
- x11-libs/wxGTK:${WX_GTK_VER}[X]"
-DEPEND="${RDEPEND}
- media-gfx/pngcrush
- test? (
- ${RDEPEND}
- )
- "
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- rm -rf minfx bmrblib extern/numdifftools || die
- tc-export CC
-}
-
-src_compile() {
- escons
-}
-
-src_test() {
- VIRTUALX_COMMAND="${EPYTHON} ./${PN}.py -x --traceback"
- virtualmake
-}
-
-src_install() {
- dodoc README docs/{CHANGES,COMMITTERS,JOBS,relax.pdf}
-
- python_moduleinto ${PN}
- python_domodule *
-
- rm ${PN} README || die
-
- make_wrapper ${PN}-nmr "${EPYTHON} $(python_get_sitedir)/${PN}/${PN}.py $@"
-}
diff --git a/sci-chemistry/relax/relax-3.3.6.ebuild b/sci-chemistry/relax/relax-3.3.9.ebuild
index b8a571cbdc2a..5ffdf922756d 100644
--- a/sci-chemistry/relax/relax-3.3.6.ebuild
+++ b/sci-chemistry/relax/relax-3.3.9.ebuild
@@ -38,9 +38,7 @@ RDEPEND="
x11-libs/wxGTK:${WX_GTK_VER}[X]"
DEPEND="${RDEPEND}
media-gfx/pngcrush
- test? (
- ${RDEPEND}
- )
+ test? ( ${RDEPEND} )
"
pkg_setup() {
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index bbc19ff8d0e5..ab7f95a525a6 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -8,4 +8,4 @@ DIST openrc-0.16.3.tar.bz2 158844 SHA256 6f2d5293f82591183391362fdbcb6b24b6a07c7
DIST openrc-0.16.4.tar.bz2 158599 SHA256 6771257e208da2e4d20b4ac2e3e7f065eb8873566644ff385e9dbd6bc5221d21 SHA512 8ade50cdb8c2e05e00e917f848e96bfee54bb4ac77bf50af8c5ab66e2e01f8a5c2621123087945feaa9b15ad84a5936e23cc489a2bb7127c2b118a5a0695ee6e WHIRLPOOL 706d7b1101927ff89afb01ad766f491db94ff04f574bc7b69349b6ab0334ed5d2cd5ee2d8041cf5a0ba00f5a6a3596502835fa132c668533772a42737f0e2412
DIST openrc-0.16.tar.bz2 157924 SHA256 969ce450bb095a406ef14362572633b14c8696b57d67361394c5951704273ce3 SHA512 3ff3958bf480ec6bf97e50c8911c382dc855322a74d57b65da975e98d8b76debda971826d15803be96f2ae9c7fd5ebf4cf0c43013663a042224a9c49377614f8 WHIRLPOOL 5e6bb11b907a2fe3812653354950b0ec4e13571981580d03d2ee9b93dc8a68ce128ee1ec7560557adbc90af44aa881648aae51e15bb0f0990ca338ffb3c6c814
DIST openrc-0.17.tar.bz2 160533 SHA256 45818d9ef4659e8dd924a1468a091255c305daee5417f94d9515f0e125298b30 SHA512 6e69b036d113f066b0dd0bfe55e019328e0e77cff6c93f0a3e55751aa0a72411aa3b1efe8b4327e156a9612e4155863b0a81c9eda043c12904bb36e861b71399 WHIRLPOOL de45daf6f4aebe632ea9fcb46408e63f0aed6c9b9129fb5510f348f20cf1c62aa42e7dce47a7f19a441696596fa57494642e7334a42c415fdbc865cb80a18eff
-DIST openrc-0.18.tar.bz2 158171 SHA256 1d4831d9941df9248a5622060fb974bc912382cd1f1e07682a34d50e8f5215e7 SHA512 12ff8ffe9476a6f677708724eac537dfec5e49c22e98815c281f2316c88c0d7402f91de99bad8819393de0c0b00dd81a7917808bef47c51d2f593da7ef351b94 WHIRLPOOL b29b599efda3ab0a84895779ebc3cb013d9a7dc16742ea166f1c7bf2b98c38132d479fc43e7904d245a8eacb5c3af685d671be4d770e9f53a68062b76ebf00e7
+DIST openrc-0.18.1.tar.bz2 158198 SHA256 1af3bc056c164c0cae9b41525a0f6381dd5dfdbef35961142a679a530d31ac9e SHA512 81aa46b2dc0f3babad3c1c0bce5add9d4f04700ac6d217f7851c5f7d064b44934ace1bd80a2d55b8256f09a6df2d564b5f944b3aaf78e08c3ada49cd5b0d9e5b WHIRLPOOL d996b123802ade2a62bfea8a9b583611fa76ca911fc8549950bb89c4fb7d02768ef6cdb5784f7389b6fe0c89a043547e091023b84da33ce35061a7d618dffbda
diff --git a/sys-apps/openrc/openrc-0.18.ebuild b/sys-apps/openrc/openrc-0.18.1.ebuild
index f1c78ac2cb42..f1c78ac2cb42 100644
--- a/sys-apps/openrc/openrc-0.18.ebuild
+++ b/sys-apps/openrc/openrc-0.18.1.ebuild
diff --git a/sys-apps/paludis/metadata.xml b/sys-apps/paludis/metadata.xml
index 93c3ebe9295a..8c4fd0d96e88 100644
--- a/sys-apps/paludis/metadata.xml
+++ b/sys-apps/paludis/metadata.xml
@@ -13,6 +13,9 @@
<flag name="pbins">Enable binary package support. Adds dependency upon
<pkg>app-arch/libarchive</pkg></flag>
<flag name="pink">Use a less boring colourscheme than the default</flag>
- <flag name='search-index'>Enable cave search --index. Requires sqlite.</flag>
+ <flag name='search-index'>Enable cave search --index. Requires
+ <pkg>dev-db/sqlite</pkg>.</flag>
+ <flag name='xml'>Build xml things for metadata.xml and GLSA support
+ (needs <pkg>dev-libs/libxml2</pkg>).</flag>
</use>
</pkgmetadata>
diff --git a/sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild b/sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild
index a329e631a93c..0da6cdaf14f7 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.4-r1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/rel
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND=">=sys-libs/libselinux-${SELNX_VER}:=[python]
>=sys-libs/glibc-2.4
diff --git a/sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild b/sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild
index 10f001209543..047d51130b3f 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.4-r2.ebuild
@@ -31,7 +31,7 @@ if [[ ${PV} == 9999 ]] ; then
else
SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz
https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-${EXTRAS_VER}.tar.bz2"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
S1="${WORKDIR}/${MY_P}"
S2="${WORKDIR}/policycoreutils-extra"
S="${S1}"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 598a7590ea87..1f0dbcacb554 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,7 +1,3 @@
-DIST portage-2.2.14.tar.bz2 896674 SHA256 8dd65971e0f1c31dca922b0f7be06e622aabbed8d012d056ff25a169fc9946d8 SHA512 c8724b42d9932adf6065ff9f9c3bb3d22ec3258dcdb23e041ce704f2c7b634d459a36764f3ec5aa4613843733c70725025af10439816c538ec12837db50dc1ab WHIRLPOOL 82bb660fcc1f0bb4639b53829cf8207fc40ee01a0cb9935ad46fb5039f0558fbbbb3af3d12d208289e9701e0874d77a7990911fd50fe04806948c6c6955625fc
-DIST portage-2.2.18.tar.bz2 942561 SHA256 e0d54f2fbcdc8b5fce716475183fa6e889b6fa8178c92d65a850df73f1636560 SHA512 be4f95bc04a61cdb371fc66a03d2183961bfd458e9b2b89cf8cab8c9e70bde4119be266177d947e31429627609ed75a75c21abfe4b674ca529632d5728e8e8a6 WHIRLPOOL f334bf5198d2214de557a046ed3217e23d48d8f8d7d64fb0bd2611dd5c8725139eaf7d1e1065f822d8816f3979e86d6a6f8df4d2f4605df0b5c157d6bbf09a6d
DIST portage-2.2.20.1.tar.bz2 950298 SHA256 84dd3ed1d9fd0a3336e956d057590c75834a906ae62a450411232fe5a842475c SHA512 5f7373da20d448059e8fdc8a3593eaca780be3184f0494bac66f5eea7c33d00dd61b9e74cbe9a52413f08cef29d426ed8751e20e16be09178468c18d77a6ae2e WHIRLPOOL 99643ce0ab74c5df64fb5239948c6102bc39847ff88eaf210c069c0c9587c1e8bdd1a032a7e61c1225b6113645387861d439e9c4f103df4d0f042b73e1afc328
-DIST portage-2.2.20.tar.bz2 950293 SHA256 483ce0b20960840f6499452ca4ef7df36fde08f835dcadf3cdd118c1ff7207a4 SHA512 fffb43a4c25a70cae071246fde7e379107535e607b9e8dd9fb513315a10750db92209bb436f532930a44cac06ba43aade06a7c2b0a1d675fd816968ba0fce7ae WHIRLPOOL aa1e560007cdafebd2bf56964d61e55a91fef4be5cd9bc50560891140287f6827ecda9d99e31ceb4e5a64691863fde325b51594cfdcfe88eb260fba47dad5fb9
-DIST portage-2.2.22.tar.bz2 973737 SHA256 d8ae50e2306452c4f8c2772e4001fbfffbcb8f6e3606d61fad039c7c11a3f180 SHA512 8acfe71880bdd1a681f54c8225d73f9dea52192c056b9cf64ed50aff2cc822568bebc5a8d7bac46f2d1f16093b6950434004926b10007c9591c18a435465e689 WHIRLPOOL 30d95197c63bac768f08e2397f1be79f077619f92833db6e86cb06e967ae982eed004106d869c86d37ac1b3cd66ca0a6c8acb4915dfb0385904caf09a901c93e
DIST portage-2.2.23.tar.bz2 960229 SHA256 9aecc9f4c813810f99f6604a9806e268b162d90243a9769f1410b3a96822cdfb SHA512 17b8fe4967719bacd8f3ca324bde3328d82f5b7748a05b66cca165dcc8a4abbaf7e05ec61a54684cd1b001297dc0adc04c3771d0fd3cc4732f17ac9e0810e6ad WHIRLPOOL da7229c2be8330e898ef1e422a62683a003c16a640fee9d183c8afc8474779d302c0de639072099c8d47372fa0c74e2a635c485d8c7ed2b2344cacc857199578
DIST portage-2.2.8.tar.bz2 874672 SHA256 c1074e01173df5384e003598dbc5f64f09e92f83fd26faab2f88f9f0bc64aa7e SHA512 acc47d94ff8c08e5a7bf2d4c4e600863430dd1e7d0bb8b4254d6477a498933cae663db84debf9487d2243c2cba689629ef8e8b6cf108e10d40e89e8e8d7e1257 WHIRLPOOL d54290ede8d3d85e5211cda7e86ed740178121ef2f47cf0858c27941d8679d29c11445befff962986d40a47ded50d0d4654de19e7d4aef3fdf2546655a0d6fe2
diff --git a/sys-apps/portage/portage-2.2.14.ebuild b/sys-apps/portage/portage-2.2.14.ebuild
deleted file mode 100644
index a601aab86e94..000000000000
--- a/sys-apps/portage/portage-2.2.14.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(
- pypy
- python3_3 python3_4
- python2_7
-)
-# Note: substituted below
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
-
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
- dev-lang/python-exec:2
- >=sys-apps/sed-4.0.5 sys-devel/patch
- doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
- epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
- dev-lang/python-exec:2
- !build? (
- >=sys-apps/sed-4.0.5
- app-shells/bash:0[readline]
- >=app-admin/eselect-1.2
- )
- elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
- elibc_glibc? ( >=sys-apps/sandbox-2.2 )
- elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
- >=app-misc/pax-utils-0.1.17
- selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
- xattr? ( kernel_linux? (
- >=sys-apps/install-xattr-0.3
- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
- python2_7 pypy)
- ) )
- !<app-admin/logrotate-3.8.0"
-PDEPEND="
- !build? (
- >=net-misc/rsync-2.6.4
- userland_GNU? ( >=sys-apps/coreutils-6.4 )
- )"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
-
-prefix_src_archives() {
- local x y
- for x in ${@}; do
- for y in ${SRC_ARCHIVES}; do
- echo ${y}/${x}
- done
- done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
- $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- if ! use ipc ; then
- einfo "Disabling ipc..."
- sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
- -i pym/_emerge/AbstractEbuildProcess.py || \
- die "failed to patch AbstractEbuildProcess.py"
- fi
-
- if use xattr && use kernel_linux ; then
- einfo "Adding FEATURES=xattr to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- if [[ -n ${EPREFIX} ]] ; then
- einfo "Setting portage.const.EPREFIX ..."
- sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
- -i pym/portage/const.py || \
- die "Failed to patch portage.const.EPREFIX"
-
- einfo "Prefixing shebangs ..."
- while read -r -d $'\0' ; do
- local shebang=$(head -n1 "$REPLY")
- if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
- sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
- die "sed failed"
- fi
- done < <(find . -type f -print0)
-
- einfo "Adjusting make.globals ..."
- sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
- -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
- -i cnf/make.globals || die "sed failed"
-
- einfo "Adjusting repos.conf ..."
- sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
- -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
- -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
- -i cnf/repos.conf || die "sed failed"
-
- einfo "Adding FEATURES=force-prefix to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- cd "${S}/cnf" || die
- if [ -f "make.conf.example.${ARCH}".diff ]; then
- patch make.conf.example "make.conf.example.${ARCH}".diff || \
- die "Failed to patch make.conf.example"
- else
- eerror ""
- eerror "Portage does not have an arch-specific configuration for this arch."
- eerror "Please notify the arch maintainer about this issue. Using generic."
- eerror ""
- fi
-}
-
-python_compile_all() {
- local targets=()
- use doc && targets+=( docbook )
- use epydoc && targets+=( epydoc )
-
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-}
-
-python_test() {
- esetup.py test
-}
-
-python_install() {
- # Install sbin scripts to bindir for python-exec linking
- # they will be relocated in pkg_preinst()
- distutils-r1_python_install \
- --system-prefix="${EPREFIX}/usr" \
- --bindir="$(python_get_scriptdir)" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
- --sbindir="$(python_get_scriptdir)" \
- --sysconfdir="${EPREFIX}/etc" \
- "${@}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- local targets=()
- use doc && targets+=( install_docbook )
- use epydoc && targets+=( install_epydoc )
-
- # install docs
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-
- # Due to distutils/python-exec limitations
- # these must be installed to /usr/bin.
- local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
- einfo "Moving admin scripts to the correct directory"
- dodir /usr/sbin
- for target in ${sbin_relocations}; do
- einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
- mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
- done
-}
-
-pkg_preinst() {
- # comment out sanity test until it is fixed to work
- # with the new PORTAGE_PYM_PATH
- #if [[ $ROOT == / ]] ; then
- ## Run some minimal tests as a sanity check.
- #local test_runner=$(find "${ED}" -name runTests)
- #if [[ -n $test_runner && -x $test_runner ]] ; then
- #einfo "Running preinst sanity tests..."
- #"$test_runner" || die "preinst sanity tests failed"
- #fi
- #fi
-
- # elog dir must exist to avoid logrotate error for bug #415911.
- # This code runs in preinst in order to bypass the mapping of
- # portage:portage to root:root which happens after src_install.
- keepdir /var/log/portage/elog
- # This is allowed to fail if the user/group are invalid for prefix users.
- if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
- chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
- fi
-
- if has_version "<${CATEGORY}/${PN}-2.1.13" || \
- {
- has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
- has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
- } ; then
- USERPRIV_UPGRADE=true
- USERSYNC_UPGRADE=true
- REPOS_CONF_UPGRADE=true
- REPOS_CONF_SYNC=
- type -P portageq >/dev/null 2>&1 && \
- REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
- else
- USERPRIV_UPGRADE=false
- USERSYNC_UPGRADE=false
- REPOS_CONF_UPGRADE=false
- fi
-}
-
-get_ownership() {
- case ${USERLAND} in
- BSD)
- stat -f '%Su:%Sg' "${1}"
- ;;
- *)
- stat -c '%U:%G' "${1}"
- ;;
- esac
-}
-
-new_config_protect() {
- # Generate a ._cfg file even if the target file
- # does not exist, ensuring that the user will
- # notice the config change.
- local basename=${1##*/}
- local dirname=${1%/*}
- local i=0
- while true ; do
- local filename=$(
- echo -n "${dirname}/._cfg"
- printf "%04d" ${i}
- echo -n "_${basename}"
- )
- [[ -e ${filename} ]] || break
- (( i++ ))
- done
- echo "${filename}"
-}
-
-pkg_postinst() {
-
- if ${REPOS_CONF_UPGRADE} ; then
- einfo "Generating repos.conf"
- local repo_name=
- [[ -f ${PORTDIR}/profiles/repo_name ]] && \
- repo_name=$(< "${PORTDIR}/profiles/repo_name")
- if [[ -z ${REPOS_CONF_SYNC} ]] ; then
- REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
- fi
- local sync_type=
- [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
- if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
- sync_type=cvs
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
- fi
-
- cat <<-EOF > "${T}/repos.conf"
- [DEFAULT]
- main-repo = ${repo_name:-gentoo}
-
- [${repo_name:-gentoo}]
- location = ${PORTDIR:-${EPREFIX}/usr/portage}
- sync-type = ${sync_type:-rsync}
- sync-uri = ${REPOS_CONF_SYNC}
- EOF
-
- [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
- local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
- if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
- dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
- fi
- # Don't install the config update if the desired repos.conf directory
- # and config file exist, since users may accept it blindly and break
- # their config (bug #478726).
- [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
- mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
- if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
- einfo "Generating make.conf PORTDIR setting for backward compatibility"
- for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
- [[ -e ${dest} ]] && break
- done
- [[ -d ${dest} ]] && dest=${dest}/portdir.conf
- rm -rf "${T}/make.conf"
- [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
- cat <<-EOF >> "${T}/make.conf"
-
- # Set PORTDIR for backward compatibility with various tools:
- # gentoo-bashcomp - bug #478444
- # euse - bug #474574
- # euses and ufed - bug #478318
- PORTDIR="${EPREFIX}/usr/portage"
- EOF
- mkdir -p "${dest%/*}"
- mv "${T}/make.conf" "$(new_config_protect "${dest}")"
- fi
- fi
-
- local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
- if ${USERSYNC_UPGRADE} && \
- [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
- local ownership=$(get_ownership "${PORTDIR}")
- if [[ -n ${ownership} ]] ; then
- einfo "Adjusting PORTDIR permissions for usersync"
- find "${PORTDIR}" -path "${distdir%/}" -prune -o \
- ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
- -exec chown "${ownership}" {} +
- fi
- fi
-
- # Do this last, since it could take a long time if there
- # are lots of live sources, and the user may be tempted
- # to kill emerge while it is running.
- if ${USERPRIV_UPGRADE} && \
- [[ -d ${distdir} && -w ${distdir} ]] ; then
- local ownership=$(get_ownership "${distdir}")
- if [[ ${ownership#*:} == portage ]] ; then
- einfo "Adjusting DISTDIR permissions for userpriv"
- find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
- -exec chown -R portage:portage {} +
- fi
- fi
-}
diff --git a/sys-apps/portage/portage-2.2.18.ebuild b/sys-apps/portage/portage-2.2.18.ebuild
deleted file mode 100644
index ebea2d31a614..000000000000
--- a/sys-apps/portage/portage-2.2.18.ebuild
+++ /dev/null
@@ -1,352 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(
- pypy
- python3_3 python3_4
- python2_7
-)
-# Note: substituted below
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
-
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
- dev-lang/python-exec:2
- >=sys-apps/sed-4.0.5 sys-devel/patch
- doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
- epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
- dev-lang/python-exec:2
- !build? (
- >=sys-apps/sed-4.0.5
- app-shells/bash:0[readline]
- >=app-admin/eselect-1.2
- )
- elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
- elibc_glibc? ( >=sys-apps/sandbox-2.2 )
- elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
- >=app-misc/pax-utils-0.1.17
- selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
- xattr? ( kernel_linux? (
- >=sys-apps/install-xattr-0.3
- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
- python2_7 pypy)
- ) )
- !<app-admin/logrotate-3.8.0"
-PDEPEND="
- !build? (
- >=net-misc/rsync-2.6.4
- userland_GNU? ( >=sys-apps/coreutils-6.4 )
- )"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
-
-prefix_src_archives() {
- local x y
- for x in ${@}; do
- for y in ${SRC_ARCHIVES}; do
- echo ${y}/${x}
- done
- done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
- $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- if ! use ipc ; then
- einfo "Disabling ipc..."
- sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
- -i pym/_emerge/AbstractEbuildProcess.py || \
- die "failed to patch AbstractEbuildProcess.py"
- fi
-
- if use xattr && use kernel_linux ; then
- einfo "Adding FEATURES=xattr to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- if [[ -n ${EPREFIX} ]] ; then
- einfo "Setting portage.const.EPREFIX ..."
- sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
- -i pym/portage/const.py || \
- die "Failed to patch portage.const.EPREFIX"
-
- einfo "Prefixing shebangs ..."
- while read -r -d $'\0' ; do
- local shebang=$(head -n1 "$REPLY")
- if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
- sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
- die "sed failed"
- fi
- done < <(find . -type f -print0)
-
- einfo "Adjusting make.globals ..."
- sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
- -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
- -i cnf/make.globals || die "sed failed"
-
- einfo "Adjusting repos.conf ..."
- sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
- -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
- -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
- -i cnf/repos.conf || die "sed failed"
-
- einfo "Adding FEATURES=force-prefix to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- cd "${S}/cnf" || die
- if [ -f "make.conf.example.${ARCH}".diff ]; then
- patch make.conf.example "make.conf.example.${ARCH}".diff || \
- die "Failed to patch make.conf.example"
- else
- eerror ""
- eerror "Portage does not have an arch-specific configuration for this arch."
- eerror "Please notify the arch maintainer about this issue. Using generic."
- eerror ""
- fi
-}
-
-python_compile_all() {
- local targets=()
- use doc && targets+=( docbook )
- use epydoc && targets+=( epydoc )
-
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-}
-
-python_test() {
- esetup.py test
-}
-
-python_install() {
- # Install sbin scripts to bindir for python-exec linking
- # they will be relocated in pkg_preinst()
- distutils-r1_python_install \
- --system-prefix="${EPREFIX}/usr" \
- --bindir="$(python_get_scriptdir)" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
- --sbindir="$(python_get_scriptdir)" \
- --sysconfdir="${EPREFIX}/etc" \
- "${@}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- local targets=()
- use doc && targets+=( install_docbook )
- use epydoc && targets+=( install_epydoc )
-
- # install docs
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-
- # Due to distutils/python-exec limitations
- # these must be installed to /usr/bin.
- local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
- einfo "Moving admin scripts to the correct directory"
- dodir /usr/sbin
- for target in ${sbin_relocations}; do
- einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
- mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
- done
-}
-
-pkg_preinst() {
- # comment out sanity test until it is fixed to work
- # with the new PORTAGE_PYM_PATH
- #if [[ $ROOT == / ]] ; then
- ## Run some minimal tests as a sanity check.
- #local test_runner=$(find "${ED}" -name runTests)
- #if [[ -n $test_runner && -x $test_runner ]] ; then
- #einfo "Running preinst sanity tests..."
- #"$test_runner" || die "preinst sanity tests failed"
- #fi
- #fi
-
- # elog dir must exist to avoid logrotate error for bug #415911.
- # This code runs in preinst in order to bypass the mapping of
- # portage:portage to root:root which happens after src_install.
- keepdir /var/log/portage/elog
- # This is allowed to fail if the user/group are invalid for prefix users.
- if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
- chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
- fi
-
- if has_version "<${CATEGORY}/${PN}-2.1.13" || \
- {
- has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
- has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
- } ; then
- USERPRIV_UPGRADE=true
- USERSYNC_UPGRADE=true
- REPOS_CONF_UPGRADE=true
- REPOS_CONF_SYNC=
- type -P portageq >/dev/null 2>&1 && \
- REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
- else
- USERPRIV_UPGRADE=false
- USERSYNC_UPGRADE=false
- REPOS_CONF_UPGRADE=false
- fi
-}
-
-get_ownership() {
- case ${USERLAND} in
- BSD)
- stat -f '%Su:%Sg' "${1}"
- ;;
- *)
- stat -c '%U:%G' "${1}"
- ;;
- esac
-}
-
-new_config_protect() {
- # Generate a ._cfg file even if the target file
- # does not exist, ensuring that the user will
- # notice the config change.
- local basename=${1##*/}
- local dirname=${1%/*}
- local i=0
- while true ; do
- local filename=$(
- echo -n "${dirname}/._cfg"
- printf "%04d" ${i}
- echo -n "_${basename}"
- )
- [[ -e ${filename} ]] || break
- (( i++ ))
- done
- echo "${filename}"
-}
-
-pkg_postinst() {
-
- if ${REPOS_CONF_UPGRADE} ; then
- einfo "Generating repos.conf"
- local repo_name=
- [[ -f ${PORTDIR}/profiles/repo_name ]] && \
- repo_name=$(< "${PORTDIR}/profiles/repo_name")
- if [[ -z ${REPOS_CONF_SYNC} ]] ; then
- REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
- fi
- local sync_type=
- [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
- if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
- sync_type=cvs
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
- fi
-
- cat <<-EOF > "${T}/repos.conf"
- [DEFAULT]
- main-repo = ${repo_name:-gentoo}
-
- [${repo_name:-gentoo}]
- location = ${PORTDIR:-${EPREFIX}/usr/portage}
- sync-type = ${sync_type:-rsync}
- sync-uri = ${REPOS_CONF_SYNC}
- EOF
-
- [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
- local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
- if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
- dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
- fi
- # Don't install the config update if the desired repos.conf directory
- # and config file exist, since users may accept it blindly and break
- # their config (bug #478726).
- [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
- mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
- if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
- einfo "Generating make.conf PORTDIR setting for backward compatibility"
- for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
- [[ -e ${dest} ]] && break
- done
- [[ -d ${dest} ]] && dest=${dest}/portdir.conf
- rm -rf "${T}/make.conf"
- [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
- cat <<-EOF >> "${T}/make.conf"
-
- # Set PORTDIR for backward compatibility with various tools:
- # gentoo-bashcomp - bug #478444
- # euse - bug #474574
- # euses and ufed - bug #478318
- PORTDIR="${EPREFIX}/usr/portage"
- EOF
- mkdir -p "${dest%/*}"
- mv "${T}/make.conf" "$(new_config_protect "${dest}")"
- fi
- fi
-
- local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
- if ${USERSYNC_UPGRADE} && \
- [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
- local ownership=$(get_ownership "${PORTDIR}")
- if [[ -n ${ownership} ]] ; then
- einfo "Adjusting PORTDIR permissions for usersync"
- find "${PORTDIR}" -path "${distdir%/}" -prune -o \
- ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
- -exec chown "${ownership}" {} +
- fi
- fi
-
- # Do this last, since it could take a long time if there
- # are lots of live sources, and the user may be tempted
- # to kill emerge while it is running.
- if ${USERPRIV_UPGRADE} && \
- [[ -d ${distdir} && -w ${distdir} ]] ; then
- local ownership=$(get_ownership "${distdir}")
- if [[ ${ownership#*:} == portage ]] ; then
- einfo "Adjusting DISTDIR permissions for userpriv"
- find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
- -exec chown -R portage:portage {} +
- fi
- fi
-}
diff --git a/sys-apps/portage/portage-2.2.20.ebuild b/sys-apps/portage/portage-2.2.20.ebuild
deleted file mode 100644
index 5db3fabe9ac4..000000000000
--- a/sys-apps/portage/portage-2.2.20.ebuild
+++ /dev/null
@@ -1,365 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(
- pypy
- python3_3 python3_4
- python2_7
-)
-# Note: substituted below
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
-
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
- >=app-arch/tar-1.27
- dev-lang/python-exec:2
- >=sys-apps/sed-4.0.5 sys-devel/patch
- doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
- epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
- >=app-arch/tar-1.27
- dev-lang/python-exec:2
- !build? (
- >=sys-apps/sed-4.0.5
- app-shells/bash:0[readline]
- >=app-admin/eselect-1.2
- )
- elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
- elibc_glibc? ( >=sys-apps/sandbox-2.2 )
- elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
- >=app-misc/pax-utils-0.1.17
- selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
- xattr? ( kernel_linux? (
- >=sys-apps/install-xattr-0.3
- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
- python2_7 pypy)
- ) )
- !<app-admin/logrotate-3.8.0"
-PDEPEND="
- !build? (
- >=net-misc/rsync-2.6.4
- userland_GNU? ( >=sys-apps/coreutils-6.4 )
- )"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
-
-prefix_src_archives() {
- local x y
- for x in ${@}; do
- for y in ${SRC_ARCHIVES}; do
- echo ${y}/${x}
- done
- done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
- $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- if ! use ipc ; then
- einfo "Disabling ipc..."
- sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
- -i pym/_emerge/AbstractEbuildProcess.py || \
- die "failed to patch AbstractEbuildProcess.py"
- fi
-
- if use xattr && use kernel_linux ; then
- einfo "Adding FEATURES=xattr to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- if [[ -n ${EPREFIX} ]] ; then
- einfo "Setting portage.const.EPREFIX ..."
- sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
- -i pym/portage/const.py || \
- die "Failed to patch portage.const.EPREFIX"
-
- einfo "Prefixing shebangs ..."
- while read -r -d $'\0' ; do
- local shebang=$(head -n1 "$REPLY")
- if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
- sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
- die "sed failed"
- fi
- done < <(find . -type f -print0)
-
- einfo "Adjusting make.globals ..."
- sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
- -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
- -i cnf/make.globals || die "sed failed"
-
- einfo "Adjusting repos.conf ..."
- sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
- -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
- -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
- -i cnf/repos.conf || die "sed failed"
-
- einfo "Adding FEATURES=force-prefix to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- cd "${S}/cnf" || die
- if [ -f "make.conf.example.${ARCH}".diff ]; then
- patch make.conf.example "make.conf.example.${ARCH}".diff || \
- die "Failed to patch make.conf.example"
- else
- eerror ""
- eerror "Portage does not have an arch-specific configuration for this arch."
- eerror "Please notify the arch maintainer about this issue. Using generic."
- eerror ""
- fi
-}
-
-python_compile_all() {
- local targets=()
- use doc && targets+=( docbook )
- use epydoc && targets+=( epydoc )
-
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-}
-
-python_test() {
- esetup.py test
-}
-
-python_install() {
- # Install sbin scripts to bindir for python-exec linking
- # they will be relocated in pkg_preinst()
- distutils-r1_python_install \
- --system-prefix="${EPREFIX}/usr" \
- --bindir="$(python_get_scriptdir)" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
- --sbindir="$(python_get_scriptdir)" \
- --sysconfdir="${EPREFIX}/etc" \
- "${@}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- local targets=()
- use doc && targets+=( install_docbook )
- use epydoc && targets+=( install_epydoc )
-
- # install docs
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-
- # Due to distutils/python-exec limitations
- # these must be installed to /usr/bin.
- local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
- einfo "Moving admin scripts to the correct directory"
- dodir /usr/sbin
- for target in ${sbin_relocations}; do
- einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
- mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
- done
-}
-
-pkg_preinst() {
- # comment out sanity test until it is fixed to work
- # with the new PORTAGE_PYM_PATH
- #if [[ $ROOT == / ]] ; then
- ## Run some minimal tests as a sanity check.
- #local test_runner=$(find "${ED}" -name runTests)
- #if [[ -n $test_runner && -x $test_runner ]] ; then
- #einfo "Running preinst sanity tests..."
- #"$test_runner" || die "preinst sanity tests failed"
- #fi
- #fi
-
- # elog dir must exist to avoid logrotate error for bug #415911.
- # This code runs in preinst in order to bypass the mapping of
- # portage:portage to root:root which happens after src_install.
- keepdir /var/log/portage/elog
- # This is allowed to fail if the user/group are invalid for prefix users.
- if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
- chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
- fi
-
- if has_version "<${CATEGORY}/${PN}-2.1.13" || \
- {
- has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
- has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
- } ; then
- USERPRIV_UPGRADE=true
- USERSYNC_UPGRADE=true
- REPOS_CONF_UPGRADE=true
- REPOS_CONF_SYNC=
- type -P portageq >/dev/null 2>&1 && \
- REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
- else
- USERPRIV_UPGRADE=false
- USERSYNC_UPGRADE=false
- REPOS_CONF_UPGRADE=false
- fi
-}
-
-get_ownership() {
- case ${USERLAND} in
- BSD)
- stat -f '%Su:%Sg' "${1}"
- ;;
- *)
- stat -c '%U:%G' "${1}"
- ;;
- esac
-}
-
-new_config_protect() {
- # Generate a ._cfg file even if the target file
- # does not exist, ensuring that the user will
- # notice the config change.
- local basename=${1##*/}
- local dirname=${1%/*}
- local i=0
- while true ; do
- local filename=$(
- echo -n "${dirname}/._cfg"
- printf "%04d" ${i}
- echo -n "_${basename}"
- )
- [[ -e ${filename} ]] || break
- (( i++ ))
- done
- echo "${filename}"
-}
-
-pkg_postinst() {
-
- if ${REPOS_CONF_UPGRADE} ; then
- einfo "Generating repos.conf"
- local repo_name=
- [[ -f ${PORTDIR}/profiles/repo_name ]] && \
- repo_name=$(< "${PORTDIR}/profiles/repo_name")
- if [[ -z ${REPOS_CONF_SYNC} ]] ; then
- REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
- fi
- local sync_type=
- [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
- if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
- sync_type=cvs
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
- fi
-
- cat <<-EOF > "${T}/repos.conf"
- [DEFAULT]
- main-repo = ${repo_name:-gentoo}
-
- [${repo_name:-gentoo}]
- location = ${PORTDIR:-${EPREFIX}/usr/portage}
- sync-type = ${sync_type:-rsync}
- sync-uri = ${REPOS_CONF_SYNC}
- EOF
-
- [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
- local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
- if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
- dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
- fi
- # Don't install the config update if the desired repos.conf directory
- # and config file exist, since users may accept it blindly and break
- # their config (bug #478726).
- [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
- mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
- if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
- einfo "Generating make.conf PORTDIR setting for backward compatibility"
- for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
- [[ -e ${dest} ]] && break
- done
- [[ -d ${dest} ]] && dest=${dest}/portdir.conf
- rm -rf "${T}/make.conf"
- [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
- cat <<-EOF >> "${T}/make.conf"
-
- # Set PORTDIR for backward compatibility with various tools:
- # gentoo-bashcomp - bug #478444
- # euse - bug #474574
- # euses and ufed - bug #478318
- PORTDIR="${EPREFIX}/usr/portage"
- EOF
- mkdir -p "${dest%/*}"
- mv "${T}/make.conf" "$(new_config_protect "${dest}")"
- fi
- fi
-
- local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
- if ${USERSYNC_UPGRADE} && \
- [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
- local ownership=$(get_ownership "${PORTDIR}")
- if [[ -n ${ownership} ]] ; then
- einfo "Adjusting PORTDIR permissions for usersync"
- find "${PORTDIR}" -path "${distdir%/}" -prune -o \
- ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
- -exec chown "${ownership}" {} +
- fi
- fi
-
- # Do this last, since it could take a long time if there
- # are lots of live sources, and the user may be tempted
- # to kill emerge while it is running.
- if ${USERPRIV_UPGRADE} && \
- [[ -d ${distdir} && -w ${distdir} ]] ; then
- local ownership=$(get_ownership "${distdir}")
- if [[ ${ownership#*:} == portage ]] ; then
- einfo "Adjusting DISTDIR permissions for userpriv"
- find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
- -exec chown -R portage:portage {} +
- fi
- fi
-
- einfo ""
- einfo "The 'websync' module has now been properly renamed to 'webrsync'"
- einfo "Please update your repos.conf/gentoo.conf file if needed."
- einfo ""
- einfo "This release of portage removed the new squashfs sync module "
- einfo "introduced in portage-2.2.19."
- einfo "Look for it to be released as an installable portage module soon."
- einfo "This will allow it to develop at it's own pace partially independant"
- einfo "of portage"
- einfo ""
-}
diff --git a/sys-apps/portage/portage-2.2.22.ebuild b/sys-apps/portage/portage-2.2.22.ebuild
deleted file mode 100644
index 99d5c1cb67f9..000000000000
--- a/sys-apps/portage/portage-2.2.22.ebuild
+++ /dev/null
@@ -1,363 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=(
- pypy
- python3_3 python3_4
- python2_7
-)
-# Note: substituted below
-PYTHON_REQ_USE='bzip2(+)'
-
-inherit distutils-r1 multilib
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_ru selinux xattr"
-
-DEPEND="!build? ( ${PYTHON_DEPS//bzip2(+)/ssl(+),bzip2(+)} )
- >=app-arch/tar-1.27
- dev-lang/python-exec:2
- >=sys-apps/sed-4.0.5 sys-devel/patch
- doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
- epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-RDEPEND="
- >=app-arch/tar-1.27
- dev-lang/python-exec:2
- !build? (
- >=sys-apps/sed-4.0.5
- app-shells/bash:0[readline]
- >=app-admin/eselect-1.2
- )
- elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
- elibc_glibc? ( >=sys-apps/sandbox-2.2 )
- elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
- >=app-misc/pax-utils-0.1.17
- selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
- xattr? ( kernel_linux? (
- >=sys-apps/install-xattr-0.3
- $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
- python2_7 pypy)
- ) )
- !<app-admin/logrotate-3.8.0"
-PDEPEND="
- !build? (
- >=net-misc/rsync-2.6.4
- userland_GNU? ( >=sys-apps/coreutils-6.4 )
- )"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~dolsen/releases/portage"
-
-prefix_src_archives() {
- local x y
- for x in ${@}; do
- for y in ${SRC_ARCHIVES}; do
- echo ${y}/${x}
- done
- done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
- $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- if ! use ipc ; then
- einfo "Disabling ipc..."
- sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
- -i pym/_emerge/AbstractEbuildProcess.py || \
- die "failed to patch AbstractEbuildProcess.py"
- fi
-
- if use xattr && use kernel_linux ; then
- einfo "Adding FEATURES=xattr to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- if [[ -n ${EPREFIX} ]] ; then
- einfo "Setting portage.const.EPREFIX ..."
- sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
- -i pym/portage/const.py || \
- die "Failed to patch portage.const.EPREFIX"
-
- einfo "Prefixing shebangs ..."
- while read -r -d $'\0' ; do
- local shebang=$(head -n1 "$REPLY")
- if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
- sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
- die "sed failed"
- fi
- done < <(find . -type f -print0)
-
- einfo "Adjusting make.globals ..."
- sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
- -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
- -i cnf/make.globals || die "sed failed"
-
- einfo "Adjusting repos.conf ..."
- sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
- -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
- -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
- -e "s|^\(sync-uri = \).*|\\1rsync://prefix.gentooexperimental.org/gentoo-portage-prefix|" \
- -i cnf/repos.conf || die "sed failed"
-
- einfo "Adding FEATURES=force-prefix to make.globals ..."
- echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
- || die "failed to append to make.globals"
- fi
-
- cd "${S}/cnf" || die
- if [ -f "make.conf.example.${ARCH}".diff ]; then
- patch make.conf.example "make.conf.example.${ARCH}".diff || \
- die "Failed to patch make.conf.example"
- else
- eerror ""
- eerror "Portage does not have an arch-specific configuration for this arch."
- eerror "Please notify the arch maintainer about this issue. Using generic."
- eerror ""
- fi
-}
-
-python_compile_all() {
- local targets=()
- use doc && targets+=( docbook )
- use epydoc && targets+=( epydoc )
-
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-}
-
-python_test() {
- esetup.py test
-}
-
-python_install() {
- # Install sbin scripts to bindir for python-exec linking
- # they will be relocated in pkg_preinst()
- distutils-r1_python_install \
- --system-prefix="${EPREFIX}/usr" \
- --bindir="$(python_get_scriptdir)" \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
- --sbindir="$(python_get_scriptdir)" \
- --sysconfdir="${EPREFIX}/etc" \
- "${@}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- local targets=()
- use doc && targets+=( install_docbook )
- use epydoc && targets+=( install_epydoc )
-
- # install docs
- if [[ ${targets[@]} ]]; then
- esetup.py "${targets[@]}"
- fi
-
- # Due to distutils/python-exec limitations
- # these must be installed to /usr/bin.
- local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
- einfo "Moving admin scripts to the correct directory"
- dodir /usr/sbin
- for target in ${sbin_relocations}; do
- einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
- mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
- done
-}
-
-pkg_preinst() {
- # comment out sanity test until it is fixed to work
- # with the new PORTAGE_PYM_PATH
- #if [[ $ROOT == / ]] ; then
- ## Run some minimal tests as a sanity check.
- #local test_runner=$(find "${ED}" -name runTests)
- #if [[ -n $test_runner && -x $test_runner ]] ; then
- #einfo "Running preinst sanity tests..."
- #"$test_runner" || die "preinst sanity tests failed"
- #fi
- #fi
-
- # elog dir must exist to avoid logrotate error for bug #415911.
- # This code runs in preinst in order to bypass the mapping of
- # portage:portage to root:root which happens after src_install.
- keepdir /var/log/portage/elog
- # This is allowed to fail if the user/group are invalid for prefix users.
- if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
- chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
- fi
-
- if has_version "<${CATEGORY}/${PN}-2.1.13" || \
- {
- has_version ">=${CATEGORY}/${PN}-2.2_rc0" && \
- has_version "<${CATEGORY}/${PN}-2.2.0_alpha189"
- } ; then
- USERPRIV_UPGRADE=true
- USERSYNC_UPGRADE=true
- REPOS_CONF_UPGRADE=true
- REPOS_CONF_SYNC=
- type -P portageq >/dev/null 2>&1 && \
- REPOS_CONF_SYNC=$("$(type -P portageq)" envvar SYNC)
- else
- USERPRIV_UPGRADE=false
- USERSYNC_UPGRADE=false
- REPOS_CONF_UPGRADE=false
- fi
-}
-
-get_ownership() {
- case ${USERLAND} in
- BSD)
- stat -f '%Su:%Sg' "${1}"
- ;;
- *)
- stat -c '%U:%G' "${1}"
- ;;
- esac
-}
-
-new_config_protect() {
- # Generate a ._cfg file even if the target file
- # does not exist, ensuring that the user will
- # notice the config change.
- local basename=${1##*/}
- local dirname=${1%/*}
- local i=0
- while true ; do
- local filename=$(
- echo -n "${dirname}/._cfg"
- printf "%04d" ${i}
- echo -n "_${basename}"
- )
- [[ -e ${filename} ]] || break
- (( i++ ))
- done
- echo "${filename}"
-}
-
-pkg_postinst() {
-
- if ${REPOS_CONF_UPGRADE} ; then
- einfo "Generating repos.conf"
- local repo_name=
- [[ -f ${PORTDIR}/profiles/repo_name ]] && \
- repo_name=$(< "${PORTDIR}/profiles/repo_name")
- if [[ -z ${REPOS_CONF_SYNC} ]] ; then
- REPOS_CONF_SYNC=$(grep "^sync-uri =" "${EROOT:-${ROOT}}usr/share/portage/config/repos.conf")
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC##* }
- fi
- local sync_type=
- [[ ${REPOS_CONF_SYNC} == git://* ]] && sync_type=git
-
- if [[ ${REPOS_CONF_SYNC} == cvs://* ]]; then
- sync_type=cvs
- REPOS_CONF_SYNC=${REPOS_CONF_SYNC#cvs://}
- fi
-
- cat <<-EOF > "${T}/repos.conf"
- [DEFAULT]
- main-repo = ${repo_name:-gentoo}
-
- [${repo_name:-gentoo}]
- location = ${PORTDIR:-${EPREFIX}/usr/portage}
- sync-type = ${sync_type:-rsync}
- sync-uri = ${REPOS_CONF_SYNC}
- EOF
-
- [[ ${sync_type} == cvs ]] && echo "sync-cvs-repo = $(<"${PORTDIR}/CVS/Repository")" >> "${T}/repos.conf"
-
- local dest=${EROOT:-${ROOT}}etc/portage/repos.conf
- if [[ ! -f ${dest} ]] && mkdir -p "${dest}" 2>/dev/null ; then
- dest=${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf
- fi
- # Don't install the config update if the desired repos.conf directory
- # and config file exist, since users may accept it blindly and break
- # their config (bug #478726).
- [[ -e ${EROOT:-${ROOT}}etc/portage/repos.conf/${repo_name:-gentoo}.conf ]] || \
- mv "${T}/repos.conf" "$(new_config_protect "${dest}")"
-
- if [[ ${PORTDIR} == ${EPREFIX}/usr/portage ]] ; then
- einfo "Generating make.conf PORTDIR setting for backward compatibility"
- for dest in "${EROOT:-${ROOT}}etc/make.conf" "${EROOT:-${ROOT}}etc/portage/make.conf" ; do
- [[ -e ${dest} ]] && break
- done
- [[ -d ${dest} ]] && dest=${dest}/portdir.conf
- rm -rf "${T}/make.conf"
- [[ -f ${dest} ]] && cat "${dest}" > "${T}/make.conf"
- cat <<-EOF >> "${T}/make.conf"
-
- # Set PORTDIR for backward compatibility with various tools:
- # gentoo-bashcomp - bug #478444
- # euse - bug #474574
- # euses and ufed - bug #478318
- PORTDIR="${EPREFIX}/usr/portage"
- EOF
- mkdir -p "${dest%/*}"
- mv "${T}/make.conf" "$(new_config_protect "${dest}")"
- fi
- fi
-
- local distdir=${PORTAGE_ACTUAL_DISTDIR-${DISTDIR}}
-
- if ${USERSYNC_UPGRADE} && \
- [[ -d ${PORTDIR} && -w ${PORTDIR} ]] ; then
- local ownership=$(get_ownership "${PORTDIR}")
- if [[ -n ${ownership} ]] ; then
- einfo "Adjusting PORTDIR permissions for usersync"
- find "${PORTDIR}" -path "${distdir%/}" -prune -o \
- ! \( -user "${ownership%:*}" -a -group "${ownership#*:}" \) \
- -exec chown "${ownership}" {} +
- fi
- fi
-
- # Do this last, since it could take a long time if there
- # are lots of live sources, and the user may be tempted
- # to kill emerge while it is running.
- if ${USERPRIV_UPGRADE} && \
- [[ -d ${distdir} && -w ${distdir} ]] ; then
- local ownership=$(get_ownership "${distdir}")
- if [[ ${ownership#*:} == portage ]] ; then
- einfo "Adjusting DISTDIR permissions for userpriv"
- find "${distdir}" -mindepth 1 -maxdepth 1 -type d -uid 0 \
- -exec chown -R portage:portage {} +
- fi
- fi
-
- einfo ""
- einfo "This release of portage contains the new repoman code base"
- einfo "This code base is still being developed. So its API's are"
- einfo "not to be considered stable and are subject to change."
- einfo "The code released has been tested and considered ready for use."
- einfo "This however does not guarantee it to be completely bug free."
- einfo "Please report any bugs you may encounter."
- einfo ""
-}
diff --git a/sys-apps/portage/portage-2.2.23.ebuild b/sys-apps/portage/portage-2.2.23.ebuild
index 99d5c1cb67f9..43cb079e8c28 100644
--- a/sys-apps/portage/portage-2.2.23.ebuild
+++ b/sys-apps/portage/portage-2.2.23.ebuild
@@ -6,7 +6,7 @@ EAPI=5
PYTHON_COMPAT=(
pypy
- python3_3 python3_4
+ python3_3 python3_4 python3_5
python2_7
)
# Note: substituted below
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 51113f5786e2..f6dea3e1b2ef 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
PYTHON_COMPAT=(
pypy
- python3_3 python3_4
+ python3_3 python3_4 python3_5
python2_7
)
# Note: substituted below
diff --git a/sys-apps/util-linux/util-linux-2.26.2.ebuild b/sys-apps/util-linux/util-linux-2.26.2.ebuild
index 27d8e1815af8..3f58b43ea732 100644
--- a/sys-apps/util-linux/util-linux-2.26.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.26.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit git-2 autotools
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
else
- KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
fi
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index cbe01afe2bae..c67519894387 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1 +1,2 @@
DIST keystone-2015.1.1.tar.gz 884979 SHA256 6c703f2d26c6a5f4fd4963dc11474b55cf87c5890d97361a4738df35eea258c5 SHA512 0c540f2a33729a539e68cb5d3e0b0b4ef0014829c274b0b92d982cd7d75110b14a3edc9db9c15794dd4c73f45a4982f47f99f75be6cbd8c91b0550ef24040848 WHIRLPOOL c20cc32d6043e9a2e9e5441a17e55431efabc3619156256c8fe8217bd876b07abb5860a48fc4bd761f505f022579d815a29b56d5c7a0536bafe89a2ad4b3b93a
+DIST keystone-2015.1.2.tar.gz 889207 SHA256 af63a89ca1cebfff593e35c24105c1442ab50f760871d756a48cfc120a7a8ddb SHA512 1592fb4e4d0b3ada08f2f12a25e9da08979e6c624239660b38b858115e1dc04a810857f07753ad855f51abf3b4cc43bae4a6f53cca33d10ab9e16ec4229bff42 WHIRLPOOL 285d9e91dcd8b3961596c0d1a7d093d32538e4fefb0e082fc496c79882c5f5d80a296ad415c443d0549a8412488d38820799db7ba03be98013d1340e0641a19e
diff --git a/sys-auth/keystone/keystone-2015.1.2.ebuild b/sys-auth/keystone/keystone-2015.1.2.ebuild
new file mode 100644
index 000000000000..722216180abb
--- /dev/null
+++ b/sys-auth/keystone/keystone-2015.1.2.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 user
+
+DESCRIPTION="The Openstack authentication, authorization, and service catalog"
+HOMEPAGE="https://launchpad.net/keystone"
+SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+sqlite memcached mongo mysql postgres ldap test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+ <dev-python/pbr-1.0[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ >=dev-python/bashate-0.2[${PYTHON_USEDEP}]
+ dev-lang/python[sqlite]
+ memcached? (
+ >=dev-python/python-memcached-1.48[${PYTHON_USEDEP}]
+ )
+ mongo? (
+ >=dev-python/pymongo-2.6.3[${PYTHON_USEDEP}]
+ <dev-python/pymongo-3.0[${PYTHON_USEDEP}]
+ )
+ ldap? (
+ >=dev-python/python-ldap-2.4[${PYTHON_USEDEP}]
+ >=dev-python/ldappool-1.0[${PYTHON_USEDEP}]
+ )
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+ <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0[${PYTHON_USEDEP}]
+ <dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+ <dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=dev-python/webtest-2.0[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+ !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+ >=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+ <dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+ )"
+RDEPEND="
+ >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+ >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+ !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+ >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+ >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ dev-python/paste[${PYTHON_USEDEP}]
+ >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.0[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ sqlite? (
+ >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ dev-python/mysql-python
+ >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ dev-python/psycopg:2
+ >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+ )
+ >=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+ <dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
+ <dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+ <dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-policy-0.3.1[${PYTHON_USEDEP}]
+ <dev-python/oslo-policy-0.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
+ <dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
+ dev-python/pysaml2[${PYTHON_USEDEP}]
+ >=dev-python/dogpile-cache-0.5.3[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+ <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pycadf-0.8.0[${PYTHON_USEDEP}]
+ <dev-python/pycadf-0.9.0[${PYTHON_USEDEP}]
+ dev-python/posix_ipc[${PYTHON_USEDEP}]
+ >=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+pkg_setup() {
+ enewgroup keystone
+ enewuser keystone -1 -1 /var/lib/keystone keystone
+}
+
+python_prepare_all() {
+ # it's in git, but not in the tarball.....
+ sed -i '/^hacking/d' test-requirements.txt test-requirements-py3.txt || die
+ mkdir -p ${PN}/tests/tmp/ || die
+ cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
+ distutils-r1_python_prepare_all
+}
+
+# Ignore (naughty) test_.py files & 1 test that connect to the network
+#-I 'test_keystoneclient*' \
+python_test() {
+ nosetests -I 'test_keystoneclient*' \
+ -e test_static_translated_string_is_Message \
+ -e test_get_token_id_error_handling \
+ -e test_provider_token_expiration_validation \
+ -e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
+}
+
+python_install() {
+ distutils-r1_python_install
+ newconfd "${FILESDIR}/keystone.confd" keystone
+ newinitd "${FILESDIR}/keystone.initd" keystone
+
+ diropts -m 0750
+ keepdir /etc/keystone /var/log/keystone
+ insinto /etc/keystone
+ insopts -m0640 -okeystone -gkeystone
+ doins etc/keystone.conf.sample etc/logging.conf.sample
+ doins etc/default_catalog.templates etc/policy.json
+ doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
+
+ fowners keystone:keystone /etc/keystone /var/log/keystone
+}
+
+pkg_postinst() {
+ elog "You might want to run:"
+ elog "emerge --config =${CATEGORY}/${PF}"
+ elog "if this is a new install."
+ elog "If you have not already configured your openssl installation"
+ elog "please do it by modifying /etc/ssl/openssl.cnf"
+ elog "BEFORE issuing the configuration command."
+ elog "Otherwise default values will be used."
+}
+
+pkg_config() {
+ if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
+ einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
+ read
+ "${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
+ else
+ einfo "keystone PKI certificates directory already present, skipping configuration"
+ fi
+}
diff --git a/sys-auth/keystone/keystone-2015.1.9999.ebuild b/sys-auth/keystone/keystone-2015.1.9999.ebuild
index a3ab5b1aef2d..c03895ef3ec7 100644
--- a/sys-auth/keystone/keystone-2015.1.9999.ebuild
+++ b/sys-auth/keystone/keystone-2015.1.9999.ebuild
@@ -25,8 +25,6 @@ DEPEND="
<dev-python/pbr-1.0[${PYTHON_USEDEP}]
test? (
${RDEPEND}
- >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
- <dev-python/hacking-0.11[${PYTHON_USEDEP}]
>=dev-python/bashate-0.2[${PYTHON_USEDEP}]
dev-lang/python[sqlite]
memcached? (
@@ -88,13 +86,15 @@ RDEPEND="
<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
)
>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
dev-python/passlib[${PYTHON_USEDEP}]
>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
@@ -113,6 +113,7 @@ RDEPEND="
>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
dev-python/pysaml2[${PYTHON_USEDEP}]
@@ -134,6 +135,7 @@ pkg_setup() {
python_prepare_all() {
# it's in git, but not in the tarball.....
+ sed -i '/^hacking/d' test-requirements.txt test-requirements-py3.txt || die
mkdir -p ${PN}/tests/tmp/ || die
cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
distutils-r1_python_prepare_all
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 28036c596b91..100031314332 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1 +1,2 @@
DIST cinder-2015.1.1.tar.gz 2068679 SHA256 11c6c7e749021978b9daeb631aa9f776a9ab70ea1549e8443a225a20ca98a945 SHA512 8d0cb81ef474b82ce4e377818916b1c2cf3566993c58f756ead17ee57d3316d61cfc0603cfce4e4460c43a6ef17813f5d85126fbaceed54c86060f3e22e39313 WHIRLPOOL a3a896c33a436c485490dd95169252e014757f8c6f555ffa61e26406b9405dbedd90f89bf424b2cfd2f145770f064ce551b59395b337f9b6d883301ca50d49b9
+DIST cinder-2015.1.2.tar.gz 2079511 SHA256 8baa42a3008b0bb0870df678237c0d06ab8ee148b3bf5c00c6b95cfe05c52333 SHA512 312b89068b80c642b8055084575e378ae449b615b6135f15f7aa327808e7a4f05887d0626dc69329c8d08001cf8a8488453b783a81c0f083340e15a8dd411f26 WHIRLPOOL dc3b532603167ac7a910120aca122d54646190c9d1a38a024d03675051b726f09f62d55f8bf5e404d83f8a9df8968bd953c3abf30d6eb45851134d399177fa7e
diff --git a/sys-cluster/cinder/cinder-2015.1.2.ebuild b/sys-cluster/cinder/cinder-2015.1.2.ebuild
new file mode 100644
index 000000000000..31cc6dfe981d
--- /dev/null
+++ b/sys-cluster/cinder/cinder-2015.1.2.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+#sudo is a build dep because I want the sudoers.d directory to exist, lazy.
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+ <dev-python/pbr-1.0[${PYTHON_USEDEP}]
+ app-admin/sudo
+ test? (
+ ${RDEPEND}
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+ <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0[${PYTHON_USEDEP}]
+ <dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
+ dev-python/mysql-python[${PYTHON_USEDEP}]
+ dev-python/psycopg[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+ <dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+ !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+ >=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+ <dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+ )"
+
+RDEPEND="
+ >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+ !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+ >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+ <dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+ >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+ <dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
+ <dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
+ <dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+ dev-python/paste[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
+ <dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
+ >=dev-python/python-glanceclient-0.15.0[${PYTHON_USEDEP}]
+ <dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+ >=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
+ <dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}]
+ >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+ <dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.0[${PYTHON_USEDEP}]
+ >=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
+ <dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ sqlite? (
+ >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ dev-python/mysql-python
+ >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ dev-python/psycopg:2
+ >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+ )
+ >=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+ <dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/suds-0.4[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
+ <dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
+ iscsi? (
+ sys-block/tgt
+ sys-block/open-iscsi
+ )
+ lvm? ( sys-fs/lvm2 )
+ memcached? ( net-misc/memcached )
+ app-emulation/qemu
+ sys-fs/sysfsutils"
+# qemu is needed for image conversion
+
+PATCHES=(
+
+)
+
+pkg_setup() {
+ linux-info_pkg_setup
+ CONFIG_CHECK_MODULES="ISCSI_TCP"
+ if linux_config_exists; then
+ for module in ${CONFIG_CHECK_MODULES}; do
+ linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+ done
+ fi
+ enewgroup cinder
+ enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ distutils-r1_python_compile
+ mv cinder/test.py cinder/test.py.bak || die
+ ./tools/config/generate_sample.sh -b ./ -p cinder -o etc/cinder || die
+ mv cinder/test.py.bak cinder/test.py || die
+}
+
+python_test() {
+ # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+ nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install() {
+ distutils-r1_python_install
+ keepdir /etc/cinder
+ dodir /etc/cinder/rootwrap.d
+
+ for svc in api scheduler volume; do
+ newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+ done
+
+ insinto /etc/cinder
+ insopts -m0640 -o cinder -g cinder
+ newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
+ newins "${S}/etc/cinder/api-paste.ini" "api-paste.ini"
+ newins "${S}/etc/cinder/logging_sample.conf" "logging_sample.conf"
+ newins "${S}/etc/cinder/policy.json" "policy.json"
+ newins "${S}/etc/cinder/rootwrap.conf" "rootwrap.conf"
+ insinto /etc/cinder/rootwrap.d
+ newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
+
+ dodir /var/log/cinder
+ fowners cinder:cinder /var/log/cinder
+
+ #add sudoers definitions for user nova
+ insinto /etc/sudoers.d/
+ insopts -m 0440 -o root -g root
+ newins "${FILESDIR}/cinder.sudoersd" cinder
+}
+
+pkg_postinst() {
+ if use iscsi ; then
+ elog "Cinder needs tgtd to be installed and running to work with iscsi"
+ elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+ fi
+}
diff --git a/sys-cluster/cinder/cinder-2015.1.9999.ebuild b/sys-cluster/cinder/cinder-2015.1.9999.ebuild
index 10f2360aa8c4..422f54e08a52 100644
--- a/sys-cluster/cinder/cinder-2015.1.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2015.1.9999.ebuild
@@ -25,8 +25,6 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
app-admin/sudo
test? (
${RDEPEND}
- >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
- <dev-python/hacking-0.11[${PYTHON_USEDEP}]
>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
@@ -64,7 +62,7 @@ RDEPEND="
>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
@@ -81,6 +79,7 @@ RDEPEND="
>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
>=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
@@ -119,6 +118,8 @@ RDEPEND="
<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
)
>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
>=dev-python/suds-0.4[${PYTHON_USEDEP}]
@@ -153,6 +154,11 @@ pkg_setup() {
enewuser cinder -1 -1 /var/lib/cinder cinder
}
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
python_compile() {
distutils-r1_python_compile
mv cinder/test.py cinder/test.py.bak || die
diff --git a/sys-cluster/libcircle/Manifest b/sys-cluster/libcircle/Manifest
index 28bac28f1192..2aea37171c24 100644
--- a/sys-cluster/libcircle/Manifest
+++ b/sys-cluster/libcircle/Manifest
@@ -1 +1,2 @@
DIST libcircle-0.2.0_rc1.tar.gz 351901 SHA256 59ed75c0bdf2b24f96fbc0230848a5aab57d4eab5a68895489d59a7f68ddd2ee SHA512 1ce07ae012c281fe3e6fbae29bf48e1079768ed5f92f9375c3be02880bed1b1feee6630b31560d7129f76640990e94da1753f55b11a0a8977adaaf9e51144044 WHIRLPOOL 984713d28ee80f686daea7d419a1135360bcda542f904a1aa4ea0ef03b87482e60c2c0858a9e6fd85d7bde1ef557bd61c717ba924f942dfd82d7cbeb9a2e0359
+DIST libcircle-0.2.1_rc1.tar.gz 354251 SHA256 a0d0d75db2be9e47045572ad40f7e1077b7c3540f79180ad1db265ca89438db3 SHA512 9a125bc9f95b1dfb1c777dece4310a709cec46f820651216cd3a34486260f80221e564b82dfaf1ba58b8091b18c6d6b87b0c64d24a940cae6593dc144426fb54 WHIRLPOOL ec77f629c8d5b2391a8f25aa888e0606a0d0240ccf86e6bbe5ba8a04c5e411a6d3f077777da6cdd7badaa87c40b44b6a67b7b901ceb94fb3bec3b118b8465a0a
diff --git a/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild b/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild
new file mode 100644
index 000000000000..c702e2734878
--- /dev/null
+++ b/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools-utils
+
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="git://github.com/hpc/${PN}.git https://github.com/hpc/${PN}.git"
+ inherit git-2
+ KEYWORDS=""
+else
+ inherit vcs-snapshot
+ SRC_URI="https://github.com/hpc/${PN}/archive/${PV/_rc/-rc.}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux"
+fi
+
+DESCRIPTION="an API for distributing embarrassingly parallel workloads using self-stabilization"
+HOMEPAGE="https://github.com/hpc/libcircle"
+
+SLOT="0"
+LICENSE="BSD"
+IUSE="doc test"
+
+RDEPEND="virtual/mpi"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( dev-libs/check )"
+
+DOCS=( HACKING.md README.md )
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable test tests)
+ $(use_enable doc doxygen)
+ )
+ autotools-utils_src_configure
+}
+
+src_install() {
+ use doc && HTML_DOCS=( "${BUILD_DIR}/doc/html/" )
+ autotools-utils_src_install
+}
diff --git a/sys-cluster/libquo/Manifest b/sys-cluster/libquo/Manifest
index 63f28a215568..9551aa73a62b 100644
--- a/sys-cluster/libquo/Manifest
+++ b/sys-cluster/libquo/Manifest
@@ -1,3 +1,4 @@
DIST libquo-1.2.2.tar.gz 711528 SHA256 fb1231bde16b5e669caf23f5bfed4c77643cd3d4ae2ae755cfe258610a70667a SHA512 1aad84e65ba9167656ba6ffd53859816ea396239781b51846992766be7d01e33af732ac9c2ddda5839ec518bf304b4882a73f884c714c6e8eb9dc6884a9a6b11 WHIRLPOOL c5d28ddebaf98912b7ee92ab9e765cbff91ad1a29b323babc9db2d534f4261127377906ffbf670a4e38e65b248d4a56c8435290f4b64f39aae7e27b3d6ebaeb7
DIST libquo-1.2.3.tar.gz 727836 SHA256 8f359b6f9efe0d38d2a7b6999b801297d80cebbf74b30de7b124bccbd77ae04e SHA512 d937253f1444723631439a78e5533d9ce4c8772f04f7c3475fe48c63d0dd827d5d73c4a925efec614a36d1c9680e9d93d53617ac12c00fce65b922fa69cd8c5b WHIRLPOOL 4d35a9e806184051ae56fc5c8f1454e73fa4dfb96b181b13753ac09d8f654f7f1154ca8008514aea0fc2b46bad8011d6a27e022c9811eb852d4e6c78b6041951
+DIST libquo-1.2.4.tar.gz 714871 SHA256 a7324c5e7faa6f99e14e7565d19a657e21e686dd039d8519fad48890bbb6ce18 SHA512 a8b6ab6bcaab3f22cc707ee85ea41c8b8f345bf11319a12bc1e4bceed15577f339b7c797ecee4301d0ba8b8c5ebb7af5961d19982261e41192c3fc777cbfecfe WHIRLPOOL eef090a00843a37a0f9823973bc26220416a0bb6f2db1f727ef964ce8f8b0d664c7703b6fff4e2357cc1d7fd9deca527f4cdd2b368e56ffe9c175df613446df4
DIST libquo-1.2.tar.gz 710465 SHA256 accd7b5fd1d7118897d98929245b8a91baf3d00e477769df66322a7feeed352d SHA512 c9c087490c01af51f47490635dbf42d5433719931afbaa89dfe91bfe812e09e468649cf5a7703b6c3d5b0c0d6d6318731dcff4928a52017505f814750131c75b WHIRLPOOL a209676d6bc8d0b012e8797d5600ec812b35aeae06391b6f3cc5b7bac743198fc17726187d199988fb75e8c5a33706921982b35c8094dee6fef303e57fd5be96
diff --git a/sys-cluster/libquo/libquo-1.2.4-r1.ebuild b/sys-cluster/libquo/libquo-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..6f4ed947735e
--- /dev/null
+++ b/sys-cluster/libquo/libquo-1.2.4-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+FORTRAN_STANDARD=90
+
+inherit autotools-utils fortran-2
+
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="git://github.com/losalamos/${PN}.git https://github.com/losalamos/${PN}.git"
+ inherit git-r3
+ KEYWORDS=""
+ AUTOTOOLS_AUTORECONF=1
+else
+ SRC_URI="http://losalamos.github.io/${PN}/dists/${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="run-time tuning of process binding policies made easy"
+HOMEPAGE="http://losalamos.github.io/libquo/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="fortran static-libs"
+
+DEPEND="
+ virtual/mpi[fortran?]
+ sys-process/numactl
+ sys-apps/hwloc[numa,xml]
+ "
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ autotools-utils_src_configure CC=mpicc FC=$(usex fortran mpif90 false)
+}
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 846acf815b37..409b8d27bb53 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1 +1,2 @@
DIST neutron-2015.1.1.tar.gz 2049496 SHA256 91569feaacc983635f64bc27f3903162526e984778aa6683129e578715f8c5b9 SHA512 aa9712a0d44efc2d52f47a2dfac449fb57b82bef675ea5d64b950859780240fbd441a3f8cd9684afff3c51502f8200c0db3b17471fabbd30724ce92662183fe2 WHIRLPOOL aeb6757f855115eb08d2707db40f54cdd488e67e69eb829ea2b31e83fe029ca3cde24e4520b8d8649da285354b161f47a237181a199cd786552d26f19c66181e
+DIST neutron-2015.1.2.tar.gz 2064808 SHA256 3ff282d75e86ea25f64e97e24b2960e7ffaeef7cf4a69c16d20ffe18065d0ef0 SHA512 441f872b4c8b117cd28d0f0a4c9a1a60382e48fecd120bb5fc9cbd209a49af41fa17f3ecd2b0d7266a0627d9afe387ea32a2d75bc2337968b5c2cb7a87732aa4 WHIRLPOOL 70a05c56ca367d8553b0c3a2067c33e6ae9decc52f745c3cb8ecf9bb842239849af34f490bd8dfbdf1a2243622d7f72d31cbcfea7435e99215ae7a65a3c2248e
diff --git a/sys-cluster/neutron/neutron-2015.1.2.ebuild b/sys-cluster/neutron/neutron-2015.1.2.ebuild
new file mode 100644
index 000000000000..4df2cc237853
--- /dev/null
+++ b/sys-cluster/neutron/neutron-2015.1.2.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 linux-info user
+
+DESCRIPTION="A virtual network service for Openstack"
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="compute-only dhcp doc ipv6 l3 metadata openvswitch linuxbridge server test sqlite mysql postgres"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+ compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
+ || ( openvswitch linuxbridge ) )"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+ <dev-python/pbr-1.0[${PYTHON_USEDEP}]
+ app-admin/sudo
+ test? (
+ ${RDEPEND}
+ >=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
+ <dev-python/cliff-1.11.0[${PYTHON_USEDEP}]
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+ <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0[${PYTHON_USEDEP}]
+ <dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+ !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+ >=dev-python/webtest-2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+ <dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+ <dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+ )"
+
+RDEPEND="
+ dev-python/paste[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+ >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.0[${PYTHON_USEDEP}]
+ >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+ !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+ >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+ >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+ !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+ dev-python/jsonrpclib[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+ <dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+ >=dev-python/python-neutronclient-2.4.0[${PYTHON_USEDEP}]
+ <dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+ compute-only? (
+ >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+ )
+ sqlite? (
+ >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ dev-python/mysql-python
+ >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ dev-python/psycopg:2
+ >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+ )
+ >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
+ <dev-python/alembic-0.8.1[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+ <dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
+ <dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+ <dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
+ <dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
+ <dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}]
+ dev-python/pyudev[${PYTHON_USEDEP}]
+ sys-apps/iproute2
+ net-misc/bridge-utils
+ net-firewall/ipset
+ net-firewall/iptables
+ net-firewall/ebtables
+ openvswitch? ( net-misc/openvswitch )
+ ipv6? ( net-misc/radvd )
+ dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
+
+PATCHES=(
+)
+
+pkg_setup() {
+ linux-info_pkg_setup
+ CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+ IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
+ NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
+ if linux_config_exists; then
+ for module in ${CONFIG_CHECK_MODULES}; do
+ linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+ done
+ fi
+ enewgroup neutron
+ enewuser neutron -1 -1 /var/lib/neutron neutron
+}
+
+pkg_config() {
+ fperms 0700 /var/log/neutron
+ fowners neutron:neutron /var/log neutron
+}
+
+sddrc_prepare() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ # it's /bin/ip not /sbin/ip
+ sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
+ distutils-r1_src_prepare
+}
+
+python_compile_all() {
+ use doc && make -C doc html
+}
+
+python_test() {
+ # https://bugs.launchpad.net/neutron/+bug/1234857
+ # https://bugs.launchpad.net/swift/+bug/1249727
+ # https://bugs.launchpad.net/neutron/+bug/1251657
+ # turn multiprocessing off, testr will use it --parallel
+ local DISTUTILS_NO_PARALLEL_BUILD=1
+ # Move tests out that attempt net connection, have failures
+ mv $(find . -name test_ovs_tunnel.py) . || die
+ sed -e 's:test_app_using_ipv6_and_ssl:_&:' \
+ -e 's:test_start_random_port_with_ipv6:_&:' \
+ -i neutron/tests/unit/test_wsgi.py || die
+ testr init
+ testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+ distutils-r1_python_install
+ if use server; then
+ newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+ newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
+ dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
+ fi
+ if use dhcp; then
+ newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+ newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
+ fi
+ if use l3; then
+ newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+ newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
+ fi
+ if use metadata; then
+ newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+ newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
+ fi
+ if use openvswitch; then
+ newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+ newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
+ newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+ newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
+ fi
+ if use linuxbridge; then
+ newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+ newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
+ fi
+ diropts -m 755 -o neutron -g neutron
+ dodir /var/log/neutron /var/lib/neutron
+ keepdir /etc/neutron
+ insinto /etc/neutron
+ insopts -m 0640 -o neutron -g neutron
+
+ doins etc/*
+ # stupid renames
+ rm "${D}etc/neutron/quantum"
+ insinto /etc/neutron
+ doins -r "etc/neutron/plugins"
+ insopts -m 0640 -o root -g root
+ doins "etc/rootwrap.conf"
+ doins -r "etc/neutron/rootwrap.d"
+
+ insopts -m 0644
+ insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/"
+ doins -r "neutron/db/migration/alembic_migrations/versions"
+
+ #add sudoers definitions for user neutron
+ insinto /etc/sudoers.d/
+ insopts -m 0440 -o root -g root
+ newins "${FILESDIR}/neutron.sudoersd" neutron
+
+ #remove superfluous stuff
+ rm -R "${D}/usr/etc/"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/build/html/. )
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ elog
+ elog "neutron-server's conf.d file may need updating to include additional ini files"
+ elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+ elog "on if you will use openvswitch or linuxbridge (or something else)"
+ elog
+ elog "Other conf.d files may need updating too, but should be good for the default use case"
+ elog
+}
diff --git a/sys-cluster/neutron/neutron-2015.1.9999.ebuild b/sys-cluster/neutron/neutron-2015.1.9999.ebuild
index 0c103b718b37..6d4f5d4b9b71 100644
--- a/sys-cluster/neutron/neutron-2015.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2015.1.9999.ebuild
@@ -27,8 +27,6 @@ DEPEND="
app-admin/sudo
test? (
${RDEPEND}
- >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
- <dev-python/hacking-0.11[${PYTHON_USEDEP}]
>=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
<dev-python/cliff-1.11.0[${PYTHON_USEDEP}]
>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
@@ -70,7 +68,7 @@ RDEPEND="
>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
<dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
- >=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
+ >=dev-python/python-neutronclient-2.4.0[${PYTHON_USEDEP}]
<dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
@@ -96,10 +94,11 @@ RDEPEND="
>=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
<dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
>=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
+ <dev-python/alembic-0.8.1[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
@@ -120,6 +119,7 @@ RDEPEND="
>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
>=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
<dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}]
@@ -134,7 +134,6 @@ RDEPEND="
dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
PATCHES=(
-
)
pkg_setup() {
@@ -156,9 +155,10 @@ pkg_config() {
fowners neutron:neutron /var/log neutron
}
-src_prepare() {
- #it's /bin/ip not /sbin/ip
- sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/*
+sddrc_prepare() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ # it's /bin/ip not /sbin/ip
+ sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
distutils-r1_src_prepare
}
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 376b4c5143d0..dbc8947f2a8c 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -1 +1,2 @@
DIST nova-2015.1.1.tar.gz 4544374 SHA256 d9b480827995727f2ccc06e4b5709e689e8a466006e07157ce92bc9d074e197e SHA512 7aad21fc59143cd4acab4a97980aafa9b1216789a0206c0d3098f5d96257e40baa77ef45696982648cc82a7f988f40525621da402871eeb398b21699932cea64 WHIRLPOOL 08b94f93be1e5821cfaaa835f33af2ddc23e75cea3dc6f1ca82be80317db95abd38dda336cca212cd68111fa65ca8c53c62f684e07acd2c1906e8d4cfc989905
+DIST nova-2015.1.2.tar.gz 4564794 SHA256 8ea47c076367dec47d7bea89210f260da64171be5adf559ced8514d5fdb6c453 SHA512 c3ec70f90723dbbc6c04a1ab5e5fd43b43c4080ab6a7454bd48d47eb2f228fe22b59f999f881dfb28fbd502e084c0c8764f5cdf4b096f6af46a2f0c97f0e4f61 WHIRLPOOL d3e038905726574864cc5c4d04ead21c90c24a676bc6d5580e65a1b37830889b92b7df09165b5f97e345aa99ba94a3f42b3212119a4bae34b318aa5946052bf6
diff --git a/sys-cluster/nova/nova-2015.1.2.ebuild b/sys-cluster/nova/nova-2015.1.2.ebuild
new file mode 100644
index 000000000000..ca2055030ed0
--- /dev/null
+++ b/sys-cluster/nova/nova-2015.1.2.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info multilib user
+
+DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python"
+HOMEPAGE="https://launchpad.net/nova"
+SRC_URI="https://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite test xen"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+ compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
+ compute? ( ^^ ( kvm xen ) )"
+
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+ <dev-python/pbr-1.0[${PYTHON_USEDEP}]
+ app-admin/sudo
+ test? (
+ ${RDEPEND}
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+ <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0[${PYTHON_USEDEP}]
+ <dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+ <dev-python/mox3-0.8.0[${PYTHON_USEDEP}]
+ dev-python/mysql-python[${PYTHON_USEDEP}]
+ dev-python/psycopg[${PYTHON_USEDEP}]
+ >=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
+ <dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
+ >=dev-python/python-ironicclient-0.4.1[${PYTHON_USEDEP}]
+ <dev-python/python-ironicclient-0.6.0[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+ <dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+ !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+ <dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+ >=dev-python/suds-0.4[${PYTHON_USEDEP}]
+ >=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
+ <dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
+ )"
+
+# barbicanclient is in here for doc generation
+RDEPEND="
+ compute-only? (
+ >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+ )
+ sqlite? (
+ >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ dev-python/mysql-python
+ >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ dev-python/psycopg:2
+ >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+ <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+ )
+ >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+ >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+ !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.6[${PYTHON_USEDEP}]
+ >=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+ <dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+ >=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
+ !~dev-python/routes-2.0[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+ >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+ dev-python/paste[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
+ >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+ >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+ >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
+ <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-cinderclient-1.1.0[${PYTHON_USEDEP}]
+ <dev-python/python-cinderclient-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/python-neutronclient-2.4.0[${PYTHON_USEDEP}]
+ <dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/python-glanceclient-0.15.0[${PYTHON_USEDEP}]
+ <dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+ >=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
+ <dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+ <dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/websockify-0.6.0[${PYTHON_USEDEP}]
+ <dev-python/websockify-0.7.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
+ <dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
+ <dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
+ <dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+ >=dev-python/rfc3986-0.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
+ <dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
+ >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+ <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+ dev-python/libvirt-python[${PYTHON_USEDEP}]
+ app-emulation/libvirt[iscsi?]
+ novncproxy? ( www-apps/novnc )
+ sys-apps/iproute2
+ openvswitch? ( net-misc/openvswitch )
+ rabbitmq? ( net-misc/rabbitmq-server )
+ memcached? ( net-misc/memcached
+ dev-python/python-memcached )
+ sys-fs/sysfsutils
+ sys-fs/multipath-tools
+ net-misc/bridge-utils
+ compute? (
+ app-cdr/cdrkit
+ kvm? ( app-emulation/qemu )
+ xen? ( app-emulation/xen
+ app-emulation/xen-tools )
+ )
+ iscsi? (
+ sys-fs/lsscsi
+ >=sys-block/open-iscsi-2.0.872-r3
+ )"
+
+PATCHES=(
+)
+
+pkg_setup() {
+ linux-info_pkg_setup
+ CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+ IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+ NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+ ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+ if linux_config_exists; then
+ for module in ${CONFIG_CHECK_MODULES}; do
+ linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+ done
+ fi
+ enewgroup nova
+ enewuser nova -1 -1 /var/lib/nova nova
+}
+
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ sed -i 's/python/python2\.7/g' tools/config/generate_sample.sh || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ distutils-r1_python_compile
+ ./tools/config/generate_sample.sh -b ./ -p nova -o etc/nova || die
+}
+
+python_test() {
+ # turn multiprocessing off, testr will use it --parallel
+ local DISTUTILS_NO_PARALLEL_BUILD=1
+ testr init
+ testr run --parallel || die "failed testsuite under python2.7"
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ if use !compute-only; then
+ for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+ newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+ done
+ fi
+ use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+ use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+ diropts -m 0750 -o nova -g qemu
+ dodir /var/log/nova /var/lib/nova/instances
+ diropts -m 0750 -o nova -g nova
+
+ insinto /etc/nova
+ insopts -m 0640 -o nova -g nova
+ newins "etc/nova/nova.conf.sample" "nova.conf"
+ doins "etc/nova/api-paste.ini"
+ doins "etc/nova/logging_sample.conf"
+ doins "etc/nova/policy.json"
+ doins "etc/nova/rootwrap.conf"
+ #rootwrap filters
+ insinto /etc/nova/rootwrap.d
+ doins "etc/nova/rootwrap.d/api-metadata.filters"
+ doins "etc/nova/rootwrap.d/compute.filters"
+ doins "etc/nova/rootwrap.d/network.filters"
+ #copy migration conf file (not coppied on install via setup.py script)
+ insopts -m 0644
+ insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
+ doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+ #copy the CA cert dir (not coppied on install via setup.py script)
+ cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed"
+
+ #add sudoers definitions for user nova
+ insinto /etc/sudoers.d/
+ insopts -m 0600 -o root -g root
+ doins "${FILESDIR}/nova-sudoers"
+
+ if use iscsi ; then
+ # Install udev rules for handle iscsi disk with right links under /dev
+ udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+ insinto /etc/nova/
+ doins "${FILESDIR}/scsi-openscsi-link.sh"
+ fi
+}
+
+pkg_postinst() {
+ if use iscsi ; then
+ elog "iscsid needs to be running if you want cinder to connect"
+ fi
+}
diff --git a/sys-cluster/nova/nova-2015.1.9999.ebuild b/sys-cluster/nova/nova-2015.1.9999.ebuild
index 20dd5e439514..2ba0bf9daa34 100644
--- a/sys-cluster/nova/nova-2015.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2015.1.9999.ebuild
@@ -27,14 +27,13 @@ DEPEND="
app-admin/sudo
test? (
${RDEPEND}
- >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
- <dev-python/hacking-0.11[${PYTHON_USEDEP}]
>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
>=dev-python/mock-1.0[${PYTHON_USEDEP}]
<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
>=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
+ <dev-python/mox3-0.8.0[${PYTHON_USEDEP}]
dev-python/mysql-python[${PYTHON_USEDEP}]
dev-python/psycopg[${PYTHON_USEDEP}]
>=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
@@ -94,7 +93,9 @@ RDEPEND="
>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
dev-python/paste[${PYTHON_USEDEP}]
- ~dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-migrate-0.9.8[${PYTHON_USEDEP}]
+ <dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}]
>=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
>=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
dev-python/pyasn1[${PYTHON_USEDEP}]
@@ -104,7 +105,7 @@ RDEPEND="
<dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
>=dev-python/python-cinderclient-1.1.0[${PYTHON_USEDEP}]
<dev-python/python-cinderclient-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
+ >=dev-python/python-neutronclient-2.4.0[${PYTHON_USEDEP}]
<dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
>=dev-python/python-glanceclient-0.15.0[${PYTHON_USEDEP}]
<dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
@@ -115,7 +116,7 @@ RDEPEND="
<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
>=dev-python/websockify-0.6.0[${PYTHON_USEDEP}]
<dev-python/websockify-0.7.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-1.8.2[${PYTHON_USEDEP}]
<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
>=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
@@ -126,6 +127,7 @@ RDEPEND="
>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+ !~dev-python/oslo-utils-1.4.1[${PYTHON_USEDEP}]
<dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
@@ -180,9 +182,10 @@ pkg_setup() {
enewuser nova -1 -1 /var/lib/nova nova
}
-python_prepare() {
- distutils-r1_python_prepare
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
sed -i 's/python/python2\.7/g' tools/config/generate_sample.sh || die
+ distutils-r1_python_prepare_all
}
python_compile() {
diff --git a/sys-cluster/ploop/Manifest b/sys-cluster/ploop/Manifest
index 056d0d085246..e48d97d8c5ee 100644
--- a/sys-cluster/ploop/Manifest
+++ b/sys-cluster/ploop/Manifest
@@ -1 +1,2 @@
DIST ploop-1.13.2.tar.bz2 122821 SHA256 c1705c3bebd4f0f8860fecadf57cca457216b2abad880eb36098351244f9c1c3 SHA512 85a3314dc1114b692cd98290412fd2ea78c516964c712487dd72f8347fd583172d8836f997d63ccade89ee39be031669074d9bc957926b97175e659ec505ddfb WHIRLPOOL aea714ec18aa82cce2fcffa9aafdfe0e627ed83db9b8eaf0621b2dddb58fd300fdd9a3896e2e5192154cc5e0b6b11668128ed2e66fd04c1daae84e23d41c7a99
+DIST ploop-1.14.1.tar.bz2 123962 SHA256 841fde81c46632072ff8bcc29a4074a15b3c8359967254deeba51f0af34a6c0e SHA512 7a235865f071de6e2762923d6591c8c6ee00d0d05ec80c6a2a1332f5b6881ccf827f7ddc40dfe1d663b8abf492a188a23f7d28a43dd553d6e37c8091cb3bc484 WHIRLPOOL 8e80385233cbd5be0a26a20fb5442f82fa57adffe22f78a1207c73ece65822091c7fbbf90b59b97b8cf6ff760447a93c391e828af5402ecdc59285a74c114332
diff --git a/sys-cluster/ploop/files/disable_create_run_dir.patch b/sys-cluster/ploop/files/disable_create_run_dir.patch
new file mode 100644
index 000000000000..726094903b51
--- /dev/null
+++ b/sys-cluster/ploop/files/disable_create_run_dir.patch
@@ -0,0 +1,21 @@
+--- lib/Makefile.old 2015-10-10 15:49:25.377235002 +0300
++++ lib/Makefile 2015-10-10 15:49:50.021464544 +0300
+@@ -76,17 +76,13 @@
+ .depend: $(filter-out $(GENERATED),$(SOURCES))
+ -include .depend
+
+-install-lockdir:
+- $(Q) $(INSTALL) -d $(DESTDIR)$(LOCKDIR)
+-.PHONY: install-lockdir
+-
+ install-pc: $(PC)
+ $(E) " INSTALL " $(PC)
+ $(Q) $(INSTALL) -d $(DESTDIR)$(PCDIR)
+ $(Q) $(INSTALL) $(PC) $(DESTDIR)$(PCDIR)
+ .PHONY: install-pc
+
+-install: all install-lockdir install-pc
++install: all install-pc
+ $(Q) $(INSTALL) -d $(DESTDIR)$(LIBDIR)
+ $(E) " INSTALL " $(LIBPLOOP)
+ $(Q) $(INSTALL) -m 644 $(LIBPLOOP) $(DESTDIR)$(LIBDIR)
diff --git a/sys-cluster/ploop/ploop-1.14.1.ebuild b/sys-cluster/ploop/ploop-1.14.1.ebuild
new file mode 100644
index 000000000000..00858bd6526a
--- /dev/null
+++ b/sys-cluster/ploop/ploop-1.14.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs multilib systemd
+
+DESCRIPTION="openvz tool and a library to control ploop block devices"
+HOMEPAGE="http://wiki.openvz.org/Download/ploop"
+SRC_URI="http://download.openvz.org/utils/ploop/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug static-libs"
+
+DEPEND="
+ dev-libs/libxml2
+ virtual/pkgconfig
+ "
+
+RDEPEND="dev-libs/libxml2
+ !<sys-cluster/vzctl-4.8
+ sys-block/parted
+ sys-fs/e2fsprogs
+ sys-process/lsof
+ sys-apps/findutils
+ "
+
+DOCS=( tools/README )
+
+src_prepare() {
+ epatch "${FILESDIR}/disable_create_run_dir.patch"
+
+ # Respect CFLAGS and CC, do not add debug by default
+ sed -i \
+ -e 's|CFLAGS =|CFLAGS +=|' \
+ -e '/CFLAGS/s/-g -O0 //' \
+ -e '/CFLAGS/s/-O2//' \
+ -e 's|CC=|CC?=|' \
+ -e 's/-Werror//' \
+ -e '/DEBUG=yes/d' \
+ -e '/LOCKDIR/s/var/run/' \
+ Makefile.inc || die 'sed on Makefile.inc failed'
+ # Avoid striping of binaries
+ sed -e '/INSTALL/{s: -s::}' -i tools/Makefile || die 'sed on tools/Makefile failed'
+
+ # respect AR and RANLIB, bug #452092
+ tc-export AR RANLIB
+ sed -i -e 's/ranlib/$(RANLIB)/' lib/Makefile || die 'sed on lib/Makefile failed'
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" V=1 $(usex debug 'DEBUG' '' '=yes' '')
+}
+
+src_install() {
+ default
+ ldconfig -n "${D}/usr/$(get_libdir)/" || die
+}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild
index 95aa23308726..4273a03bd630 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3025.ebuild
@@ -22,8 +22,7 @@ IUSE=""
CDEPEND="dev-libs/beecrypt
net-firewall/iptables
net-misc/vconfig
- sys-apps/iproute2
- || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )"
+ sys-apps/iproute2"
DEPEND=">=dev-libs/dietlibc-0.33_pre20110403
${CDEPEND}"
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3062.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3062.ebuild
index 96af5e621952..cb9183683226 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3062.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3062.ebuild
@@ -22,8 +22,7 @@ IUSE=""
CDEPEND="dev-libs/beecrypt
net-firewall/iptables
net-misc/vconfig
- sys-apps/iproute2
- sys-apps/coreutils"
+ sys-apps/iproute2"
DEPEND=">dev-libs/dietlibc-0.33
${CDEPEND}"
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild
index 6a706d80af5b..79bea53779ba 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild
@@ -22,8 +22,7 @@ IUSE=""
CDEPEND="dev-libs/beecrypt
net-firewall/iptables
net-misc/vconfig
- sys-apps/iproute2
- sys-apps/coreutils"
+ sys-apps/iproute2"
DEPEND=">dev-libs/dietlibc-0.33
${CDEPEND}"
diff --git a/sys-cluster/vzctl/Manifest b/sys-cluster/vzctl/Manifest
index 3a3c4088aecf..3c4f93eb4cae 100644
--- a/sys-cluster/vzctl/Manifest
+++ b/sys-cluster/vzctl/Manifest
@@ -1,3 +1,2 @@
DIST vzctl-4.9.1.tar.bz2 517940 SHA256 b15f4b4eacd88d2a5e745f556dfe6ae079a77c0d3f0fa818674bc98715ad7d72 SHA512 998882a1f628104a9e0c6a598ee84046fb03da03b7b2ce703396659cf7d7bd0bb67bf1590596e5e43ff1223ef23078fb7cab2228e768e79d3c3136b1ba418e50 WHIRLPOOL feff55376fa5f470627f7fcbd4e9a0c24e04b8575219d33ffa5eb4a67d79e64682975b89fbf06953d4d88044e1771c9dfef3a5b578914900e5f88f59eb2d3895
-DIST vzctl-4.9.2.tar.bz2 549613 SHA256 a345719d47e8a3f96c5af4c86b58a9677848eee6f4777403b447eff2c9320cae SHA512 c2ab45eb8f8f80c8b044f652c68c1c816b3df85f3aca5fe33b385dea4b6addeb8e6ebe6232342454efc4c683e8433149828dffdbcb181af6bfcb68d8b5a86ef1 WHIRLPOOL 42919c1096133250787996071f1d16e0d6bce542760c58a4d6af019960b6db7df4636d0735f21ffda95032fbabb4cf6709da532bee96e9e7775bf665049cbc46
-DIST vzctl-4.9.3.tar.bz2 549543 SHA256 c2fe73928933609893e99b16405f9da6a2d19e43a1164e7448bea81eb47355a0 SHA512 4c4fb69c217b403668a6ec64189eaf23d3ecaadc6ad9f09127a4c2b6d3dc88ac4c73ba182f99f5e1e9c64161a285d83421bb81343fbb83481c46a8489ac99819 WHIRLPOOL 546865b8b8bac4c5a95b191a283080965e1f3bfd51cdc09d4b36a0ac97df9339e8fb2a495df60290b0d92d2a3750d97a27cbb02b1de46c715b8784e1dea3e3f5
+DIST vzctl-4.9.4.tar.bz2 550370 SHA256 bc3c63841b5244181e71bd1daf7c9aca6df3d42ed886a161fa5ba4b1b4520420 SHA512 651aa7882ba77442666a09441769f821a7374f417199380667b27c9980203597575dfe12ad5c261da22941b6a2bc6e032d3f9c2d88dcb03af6412634cc5b4706 WHIRLPOOL ed3c2531919b68fc2ae8acd9ac7b582b91f0eb6976155f12e2b35dbb236044c538e6499129aca579f9bc7697379c323bc6b32d0796a74a28b816a2dfb188c84f
diff --git a/sys-cluster/vzctl/vzctl-4.9.2.ebuild b/sys-cluster/vzctl/vzctl-4.9.2.ebuild
deleted file mode 100644
index 2ec6e8f0c05a..000000000000
--- a/sys-cluster/vzctl/vzctl-4.9.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit base bash-completion-r1 eutils toolchain-funcs udev
-
-DESCRIPTION="OpenVZ ConTainers control utility"
-HOMEPAGE="http://openvz.org/"
-SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 -amd64-fbsd -sparc-fbsd -x86-fbsd"
-IUSE="+ploop +vzmigrate"
-
-RDEPEND="net-firewall/iptables
- sys-apps/ed
- >=sys-apps/iproute2-3.3.0
- >=sys-fs/vzquota-3.1
- ploop? (
- >=sys-cluster/ploop-1.13
- sys-block/parted
- sys-fs/quota
- dev-libs/libxml2
- )
- >=dev-libs/libcgroup-0.38
- vzmigrate? (
- net-misc/openssh
- net-misc/rsync[xattr,acl]
- app-arch/tar[xattr,acl]
- net-misc/bridge-utils
- virtual/awk
- )
- virtual/udev
- sys-apps/attr
- "
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- "
-
-src_prepare() {
-
- # Set default OSTEMPLATE on gentoo
- sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed'
- # Set proper udev directory
- sed -i -e "s:/lib/udev:$(get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed'
-}
-
-src_configure() {
-
- econf \
- --localstatedir=/var \
- --enable-udev \
- --enable-bashcomp \
- --enable-logrotate \
- --with-vz \
- $(use_with ploop) \
- --with-cgroup
-}
-
-src_install() {
-
- emake DESTDIR="${D}" udevdir="$(get_udevdir)"/rules.d install install-gentoo
-
- # install the bash-completion script into the right location
- rm -rf "${ED}"/etc/bash_completion.d
- newbashcomp etc/bash_completion.d/vzctl.sh ${PN}
-
- # We need to keep some dirs
- keepdir /vz/{dump,lock,root,private,template/cache}
- keepdir /etc/vz/names /var/lib/vzctl/veip
-}
-
-pkg_postinst() {
- einfo "This vzctl release required kernel above 2.6.32.92"
-
- einfo "If you have checkpoint suspend/restore feature in vanilla kernel"
- einfo "please install "sys-process/criu" "
- einfo "This is experimental and not stable ( in gentoo ) now"
-
- einfo "if you have work with .xz compressed template, please install app-arch/xz-utils"
- einfo "if you have check signature donwloaded template - install gpg "
-}
diff --git a/sys-cluster/vzctl/vzctl-4.9.3.ebuild b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
index 2db41861a115..2db41861a115 100644
--- a/sys-cluster/vzctl/vzctl-4.9.3.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 4c7662a85c69..ee59deb9b7db 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -73,7 +73,7 @@ DIST gcc-4.9.2-patches-1.6.tar.bz2 25006 SHA256 0c7219d375be35b16d0bc5e323a1e40b
DIST gcc-4.9.2-piepatches-v0.6.2.tar.bz2 14278 SHA256 f8876b172c2b4c5936b2cb18d3f092bfda8891bcdedcb569b63272a8530d81d0 SHA512 3f2d48743abba258ee6e298fc085f38d54c7b4cf4d431fe2efb83f718bdac3be916e67a3273aff1573db076decefbf4de3c4f706e102e6aafbce2371256048d8 WHIRLPOOL 76bbecad6d23793139040446721a5fb4711a9e272cf12545c51dd85c2d900e09e34dc0c260b80ad190a8072b475d779f5c6dd6b7891124bc4963b366f40989d3
DIST gcc-4.9.2-uclibc-patches-1.0.tar.bz2 2540 SHA256 3ca63cba5edb01367352fcd558890a838630deb4c30f82f4c7e8074ad75e57fc SHA512 69f6f80e23efee0b937fca0f2056e17b4fe643817d2394bbfd16cbb453d74c76a0bb8727815f689a795897d9cd5e06ecc74d3d9ad45175fe837ad008eee09706 WHIRLPOOL 3946513e83960fe891267e103e434cae0616cd45b5e7eaff5f4f671741c1445941cf80b7497231cf50f137941c01859dbbac0a95745fb7ae663a3ee512bd7162
DIST gcc-4.9.2.tar.bz2 89939747 SHA256 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd SHA512 e96cba06d572dbe7f382a2b00fd9297dcf9f9219d46a9ad0bd904dc36d5e7db3335e422640b79a27fed6fde91b0731732b94a0e2fbcd47344d6779f8ba1f4f9c WHIRLPOOL c4afdd0ec98e6f903044f1d3061fd96cf1e9bcbe2f90c388f5bc9ff8b2493b94367e84fdff7c2075ba37e2f950ecf2dba7c11786c653c2c7e86a5e8ff7d98e85
-DIST gcc-4.9.3-patches-1.2.tar.bz2 23657 SHA256 1eb0b19e9f048ba30b897154aa51d4c84e5c65eeaa35faa2614af5219b06529b SHA512 05eeb60c7b8a99f3b283caea06a8e1a015c41756496b67ed912467cb437dcb9d3bcefc235e6e1dd79c6f7364f378af6a3ebf52b333610a25a6f85cb10c4394b6 WHIRLPOOL d457b4fe4257cc4ef57317187b979d0a97f5c55d8ba4ddd2133e37d1f63299bfe35c3e11ab4efecc5c4f0361789773e5035b216d7fbbe4cdf4bc0c41be0aa655
+DIST gcc-4.9.3-patches-1.3.tar.bz2 23643 SHA256 a686a3097b6075fd40e25cde70ad881f22758565112395f03890c2f455f6b998 SHA512 d75960e64a52e0cea60eec863b7caaa434a07c25d410f78d9580f9890406aff5a648a61e718b2b812b4c5fc798ccbb82e9a16f05bc991af69f5a311795100ab9 WHIRLPOOL f98dbd2b587d292e0589b7dfe3a9d9ac5a2eb9b964bb7d1da75b5d958b11d5155b7604b6c1006def09c66045a8fc23379496bd0fd7909629d0e004ecf60aed66
DIST gcc-4.9.3-piepatches-v0.6.3.tar.bz2 14388 SHA256 268fd94cf905c9a9b95a259378c54a50763d1e13cc833cb0fc84ba33f0da78c4 SHA512 7e08934c729d06b578c420dcc845cb5fe274cb3f1f6eea8ba83a5031f0ba5f2c811e6b8fe5c2a72682030a71bf4134fd0e0d151452145899a7ae0318ebaf058a WHIRLPOOL 8f8d20c70061cd446d7c39d0f638c15ffaa64bc1cabc0f14c3f3632c76e432a3c4794cdb33799cacee754530876543902f53bca4465fca7d51c73f07eded9fe3
DIST gcc-4.9.3-uclibc-patches-1.0.tar.bz2 2515 SHA256 dd19904d4ab005ef142056228f326e75b3d4d79b8056189a505129b5940a575c SHA512 825092620a3c554ef06219fd1152c3677f1456315563b9e65282a73096e75600389e93298ed76cad41ce3eeecc6a7009ca722585b93c04095bd2d0a06c4404e6 WHIRLPOOL 0c184a5cc74f80a61f354ee85bc5a0f5b44d93bc9fa2e1892fbfe899958cfa5263b8b72cc4f905bc69bd1cc90cf870a6056c4003ec493b815646a72a0fe2e44e
DIST gcc-4.9.3.tar.bz2 90006707 SHA256 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e SHA512 9ac57377a6975fc7adac704ec81355262b9f537def6955576753b87715470a20ee6a2a3144a79cc8fcba3443f7b44c7337d79d704b522d053f54f79aa6b442df WHIRLPOOL 085e4cc1825b031652cbe9e098671f761acfeca64c6cc9b8ad2a8961c13fcac9e02b4538b44dc38181a355266f2c55c99ce5a1bff3f2860b870285cf3f0e84a5
diff --git a/sys-devel/gcc/gcc-4.9.3.ebuild b/sys-devel/gcc/gcc-4.9.3.ebuild
index 199d89f33bc1..5d2355ce6ec0 100644
--- a/sys-devel/gcc/gcc-4.9.3.ebuild
+++ b/sys-devel/gcc/gcc-4.9.3.ebuild
@@ -4,7 +4,7 @@
EAPI="4"
-PATCH_VER="1.2"
+PATCH_VER="1.3"
UCLIBC_VER="1.0"
# Hardened gcc 4 stuff
diff --git a/sys-devel/gdb/gdb-7.10-r1.ebuild b/sys-devel/gdb/gdb-7.10-r1.ebuild
index ec3031d7d1c2..9e9dde1288a0 100644
--- a/sys-devel/gdb/gdb-7.10-r1.ebuild
+++ b/sys-devel/gdb/gdb-7.10-r1.ebuild
@@ -143,6 +143,8 @@ src_configure() {
--enable-64-bit-bfd
--disable-install-libbfd
--disable-install-libiberty
+ # Disable guile for now as it requires guile-2.x #562902
+ --without-guile
# This only disables building in the readline subdir.
# For gdb itself, it'll use the system version.
--disable-readline
diff --git a/sys-devel/gdb/gdb-7.8.2.ebuild b/sys-devel/gdb/gdb-7.8.2.ebuild
index 46bdbb4a769b..8fe989bf270d 100644
--- a/sys-devel/gdb/gdb-7.8.2.ebuild
+++ b/sys-devel/gdb/gdb-7.8.2.ebuild
@@ -128,6 +128,8 @@ src_configure() {
--enable-64-bit-bfd
--disable-install-libbfd
--disable-install-libiberty
+ # Disable guile for now as it requires guile-2.x #562902
+ --without-guile
# This only disables building in the readline subdir.
# For gdb itself, it'll use the system version.
--disable-readline
diff --git a/sys-devel/gdb/gdb-7.9.1.ebuild b/sys-devel/gdb/gdb-7.9.1.ebuild
index 0f5a4d99b5eb..965d89bc72db 100644
--- a/sys-devel/gdb/gdb-7.9.1.ebuild
+++ b/sys-devel/gdb/gdb-7.9.1.ebuild
@@ -142,6 +142,8 @@ src_configure() {
--enable-64-bit-bfd
--disable-install-libbfd
--disable-install-libiberty
+ # Disable guile for now as it requires guile-2.x #562902
+ --without-guile
# This only disables building in the readline subdir.
# For gdb itself, it'll use the system version.
--disable-readline
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index ec3031d7d1c2..9e9dde1288a0 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -143,6 +143,8 @@ src_configure() {
--enable-64-bit-bfd
--disable-install-libbfd
--disable-install-libiberty
+ # Disable guile for now as it requires guile-2.x #562902
+ --without-guile
# This only disables building in the readline subdir.
# For gdb itself, it'll use the system version.
--disable-readline
diff --git a/sys-devel/gettext/gettext-0.19.4.ebuild b/sys-devel/gettext/gettext-0.19.4.ebuild
index de130c1f094b..6ceb3e7c5e46 100644
--- a/sys-devel/gettext/gettext-0.19.4.ebuild
+++ b/sys-devel/gettext/gettext-0.19.4.ebuild
@@ -4,16 +4,16 @@
EAPI="4"
-inherit flag-o-matic eutils multilib toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
+inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
DESCRIPTION="GNU locale utilities"
HOMEPAGE="https://www.gnu.org/software/gettext/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3 LGPL-2"
+LICENSE="GPL-3+ LGPL-2.1+"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc elibc_musl"
+IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
# only runtime goes multilib
DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
@@ -25,11 +25,7 @@ DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
RDEPEND="${DEPEND}
!git? ( cvs? ( dev-vcs/cvs ) )
git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r11
- )"
+ java? ( >=virtual/jre-1.4 )"
PDEPEND="emacs? ( app-emacs/po-mode )"
MULTILIB_WRAPPED_HEADERS=(
@@ -37,6 +33,11 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/gettext-po.h
)
+pkg_setup() {
+ mono-env_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
src_prepare() {
java-pkg-opt-2_src_prepare
epunt_cxx
@@ -68,9 +69,6 @@ multilib_src_configure() {
fi
use cxx || export CXX=$(tc-getCC)
- # Should be able to drop this hack in next release. #333887
- tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
-
local ECONF_SOURCE=${S}
if ! multilib_is_native_abi ; then
# for non-native ABIs, we build runtime only
diff --git a/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild b/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild
index dc2e22a61606..b6fb8a8ac2c2 100644
--- a/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild
+++ b/sys-devel/gettext/gettext-0.19.5.1-r1.ebuild
@@ -4,16 +4,16 @@
EAPI="4"
-inherit flag-o-matic eutils multilib toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
+inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
DESCRIPTION="GNU locale utilities"
HOMEPAGE="https://www.gnu.org/software/gettext/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3 LGPL-2"
+LICENSE="GPL-3+ LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc elibc_musl"
+IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
# only runtime goes multilib
DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
@@ -25,11 +25,7 @@ DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
RDEPEND="${DEPEND}
!git? ( cvs? ( dev-vcs/cvs ) )
git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r11
- )"
+ java? ( >=virtual/jre-1.4 )"
PDEPEND="emacs? ( app-emacs/po-mode )"
MULTILIB_WRAPPED_HEADERS=(
@@ -37,6 +33,11 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/gettext-po.h
)
+pkg_setup() {
+ mono-env_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
src_prepare() {
java-pkg-opt-2_src_prepare
@@ -74,9 +75,6 @@ multilib_src_configure() {
fi
use cxx || export CXX=$(tc-getCC)
- # Should be able to drop this hack in next release. #333887
- tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
-
local ECONF_SOURCE=${S}
if ! multilib_is_native_abi ; then
# for non-native ABIs, we build runtime only
diff --git a/sys-devel/gettext/gettext-0.19.5.ebuild b/sys-devel/gettext/gettext-0.19.5.ebuild
index 9e7d153732d5..0b284dd905df 100644
--- a/sys-devel/gettext/gettext-0.19.5.ebuild
+++ b/sys-devel/gettext/gettext-0.19.5.ebuild
@@ -4,16 +4,16 @@
EAPI="4"
-inherit flag-o-matic eutils multilib toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
+inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
DESCRIPTION="GNU locale utilities"
HOMEPAGE="https://www.gnu.org/software/gettext/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3 LGPL-2"
+LICENSE="GPL-3+ LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc elibc_musl"
+IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
# only runtime goes multilib
DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
@@ -25,11 +25,7 @@ DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
RDEPEND="${DEPEND}
!git? ( cvs? ( dev-vcs/cvs ) )
git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r11
- )"
+ java? ( >=virtual/jre-1.4 )"
PDEPEND="emacs? ( app-emacs/po-mode )"
MULTILIB_WRAPPED_HEADERS=(
@@ -37,6 +33,11 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/gettext-po.h
)
+pkg_setup() {
+ mono-env_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
src_prepare() {
java-pkg-opt-2_src_prepare
epunt_cxx
@@ -68,9 +69,6 @@ multilib_src_configure() {
fi
use cxx || export CXX=$(tc-getCC)
- # Should be able to drop this hack in next release. #333887
- tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
-
local ECONF_SOURCE=${S}
if ! multilib_is_native_abi ; then
# for non-native ABIs, we build runtime only
diff --git a/sys-devel/gettext/gettext-0.19.6-r1.ebuild b/sys-devel/gettext/gettext-0.19.6-r1.ebuild
new file mode 100644
index 000000000000..7677f88eb8dd
--- /dev/null
+++ b/sys-devel/gettext/gettext-0.19.6-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Note: Keep version bumps in sync with dev-libs/libintl.
+
+EAPI="5"
+
+inherit eutils mono-env libtool java-pkg-opt-2 multilib-minimal
+
+DESCRIPTION="GNU locale utilities"
+HOMEPAGE="https://www.gnu.org/software/gettext/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+# Only libasprintf is under the LGPL (and libintl is in a sep package),
+# so put that license behind USE=cxx.
+LICENSE="GPL-3+ cxx? ( LGPL-2.1+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs"
+
+# only runtime goes multilib
+# Note: expat lacks a subslot because it is dynamically loaded at runtime. We
+# would depend on older subslots if they were available (based on the ABIs that
+# are explicitly handled), but expat doesn't currently use subslots.
+DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+ >=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+ dev-libs/libxml2:=
+ dev-libs/expat
+ acl? ( virtual/acl )
+ ncurses? ( sys-libs/ncurses:0= )
+ java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}
+ !git? ( cvs? ( dev-vcs/cvs ) )
+ git? ( dev-vcs/git )
+ java? ( >=virtual/jre-1.4 )"
+PDEPEND="emacs? ( app-emacs/po-mode )"
+
+MULTILIB_WRAPPED_HEADERS=(
+ # only installed for native ABI
+ /usr/include/gettext-po.h
+)
+
+pkg_setup() {
+ mono-env_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ java-pkg-opt-2_src_prepare
+
+ epunt_cxx
+ elibtoolize
+}
+
+multilib_src_configure() {
+ local myconf=(
+ # switches common to runtime and top-level
+ --cache-file="${BUILD_DIR}"/config.cache
+ --docdir="/usr/share/doc/${PF}"
+
+ # Emacs support is now in a separate package
+ --without-emacs
+ --without-lispdir
+ # glib depends on us so avoid circular deps
+ --with-included-glib
+ # libcroco depends on glib which ... ^^^
+ --with-included-libcroco
+ # this will _disable_ libunistring (since it is not bundled),
+ # see bug #326477
+ --with-included-libunistring
+ # Never build libintl since it's in dev-libs/libintl now.
+ --without-included-gettext
+
+ $(use_enable acl)
+ $(use_enable cxx c++)
+ $(use_enable cxx libasprintf)
+ $(use_with git)
+ $(usex git --without-cvs $(use_with cvs))
+ $(use_enable java)
+ $(use_enable ncurses curses)
+ $(use_enable nls)
+ $(use_enable openmp)
+ $(use_enable static-libs static)
+ )
+
+ local ECONF_SOURCE=${S}
+ if ! multilib_is_native_abi ; then
+ # for non-native ABIs, we build runtime only
+ ECONF_SOURCE+=/gettext-runtime
+ fi
+
+ econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi ; then
+ dosym msgfmt /usr/bin/gmsgfmt #43435
+ dobin gettext-tools/misc/gettextize
+ fi
+}
+
+multilib_src_install_all() {
+ use nls || rm -r "${D}"/usr/share/locale
+ use static-libs || prune_libtool_files --all
+
+ rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
+
+ if use java ; then
+ java-pkg_dojar "${D}"/usr/share/${PN}/*.jar
+ rm -f "${D}"/usr/share/${PN}/*.jar
+ rm -f "${D}"/usr/share/${PN}/*.class
+ if use doc ; then
+ java-pkg_dojavadoc "${D}"/usr/share/doc/${PF}/javadoc2
+ rm -rf "${D}"/usr/share/doc/${PF}/javadoc2
+ fi
+ fi
+
+ if use doc ; then
+ dohtml "${D}"/usr/share/doc/${PF}/*.html
+ else
+ rm -rf "${D}"/usr/share/doc/${PF}/{csharpdoc,examples,javadoc2,javadoc1}
+ fi
+ rm -f "${D}"/usr/share/doc/${PF}/*.html
+
+ dodoc AUTHORS ChangeLog NEWS README THANKS
+}
+
+pkg_preinst() {
+ java-pkg-opt-2_pkg_preinst
+}
diff --git a/sys-devel/gettext/gettext-0.19.6.ebuild b/sys-devel/gettext/gettext-0.19.6.ebuild
index c024c12229fe..0f921c07273d 100644
--- a/sys-devel/gettext/gettext-0.19.6.ebuild
+++ b/sys-devel/gettext/gettext-0.19.6.ebuild
@@ -4,16 +4,16 @@
EAPI="4"
-inherit flag-o-matic eutils multilib toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
+inherit eutils toolchain-funcs mono-env libtool java-pkg-opt-2 multilib-minimal
DESCRIPTION="GNU locale utilities"
HOMEPAGE="https://www.gnu.org/software/gettext/"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3 LGPL-2"
+LICENSE="GPL-3+ LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc elibc_musl"
+IUSE="acl -cvs +cxx doc emacs git java ncurses nls openmp static-libs elibc_glibc elibc_musl"
# only runtime goes multilib
DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
@@ -25,11 +25,7 @@ DEPEND=">=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
RDEPEND="${DEPEND}
!git? ( cvs? ( dev-vcs/cvs ) )
git? ( dev-vcs/git )
- java? ( >=virtual/jre-1.4 )
- abi_x86_32? (
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- !<=app-emulation/emul-linux-x86-baselibs-20131008-r11
- )"
+ java? ( >=virtual/jre-1.4 )"
PDEPEND="emacs? ( app-emacs/po-mode )"
MULTILIB_WRAPPED_HEADERS=(
@@ -37,6 +33,11 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/gettext-po.h
)
+pkg_setup() {
+ mono-env_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
src_prepare() {
java-pkg-opt-2_src_prepare
@@ -69,9 +70,6 @@ multilib_src_configure() {
fi
use cxx || export CXX=$(tc-getCC)
- # Should be able to drop this hack in next release. #333887
- tc-is-cross-compiler && export gl_cv_func_working_acl_get_file=yes
-
local ECONF_SOURCE=${S}
if ! multilib_is_native_abi ; then
# for non-native ABIs, we build runtime only
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch
new file mode 100644
index 000000000000..c0f3a5ff3c8a
--- /dev/null
+++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-lldb_tinfo.patch
@@ -0,0 +1,12 @@
+--- tools/lldb/cmake/LLDBDependencies.cmake 2015/09/16 20:13:53 247841
++++ tools/lldb/cmake/LLDBDependencies.cmake 2015/09/16 20:14:01 247842
+@@ -141,6 +141,9 @@
+ endif()
+ if (NOT LLDB_DISABLE_CURSES)
+ list(APPEND LLDB_SYSTEM_LIBS panel ncurses)
++ if(LLVM_ENABLE_TERMINFO AND HAVE_TERMINFO)
++ list(APPEND LLDB_SYSTEM_LIBS ${TERMINFO_LIBS})
++ endif()
+ endif()
+ endif()
+ # On FreeBSD backtrace() is provided by libexecinfo, not libc.
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch
new file mode 100644
index 000000000000..d53ce193ca25
--- /dev/null
+++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-build_doc.patch
@@ -0,0 +1,12 @@
+diff -Naur llvm-3.7.0.src.orig/docs/CMakeLists.txt llvm-3.7.0.src/docs/CMakeLists.txt
+--- llvm-3.7.0.src.orig/docs/CMakeLists.txt 2015-08-18 18:48:44.000000000 +0200
++++ llvm-3.7.0.src/docs/CMakeLists.txt 2015-10-12 14:40:00.985384589 +0200
+@@ -115,7 +115,7 @@
+ endif()
+
+ list(FIND LLVM_BINDINGS_LIST ocaml uses_ocaml)
+-if( NOT uses_ocaml LESS 0 )
++if( NOT uses_ocaml LESS 0 AND LLVM_BUILD_DOCS )
+ set(doc_targets
+ ocaml_llvm
+ ocaml_llvm_all_backends
diff --git a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
index caba3d17bb74..024bad737de5 100644
--- a/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
+++ b/sys-devel/llvm/files/cmake/llvm-3.7.0-ocaml-multilib.patch
@@ -14,13 +14,13 @@
install(FILES ${install_files}
- DESTINATION lib/ocaml)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
install(FILES ${install_shlibs}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE
- DESTINATION lib/ocaml)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
foreach( install_file ${install_files} ${install_shlibs} )
get_filename_component(filename "${install_file}" NAME)
@@ -31,7 +31,7 @@
install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm_${TARGET}"
- DESTINATION lib/ocaml)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
endforeach()
--- llvm-3.7.0rc3.src-orig/bindings/ocaml/llvm/CMakeLists.txt 2014-12-30 14:24:07.000000000 +1100
+++ llvm-3.7.0rc3.src/bindings/ocaml/llvm/CMakeLists.txt 2015-08-30 19:23:43.561583624 +1000
@@ -40,4 +40,4 @@
install(FILES "${LLVM_LIBRARY_DIR}/ocaml/META.llvm"
- DESTINATION lib/ocaml)
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml)
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/ocaml/llvm)
diff --git a/sys-devel/llvm/files/llvm-3.7-lldb_python.patch b/sys-devel/llvm/files/llvm-3.7-lldb_python.patch
new file mode 100644
index 000000000000..1a958271e187
--- /dev/null
+++ b/sys-devel/llvm/files/llvm-3.7-lldb_python.patch
@@ -0,0 +1,23 @@
+diff -Naur llvm-3.7.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py llvm-3.7.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py
+--- llvm-3.7.0.src.orig/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2015-06-04 05:12:37.000000000 +0200
++++ llvm-3.7.0.src/tools/lldb/scripts/Python/finishSwigPythonLLDB.py 2015-10-11 19:19:54.074935710 +0200
+@@ -371,14 +371,14 @@
+ strLibFileExtn = ".dylib";
+ else:
+ strLibFileExtn = ".so";
+- strSrc = os.path.join("lib", "liblldb" + strLibFileExtn);
++ strSrc = os.path.join("GENTOO_LIBDIR", "liblldb" + strLibFileExtn);
+
+- if eOSType != utilsOsType.EnumOsType.Windows:
++# if eOSType != utilsOsType.EnumOsType.Windows:
+ # Create a symlink to the "lib" directory, to ensure liblldb's RPATH is
+ # effective.
+- bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, "lib", os.path.join("../lib") );
+- if not bOk:
+- return (bOk, strErrMsg)
++# bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, "lib", os.path.join("../lib") );
++# if not bOk:
++# return (bOk, strErrMsg)
+
+ bOk, strErrMsg = make_symlink( vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget );
+
diff --git a/sys-devel/llvm/llvm-3.7.0-r2.ebuild b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
new file mode 100644
index 000000000000..82c0d64b3db8
--- /dev/null
+++ b/sys-devel/llvm/llvm-3.7.0-r2.ebuild
@@ -0,0 +1,511 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit check-reqs cmake-utils eutils flag-o-matic multilib \
+ multilib-minimal python-r1 toolchain-funcs pax-utils
+
+DESCRIPTION="Low Level Virtual Machine"
+HOMEPAGE="http://llvm.org/"
+SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
+ clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
+ http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
+ http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
+ lldb? ( http://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz )
+ !doc? ( http://dev.gentoo.org/~voyageur/distfiles/${P}-manpages.tar.bz2 )"
+
+LICENSE="UoI-NCSA"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml
+ python +static-analyzer test xml video_cards_radeon kernel_Darwin"
+
+COMMON_DEPEND="
+ sys-libs/zlib:0=
+ clang? (
+ python? ( ${PYTHON_DEPS} )
+ static-analyzer? (
+ dev-lang/perl:*
+ ${PYTHON_DEPS}
+ )
+ xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
+ )
+ gold? ( >=sys-devel/binutils-2.22:*[cxx] )
+ libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
+ libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
+ ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
+ ocaml? (
+ >=dev-lang/ocaml-4.00.0:0=
+ dev-ml/findlib
+ dev-ml/ocaml-ctypes
+ !!<=sys-devel/llvm-3.7.0-r2[ocaml] )"
+# configparser-3.2 breaks the build (3.3 or none at all are fine)
+DEPEND="${COMMON_DEPEND}
+ dev-lang/perl
+ >=sys-devel/make-3.81
+ >=sys-devel/flex-2.5.4
+ >=sys-devel/bison-1.875d
+ || ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
+ ( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
+ )
+ || ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
+ kernel_Darwin? ( sys-libs/libcxx )
+ clang? ( xml? ( virtual/pkgconfig ) )
+ doc? ( dev-python/sphinx )
+ gold? ( sys-libs/binutils-libs )
+ libffi? ( virtual/pkgconfig )
+ lldb? ( dev-lang/swig )
+ !!<dev-python/configparser-3.3.0.2
+ ocaml? ( test? ( dev-ml/ounit ) )
+ ${PYTHON_DEPS}"
+RDEPEND="${COMMON_DEPEND}
+ clang? ( !<=sys-devel/clang-${PV}-r99 )
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+PDEPEND="clang? ( =sys-devel/clang-${PV}-r100 )"
+
+# pypy gives me around 1700 unresolved tests due to open file limit
+# being exceeded. probably GC does not close them fast enough.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ lldb? ( clang )
+ test? ( || ( $(python_gen_useflags 'python*') ) )"
+
+S=${WORKDIR}/${P/_}.src
+
+pkg_pretend() {
+ # in megs
+ # !clang !debug !multitarget -O2 400
+ # !clang !debug multitarget -O2 550
+ # clang !debug !multitarget -O2 950
+ # clang !debug multitarget -O2 1200
+ # !clang debug multitarget -O2 5G
+ # clang !debug multitarget -O0 -g 12G
+ # clang debug multitarget -O2 16G
+ # clang debug multitarget -O0 -g 14G
+
+ local build_size=550
+ use clang && build_size=1200
+
+ if use debug; then
+ ewarn "USE=debug is known to increase the size of package considerably"
+ ewarn "and cause the tests to fail."
+ ewarn
+
+ (( build_size *= 14 ))
+ elif is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn "The C++ compiler -g option is known to increase the size of the package"
+ ewarn "considerably. If you run out of space, please consider removing it."
+ ewarn
+
+ (( build_size *= 10 ))
+ fi
+
+ # Multiply by number of ABIs :).
+ local abis=( $(multilib_get_enabled_abis) )
+ (( build_size *= ${#abis[@]} ))
+
+ local CHECKREQS_DISK_BUILD=${build_size}M
+ check-reqs_pkg_pretend
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ echo 'int main() {return 0;}' > "${T}"/test.cxx || die
+ ebegin "Trying to build a C++11 test program"
+ if ! $(tc-getCXX) -std=c++11 -o /dev/null "${T}"/test.cxx; then
+ eerror "LLVM-${PV} requires C++11-capable C++ compiler. Your current compiler"
+ eerror "does not seem to support -std=c++11 option. Please upgrade your compiler"
+ eerror "to gcc-4.7 or an equivalent version supporting C++11."
+ die "Currently active compiler does not support -std=c++11"
+ fi
+ eend ${?}
+ fi
+}
+
+pkg_setup() {
+ pkg_pretend
+}
+
+src_unpack() {
+ default
+
+ if use clang; then
+ mv "${WORKDIR}"/cfe-${PV/_}.src "${S}"/tools/clang \
+ || die "clang source directory move failed"
+ mv "${WORKDIR}"/compiler-rt-${PV/_}.src "${S}"/projects/compiler-rt \
+ || die "compiler-rt source directory move failed"
+ mv "${WORKDIR}"/clang-tools-extra-${PV/_}.src "${S}"/tools/clang/tools/extra \
+ || die "clang-tools-extra source directory move failed"
+ fi
+
+ if use lldb; then
+ mv "${WORKDIR}"/lldb-${PV/_}.src "${S}"/tools/lldb \
+ || die "lldb source directory move failed"
+ fi
+}
+
+src_prepare() {
+ # Make ocaml warnings non-fatal, bug #537308
+ sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml || die
+ # Fix libdir for ocaml bindings install, bug #559134
+ epatch "${FILESDIR}"/cmake/${P}-ocaml-multilib.patch
+ # Do not build/install ocaml docs with USE=-doc, bug #562008
+ epatch "${FILESDIR}"/cmake/${P}-ocaml-build_doc.patch
+
+ # Make it possible to override Sphinx HTML install dirs
+ # https://llvm.org/bugs/show_bug.cgi?id=23780
+ epatch "${FILESDIR}"/cmake/0002-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+
+ # Prevent race conditions with parallel Sphinx runs
+ # https://llvm.org/bugs/show_bug.cgi?id=23781
+ epatch "${FILESDIR}"/cmake/0003-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+
+ # Prevent installing libgtest
+ # https://llvm.org/bugs/show_bug.cgi?id=18341
+ epatch "${FILESDIR}"/cmake/0004-cmake-Do-not-install-libgtest.patch
+
+ if use clang; then
+ # Automatically select active system GCC's libraries, bugs #406163 and #417913
+ epatch "${FILESDIR}"/clang-3.5-gentoo-runtime-gcc-detection-v3.patch
+
+ epatch "${FILESDIR}"/clang-3.6-gentoo-install.patch
+
+ sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
+ tools/clang/tools/scan-build/scan-build || die
+
+ # Install clang runtime into /usr/lib/clang
+ # https://llvm.org/bugs/show_bug.cgi?id=23792
+ epatch "${FILESDIR}"/cmake/clang-0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+ epatch "${FILESDIR}"/cmake/compiler-rt-0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+
+ # Make it possible to override CLANG_LIBDIR_SUFFIX
+ # (that is used only to find LLVMgold.so)
+ # https://llvm.org/bugs/show_bug.cgi?id=23793
+ epatch "${FILESDIR}"/cmake/clang-0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+
+ # Fix WX sections, bug #421527
+ find "${S}"/projects/compiler-rt/lib/builtins -type f -name \*.S -exec sed \
+ -e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
+ -i {} \; || die
+ fi
+
+ if use lldb; then
+ # Do not install dummy readline.so module from
+ # https://llvm.org/bugs/show_bug.cgi?id=18841
+ sed -e 's/add_subdirectory(readline)/#&/' \
+ -i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
+
+ # Fix Python paths, bugs #562436 and #562438
+ epatch "${FILESDIR}"/${PN}-3.7-lldb_python.patch
+ sed -e "s/GENTOO_LIBDIR/$(get_libdir)/" \
+ -i tools/lldb/scripts/Python/finishSwigPythonLLDB.py || die
+
+ # Fix build with ncurses[tinfo], #560474
+ # http://llvm.org/viewvc/llvm-project?view=revision&revision=247842
+ epatch "${FILESDIR}"/cmake/${P}-lldb_tinfo.patch
+ fi
+
+ # User patches
+ epatch_user
+
+ python_setup
+
+ # Native libdir is used to hold LLVMgold.so
+ NATIVE_LIBDIR=$(get_libdir)
+}
+
+multilib_src_configure() {
+ local targets
+ if use multitarget; then
+ targets=all
+ else
+ targets='host;CppBackend'
+ use video_cards_radeon && targets+=';AMDGPU'
+ fi
+
+ local ffi_cflags ffi_ldflags
+ if use libffi; then
+ ffi_cflags=$(pkg-config --cflags-only-I libffi)
+ ffi_ldflags=$(pkg-config --libs-only-L libffi)
+ fi
+
+ local libdir=$(get_libdir)
+ local mycmakeargs=(
+ "${mycmakeargs[@]}"
+ -DLLVM_LIBDIR_SUFFIX=${libdir#lib}
+
+ -DBUILD_SHARED_LIBS=ON
+ -DLLVM_ENABLE_TIMESTAMPS=OFF
+ -DLLVM_TARGETS_TO_BUILD="${targets}"
+ -DLLVM_BUILD_TESTS=$(usex test)
+
+ -DLLVM_ENABLE_FFI=$(usex libffi)
+ -DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+ -DLLVM_ENABLE_ASSERTIONS=$(usex debug)
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+
+ -DWITH_POLLY=OFF # TODO
+
+ -DLLVM_HOST_TRIPLE="${CHOST}"
+
+ -DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
+ -DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
+
+ -DHAVE_HISTEDIT_H=$(usex libedit)
+ )
+
+ if use lldb; then
+ mycmakeargs+=(
+ -DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+ -DLLDB_DISABLE_CURSES=$(usex !ncurses)
+ -DLLDB_ENABLE_TERMINFO=$(usex ncurses)
+ )
+ fi
+
+ if ! multilib_is_native_abi || ! use ocaml; then
+ mycmakeargs+=(
+ -DOCAMLFIND=NO
+ )
+ fi
+# Note: go bindings have no CMake rules at the moment
+# but let's kill the check in case they are introduced
+# if ! multilib_is_native_abi || ! use go; then
+ mycmakeargs+=(
+ -DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
+ )
+# fi
+
+ if multilib_is_native_abi; then
+ mycmakeargs+=(
+ -DLLVM_BUILD_DOCS=$(usex doc)
+ -DLLVM_ENABLE_SPHINX=$(usex doc)
+ -DLLVM_ENABLE_DOXYGEN=OFF
+ -DLLVM_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/html"
+ -DSPHINX_WARNINGS_AS_ERRORS=OFF
+ -DLLVM_INSTALL_UTILS=ON
+ )
+
+ if use clang; then
+ mycmakeargs+=(
+ -DCLANG_INSTALL_HTML="${EPREFIX}/usr/share/doc/${PF}/clang"
+ )
+ fi
+
+ if use gold; then
+ mycmakeargs+=(
+ -DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
+ )
+ fi
+
+ if use lldb; then
+ mycmakeargs+=(
+ -DLLDB_DISABLE_PYTHON=$(usex !python)
+ )
+ fi
+
+ else
+ if use clang; then
+ mycmakeargs+=(
+ # disable compiler-rt on non-native ABI because:
+ # 1. it fails to configure because of -m32
+ # 2. it is shared between ABIs so no point building
+ # it multiple times
+ -DLLVM_EXTERNAL_COMPILER_RT_BUILD=OFF
+ -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_BUILD=OFF
+ )
+ fi
+ if use lldb; then
+ mycmakeargs+=(
+ # only run swig on native abi
+ -DLLDB_DISABLE_PYTHON=ON
+ )
+ fi
+ fi
+
+ if use clang; then
+ mycmakeargs+=(
+ -DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
+ -DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
+ -DCLANG_LIBDIR_SUFFIX="${NATIVE_LIBDIR#lib}"
+ )
+
+ # -- not needed when compiler-rt is built with host compiler --
+ # cmake passes host C*FLAGS to compiler-rt build
+ # which is performed using clang, so we need to filter out
+ # some flags clang does not support
+ # (if you know some more flags that don't work, let us know)
+ #filter-flags -msahf -frecord-gcc-switches
+ fi
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ # TODO: not sure why this target is not correctly called
+ multilib_is_native_abi && use doc && use ocaml && cmake-utils_src_make docs/ocaml_doc
+
+ pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
+ pax-mark m "${BUILD_DIR}"/bin/lli
+ pax-mark m "${BUILD_DIR}"/bin/lli-child-target
+
+ if use test; then
+ pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
+ pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
+ pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
+ fi
+}
+
+multilib_src_test() {
+ # respect TMPDIR!
+ local -x LIT_PRESERVES_TMP=1
+ local test_targets=( check )
+ # clang tests won't work on non-native ABI because we skip compiler-rt
+ multilib_is_native_abi && use clang && test_targets+=( check-clang )
+ cmake-utils_src_make "${test_targets[@]}"
+}
+
+src_install() {
+ local MULTILIB_CHOST_TOOLS=(
+ /usr/bin/llvm-config
+ )
+
+ local MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/llvm/Config/config.h
+ /usr/include/llvm/Config/llvm-config.h
+ )
+
+ if use clang; then
+ # note: magic applied in multilib_src_install()!
+ CLANG_VERSION=${PV%.*}
+
+ MULTILIB_CHOST_TOOLS+=(
+ /usr/bin/clang
+ /usr/bin/clang++
+ /usr/bin/clang-cl
+ /usr/bin/clang-${CLANG_VERSION}
+ /usr/bin/clang++-${CLANG_VERSION}
+ /usr/bin/clang-cl-${CLANG_VERSION}
+ )
+
+ MULTILIB_WRAPPED_HEADERS+=(
+ /usr/include/clang/Config/config.h
+ )
+ fi
+
+ multilib-minimal_src_install
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+
+ if multilib_is_native_abi; then
+ # Install man pages.
+ use doc || doman "${WORKDIR}"/${P}-manpages/*.1
+
+ # Symlink the gold plugin.
+ if use gold; then
+ dodir "/usr/${CHOST}/binutils-bin/lib/bfd-plugins"
+ dosym "../../../../$(get_libdir)/LLVMgold.so" \
+ "/usr/${CHOST}/binutils-bin/lib/bfd-plugins/LLVMgold.so"
+ fi
+ fi
+
+ # apply CHOST and CLANG_VERSION to clang executables
+ # they're statically linked so we don't have to worry about the lib
+ if use clang; then
+ local clang_tools=( clang clang++ clang-cl )
+ local i
+
+ # cmake gives us:
+ # - clang-X.Y
+ # - clang -> clang-X.Y
+ # - clang++, clang-cl -> clang
+ # we want to have:
+ # - clang-X.Y
+ # - clang++-X.Y, clang-cl-X.Y -> clang-X.Y
+ # - clang, clang++, clang-cl -> clang*-X.Y
+ # so we need to fix the two tools
+ for i in "${clang_tools[@]:1}"; do
+ rm "${ED%/}/usr/bin/${i}" || die
+ dosym "clang-${CLANG_VERSION}" "/usr/bin/${i}-${CLANG_VERSION}"
+ dosym "${i}-${CLANG_VERSION}" "/usr/bin/${i}"
+ done
+
+ # now prepend ${CHOST} and let the multilib-build.eclass symlink it
+ if ! multilib_is_native_abi; then
+ # non-native? let's replace it with a simple wrapper
+ for i in "${clang_tools[@]}"; do
+ rm "${ED%/}/usr/bin/${i}-${CLANG_VERSION}" || die
+ cat > "${T}"/wrapper.tmp <<-_EOF_
+ #!${EPREFIX}/bin/sh
+ exec "${i}-${CLANG_VERSION}" $(get_abi_CFLAGS) "\${@}"
+ _EOF_
+ newbin "${T}"/wrapper.tmp "${i}-${CLANG_VERSION}"
+ done
+ fi
+ fi
+}
+
+multilib_src_install_all() {
+ insinto /usr/share/vim/vimfiles
+ doins -r utils/vim/*/
+ # some users may find it useful
+ dodoc utils/vim/vimrc
+
+ if use clang; then
+ pushd tools/clang >/dev/null || die
+
+ if use static-analyzer ; then
+ pushd tools/scan-build >/dev/null || die
+
+ dobin ccc-analyzer scan-build
+ dosym ccc-analyzer /usr/bin/c++-analyzer
+ doman scan-build.1
+
+ insinto /usr/share/llvm
+ doins scanview.css sorttable.js
+
+ popd >/dev/null || die
+ fi
+
+ python_inst() {
+ if use static-analyzer ; then
+ pushd tools/scan-view >/dev/null || die
+
+ python_doscript scan-view
+
+ touch __init__.py || die
+ python_moduleinto clang
+ python_domodule *.py Resources
+
+ popd >/dev/null || die
+ fi
+
+ if use python ; then
+ pushd bindings/python/clang >/dev/null || die
+
+ python_moduleinto clang
+ python_domodule *.py
+
+ popd >/dev/null || die
+ fi
+
+ # AddressSanitizer symbolizer (currently separate)
+ python_doscript "${S}"/projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
+ }
+ python_foreach_impl python_inst
+ popd >/dev/null || die
+ fi
+}
+
+pkg_postinst() {
+ if use clang; then
+ elog "To enable OpenMP support in clang, install sys-libs/libomp"
+ elog "and use the '-fopenmp=libomp' command line option"
+ fi
+}
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 6604433d0ce7..e341564a78bd 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -6,3 +6,4 @@ DIST aufs3-standalone-3_p20150518.tar.xz 2967016 SHA256 f938bdcc461dacf2b59c807b
DIST aufs3-standalone-3_p20150525.tar.xz 2988108 SHA256 117be76206e67425c4144174afaa347c4f9e9414200899b5c43a8ec0b91c7d03 SHA512 ea6031ff9231ce68b95450e428989ad81b1c6ce4a9a21f718f73dbafd3aa1e12191d7abd57829e0f80cc0cf0aa412e35b2cad4e14430078b88b2e17312d7b708 WHIRLPOOL 81aeff069ebc6122856c74fcdd38784bd7a231c99726a73ddaad04f145978053fd3ff8b788ac0995fa261cfbf62d461c43f8dca887525df887fdb0011a417f40
DIST aufs3-standalone-3_p20150608.tar.xz 3015460 SHA256 cdf92d07f45becfeb70ea3314e554ea9c8766a2815c3aa6c8d634b5307c76d5d SHA512 4d29d2d4908cd7a4471bc3efe5c23e57d41765937c700eee8593a5c07d7e84e12e6093ef4338b6bd4e9e6f0e44674557a659fd5fa5257a79b381385d208c2209 WHIRLPOOL ccf68e64eb5bc1893c2e5d50c6fc3eaf4e71fd06949ae16e4343734dca39f7f016ab0a08796d444efe55947a8645193979c0dccce702d8c38e46207bfde4f1ad
DIST aufs3-standalone-3_p20150622.tar.xz 3063280 SHA256 2fa44f9df9d58df7a5251ebd2cec206fa90ca8e110c1f657df18e62adb170517 SHA512 fe7a62249130d68f72b14f21b57e5d6db402f56637afc876068d916e78884d08476c804ac58ef06eeb9e13e0a2e1cb75ac782f83054f1c06cb85c74a3c48ba01 WHIRLPOOL 7f85a5324d51e148c97109357c13fcab76121d25ee006211d2212f9c6d352330be110569848c8ca96421bc4582025c73030329d7e501837e4d18cafd6002f153
+DIST aufs3-standalone-3_p20151012.tar.xz 3122148 SHA256 f54f1f19bec26f653939e00b30007a465a1f555356ec3886f2a5970276494d0e SHA512 fcf251f358c0dfb66387744d1a1339b2bbcc979c7cc86d01068d108abd6a765c69ecce56cc182d385006febf5abf093fb2c2af77e4cc149134ac413a26b4118f WHIRLPOOL 06be7483792bceea58b26d733c1eed6f69ddd81cd49617550c3414e1800964690b69c1ee9f12b1d48887d051d6b0488a009a56aec0df7cbcc5625ca27f9043f8
diff --git a/sys-fs/aufs3/aufs3-3_p20151012.ebuild b/sys-fs/aufs3/aufs3-3_p20151012.ebuild
new file mode 100644
index 000000000000..9930d1ec65b1
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20151012.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=19
+# highest supported version
+KERN_MAX_VER=20
+# lowest supported version
+KERN_MIN_VER=14
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+ dev-util/patchutils
+ dev-vcs/git"
+RDEPEND="
+ sys-fs/aufs-util
+ !sys-fs/aufs
+ !sys-fs/aufs2
+ !sys-fs/aufs4"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+ CONFIG_CHECK+=" !AUFS_FS"
+ use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+ use nfs && CONFIG_CHECK+=" EXPORTFS"
+ use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+ use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+ use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+ # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+ [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+ get_version
+ kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+ kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+ linux-mod_pkg_setup
+
+ if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+ PATCH_BRANCH="x-rcN"
+ elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
+ PATCH_BRANCH="${KV_MINOR}".21+
+ elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
+ PATCH_BRANCH="${KV_MINOR}".1+
+ else
+ PATCH_BRANCH="${KV_MINOR}"
+ fi
+
+ case ${KV_EXTRA} in
+ "")
+ elog "It seems you are using vanilla-sources with aufs3"
+ elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+ elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+ ;;
+ "-gentoo")
+ elog "It seems you are using gentoo-sources with aufs3"
+ elog "Please use sys-kernel/aufs-sources"
+ elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
+ ;;
+ esac
+
+ pushd "${T}" &> /dev/null
+ unpack ${A}
+ cd ${PN}-standalone || die
+ local module_branch=origin/${PN}.${PATCH_BRANCH}
+ einfo "Using ${module_branch} as patch source"
+ git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+ combinediff ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
+ combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+ if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+ if use kernel-patch; then
+ cd ${KV_DIR}
+ ewarn "Patching your kernel..."
+ patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+ epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+ ewarn "You need to compile your kernel with the applied patch"
+ ewarn "to be able to load and use the aufs kernel module"
+ else
+ eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+ eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+ eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+ die "missing kernel patch, please apply it first"
+ fi
+ fi
+ popd &> /dev/null
+ export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+ for option in $*; do
+ grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+ sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+ done
+}
+
+src_prepare() {
+ local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+ einfo "Using for module creation branch ${module_branch}"
+ git checkout -q -b local-gentoo ${module_branch} || die
+
+ # All config options to off
+ sed "s:= y:=:g" -i config.mk || die
+
+ set_config RDU BRANCH_MAX_127 SBILIST
+
+ use debug && set_config DEBUG
+ use fuse && set_config BR_FUSE POLL
+ use hfs && set_config BR_HFSPLUS
+ use inotify && set_config HNOTIFY HFSNOTIFY
+ use nfs && set_config EXPORT
+ use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+ use ramfs && set_config BR_RAMFS
+
+ if use pax_kernel; then
+ if kernel_is ge 3 11; then
+ epatch "${FILESDIR}"/pax-3.11.patch
+ else
+ epatch "${FILESDIR}"/pax-3.patch
+ fi
+ fi
+
+ sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+ local ARCH=x86
+
+ emake \
+ CC=$(tc-getCC) \
+ LD=$(tc-getLD) \
+ LDFLAGS="$(raw-ldflags)" \
+ ARCH=$(tc-arch-kernel) \
+ CONFIG_AUFS_FS=m \
+ KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+ linux-mod_src_install
+
+ insinto /usr/share/doc/${PF}
+
+ use doc && doins -r Documentation
+
+ use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+ dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_pkg_postinst
+ linux-mod_pkg_postinst
+}
diff --git a/sys-fs/aufs3/metadata.xml b/sys-fs/aufs3/metadata.xml
index 1a39d4b8e6bc..f2a4b5a8cc0e 100644
--- a/sys-fs/aufs3/metadata.xml
+++ b/sys-fs/aufs3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
index d382c8073831..86af950287ea 100644
--- a/sys-fs/aufs4/Manifest
+++ b/sys-fs/aufs4/Manifest
@@ -1,4 +1,4 @@
-DIST aufs4-standalone-0_pre20150420.tar.xz 424400 SHA256 7d96ee8bb16a4b72d60bfbab2955f5e68aec5a01d61a0a4870bb90f69099ad0f SHA512 71e460c582591861a1042fe628b186f081581f61fef61ccdc1ddb98ae7ee289ae58922c9df1549109f4351c8de3858fb3b2eb040f7e1da488f05f5b954468311 WHIRLPOOL f6b324404a62b465cd8a2d677000c4b4c7f951fa502f7ed6e5634d4a39dc90bb87e245a7f7036379a02d8e7f8a9fc64801c33e86ceb747b63912b8509d68a925
+DIST aufs4-standalone-0_pre20150420.tar.xz 424360 SHA256 b570006f74faffa91906091ae07dd0441b57f0a1b90f3cbce3585d2b601c98b8 SHA512 51aff25489299e3c59457eea6076e15fb1179233292ad799b4b755368925500fe57fd336361f0cfe7f2d3b8d5469693c1049b8528038a5f0f1baa07b665af9ac WHIRLPOOL 7bd4f604613b3afa94b57eb273fa074334aa0273d21b9db139c8ad13e138defe9f86334d0784c2c3072f86cfcbdcaa5baaea621e72550524248ec1a733dba9e1
DIST aufs4-standalone-0_pre20150504.tar.xz 466636 SHA256 b14bba141ead117ff9193a8a896a2bcefc418e11e642eb8547d4785833d70261 SHA512 c1299eb6ca179e60e60be2f7792001e2277f9507fd416994abd41c43e066be46ea508eaface45740153e4c34ccfcdcb3aa6a6118c840786fb1abf5aa56d6cc63 WHIRLPOOL 37bf469947c8ef5e0724e37fa40ec9535ff4065f81e64d45d924c16bb1d059d526ae853d0a73cd67de2aeacd3c41444a3a51545e9a12d08c0b8b27b526fa4dff
DIST aufs4-standalone-0_pre20150511.tar.xz 501548 SHA256 a26e5e684c1878d0bd8e18c512979a6d0cccd9b1c8219746fe3d93ab1448f1be SHA512 da123ea8da38c840de76201284bf6846d794421e38e6193206ac753380eab3ecea33724c23c7b25d62f933c0c3d1e67082d17c1e702eefdb24c722808b88a69d WHIRLPOOL c7d2c81119933a55f0aa357fbc840f4a60597144386150c45260f2c7b99a0722d362595558df4b0db146c0fe65fb6886b002186e15a5e8cea00b3a04075a5500
DIST aufs4-standalone-0_pre20150518.tar.xz 515624 SHA256 e2c2aeb02dce4f2b15da8459e92e90896c0fc795d6df829e2cab4eb2a82174a1 SHA512 4188d4d7928e1ee8ce88a7a079ee75c0ab9695c3e23db66952ff9d276ad3cfa5dbed1585dabe05856c5f3417d436fa3a1f93645ee68ebaa65a21610de8e34aca WHIRLPOOL 013672a12293ffe9067013d0295f6d797fafafa9f1ca49eb37a831fb77addac52dee804b9c809eadf4d18205a81e419be0b0b273d875a0f04e657498ccf95af8
@@ -7,3 +7,4 @@ DIST aufs4-standalone-0_pre20150608.tar.xz 532144 SHA256 8aaa1f348de3b6cfa86f215
DIST aufs4-standalone-0_pre20150622.tar.xz 543932 SHA256 28de7f6968c62a48b78f4b6c9234dd4b7b134632e1d4e7d50e87da9e05c06343 SHA512 82f130ed3b43e2bfe42079c96dca70e868d7ce1df5511f68e7b85d343105d452c334fe7a15c1cd4e01450ca39dd527123c060b98b396d13c4250541ec464c2fc WHIRLPOOL e46a01857f2cbd52e6a3717bc5d076197443146fa9eab3b542aeb2698da652a45e8d40e1f9f50d9d4c3fc34d9a6da225712ac32f27f15eded4e8e3f23e113de8
DIST aufs4-standalone-0_pre20150629.tar.xz 547808 SHA256 7c1d9a815c73e8cb1c9f909eee8f6945486c8e8feeea9cae4b3865b6032f17e5 SHA512 b7c734fb83515790b58a81b904acb286ef52124e0799dad1c7900dc8af3e0dc6f2875ba86805f1f39b8d04ce6660bf0c0307e4bbc1b58f2ca6171ead5e668a94 WHIRLPOOL b39f2cdeffd20b636c4a3aa5ec8e87cd6b1c8bdfdab071d1cabf53e10629beebffc919abf5fc90915ec0c14f4b4c45a510bbd303765564348a0e2d1688ddf79b
DIST aufs4-standalone-0_pre20150928.tar.xz 649700 SHA256 614a7d36577d9c432deba647ae925a05f05468fcf9af54c84c553ee9f4b4ccb8 SHA512 69182e8ef0cd8bb251bd579e18aea1fdc5b38d16f9bd8a7dd23eaf84ae86bb24dd011871f90a0d0c1434a6136b9dcc70ed07b6f8301344d13083cd6a755c75ba WHIRLPOOL b43eb05904917f74ea38bd148543552dc1d40eb590cf5059a884dcba909e76943cb9e2d1b873300701ffbc6061beeb3efb76f8014e08a8742c48c38cd6c5fe53
+DIST aufs4-standalone-0_pre20151012.tar.xz 651492 SHA256 3cb564a71a4d4fe4f16c9412b5c714645739beea9471db421d76f1af2af86d83 SHA512 abf1833a4902dc95cce203607cd715b6794b13e064c073139bc06facfd86ceb817d00d7bed0f5420d8f8f7c9205524a8ffc9431dc1c0d2da1e73393b7d89d33d WHIRLPOOL a8cb9e8fc4449dbc54e1bfab1c9acb61e7dc31c33c62d8a2e2feb407bc6d4a2ceb502fd85ac7519af1e9b028603525ee26763438e04736fee138420796c13e90
diff --git a/sys-fs/aufs4/aufs4-0_pre20151012.ebuild b/sys-fs/aufs4/aufs4-0_pre20151012.ebuild
new file mode 100644
index 000000000000..e9d57d6b5a63
--- /dev/null
+++ b/sys-fs/aufs4/aufs4-0_pre20151012.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=2
+# highest supported version
+KERN_MAX_VER=3
+# lowest supported version
+KERN_MIN_VER=0
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+ dev-util/patchutils
+ dev-vcs/git"
+RDEPEND="
+ sys-fs/aufs-util
+ !sys-fs/aufs
+ !sys-fs/aufs2
+ !sys-fs/aufs3"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+ CONFIG_CHECK+=" !AUFS_FS"
+ use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+ use nfs && CONFIG_CHECK+=" EXPORTFS"
+ use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+ use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+ use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+ # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+ [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+ get_version
+ kernel_is lt 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
+ kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+ linux-mod_pkg_setup
+
+ if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+ PATCH_BRANCH="x-rcN"
+ else
+ PATCH_BRANCH="${KV_MINOR}"
+ fi
+
+ case ${KV_EXTRA} in
+ "")
+ elog "It seems you are using vanilla-sources with aufs4"
+ elog "Please use sys-kernel/aufs-sources with USE=vanilla"
+ elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+ ;;
+ "-gentoo")
+ elog "It seems you are using gentoo-sources with aufs4"
+ elog "Please use sys-kernel/aufs-sources"
+ elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
+ ;;
+ esac
+
+ pushd "${T}" &> /dev/null
+ unpack ${A}
+ cd ${PN}-standalone || die
+ local module_branch=origin/${PN}.${PATCH_BRANCH}
+ einfo "Using ${module_branch} as patch source"
+ git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+ combinediff ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
+ combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
+ if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
+ if use kernel-patch; then
+ cd ${KV_DIR}
+ ewarn "Patching your kernel..."
+ patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
+ epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+ ewarn "You need to compile your kernel with the applied patch"
+ ewarn "to be able to load and use the aufs kernel module"
+ else
+ eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+ eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+ eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
+ die "missing kernel patch, please apply it first"
+ fi
+ fi
+ popd &> /dev/null
+ export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+ for option in $*; do
+ grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+ sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+ done
+}
+
+src_prepare() {
+ local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+ einfo "Using for module creation branch ${module_branch}"
+ git checkout -q -b local-gentoo ${module_branch} || die
+
+ # All config options to off
+ sed "s:= y:=:g" -i config.mk || die
+
+ set_config RDU BRANCH_MAX_127 SBILIST
+
+ use debug && set_config DEBUG
+ use fuse && set_config BR_FUSE POLL
+ use hfs && set_config BR_HFSPLUS
+ use inotify && set_config HNOTIFY HFSNOTIFY
+ use nfs && set_config EXPORT
+ use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+ use ramfs && set_config BR_RAMFS
+
+ if use pax_kernel; then
+ epatch "${FILESDIR}"/pax-4.patch
+ fi
+
+ sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+ local ARCH=x86
+
+ emake \
+ CC=$(tc-getCC) \
+ LD=$(tc-getLD) \
+ LDFLAGS="$(raw-ldflags)" \
+ ARCH=$(tc-arch-kernel) \
+ CONFIG_AUFS_FS=m \
+ KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+ linux-mod_src_install
+
+ insinto /usr/share/doc/${PF}
+
+ use doc && doins -r Documentation
+
+ use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
+
+ dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ readme.gentoo_pkg_postinst
+ linux-mod_pkg_postinst
+}
diff --git a/sys-fs/aufs4/metadata.xml b/sys-fs/aufs4/metadata.xml
index 1a39d4b8e6bc..f2a4b5a8cc0e 100644
--- a/sys-fs/aufs4/metadata.xml
+++ b/sys-fs/aufs4/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest
index 216ceb486d1d..4cbcd0fb0175 100644
--- a/sys-fs/bcache-tools/Manifest
+++ b/sys-fs/bcache-tools/Manifest
@@ -1,3 +1,2 @@
-DIST bcache-tools-0_pre20130627.tar.xz 17812 SHA256 aca02134fa3e18b27020e6500a21ff017fecadd3d64acbadc419efccc4abeacc SHA512 b3167ba61560f17ff5d1ac9e8514c9b7b5f02cc97500a5d68885bb4a04f92c50621095c922fdca1f6ff4d79955b3cd77dc42c5cda08525ad32468f8e80a5d85b WHIRLPOOL f9d335555419def9d9d8995a8b1ea7f3df78a23a13a5c818bc4d8d2cecbdd22a7f220e49c72446ea2ffa0eb3d49518dab9b2ff4ab0083df9b3d02537795c9c8d
-DIST bcache-tools-1.0.4.tgz 21683 SHA256 102ffc3a8389180f4b491188c3520f8a4b1a84e5a7ca26d2bd6de1821f4d913d SHA512 d3f325519c67ee43c2f4c690fe666dbba97c9ba06ee091f15ad082fb193895aac322b82843447205ae0eb909a520d93e0ce2dd6207707021e087dedf16d7b273 WHIRLPOOL 2c46e01dee2d8d431d83c6d6797a3fca392970819a795124d452366c12e665fe8e7467375fc537af9ac6b06c8dc650d1009e15d64d109c28d7d27e1c7061c8a1
DIST bcache-tools-1.0.5.tgz 21934 SHA256 1449294ef545b3dc6f715f7b063bc2c8656984ad73bcd81a0dc048cbba416ea9 SHA512 aaf27e4cc3037d482cb14c8bb083c1ce5cda5641a19cec67ca1ad22cde71ce035e49701145c6d920b4d62058897c4b7d29d341b3b8bd436c9c51e2f8bdb5c568 WHIRLPOOL 7c2dd6919ba7cc7eebab0c90b517cd73ab4b7e02aedf4c998d95681e3feeedf5368fa5edf58a6a3e079fd7ad3ae5040fe6f02c743132f054c7f56fbad9c44f4b
+DIST bcache-tools-1.0.8.tgz 22153 SHA256 d56923936f37287efc57a46315679102ef2c86cd0be5874590320acd48c1201c SHA512 21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc WHIRLPOOL 7fada61d2bce55755dd75a1d5518c264c0470b071b6a3c6a003bb3016554eba5715014edfda1a05597d3dca1b557fd7eaea19df467c6c503ad1a52b9664657ef
diff --git a/sys-fs/bcache-tools/bcache-tools-0_pre20130627-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-0_pre20130627-r1.ebuild
deleted file mode 100644
index 2a661efbfb99..000000000000
--- a/sys-fs/bcache-tools/bcache-tools-0_pre20130627-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="Tools for bcachefs"
-HOMEPAGE="http://bcache.evilpiepirate.org/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-src_prepare() {
- tc-export CC
- sed \
- -e '/^CFLAGS/d' \
- -i Makefile || die
-}
-
-src_install() {
- into /
- dosbin make-bcache probe-bcache bcache-super-show
- doman *.8
-
- insinto /etc/initramfs-tools/hooks/bcache
- doins initramfs/hook
-
- udev_dorules 61-bcache.rules
-
- exeinto $(get_udevdir)
- doexe bcache-register
-
- dodoc README
-}
-
-pkg_postinst() {
- udev_reload
-}
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.4.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild
index 8d4dd2b25e60..72946faeecfd 100644
--- a/sys-fs/bcache-tools/bcache-tools-1.0.4.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-1.0.8.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs udev
DESCRIPTION="Tools for bcachefs"
HOMEPAGE="http://bcache.evilpiepirate.org/"
-SRC_URI="https://github.com/g2p/bcache-tools/archive/v1.0.4.tar.gz -> ${P}.tgz"
+SRC_URI="https://github.com/g2p/bcache-tools/archive/v${PV}.tar.gz -> ${P}.tgz"
SLOT="0"
LICENSE="GPL-2"
diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index c1911b8eeb8b..a2f7e941fb7a 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -3,3 +3,4 @@ DIST duperemove-0.09.2.tar.gz 55715 SHA256 2f7155bb916f4827a940c7ceb16c785b52932
DIST duperemove-0.09.3.tar.gz 55722 SHA256 349b047cfb388f2d616695b4ecbfa091243f84024bd75fbbbd7b88fb498794a0 SHA512 fe2a19088ec9ac3dda35da8b9580ddcc1c3b49e60824f2c1bbf8c013756c060b4c9663d1977bb6622c4de19754fd4a1011cc09ef3c785c2b4b218e0c9fb15b87 WHIRLPOOL 022eba5fb6ad1a4c74a4843762e7ccc7f6ba8187adbd6eb1bbe0168482cdd57664d7f6d9b4715d36866a8d026786abcf1e77ec87530f46fbea59b1357d4c90a4
DIST duperemove-0.09.4.tar.gz 55725 SHA256 9d4c7fe0fd7ae3acb8c144e5fa8648749366c1e67a97ecbb28f07df0bb72fb29 SHA512 dff728a34bdf8df71aa13b7f9c8ffae8ce643337f4dafacb3ceeb778d326b1885f63ae03215c6d714c4fcd7b2f26b03e47d7ad3a42eca3f2d5de5b596b653bf1 WHIRLPOOL 806e5469ac7fbd6b9a1e3803f153a6a2e5eecc14fa05b9f08b3d5b1f16609fb5bc2c576c45133ac6c6a76e5d63fce4a98d44ab4e8b180b5cbccf06355d3967bc
DIST duperemove-0.09.5.tar.gz 56175 SHA256 8c8c781ab53435dfcc114d2a500525c72428fdbafc14ead10de115d77b447b69 SHA512 111127d9ab7d5567de8393197cf5bc977db1f64b7405fd848e1ca5aaa5ca7a3057fa06b61b161d0dfc45e0c5ebcc2406218d9a834db519c7ca348cdc7a0fe2f2 WHIRLPOOL aff0d6cbab8f6f76cc528316dd17656e3b190809e3955bf83f59745b5dfd085e17b832dc09b4aa3ca6312bbfb199bea0f3ecb4f59d1bcc11c1743d97da93213c
+DIST duperemove-0.10.tar.gz 95656 SHA256 1ef855c4d0a85efc8757edcac5ea7189d896d2f2abad0e572c47f6568cf050aa SHA512 11bb1a9937b9ca7969b9176bb4cfc8fff91c257a8645baa0ca0ec6b634ae3c464712414f856d5a75ed16c6d13f0ae85ac3584df1f474575a975cb20ae0d7a9f1 WHIRLPOOL f31164803447b6ba917fa214eac35037e67ab090215b97e4610f46b3276d0a3c2f3c9ee024ea813e63cbacbe2c7778d35188131c85ffc08fc47b2abd4e312d38
diff --git a/sys-fs/duperemove/duperemove-0.10.ebuild b/sys-fs/duperemove/duperemove-0.10.ebuild
new file mode 100644
index 000000000000..a39e6e67c033
--- /dev/null
+++ b/sys-fs/duperemove/duperemove-0.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Btrfs deduplication utility"
+HOMEPAGE="https://github.com/markfasheh/duperemove"
+SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# includes code from libbloom, xxhash (BSD-2)
+# includes code from polarssl (GPL-2+)
+LICENSE="GPL-2 GPL-2+ BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+ dev-db/sqlite:3=
+ dev-libs/glib:2="
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ # CC & CFLAGS are set via = so need to override them
+ # LIBRARY_FLAGS are set via += so need to pass them via env
+ local -x LIBRARY_FLAGS="${LDFLAGS}"
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="/usr" install
+}
diff --git a/sys-fs/encfs/encfs-1.7.5.ebuild b/sys-fs/encfs/encfs-1.7.5.ebuild
index 07f9147e36d4..bfe30328c9a6 100644
--- a/sys-fs/encfs/encfs-1.7.5.ebuild
+++ b/sys-fs/encfs/encfs-1.7.5.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm ~sparc x86"
IUSE="xattr"
RDEPEND="dev-libs/boost:=
- dev-libs/openssl:=
+ dev-libs/openssl:0
>=dev-libs/rlog-1.4
>=sys-fs/fuse-2.7.0
sys-libs/zlib"
diff --git a/sys-fs/encfs/encfs-1.8.1.ebuild b/sys-fs/encfs/encfs-1.8.1.ebuild
index 4e99e0ae15f0..b05a3cb70d25 100644
--- a/sys-fs/encfs/encfs-1.8.1.ebuild
+++ b/sys-fs/encfs/encfs-1.8.1.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="amd64 ~arm ~sparc x86"
IUSE="xattr nls"
RDEPEND="dev-libs/boost:=
- dev-libs/openssl:=
+ dev-libs/openssl:0
>=dev-libs/rlog-1.3
>=sys-fs/fuse-2.5
sys-libs/zlib"
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index b4fbd0bc5708..0553bdd9a397 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -1,7 +1,4 @@
DIST eudev-1.10.tar.gz 1776717 SHA256 401eeb29147d3e24d87849a8006df62eadeb369d913484d59e9e35f3f73a20d1 SHA512 76ba9e3c732a6baad448500ef72368e985e0edf45b80d920e23432b5ee2da3e841c5faf2cc281af6432625758608c31eb441c6af9e2161d4e7264348e33e086f WHIRLPOOL d3251a1ef18e46e000a0941156ca4daa33b54a6147fece4cee6d863f86c98068e88bc11bc8a90f45c578ed62338218c5c8b4b06bb6132610e3d4a30bf79fe192
-DIST eudev-1.3.tar.gz 1679385 SHA256 6f1f0b15971a53c7070a44c902c7c1303f952927aa6370dbdf4d84d8bc09fac2 SHA512 5e0016fbe15eebfa68bb04fa7b5aedd7edc7a508afdc030adb7cbec4e9eca84fe16119ca73f5724ec290ad4bba179b42d2d0bc56f3aaf2a07e3c48b18374b3b3 WHIRLPOOL db748742f9149b7a232b0d630a8734e81fb1077ed581fcde88f57f299b6746bcadec0bdd9e7ad914dae848ace9199c7d664006003dc4999af3bfa1e14099f366
-DIST eudev-1.5.3.tar.gz 1724415 SHA256 8e4362979572719562f600bfd7decd42d4e21506db5483e3d2e88f725396c57b SHA512 c00f34d76d76ebd5c2862310a2ba3d7bf2f8d348a96e0120ed02aa9014857df736e3a2280a4478e50f2537cabc9082b8f5f5e57ef7b3cf925fae6dc3a4688ddb WHIRLPOOL b3fc943f6c3eaeba92aed72dee417738a840f4176182e08f7564a1fd34baa3cf2a52787ac8e936f74f6c13b7896eb929a2f83cf087b8b09e5b8c7d7858471dd5
DIST eudev-1.9.tar.gz 1762520 SHA256 8f17e92f1177ce9352bde00360e227a7cbb3b97ac8816174bee34be80e44cef0 SHA512 13bd7df42d686818f499856d260e5dfaf10425f06e05449bf4cc8318667b166e2ae9c5e8b519008285aeaab9284ec5fde1f9f19e536dd4bae09a5439c86336b3 WHIRLPOOL d0504f05e191e94229bf60a497cab82fe461f52072ba7ed2171654e684397e4ffa9ba47c8b18cd0cc6d0168701dcac3b7d4b6c73168382e2432c7c229b2d0293
-DIST eudev-2.1.1.tar.gz 1786403 SHA256 6aef101c5496a2dc45e669307d478dbccb0ee0462a285512edcda51ff12e0e6a SHA512 b3fb6d80ef94f124e7c23d7df61ed65c298e58f400d8df6b38fb1cea1da6cd387a17866dd54e12c8160214a496dab5d55b2e40ab1a6142a332f951cd3525d490 WHIRLPOOL 2c1ea2463ea7f1a72071866795609f75021abd81d9ab36298238dc481586de5d71864467b5da04546d0e1a1e0abf9ac1386bda2140ed1b5d277ae13baaf0a7d5
-DIST eudev-3.0.tar.gz 1835636 SHA256 74db8aaf13cc392edfb821291783ecd64d815e6f81409f57e290d3017750db29 SHA512 a0cfbbd5b1e59dafaf0ba2e321756bb7bff3d1a92e09ab0fca674adc80911e55aec29ed0b74262846516443d344cf044a0cfffb9e1d1caeb2f145da8d1a5327f WHIRLPOOL e08dcdd18bc6a8f4df2d66099e2ff90abb6bf62f75af81fb98c90261ce254eba986a6742eeca5d673818c2098d8a335ce9212aa3f1be5e1495ac05a397fe3f7a
DIST eudev-3.1.2.tar.gz 1858004 SHA256 4393b69e93dd8117defde6519b199d479f9d051f52061157a1a7a41b8fe10273 SHA512 d9aeb37a163ce4a0c116f75a927b4b99f8445d06624fbb3c28ade18f3effd8c54af5a4a52477c31a0452822a3dc0901468263195256e9dbf79d2ef08cf46f2b6 WHIRLPOOL 2249128672d2adfa968c123a2538063331348bc8e8481ad9c25bf8d9fb4d2d3c8a05417439f155d9ababe657b19a595c18c6ba60ad0d5584a8ead86220b39577
+DIST eudev-3.1.5.tar.gz 1745524 SHA256 f75885a430cd50fe4b31732f808ba7f9b2adf0f26b53b8ba2957b0c1d84b6f2a SHA512 c5192e085ca4230aaac918e701989b712e5bda1558db31eb6ba635c17c4bdff398458d51cefbc5fb77a7c775ec1e04b1dbe019b8314cac3f43a5c1ae61521b5e WHIRLPOOL bc845c474101635c039515489e1316053156d3dd5f9c915c312324b9a1a6168f831e7476eeff834487fc83289e5d5eea2ba764c10bb6628b7c18d188de5f3846
diff --git a/sys-fs/eudev/eudev-1.3.ebuild b/sys-fs/eudev/eudev-1.3.ebuild
deleted file mode 100644
index c370dfde4507..000000000000
--- a/sys-fs/eudev/eudev-1.3.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-KV_min=2.6.31
-
-inherit autotools eutils multilib linux-info multilib-minimal
-
-if [[ ${PV} = 9999* ]]
-then
- EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
- inherit git-2
-else
- SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="ia64"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="doc gudev hwdb kmod introspection keymap +modutils +openrc +rule-generator selinux static-libs test"
-
-COMMON_DEPEND="gudev? ( dev-libs/glib:2 )
- kmod? ( sys-apps/kmod )
- introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
- selinux? ( sys-libs/libselinux )
- >=sys-apps/util-linux-2.20
- !<sys-libs/glibc-2.11
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-DEPEND="${COMMON_DEPEND}
- keymap? ( dev-util/gperf )
- >=dev-util/intltool-0.40.0
- virtual/pkgconfig
- virtual/os-headers
- !<sys-kernel/linux-headers-${KV_min}
- doc? ( dev-util/gtk-doc )
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
- !sys-fs/udev
- !sys-apps/coldplug
- !sys-apps/systemd
- !<sys-fs/lvm2-2.02.97
- !sys-fs/device-mapper
- !<sys-fs/udev-init-scripts-18
- gudev? ( !dev-libs/libgudev )"
-
-PDEPEND="hwdb? ( >=sys-apps/hwids-20130717-r1[udev] )
- keymap? ( >=sys-apps/hwids-20130717-r1[udev] )
- openrc? ( >=sys-fs/udev-init-scripts-18 )"
-
-REQUIRED_USE="keymap? ( hwdb )"
-
-pkg_pretend()
-{
- if ! use rule-generator; then
- ewarn
- ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
- ewarn "as described in the URL below:"
- ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
- ewarn
- ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
- ewarn "between the default or user-modified choice of sys-fs/udev. If you wish to disable"
- ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
- ewarn "exists:"
- ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules"
- ewarn
- ewarn "We are working on a better solution for the next beta release."
- ewarn
- fi
-}
-
-pkg_setup()
-{
- linux-info_pkg_setup
- get_running_version
-
- # These are required kernel options, but we don't error out on them
- # because you can build under one kernel and run under another.
- CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
-
- if kernel_is lt ${KV_min//./ }; then
- ewarn
- ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
- ewarn "Make sure to run udev under kernel version ${KV_min} or above."
- ewarn
- fi
-}
-
-src_prepare()
-{
- # change rules back to group uucp instead of dialout for now
- sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
- || die "failed to change group dialout to uucp"
-
- epatch "${FILESDIR}"/${PN}-selinux-timespan.patch
-
- epatch_user
-
- if [[ ! -e configure ]]
- then
- if use doc
- then
- gtkdocize --docdir docs || die "gtkdocize failed"
- else
- echo 'EXTRA_DIST =' > docs/gtk-doc.make
- fi
- eautoreconf
- else
- elibtoolize
- fi
-}
-
-multilib_src_configure()
-{
- local econf_args
-
- econf_args=(
- ac_cv_search_cap_init=
- ac_cv_header_sys_capability_h=yes
- DBUS_CFLAGS=' '
- DBUS_LIBS=' '
- --with-rootprefix=
- --docdir=/usr/share/doc/${PF}
- --libdir=/usr/$(get_libdir)
- --with-firmware-path="${EPREFIX}usr/lib/firmware/updates:${EPREFIX}usr/lib/firmware:${EPREFIX}lib/firmware/updates:${EPREFIX}lib/firmware"
- --with-html-dir="/usr/share/doc/${PF}/html"
- --enable-split-usr
- --exec-prefix=/
- )
-
- # Only build libudev for non-native_abi, and only install it to libdir,
- # that means all options only apply to native_abi
- if multilib_is_native_abi; then econf_args+=(
- --with-rootlibdir=/$(get_libdir)
- $(use_enable doc gtk-doc)
- $(use_enable gudev)
- $(use_enable introspection)
- $(use_enable keymap)
- $(use_enable kmod libkmod)
- $(usex kmod --enable-modules $(use_enable modutils modules))
- $(use_enable static-libs static)
- $(use_enable selinux)
- $(use_enable rule-generator)
- )
- else econf_args+=(
- $(echo --disable-{gtk-doc,gudev,introspection,keymap,libkmod,modules,static,selinux,rule-generator})
- )
- fi
- ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile()
-{
- if ! multilib_is_native_abi; then
- cd src/libudev || die "Could not change directory"
- fi
- emake
-}
-
-multilib_src_install()
-{
- if ! multilib_is_native_abi; then
- cd src/libudev || die "Could not change directory"
- fi
- emake DESTDIR="${D}" install
-}
-
-multilib_src_test()
-{
- # make sandbox get out of the way
- # these are safe because there is a fake root filesystem put in place,
- # but sandbox seems to evaluate the paths of the test i/o instead of the
- # paths of the actual i/o that results.
- # also only test for native abi
- if multilib_is_native_abi; then
- addread /sys
- addwrite /dev
- addwrite /run
- default_src_test
- fi
-}
-
-# disable header checks because we only install libudev headers for non-native abi
-multilib_check_headers()
-{
- :
-}
-
-multilib_src_install_all()
-{
- prune_libtool_files --all
- rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
- use rule-generator && use openrc && doinitd "${FILESDIR}"/udev-postmount
-
- # drop distributed hwdb files, they override sys-apps/hwids
- rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
-}
-
-pkg_preinst()
-{
- local htmldir
- for htmldir in gudev libudev; do
- if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]
- then
- rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
- fi
- if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]
- then
- dosym ../../doc/${PF}/html/${htmldir} \
- /usr/share/gtk-doc/html/${htmldir}
- fi
- done
-}
-
-pkg_postinst()
-{
- mkdir -p "${EROOT}"run
-
- # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
- # So try to remove it here (will only work if empty).
- rmdir "${EROOT}"dev/loop 2>/dev/null
- if [[ -d ${EROOT}dev/loop ]]
- then
- ewarn "Please make sure you remove /dev/loop, else losetup"
- ewarn "may be confused when looking for unused devices."
- fi
-
- # 64-device-mapper.rules now gets installed by sys-fs/device-mapper
- # remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007
- if [[ -f ${EROOT}etc/udev/rules.d/64-device-mapper.rules ]] &&
- ! has_version sys-fs/device-mapper
- then
- rm -f "${EROOT}"etc/udev/rules.d/64-device-mapper.rules
- einfo "Removed unneeded file 64-device-mapper.rules"
- fi
-
- if use hwdb && has_version 'sys-apps/hwids[udev]'; then
- udevadm hwdb --update --root="${ROOT%/}"
-
- # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
- # reload database after it has be rebuilt, but only if we are not upgrading
- # also pass if we are -9999 since who knows what hwdb related changes there might be
- if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
- [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
- udevadm control --reload
- fi
- fi
-
- ewarn
- ewarn "You need to restart eudev as soon as possible to make the"
- ewarn "upgrade go into effect:"
- ewarn "\t/etc/init.d/udev --nodeps restart"
-
- if use rule-generator && use openrc; then
- ewarn
- ewarn "Please add the udev-postmount init script to your default runlevel"
- ewarn "to ensure the legacy rule-generator functionality works as reliably"
- ewarn "as possible."
- ewarn "\trc-update add udev-postmount default"
- fi
-
- elog
- elog "For more information on eudev on Gentoo, writing udev rules, and"
- elog "fixing known issues visit:"
- elog " https://www.gentoo.org/doc/en/udev-guide.xml"
- elog
-}
diff --git a/sys-fs/eudev/eudev-1.5.3-r1.ebuild b/sys-fs/eudev/eudev-1.5.3-r1.ebuild
deleted file mode 100644
index 341faebef327..000000000000
--- a/sys-fs/eudev/eudev-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-KV_min=2.6.31
-
-inherit autotools eutils multilib linux-info multilib-minimal
-
-if [[ ${PV} = 9999* ]]
-then
- EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
- inherit git-2
-else
- SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="alpha"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="doc gudev +hwdb kmod introspection +keymap +modutils +openrc +rule-generator selinux static-libs test"
-
-COMMON_DEPEND="gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- kmod? ( sys-apps/kmod )
- introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
- selinux? ( sys-libs/libselinux )
- >=sys-apps/util-linux-2.20
- !<sys-libs/glibc-2.11
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-
-DEPEND="${COMMON_DEPEND}
- keymap? ( dev-util/gperf )
- >=dev-util/intltool-0.40.0
- virtual/pkgconfig
- virtual/os-headers
- !<sys-kernel/linux-headers-${KV_min}
- doc? ( dev-util/gtk-doc )
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
- !sys-fs/udev
- !sys-apps/coldplug
- !sys-apps/systemd
- !<sys-fs/lvm2-2.02.97
- !sys-fs/device-mapper
- !<sys-fs/udev-init-scripts-18
- gudev? ( !dev-libs/libgudev )"
-
-PDEPEND="hwdb? ( >=sys-apps/hwids-20130717-r1[udev] )
- keymap? ( >=sys-apps/hwids-20130717-r1[udev] )
- openrc? ( >=sys-fs/udev-init-scripts-18 )"
-
-REQUIRED_USE="keymap? ( hwdb )"
-
-pkg_pretend()
-{
- if ! use rule-generator; then
- ewarn
- ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
- ewarn "as described in the URL below:"
- ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
- ewarn
- ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
- ewarn "between the default or user-modified choice of sys-fs/udev. If you wish to disable"
- ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
- ewarn "exists:"
- ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules"
- ewarn
- ewarn "We are working on a better solution for the next beta release."
- ewarn
- fi
-}
-
-pkg_setup()
-{
- linux-info_pkg_setup
- get_running_version
-
- # These are required kernel options, but we don't error out on them
- # because you can build under one kernel and run under another.
- CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~SIGNALFD ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2"
-
- if kernel_is lt ${KV_min//./ }; then
- ewarn
- ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
- ewarn "Make sure to run udev under kernel version ${KV_min} or above."
- ewarn
- fi
-}
-
-src_prepare()
-{
- # change rules back to group uucp instead of dialout for now
- sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
- || die "failed to change group dialout to uucp"
-
- epatch_user
-
- if [[ ! -e configure ]]
- then
- if use doc
- then
- gtkdocize --docdir docs || die "gtkdocize failed"
- else
- echo 'EXTRA_DIST =' > docs/gtk-doc.make
- fi
- eautoreconf
- else
- elibtoolize
- fi
-}
-
-multilib_src_configure()
-{
- local econf_args
-
- econf_args=(
- ac_cv_search_cap_init=
- ac_cv_header_sys_capability_h=yes
- DBUS_CFLAGS=' '
- DBUS_LIBS=' '
- --with-rootprefix=
- --docdir=/usr/share/doc/${PF}
- --libdir=/usr/$(get_libdir)
- --with-firmware-path="${EPREFIX}usr/lib/firmware/updates:${EPREFIX}usr/lib/firmware:${EPREFIX}lib/firmware/updates:${EPREFIX}lib/firmware"
- --with-html-dir="/usr/share/doc/${PF}/html"
- --enable-split-usr
- --exec-prefix=/
-
- $(use_enable gudev)
- )
-
- # Only build libudev for non-native_abi, and only install it to libdir,
- # that means all options only apply to native_abi
- if multilib_is_native_abi; then econf_args+=(
- --with-rootlibdir=/$(get_libdir)
- $(use_enable doc gtk-doc)
- $(use_enable introspection)
- $(use_enable keymap)
- $(use_enable kmod libkmod)
- $(usex kmod --enable-modules $(use_enable modutils modules))
- $(use_enable static-libs static)
- $(use_enable selinux)
- $(use_enable rule-generator)
- )
- else econf_args+=(
- $(echo --disable-{gtk-doc,introspection,keymap,libkmod,modules,static,selinux,rule-generator})
- )
- fi
- ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile()
-{
- if multilib_is_native_abi; then
- emake
- else
- emake -C src/libudev
- use gudev && emake -C src/gudev
- fi
-}
-
-multilib_src_install()
-{
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
- else
- emake -C src/libudev DESTDIR="${D}" install
- use gudev && emake -C src/gudev DESTDIR="${D}" install
- fi
-}
-
-multilib_src_test()
-{
- # make sandbox get out of the way
- # these are safe because there is a fake root filesystem put in place,
- # but sandbox seems to evaluate the paths of the test i/o instead of the
- # paths of the actual i/o that results.
- # also only test for native abi
- if multilib_is_native_abi; then
- addread /sys
- addwrite /dev
- addwrite /run
- default_src_test
- fi
-}
-
-# disable header checks because we only install libudev headers for non-native abi
-multilib_check_headers()
-{
- :
-}
-
-multilib_src_install_all()
-{
- prune_libtool_files --all
- rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
- use rule-generator && use openrc && doinitd "${FILESDIR}"/udev-postmount
-
- # drop distributed hwdb files, they override sys-apps/hwids
- rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
-
- insinto /lib/udev/rules.d
- doins "${FILESDIR}"/40-gentoo.rules
-}
-
-pkg_preinst()
-{
- local htmldir
- for htmldir in gudev libudev; do
- if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]
- then
- rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
- fi
- if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]
- then
- dosym ../../doc/${PF}/html/${htmldir} \
- /usr/share/gtk-doc/html/${htmldir}
- fi
- done
-}
-
-pkg_postinst()
-{
- mkdir -p "${EROOT}"run
-
- # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
- # So try to remove it here (will only work if empty).
- rmdir "${EROOT}"dev/loop 2>/dev/null
- if [[ -d ${EROOT}dev/loop ]]
- then
- ewarn "Please make sure you remove /dev/loop, else losetup"
- ewarn "may be confused when looking for unused devices."
- fi
-
- # 64-device-mapper.rules now gets installed by sys-fs/device-mapper
- # remove it if user don't has sys-fs/device-mapper installed, 27 Jun 2007
- if [[ -f ${EROOT}etc/udev/rules.d/64-device-mapper.rules ]] &&
- ! has_version sys-fs/device-mapper
- then
- rm -f "${EROOT}"etc/udev/rules.d/64-device-mapper.rules
- einfo "Removed unneeded file 64-device-mapper.rules"
- fi
-
- if use hwdb && has_version 'sys-apps/hwids[udev]'; then
- udevadm hwdb --update --root="${ROOT%/}"
-
- # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
- # reload database after it has be rebuilt, but only if we are not upgrading
- # also pass if we are -9999 since who knows what hwdb related changes there might be
- if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
- [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
- udevadm control --reload
- fi
- fi
-
- ewarn
- ewarn "You need to restart eudev as soon as possible to make the"
- ewarn "upgrade go into effect:"
- ewarn "\t/etc/init.d/udev --nodeps restart"
-
- if use rule-generator && use openrc && \
- [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
- ewarn
- ewarn "Please add the udev-postmount init script to your default runlevel"
- ewarn "to ensure the legacy rule-generator functionality works as reliably"
- ewarn "as possible."
- ewarn "\trc-update add udev-postmount default"
- fi
-
- elog
- elog "For more information on eudev on Gentoo, writing udev rules, and"
- elog "fixing known issues visit:"
- elog " https://www.gentoo.org/doc/en/udev-guide.xml"
- elog
-}
diff --git a/sys-fs/eudev/eudev-2.1.1.ebuild b/sys-fs/eudev/eudev-2.1.1.ebuild
deleted file mode 100644
index e681d7cd72df..000000000000
--- a/sys-fs/eudev/eudev-2.1.1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-KV_min=2.6.39
-WANT_AUTOMAKE=1.13
-
-inherit autotools eutils linux-info multilib multilib-minimal user
-
-if [[ ${PV} = 9999* ]]; then
- EGIT_REPO_URI="git://github.com/gentoo/eudev.git"
- inherit git-2
-else
- SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://github.com/gentoo/eudev"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="doc gudev +hwdb +kmod introspection +keymap +modutils +rule-generator selinux static-libs test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.20
- gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.38 )
- kmod? ( >=sys-apps/kmod-16 )
- selinux? ( >=sys-libs/libselinux-2.1.9 )
- !<sys-libs/glibc-2.11
- !sys-apps/gentoo-systemd-integration
- !sys-apps/systemd
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r7
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )"
-DEPEND="${COMMON_DEPEND}
- keymap? ( dev-util/gperf )
- virtual/os-headers
- virtual/pkgconfig
- >=sys-devel/make-3.82-r4
- >=sys-kernel/linux-headers-${KV_min}
- doc? ( >=dev-util/gtk-doc-1.18 )
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=dev-util/intltool-0.50
- test? ( app-text/tree dev-lang/perl )"
-
-RDEPEND="${COMMON_DEPEND}
- !<sys-fs/lvm2-2.02.103
- !<sec-policy/selinux-base-2.20120725-r10
- !sys-fs/udev
- !sys-apps/systemd
- gudev? ( !dev-libs/libgudev )"
-
-PDEPEND=">=sys-fs/udev-init-scripts-26
- hwdb? ( >=sys-apps/hwids-20140304[udev] )
- keymap? ( >=sys-apps/hwids-20140304[udev] )"
-
-REQUIRED_USE="keymap? ( hwdb )"
-
-# The multilib-build.eclass doesn't handle situation where the installed headers
-# are different in ABIs. In this case, we install libgudev headers in native
-# ABI but not for non-native ABI.
-multilib_check_headers() { :; }
-
-pkg_pretend() {
- if ! use rule-generator; then
- ewarn
- ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
- ewarn "as described in the URL below:"
- ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
- ewarn
- ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
- ewarn "between the default or user-modified choice of sys-fs/udev. If you wish to disable"
- ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
- ewarn "exists:"
- ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules"
- ewarn
- ewarn "We are working on a better solution for the next beta release."
- ewarn
- fi
-}
-
-pkg_setup() {
- CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET"
- linux-info_pkg_setup
- get_running_version
-
- # These are required kernel options, but we don't error out on them
- # because you can build under one kernel and run under another.
- if kernel_is lt ${KV_min//./ }; then
- ewarn
- ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
- ewarn "Make sure to run udev under kernel version ${KV_min} or above."
- ewarn
- fi
-}
-
-src_prepare() {
- # change rules back to group uucp instead of dialout for now
- sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
- || die "failed to change group dialout to uucp"
-
- epatch_user
-
- if use doc; then
- gtkdocize --docdir docs || die "gtkdocize failed"
- else
- echo 'EXTRA_DIST =' > docs/gtk-doc.make
- fi
- eautoreconf
-}
-
-multilib_src_configure() {
- tc-export CC #463846
- export cc_cv_CFLAGS__flto=no #502950
-
- # Keep sorted by ./configure --help and only pass --disable flags
- # when *required* to avoid external deps or unnecessary compile
- local econf_args
- econf_args=(
- ac_cv_search_cap_init=
- ac_cv_header_sys_capability_h=yes
- DBUS_CFLAGS=' '
- DBUS_LIBS=' '
- --with-rootprefix=
- --docdir=/usr/share/doc/${PF}
- --libdir=/usr/$(get_libdir)
- --with-rootlibexecdir=/lib/udev
- --with-html-dir="/usr/share/doc/${PF}/html"
- --enable-split-usr
- --exec-prefix=/
-
- $(use_enable gudev)
- )
-
- # Only build libudev for non-native_abi, and only install it to libdir,
- # that means all options only apply to native_abi
- if multilib_is_native_abi; then
- econf_args+=(
- --with-rootlibdir=/$(get_libdir)
- $(use_enable doc gtk-doc)
- $(use_enable introspection)
- $(use_enable keymap)
- $(use_enable kmod libkmod)
- $(usex kmod --enable-modules $(use_enable modutils modules))
- $(use_enable static-libs static)
- $(use_enable selinux)
- $(use_enable rule-generator)
- )
- else
- econf_args+=(
- --disable-static
- --disable-gtk-doc
- --disable-introspection
- --disable-keymap
- --disable-libkmod
- --disable-modules
- --disable-selinux
- --disable-rule-generator
- )
- fi
- ECONF_SOURCE="${S}" econf "${econf_args[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- emake -C src/shared
- emake -C src/libudev
- use gudev && emake -C src/gudev
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake DESTDIR="${D}" install
- else
- emake -C src/libudev DESTDIR="${D}" install
- use gudev && emake -C src/gudev DESTDIR="${D}" install
- fi
-}
-
-multilib_src_test() {
- # make sandbox get out of the way
- # these are safe because there is a fake root filesystem put in place,
- # but sandbox seems to evaluate the paths of the test i/o instead of the
- # paths of the actual i/o that results.
- # also only test for native abi
- if multilib_is_native_abi; then
- addread /sys
- addwrite /dev
- addwrite /run
- default_src_test
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
- use rule-generator && doinitd "${FILESDIR}"/udev-postmount
-
- # drop distributed hwdb files, they override sys-apps/hwids
- rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
-
- insinto /lib/udev/rules.d
- doins "${FILESDIR}"/40-gentoo.rules
-
- insinto /usr/share/doc/${PF}/html/gudev
- doins "${S}"/docs/gudev/html/*
-
- insinto /usr/share/doc/${PF}/html/libudev
- doins "${S}"/docs/libudev/html/*
-}
-
-pkg_preinst() {
- local htmldir
- for htmldir in gudev libudev; do
- if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
- rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
- fi
- if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
- dosym ../../doc/${PF}/html/${htmldir} \
- /usr/share/gtk-doc/html/${htmldir}
- fi
- done
-}
-
-pkg_postinst() {
- mkdir -p "${EROOT}"run
-
- # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
- # So try to remove it here (will only work if empty).
- rmdir "${EROOT}"dev/loop 2>/dev/null
- if [[ -d ${EROOT}dev/loop ]]; then
- ewarn "Please make sure your remove /dev/loop,"
- ewarn "else losetup may be confused when looking for unused devices."
- fi
-
- if use hwdb && has_version 'sys-apps/hwids[udev]'; then
- udevadm hwdb --update --root="${ROOT%/}"
-
- # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
- # reload database after it has be rebuilt, but only if we are not upgrading
- # also pass if we are -9999 since who knows what hwdb related changes there might be
- if [[ ${REPLACING_VERSIONS%-r*} == ${PV} || -z ${REPLACING_VERSIONS} ]] && \
- [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
- udevadm control --reload
- fi
- fi
-
- ewarn
- ewarn "You need to restart eudev as soon as possible to make the"
- ewarn "upgrade go into effect:"
- ewarn "\t/etc/init.d/udev --nodeps restart"
-
- if use rule-generator && \
- [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
- ewarn
- ewarn "Please add the udev-postmount init script to your default runlevel"
- ewarn "to ensure the legacy rule-generator functionality works as reliably"
- ewarn "as possible."
- ewarn "\trc-update add udev-postmount default"
- fi
-
- elog
- elog "For more information on eudev on Gentoo, writing udev rules, and"
- elog "fixing known issues visit:"
- elog " https://www.gentoo.org/doc/en/udev-guide.xml"
- elog
-
- # http://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
- # https://bugs.gentoo.org/246847
- # https://bugs.gentoo.org/514174
- enewgroup input
-
- # Update hwdb database in case the format is changed by udev version.
- if has_version 'sys-apps/hwids[udev]'; then
- udevadm hwdb --update --root="${ROOT%/}"
- # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
- if [[ ${ROOT} != "" ]] && [[ ${ROOT} != "/" ]]; then
- return 0
- fi
- udevadm control --reload
- fi
- fi
-}
diff --git a/sys-fs/eudev/eudev-3.0.ebuild b/sys-fs/eudev/eudev-3.1.5.ebuild
index c32ab954d7e8..76c2d714048e 100644
--- a/sys-fs/eudev/eudev-3.0.ebuild
+++ b/sys-fs/eudev/eudev-3.1.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-2
else
SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -22,10 +22,9 @@ HOMEPAGE="https://github.com/gentoo/eudev"
LICENSE="LGPL-2.1 MIT GPL-2"
SLOT="0"
-IUSE="doc gudev +hwdb +kmod introspection selinux static-libs test"
+IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
COMMON_DEPEND=">=sys-apps/util-linux-2.20
- gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
introspection? ( >=dev-libs/gobject-introspection-1.38 )
kmod? ( >=sys-apps/kmod-16 )
selinux? ( >=sys-libs/libselinux-2.1.9 )
@@ -42,12 +41,6 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
>=sys-devel/make-3.82-r4
>=sys-kernel/linux-headers-${KV_min}
- doc? ( >=dev-util/gtk-doc-1.18
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- )
>=dev-util/intltool-0.50
test? ( app-text/tree dev-lang/perl )"
@@ -55,8 +48,7 @@ RDEPEND="${COMMON_DEPEND}
!<sys-fs/lvm2-2.02.103
!<sec-policy/selinux-base-2.20120725-r10
!sys-fs/udev
- !sys-apps/systemd
- gudev? ( !dev-libs/libgudev )"
+ !sys-apps/systemd"
PDEPEND=">=sys-fs/udev-init-scripts-26
hwdb? ( >=sys-apps/hwids-20140304[udev] )"
@@ -100,12 +92,6 @@ src_prepare() {
|| die "failed to change group dialout to uucp"
epatch_user
-
- if use doc; then
- gtkdocize --docdir docs || die "gtkdocize failed"
- else
- echo 'EXTRA_DIST =' > docs/gtk-doc.make
- fi
eautoreconf
}
@@ -122,14 +108,13 @@ multilib_src_configure() {
DBUS_CFLAGS=' '
DBUS_LIBS=' '
--with-rootprefix=
- --docdir=/usr/share/doc/${PF}
+ --with-rootrundir=/run
--libdir=/usr/$(get_libdir)
--with-rootlibexecdir=/lib/udev
- --with-html-dir="/usr/share/doc/${PF}/html"
--enable-split-usr
+ --enable-manpages
+ --disable-hwdb
--exec-prefix=/
-
- $(use_enable gudev)
)
# Only build libudev for non-native_abi, and only install it to libdir,
@@ -137,19 +122,19 @@ multilib_src_configure() {
if multilib_is_native_abi; then
econf_args+=(
--with-rootlibdir=/$(get_libdir)
- $(use_enable doc gtk-doc)
$(use_enable introspection)
$(use_enable kmod)
$(use_enable static-libs static)
$(use_enable selinux)
+ $(use_enable rule-generator)
)
else
econf_args+=(
--disable-static
- --disable-gtk-doc
--disable-introspection
--disable-kmod
--disable-selinux
+ --disable-rule-generator
)
fi
ECONF_SOURCE="${S}" econf "${econf_args[@]}"
@@ -161,7 +146,6 @@ multilib_src_compile() {
else
emake -C src/shared
emake -C src/libudev
- use gudev && emake -C src/gudev
fi
}
@@ -170,7 +154,6 @@ multilib_src_install() {
emake DESTDIR="${D}" install
else
emake -C src/libudev DESTDIR="${D}" install
- use gudev && emake -C src/gudev DESTDIR="${D}" install
fi
}
@@ -190,34 +173,11 @@ multilib_src_test() {
multilib_src_install_all() {
prune_libtool_files --all
- rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
-
- # drop distributed hwdb files, they override sys-apps/hwids
- rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
insinto /lib/udev/rules.d
doins "${FILESDIR}"/40-gentoo.rules
- if ! [[ ${PV} = 9999* ]]; then
- insinto /usr/share/doc/${PF}/html/gudev
- doins "${S}"/docs/gudev/html/*
-
- insinto /usr/share/doc/${PF}/html/libudev
- doins "${S}"/docs/libudev/html/*
- fi
-}
-
-pkg_preinst() {
- local htmldir
- for htmldir in gudev libudev; do
- if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
- rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
- fi
- if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
- dosym ../../doc/${PF}/html/${htmldir} \
- /usr/share/gtk-doc/html/${htmldir}
- fi
- done
+ use rule-generator && doinitd "${FILESDIR}"/udev-postmount
}
pkg_postinst() {
@@ -248,6 +208,15 @@ pkg_postinst() {
ewarn "upgrade go into effect:"
ewarn "\t/etc/init.d/udev --nodeps restart"
+ if use rule-generator && \
+ [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
+ ewarn
+ ewarn "Please add the udev-postmount init script to your default runlevel"
+ ewarn "to ensure the legacy rule-generator functionality works as reliably"
+ ewarn "as possible."
+ ewarn "\trc-update add udev-postmount default"
+ fi
+
elog
elog "For more information on eudev on Gentoo, writing udev rules, and"
elog "fixing known issues visit:"
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index baf44a104779..76c2d714048e 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-2
else
SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -22,10 +22,9 @@ HOMEPAGE="https://github.com/gentoo/eudev"
LICENSE="LGPL-2.1 MIT GPL-2"
SLOT="0"
-IUSE="doc gudev +hwdb +kmod introspection selinux static-libs test"
+IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
COMMON_DEPEND=">=sys-apps/util-linux-2.20
- gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
introspection? ( >=dev-libs/gobject-introspection-1.38 )
kmod? ( >=sys-apps/kmod-16 )
selinux? ( >=sys-libs/libselinux-2.1.9 )
@@ -42,12 +41,6 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
>=sys-devel/make-3.82-r4
>=sys-kernel/linux-headers-${KV_min}
- doc? ( >=dev-util/gtk-doc-1.18
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- )
>=dev-util/intltool-0.50
test? ( app-text/tree dev-lang/perl )"
@@ -55,8 +48,7 @@ RDEPEND="${COMMON_DEPEND}
!<sys-fs/lvm2-2.02.103
!<sec-policy/selinux-base-2.20120725-r10
!sys-fs/udev
- !sys-apps/systemd
- gudev? ( !dev-libs/libgudev )"
+ !sys-apps/systemd"
PDEPEND=">=sys-fs/udev-init-scripts-26
hwdb? ( >=sys-apps/hwids-20140304[udev] )"
@@ -100,12 +92,6 @@ src_prepare() {
|| die "failed to change group dialout to uucp"
epatch_user
-
- if use doc; then
- gtkdocize --docdir docs || die "gtkdocize failed"
- else
- echo 'EXTRA_DIST =' > docs/gtk-doc.make
- fi
eautoreconf
}
@@ -123,16 +109,12 @@ multilib_src_configure() {
DBUS_LIBS=' '
--with-rootprefix=
--with-rootrundir=/run
- --docdir=/usr/share/doc/${PF}
--libdir=/usr/$(get_libdir)
--with-rootlibexecdir=/lib/udev
- --with-html-dir="/usr/share/doc/${PF}/html"
--enable-split-usr
--enable-manpages
--disable-hwdb
--exec-prefix=/
-
- $(use_enable gudev)
)
# Only build libudev for non-native_abi, and only install it to libdir,
@@ -140,19 +122,19 @@ multilib_src_configure() {
if multilib_is_native_abi; then
econf_args+=(
--with-rootlibdir=/$(get_libdir)
- $(use_enable doc gtk-doc)
$(use_enable introspection)
$(use_enable kmod)
$(use_enable static-libs static)
$(use_enable selinux)
+ $(use_enable rule-generator)
)
else
econf_args+=(
--disable-static
- --disable-gtk-doc
--disable-introspection
--disable-kmod
--disable-selinux
+ --disable-rule-generator
)
fi
ECONF_SOURCE="${S}" econf "${econf_args[@]}"
@@ -164,7 +146,6 @@ multilib_src_compile() {
else
emake -C src/shared
emake -C src/libudev
- use gudev && emake -C src/gudev
fi
}
@@ -173,7 +154,6 @@ multilib_src_install() {
emake DESTDIR="${D}" install
else
emake -C src/libudev DESTDIR="${D}" install
- use gudev && emake -C src/gudev DESTDIR="${D}" install
fi
}
@@ -193,31 +173,11 @@ multilib_src_test() {
multilib_src_install_all() {
prune_libtool_files --all
- rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
insinto /lib/udev/rules.d
doins "${FILESDIR}"/40-gentoo.rules
- if ! [[ ${PV} = 9999* ]]; then
- insinto /usr/share/doc/${PF}/html/gudev
- doins "${S}"/docs/gudev/html/*
-
- insinto /usr/share/doc/${PF}/html/libudev
- doins "${S}"/docs/libudev/html/*
- fi
-}
-
-pkg_preinst() {
- local htmldir
- for htmldir in gudev libudev; do
- if [[ -d ${EROOT}usr/share/gtk-doc/html/${htmldir} ]]; then
- rm -rf "${EROOT}"usr/share/gtk-doc/html/${htmldir}
- fi
- if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
- dosym ../../doc/${PF}/html/${htmldir} \
- /usr/share/gtk-doc/html/${htmldir}
- fi
- done
+ use rule-generator && doinitd "${FILESDIR}"/udev-postmount
}
pkg_postinst() {
@@ -248,6 +208,15 @@ pkg_postinst() {
ewarn "upgrade go into effect:"
ewarn "\t/etc/init.d/udev --nodeps restart"
+ if use rule-generator && \
+ [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
+ ewarn
+ ewarn "Please add the udev-postmount init script to your default runlevel"
+ ewarn "to ensure the legacy rule-generator functionality works as reliably"
+ ewarn "as possible."
+ ewarn "\trc-update add udev-postmount default"
+ fi
+
elog
elog "For more information on eudev on Gentoo, writing udev rules, and"
elog "fixing known issues visit:"
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 458574886ce7..7a69a0012870 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,3 +1,4 @@
+DIST zfs-0.6.0-rc13.tar.gz 1490582 SHA256 3e689fc0704237c7d755c65e34ed214a262535afefafde4aef0f112f8c833a09 SHA512 c9bbf1fb7f293a0f5b1247e17c411073994bf419d5f6c1b781efeeb4022f62851e8ea3cf7ee0330b0609bfe13b8084c48f00e942ce52323d706733cccf49699e WHIRLPOOL 97083a6f5d66addc9bc7b3cc3f7dd3bc1696980affbd4033d71cd09ecad413ffb666a8a185dfa2e4f20dd4003746ad61d12142f7a6556db5b34008716c933798
DIST zfs-0.6.0-rc14.tar.gz 1527612 SHA256 5eae8ef790b26e0dd7c801cc0a235a631ad91d67f148a444d912dbeb24b9a12d SHA512 ad38544ced150ce500c78507782e53a8534815b819e5b9aefda6d670fb7905e31a42cdb4d45164700df48673ea7c42bd1d29a60f1f00e25271b3906de9212d15 WHIRLPOOL cfd4de541eb6c18ee4df8950883525d1b1887e0d9c5f840d97353a5d716ed639f1ab3dc0fe4d8368a890564f10053026bcc738b6066c4488647f1b83be54288d
DIST zfs-0.6.1.tar.gz 1535521 SHA256 42ed127f74af0ecafc14800a5d2b766655f5ea821098aba92446c1c447093fad SHA512 ef583639f15a5b2e4582760bb013ab5091abc15bae17884d811afec707aff337248102a22fb9fb6f62f99cb3477a8ae82edfdcfdfb962276f593173a5dfe5871 WHIRLPOOL a6791fc2d384e03073abc850f99ba761afd18073337264d8a7bc08b4ddc6fff52df5ce11addc9a3ac7cdfdd9ce9bd779208e515cda631ec19de05fbf9f92307b
DIST zfs-0.6.2.tar.gz 1558656 SHA256 91b844bf7a42df22d7533e8004289270b7859b8fcbca3bff8087a79b131318b4 SHA512 008f9decdea3e92f6d74f5369ec9df5776b15efbb9f2bc01012999b71e1f2bc5b46b310a329b60545907dcc78773ec79eb6d21aca49d911f33299fd0a36e1a4b WHIRLPOOL 587279866b6ffa2bfebc91f00cb28de85f7f186426a0292f44c6cde7ca3a51c1911fc0ee431c25c3ee0866174522f90ce04b54de4aa3dc0829ba3a719e47af58
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 39ecb3b554e5..1f30d4a6c698 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -4,7 +4,9 @@ DIST aufs-sources-4.0_p20150518.tar.xz 166024 SHA256 da653585bfd610bbc874b9f51c7
DIST aufs-sources-4.0_p20150629.tar.xz 166624 SHA256 af28e0752a1f9c0edf34519b58ed4aaea9e3538a3041110061d1fa55e25acfca SHA512 c68c077bf399d188c72f8c2c6ca4ce634fa710b84296275529f1a8a20c3c923ca7d418cd564d66651b5dbc3544bc556f763a5c3687e3fede55e36b13223a2bec WHIRLPOOL e3590e5da82ae5252c1e318dd775d950a14c3ac0f6235552cef0943f304361299ed33731e7365f6ef586e02e7d23be5dfdc613b40f48a042655b2a110638ca3e
DIST aufs-sources-4.1_p20150629.tar.xz 166912 SHA256 b9927b15bfc6be7b72206529402b33ceb32b72fd36c84e28f34fb73218575cd0 SHA512 6514479c83e04fe22c7d753bc351e77e9d84cc012eb590e0e463f639bd1ac4dd5cecc0f5b6046d7f721a4a90b6f492e015faadc392af2664f4bcfa9a860bec56 WHIRLPOOL e68b9da85b2abc7b6b42777e23d49c93e550e2cdd330a140f4471888e0bab5dafb5cddf2b1263b12a74098ef3d817f3270b92898137948ae76152104db5d8621
DIST aufs-sources-4.1_p20150928.tar.xz 166712 SHA256 56b6b9c40a32eab3402444ca136d01e5ee8d00438d8679b730ce97912749bcae SHA512 c88ec4cb67293f392fbfd496e3bfed0836cc2bfbc53ab4f3af0e6929181e9f60d9dca30bfa10d3e7806edacdcb0a819ba2f83d48f9f08bedc06f27146a9e4a15 WHIRLPOOL 96cdbf312cbce9d484b59ec852d31726c7c79dec68c90137f0459b5f481f56c488d63a6756538c494df065e21e70c5c87650108f7213374bba066e16972796fc
+DIST aufs-sources-4.1_p20151012.tar.xz 166736 SHA256 05c5f7e565d58b98db443752c1f7b085be2ea6b3328a7ad43ad764c72c58c9be SHA512 95f43145dea8b2068319453450de434b44b1d07b947b1ca795e7ca44e8d2c5bfb619aeb1fc8eb2085351a4a078c30b5641716def5703c9e651613f4761404d78 WHIRLPOOL 05ea5374ff905113ffbda7b17964f82ea7f2a5df0126af887cb7524d68661c8e381d094c02e2592ae4ab7c97f553d866be988adf1c938fe1acf1eca253e03db4
DIST aufs-sources-4.2_p20150928.tar.xz 166932 SHA256 fc04eaf2973ae8ba3e7bf9d68ee58a24c30a6c97e50c6666ec335b39a14438cc SHA512 2c539d77d2af8541991f19f52b8186a68484453874c864bb67163680409bd22a98e902f3a719cf0f0b583978f2bda3d4b97fe78bdcc3ebbdb7f152c13a3b8d14 WHIRLPOOL e65cbf9d55909d0e5dc28c96fb96bc51d20a210579fdebb7387d5ebf3bf66274872717a3e17b80033a799e01d5892228b41728a5cf49914f15d2cb8a8fc2715c
+DIST aufs-sources-4.2_p20151012.tar.xz 166928 SHA256 2f3b5c79bc28a9b609cd7def95420af033ea016eb8f11c0675c40a4b7dd03055 SHA512 cd17fd9baee5cb1186df59131c861f96901fef6d87696c61743d454b15a33d9383dbe69de8d6f520072063891cc6813e4489e6a177079c6f6ad903a6f6d856e5 WHIRLPOOL 6a9814d33a80576bd6f302384ed6f37eed74d64be30389e61f2b060c1e3b0784c4116b1318a60d116c961bf2782fadefbb784a965c4e5e1c440c7e2b66af779c
DIST deblob-3.18 127087 SHA256 c720eabb3911f8dfa4398c4250853df4633018abebc01a509ee4a283c3e00941 SHA512 6fe33762ba19aad7ff891b7b805cc26f6e2926f5e40c92fa45bc7f31bdeb5c8fc42b97e5d37d71b9422da239c7c54abd25f1fa2fa1e5733c6053abbf4c9e9011 WHIRLPOOL c351a3ae15c59081fca69c1b5d9b9de10f024eb01f1426722a0d6ccb7caa34330be42897cd85cf19b22ff876352b0cec1c19707edc81c4cb01ad9c1df2e3d831
DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8
DIST deblob-4.1 130695 SHA256 2888a5a3b5e8e9ec242e4d702582fa1d739a1274fcd94643a9fb3516a210a8a7 SHA512 b861b9b53f9295e5e993784031ce57cf8cddc418184ec00c28ed92c9e7660406e0ede581a93d0def36e7847b8e068c8ca6c4dfdd65c15cb174d6c5803c16214a WHIRLPOOL b90f55dd8702eb254968ed7689b50859833ed362e9aa1720ade96aa1f6f84e8f90f5d1eee034c8535e8bf767c0b5f8b0bc559219e8d81d4c6ed53bd5cfe5e65e
@@ -32,15 +34,18 @@ DIST genpatches-4.1-10.extras.tar.xz 16184 SHA256 5d4492d3d535b3904fe917532b52d3
DIST genpatches-4.1-12.base.tar.xz 266104 SHA256 d99620d6fa052732357a9b050a878d6ed7f1f3b03c1ae59d99132db8244829cc SHA512 4128fd323a7451692b512b249226f25ed5a0d5aebdf48832495d3d72351ccf61b7d7ecbccdd85915eff023fcb9fcbb408a1c01f2bb58535434153ca00d5ef0a3 WHIRLPOOL 2c9d9f8c989a319fb1b06ff8f2e29feeabed05c41546eb91a0bfa5bf2d586a7ef39c01d1e100519c844e419c92ece745b7192f3e3839c2fcf9dd08d971143c35
DIST genpatches-4.1-12.experimental.tar.xz 215960 SHA256 8d0659bda61873ce16612e919b7ba6ccb8b5b9b5362ab218a886bf2ccb2684c8 SHA512 b1392299fed208e973eed70174f55ab6e70c0f5c7cbe5e29a12dc27ca9fdb09448314fd3a32b1d4abfa529065d76e7ddbc66cc60019b1d9c66d1b96d0d146dd9 WHIRLPOOL 4e7189dae91ffcf37d70dd9d2547a8e2092cece356e004e9282d5c0aa3d5d992cb7423496ef9f28503e687052b21468e456f83772989a023fe0f8d33a2bdf00a
DIST genpatches-4.1-12.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3
-DIST genpatches-4.1-13.base.tar.xz 311220 SHA256 da5df39634a32c9da405258e947a23dff4d3d108df3533852c2be9b555060fa0 SHA512 f2e17dfe8fd8b572890129ee2dc4bae15ceca0f695fcd2b0c216bb755fd3031979b18a41aec32d24a2cc81dd2bb85b7f3050d18b7bc6615c925906f08cc2586b WHIRLPOOL 70a669cfd26ac756bce5d90087d7aadc9311140eb162c1108d414e0cce3bb4e43243057dc0e81765df4b2c95b3c99cad2a5ea2a802d02d4236b95c6e39cad077
-DIST genpatches-4.1-13.experimental.tar.xz 215988 SHA256 3b58f4e8e4867bb7eac7acc78954824f79d0e4260ab5b21d73d30ee617287708 SHA512 bed868ee20616194dfd314705234348f1a860a2163c886470a16e387940a48dfa78e1cd0e2a6b4a827b9c664fa37586d0a52925ad7502e2ca4e15e94fd33c2b3 WHIRLPOOL 2ff84c87619e2dea27886d1bf7e94753187e2f1b07c71b4b5ebbbaa3ead391c0d3a14431a67b3707ceda05d26b86598f1bfbe1beadb63285614e77b3e76102af
-DIST genpatches-4.1-13.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd
+DIST genpatches-4.1-14.base.tar.xz 311648 SHA256 e3a959d79834266bd4760d806598b7e9b982823e9b177219f0e385482380aa25 SHA512 b2626d0b45da547a293ba233a4c33c30aa4f7b9ff1d2c3a3aea664f9d99e272b5c9aeba6abc63f27930771b9c282184501c62a987985e23c53471ca5feb260d2 WHIRLPOOL 5db2f30fe0f30cd1161cfbd7d7a8a7cb6815ece833874e303782bf28afc25d11568d48372816e9736d39c781635d5ba91b3f80817552485ddf1c945c40aec01a
+DIST genpatches-4.1-14.experimental.tar.xz 215988 SHA256 3b58f4e8e4867bb7eac7acc78954824f79d0e4260ab5b21d73d30ee617287708 SHA512 bed868ee20616194dfd314705234348f1a860a2163c886470a16e387940a48dfa78e1cd0e2a6b4a827b9c664fa37586d0a52925ad7502e2ca4e15e94fd33c2b3 WHIRLPOOL 2ff84c87619e2dea27886d1bf7e94753187e2f1b07c71b4b5ebbbaa3ead391c0d3a14431a67b3707ceda05d26b86598f1bfbe1beadb63285614e77b3e76102af
+DIST genpatches-4.1-14.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd
DIST genpatches-4.2-3.base.tar.xz 44600 SHA256 ba1a0d8d9e1a139da388d44085a1011d760231467cef4ea9a87633673560e3dc SHA512 60367b50a40c60e6659cf11db99d4124b86fd7afa1bb8e5c3aac38b3025015f56f880e34250d1267ec4f295da38f656708ed2c6b46aa5b56f72503ed34b0e8c3 WHIRLPOOL 6dc72908e0ea0b4084d919f1049169fbe98153f85ae1bc87f3c3eef061b3cbefd427d87fef541299cf0bc48faea79b4a39e5dfb94dfdeedb4be7f53248ff3f9f
DIST genpatches-4.2-3.experimental.tar.xz 216620 SHA256 b038447b1d8129229469dfa3898b42374233ee00c65ea4728abaf632657f431d SHA512 17c13d9669596a34a85a844e38886099ff717248183104e3b02c438de4f1916886afea9db985b5c56170917901611331ef5038777eed2a4019811f98a75d399c WHIRLPOOL 9547278a329049d20a73e31e6bd5d6bf0270a2b3c7c02ce51163f4f91da18d74820f782e2c7ff66cd1e7f4075e088013def679568043d800c89c601a1cc4cce2
DIST genpatches-4.2-3.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3
DIST genpatches-4.2-4.base.tar.xz 44440 SHA256 439b89a4722bbc9c1ae72a17917d8923aa3447a16420674f12d22d6579571057 SHA512 526655ca30663fa2937ed784bcba1f89d3ffe8b5e9fe6e6134c40d42d698465bc6e266d73f1f35836b9ad94030aa4bbcef35aacd7145026bb158fe78f117a1b7 WHIRLPOOL 84bc29d2fcb171645f442eb13827764e1532451be808d9eba5393d81fe21ddfccc3167a027a31a334b9185f96b4b07507ee01643adcff60a7dac21bfe4f1e371
DIST genpatches-4.2-4.experimental.tar.xz 161676 SHA256 55687ed45c227be95df64f8bdeee322a3262424af4c72307c80aa0213971ac0a SHA512 722caebf457c370e0d75ea2c8f3861500f1f910a09c1e10b5c34847b94313e698f8abe4d2b5a604d35b5b8f324bd87b20b078904b80a16dd704e4d113a977a49 WHIRLPOOL d5c9d808d9aa340e912272f0d0b0e58b8f39c8a6c75b2b7294609dde43140397e0325d178815bd19425a2e885cf23e9c8b5cb889bcb84b6c4b6a1625f669daf5
DIST genpatches-4.2-4.extras.tar.xz 16184 SHA256 dae92203157380e361f9b114a56d59e68cb63a52ec9dfb9f9418b8804549c531 SHA512 3de0640711c7877872872025d10d4a34a8476244d0fcee9ebbaaa02213849683cf27492181783535a167791c35f6ddc0a60f4c939a62daf093739f776151cd15 WHIRLPOOL 6b10caf17084410d8c1b38be868c7658e74210a12f460b56956d8f4b4f462d8018bd983f58a7257a51be27181b20a3cddab1627edb05290b934ad078b307baa3
+DIST genpatches-4.2-6.base.tar.xz 99088 SHA256 13305a0197320b4426f3c49be3f030af274ffe3a3a07fe79c8580207b38b3498 SHA512 1bb5cedde8055917442613cbcf8f4c559fc54449dd974fff5b42367a8080a48ed4e49ceea96b8205eb2a8f4ea5a9b545a398a701c4c8512946f43a1275cb2784 WHIRLPOOL 856ee2d13f83501f5200649f00688f4a453b01958fa306ef883bc9134db566ca957bd8d863db73fe5137c34c84d61ec97b595e71178acf503ba5423946a9957f
+DIST genpatches-4.2-6.experimental.tar.xz 216008 SHA256 ce3ab8bec66d7e9bcf1ecd6f6e9925f8863869e09073cb76e6f4e1d9b6b65eb5 SHA512 1dec060dab9c942b154ea468e0cebae16a5a63844be3576a1300a1263e1b38e45b230faa2dabe020c0c32431b4c2025b38dd8fe866eef102359d81a3fd23f66f WHIRLPOOL 53396343aad281e3cdf36dbe4c0714723688b7e6a9938b8a8efdb1d6cf447e075f7d6cf503b5cef922f2a03ee2d85661011d0fba68c5a4a66853862bc5e1f378
+DIST genpatches-4.2-6.extras.tar.xz 16176 SHA256 587b262c33c48fd62b490d433226f8e7e695eff295679f3ee2589e07d2f6d8a2 SHA512 70da581e7c4fbf456ca5000cc2cf7aa13840400f549f84f5f8ae17f5c232d10917ef4dfdc391df96588f9e27b8cfee0d360faf19653dfd6b081e2cf23f4976d0 WHIRLPOOL 12af4e7972fe1a5fe54fe31ae58104624dba595793dcd3aac497e87c9e1850b203a2d17816bed1c88ae609e378075ed015ad426c0a72767cd3385b0b7c74a5fd
DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001
DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.1.9.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.1.9-r1.ebuild
index 76c6cc79b413..389ea8b4d417 100644
--- a/sys-kernel/aufs-sources/aufs-sources-4.1.9.ebuild
+++ b/sys-kernel/aufs-sources/aufs-sources-4.1.9-r1.ebuild
@@ -6,14 +6,14 @@ EAPI=5
ETYPE="sources"
K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="13"
+K_GENPATCHES_VER="14"
K_DEBLOB_AVAILABLE="0"
UNIPATCH_STRICTORDER=1
inherit kernel-2 eutils readme.gentoo
detect_version
detect_arch
-AUFS_VERSION=4.1_p20150928
+AUFS_VERSION=4.1_p20151012
AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.2.3.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.2.3.ebuild
new file mode 100644
index 000000000000..bff0187fd00a
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.2.3.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="6"
+K_DEBLOB_AVAILABLE="0"
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo
+detect_version
+detect_arch
+
+AUFS_VERSION=4.2_p20151012
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="deblob experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree and aufs4 support"
+SRC_URI="
+ ${KERNEL_URI}
+ ${ARCH_URI}
+ ${AUFS_URI}
+ !vanilla? ( ${GENPATCHES_URI} )
+ "
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+ if use vanilla; then
+ unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+ ewarn "You are using USE=vanilla"
+ ewarn "This will drop all support from the gentoo kernel security team"
+ fi
+
+ UNIPATCH_LIST="
+ "${WORKDIR}"/aufs4-kbuild.patch
+ "${WORKDIR}"/aufs4-base.patch
+ "${WORKDIR}"/aufs4-mmap.patch"
+
+ use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+ unpack ${AUFS_TARBALL}
+
+ einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+ kernel-2_src_unpack
+}
+
+src_prepare() {
+ if ! use module; then
+ sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+ fi
+ cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+ cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+ kernel-2_src_install
+ dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+ docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+ has_version sys-fs/aufs-util || \
+ elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+ readme.gentoo_pkg_postinst
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/metadata.xml b/sys-kernel/aufs-sources/metadata.xml
index 96688c53ef18..d7e0f2053364 100644
--- a/sys-kernel/aufs-sources/metadata.xml
+++ b/sys-kernel/aufs-sources/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 82bbeaef6350..6acbc62c0559 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -3,3 +3,4 @@ DIST patch-4.3-rc1.xz 6171956 SHA256 5248a8e4fcf347cd918622b8f17057b50a8c367758f
DIST patch-4.3-rc2.xz 6285616 SHA256 b467915f75047d805d5b9da01d416c420aea353321146e52540fcec83c3daeab SHA512 8b218328ac376d7144df179632e839184ef616c3f9f58232cc76155c15852634ddd3a8dcd995395bdd48510d9f4364bc7198e0b9e709754dd74a91c1d46a6799 WHIRLPOOL 8da044d955e1ac9ec78422c853533f071a80680cb5cf914de19858d2cb42cbc25cea857e62b5847f09570a89a96c618389d5cb1f2a35481e4846c57196cd402b
DIST patch-4.3-rc3.xz 6370684 SHA256 5fb1f48e05e7523223498dcb319cfbdb5de8211713fae3bab17f75239afc13ab SHA512 937352ac6ad4e003938635d9fb3fcb8c8c78268b1f9fb55b09623530391ca9f089b64537422dd7f1a3b0d7bb24bbc0ca896532318067a9e5c1e6904dfef8d65d WHIRLPOOL ea98b91bfefc9f1d3b71c9c3cbf8c2b23ef0a1e3092a05bbe3a7d4dcceb1073e9d361b07bb669fb50e92ae875e230148a66a67c265e6db1ff00c7836bf44e3ed
DIST patch-4.3-rc4.xz 6415156 SHA256 8ca3c9cefc9fff22ebe8cd8dba1100fa053ecc2d6197156bf3fe6aeca1570e97 SHA512 dfc14556e14a0b3ac786b189ede36e79b71ab8711cf635b0be5793d293447d7e45e59dfeed562a3295149a7a23cb03ee6713e35d511a8285d21b7a65e758e356 WHIRLPOOL 4251e94d6c31f530bd577cdbdd21f5c79f99a5a3ee124d36bbe347766e380e79e3f5e5585787bf8a808de4c964c799ca2a7f6af853941f0ac50599566fd563b7
+DIST patch-4.3-rc5.xz 6432572 SHA256 b77ae187707167ac73363ca9ef34dd38552ff0a08d5dc0467460a16bd41582c6 SHA512 c07c4cd33a3cebb616a35d1aab69d70d046c60f82e317fe2ead733e632ef22e93a39e5181dc3f6261665cc0ec80535246b47e7d37fcb46dc4891efe8bbed4258 WHIRLPOOL 7de2dc159da2ee66e2438bd0744210586596e7f6565a97bc61cd0c975e389c23036b206f394404999f985a4393f4d5d5e453933f5a2962e0f9500c0efa4004db
diff --git a/sys-kernel/git-sources/git-sources-4.3_rc5.ebuild b/sys-kernel/git-sources/git-sources-4.3_rc5.ebuild
new file mode 100644
index 000000000000..13457dbf08c4
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.3_rc5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="yes"
+K_BASE_VER="4.2"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ >=sys-devel/patch-2.7.4"
+
+pkg_postinst() {
+ postinst_sources
+}
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index a9895c686b75..6d4208f350da 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -14,7 +14,8 @@ DIST genpatches-4.2-6.base.tar.xz 99088 SHA256 13305a0197320b4426f3c49be3f030af2
DIST hardened-patches-3.14.51-1.extras.tar.bz2 1062069 SHA256 38f6ddc19d9c6e713786beaa044b70754187e798e3786e8283c4774d543deae1 SHA512 cefbd8c08305c94e3dea3aa45e54b5aa84a0f2b3f3430609f6051d3205404f5f16c6f224781dad14d3ad992f3f5fbe19a452c7d23f462f05432c044a811e1c7e WHIRLPOOL 3404a171473c11dbff323fc777850cb982c68bbb52a2fed593eac9687da77a7932f76d3193d3c34f5c873148dad1d6c025370600601236c627b9ee1ffe44fdb6
DIST hardened-patches-3.2.71-1.extras.tar.bz2 2369201 SHA256 3155d9f47b14a1970f3770d3978adfac67fc54bd178e8c02f101c0700a45baab SHA512 350e402b25297d53f25a5db4aafada3415a726d36df4eb11d700152c049f491e95cab48d88da23465628d9beee923edcbec7c1a12eb11103722aef98d8bd72f3 WHIRLPOOL 9fc84a2844471c23341f573f8cf1fef886bcfe2d11f9279e3a8f0bd529304a6865b7ce68d7b1869d7e0c68dccfaa85802088ec280acdbf37d68366a1057657ea
DIST hardened-patches-4.1.7-2.extras.tar.bz2 1419438 SHA256 c8c0fc29c39eafbcea107b8237087fd0e185297e2df9ffeaafc6b3a4736b7a45 SHA512 dac324e265174777d8b9c2369f57e52833b4228b3291e41952a9791ce41b9abf378e1d9a0521566c3a0e42de15a16afa5fe379985b7fee78b1b2b3b815d7cdd4 WHIRLPOOL 7638001f1b95e4af1d051b13648f486aa0eca524157e1a46dd2023fbd86313e0a5e8043653d7388b7286d42cc6e7c0f07cde2de3d5aee6cc058d12538a0980c1
-DIST hardened-patches-4.2.3-1.extras.tar.bz2 1457939 SHA256 ea348be2847baf6d937a4ecdd578f906097392001af821c38138a455c03d6f11 SHA512 de8d49ad734adf1c1de7020050d2f184bea1d9ec6892bb23fdf2b138dbae557b115d5770a993920f815bfe42b5237f73777b5ebaf5c747a0c268a2c1b387cb74 WHIRLPOOL 92940170e0eced28896657787a299451169fbef58ddc895250c4b8a526a914d2695c93ec76f61f5f4541f058e99f2d199978025b63ccf405b4cbb2d17ab93ae7
+DIST hardened-patches-4.2.3-2.extras.tar.bz2 1458438 SHA256 1bcf0ff6d229f7a2cb652e03d3d0262dee8375ca4dc8de7133ccc553f8007929 SHA512 20ff44e95066d1c659503d49b2af6fc9e1617e37f8a2048cbea19b5cdc10e8222aba749255981f0d313814d5afce00aaabb616134947ecd49fda52759ccdca6d WHIRLPOOL 3c2cc9ec78dc2afdf88b3f2ded3f31f9de477be8ca344c0fd1723cb8f17b4636284e52144de32f37f433c7d36576733b3e8d82c28b5dfa597a4b430b81ed7c56
+DIST hardened-patches-4.2.3-3.extras.tar.bz2 1462291 SHA256 67cfc9b769e061a6dbff425da29b92167d6cc89739e6eadd0df41f092793e9a2 SHA512 68f572857949488b66b9a5c71f4d361ac894c73f692161c5e998fadc02871d7a28b72391a22cffdcbc249483dfaee39383d92eae40d8c7b37165842a780ea5f8 WHIRLPOOL 21d2018652e15e0cc97f6e5cbdc34b9f4a574e1bee84f8b26903ba0fc7867e6f118f12b556b6c480e05ae200741ae80d0b6f21dec766d7499b2b538c119fbf0b
DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7 SHA512 77e9a52d78d6c8e951df1e166023eebe5defc5ef3c45d3ac84b613137b3c2e55cee5693d828ebd06c5034bd89ea2a5f862f55824f2b7839c9ad7212c81e3ecb0 WHIRLPOOL 7cc68baac4441740e2171fbbc4195ee6c0351de099aadaee8cb3487f6d1f8b7e1d3144ee54ba38dbd24d6be431a1ea3b921ffce82ff84df21a98da7bc61c1d17
DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.2.3.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.2.3-r1.ebuild
index 7240a8e5c677..aa0e2a0da52b 100644
--- a/sys-kernel/hardened-sources/hardened-sources-4.2.3.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.2.3-r1.ebuild
@@ -12,7 +12,7 @@ K_DEBLOB_AVAILABLE="1"
inherit kernel-2
detect_version
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.2.3-r2.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.2.3-r2.ebuild
new file mode 100644
index 000000000000..c274d5a0d60a
--- /dev/null
+++ b/sys-kernel/hardened-sources/hardened-sources-4.2.3-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base"
+K_GENPATCHES_VER="6"
+K_DEBLOB_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-3"
+HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
+SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
+UNIPATCH_EXCLUDE="
+ 1500_XATTR_USER_PREFIX.patch
+ 2900_dev-root-proc-mount-fix.patch"
+
+DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
+HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
+IUSE="deblob"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=sys-devel/gcc-4.5"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+
+ local GRADM_COMPAT="sys-apps/gradm-3.1*"
+
+ ewarn
+ ewarn "Users of grsecurity's RBAC system must ensure they are using"
+ ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
+ ewarn "It is strongly recommended that the following command is issued"
+ ewarn "prior to booting a ${PF} kernel for the first time:"
+ ewarn
+ ewarn "emerge -na =${GRADM_COMPAT}"
+ ewarn
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 7d9296969c9c..0d6f861be8d8 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -15,7 +15,7 @@ DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019
DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
DIST linux-4.2.tar.xz 85507784 SHA256 cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb SHA512 a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee WHIRLPOOL 2058e664ee287cc03119ff3dd0155b7018b9c789a13a1012f190e516172f845dcb2d977c8e6a6951e9bd720e5e8cdfa3b888cce392c9b02780520e77475870d0
DIST patch-3.10.90.xz 1183364 SHA256 dbc5e7fab6d1d0cd44eacd7a69c1802f29a4863f47959c3bdc4b56b9e79b7dbe SHA512 65ef2f586493117830b76cb8f767ec022e1f9fba3479ea246ee1638a87c28545ecf8f3517da65d9f72120555a360ffd80ddf3c10157686f2400a4bf5bb93b7a6 WHIRLPOOL 01736fc9c917057918964582f6ec0bef09bf0fd8c5e520ccd372e5a178e296a3190d9f7d3e33c96457d9044ee8c90808413712c563e108d6271f1ef079d431a5
-DIST patch-3.12.48.xz 1342140 SHA256 5a4707787f301a54e636f6f230dea1076adc04272b9a4e5fa77094d84c3ea053 SHA512 00c270064df94ab1c5661f27647e2302b3dcb7ed866bbb3053f77063a8282c9e8f58664384f4f58f37860f5b12411cda1f7a67cd39bb4384e465cd1401d48d8b WHIRLPOOL 440c3ec8e5b713bca86bb26bdfd6eea27bca1aafda659dd7905b49532463b0f4d35675a629ab8e74c26971c72a2f6d91effbf9073eaa8fcd629513078c1d9fd1
+DIST patch-3.12.49.xz 1363484 SHA256 f413289e803ed9511f080f9b8d6a15d2b20aee67d2f63ff939e2fb06519eaae9 SHA512 636ff6a7da8435a2311833fbe1cb64abd2a30e4c99705cffd81f084b7d4bfebddd3df332ee156f519d45ae3a1d9b059b510d4b634ab2bccd765cb7a8fcde365e WHIRLPOOL ddf5e7686d262742f24b955c333ed899f0a0690b06c8121b6f6a4cf5ae1de98fc730d17b7f7830382d06a5ca4b248f7f2bae1f95244611444a6a077dc6db6315
DIST patch-3.14.54.xz 1006852 SHA256 cd9463f0b8d561b9fac22f6528fa20e9dd0f03ba1fa80752d6ea74feb59e1b5c SHA512 36874d66d0a028f0c9ce8eeefdba9a9c0a09286a49a83001743505af1a9fcf21429b3dfb5a5b66ddfc98dfe6d27b780e8ddbfaa0580bd7bb7683f08cb9f95521 WHIRLPOOL 1dab7e6017a26d7819ba0718ffff394d8946b328132d13ebfa32206f1a1d32eee3e9e67823d588b140b5abb9bab1dbb5d70ab77dd1f73e9c45614b3c8d27ba87
DIST patch-3.18.22.xz 622064 SHA256 370993a59dc24aff4e7428b9c701aaf7fc9ea05fc5f1dd55f2dc93464a7a982c SHA512 281ae98feed012f43fc5b125c6d695ca59fc2f0472e757cfc1cbba3254c456c3312b468e7cf419e35ba9086f3be81feb54577b5ac56a3438bc6374f2c73e8be3 WHIRLPOOL 0df342c9af62eb0a96028bc734e8323d061af3aa4d79a8b004b4b002cb7f950fcd16097f1631faf53887c6fba9ee69387be7f02f7dd3bf7a180fac3df9015c85
DIST patch-3.2.71.xz 1456808 SHA256 24160af70c29320d74429717d5dfa3cd3547586f558890533a28dc19bc7caa0c SHA512 e953df5d59270abeb4c72fc3a2a660cade1a8b5768d5dd00c11f5b3580c65e8c8ccfb814b5bf591900c35e72c1b3aee91819d1c9ddf9aab0dce44b45750f9578 WHIRLPOOL 8377da2ff6427888db1eb670f677f6bc71f4db46244ced8a2f849b0250cd9deb8d183556987c892f88011b7c5645838048c11e214c7e2026e7f12efad31ad8b4
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.12.48.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.12.49.ebuild
index aba0a803dd0b..4c76af56d8cb 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.12.48.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.12.49.ebuild
@@ -16,4 +16,4 @@ HOMEPAGE="https://www.kernel.org"
SRC_URI="${KERNEL_URI}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="deblob"
+IUSE=""
diff --git a/sys-libs/glibc/glibc-2.20-r2.ebuild b/sys-libs/glibc/glibc-2.20-r2.ebuild
index aba23a72aaf6..8280980a4169 100644
--- a/sys-libs/glibc/glibc-2.20-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.20-r2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="alpha amd64 arm arm64 -hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 -hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
RESTRICT="strip" # strip ourself #46186
EMULTILIB_PKG="true"
diff --git a/sys-libs/glibc/glibc-2.22.ebuild b/sys-libs/glibc/glibc-2.22.ebuild
index a706597d650c..dcd307a97883 100644
--- a/sys-libs/glibc/glibc-2.22.ebuild
+++ b/sys-libs/glibc/glibc-2.22.ebuild
@@ -155,15 +155,19 @@ done
eblit-src_unpack-pre() {
[[ -n ${GCC_BOOTSTRAP_VER} ]] && use multilib && unpack gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2
+ # Bug 558636 we don't applY the pie works around for 2.22. It shoud have the support.
+ GLIBC_PATCH_EXCLUDE+=" 00_all_0002-workaround-crash-when-handling-signals-in-static-PIE.patch"
+ GLIBC_PATCH_EXCLUDE+=" 00_all_0012-disable-PIE-when-checking-for-PIC-default.patch"
}
eblit-src_prepare-post() {
cd "${S}"
if use hardened ; then
- einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
- gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
- epatch "${FILESDIR}"/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
+ # Bug 558636 we don't applY the pie works around for 2.22. It shoud have the support.
+ # einfo "Patching to get working PIE binaries on PIE (hardened) platforms"
+ # gcc-specs-pie && epatch "${FILESDIR}"/2.17/glibc-2.17-hardened-pie.patch
+ # epatch "${FILESDIR}"/2.20/glibc-2.20-hardened-inittls-nosysenter.patch
# We don't enable these for non-hardened as the output is very terse --
# it only states that a crash happened. The default upstream behavior
diff --git a/sys-libs/libselinux/libselinux-2.4.ebuild b/sys-libs/libselinux/libselinux-2.4.ebuild
index 02d769021d85..642336e6c519 100644
--- a/sys-libs/libselinux/libselinux-2.4.ebuild
+++ b/sys-libs/libselinux/libselinux-2.4.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
USE_RUBY="ruby19 ruby20"
# No, I am not calling ruby-ng
@@ -78,7 +78,7 @@ multilib_src_compile() {
building() {
einfo "Calling rubywrap for ${1}"
# Clean up .lo file to force rebuild
- test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo
+ rm -f src/selinuxswig_ruby_wrap.lo || die
emake \
CC="$(tc-getCC)" \
RUBY=${1} \
@@ -125,18 +125,18 @@ multilib_src_install() {
done
fi
- use static-libs || rm "${D}"/usr/lib*/*.a
+ use static-libs || rm "${D}"/usr/lib*/*.a || die
}
pkg_postinst() {
# Fix bug 473502
for POLTYPE in ${POLICY_TYPES};
do
- mkdir -p /etc/selinux/${POLTYPE}/contexts/files
- touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local
+ mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
+ touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
# Fix bug 516608
for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
- sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE};
+ sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} || die "Failed to recompile contexts"
done
done
}
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index d78ace2dee65..1f1d1d20aff7 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI="5"
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
USE_RUBY="ruby19 ruby20"
# No, I am not calling ruby-ng
@@ -88,7 +88,7 @@ multilib_src_compile() {
building() {
einfo "Calling rubywrap for ${1}"
# Clean up .lo file to force rebuild
- test -f src/selinuxswig_ruby_wrap.lo && rm src/selinuxswig_ruby_wrap.lo
+ rm -f src/selinuxswig_ruby_wrap.lo || die
emake \
CC="$(tc-getCC)" \
RUBY=${1} \
@@ -135,18 +135,18 @@ multilib_src_install() {
done
fi
- use static-libs || rm "${D}"/usr/lib*/*.a
+ use static-libs || rm "${D}"/usr/lib*/*.a || die
}
pkg_postinst() {
# Fix bug 473502
for POLTYPE in ${POLICY_TYPES};
do
- mkdir -p /etc/selinux/${POLTYPE}/contexts/files
- touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local
+ mkdir -p /etc/selinux/${POLTYPE}/contexts/files || die
+ touch /etc/selinux/${POLTYPE}/contexts/files/file_contexts.local || die
# Fix bug 516608
for EXPRFILE in file_contexts file_contexts.homedirs file_contexts.local ; do
- sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE};
+ sefcontext_compile /etc/selinux/${POLTYPE}/contexts/files/${EXPRFILE} || die "Failed to recompile contexts"
done
done
}
diff --git a/sys-libs/libsemanage/libsemanage-2.4-r2.ebuild b/sys-libs/libsemanage/libsemanage-2.4-r2.ebuild
index 5e14e7d668f9..b949d14907aa 100644
--- a/sys-libs/libsemanage/libsemanage-2.4-r2.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.4-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/rel
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="python"
RDEPEND=">=sys-libs/libsepol-${SEPOL_VER}[${MULTILIB_USEDEP}]
diff --git a/virtual/libintl/libintl-0-r2.ebuild b/virtual/libintl/libintl-0-r2.ebuild
new file mode 100644
index 000000000000..1f9f73f00ea5
--- /dev/null
+++ b/virtual/libintl/libintl-0-r2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for the GNU Internationalization Library"
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="elibc_glibc elibc_musl elibc_uclibc"
+
+# - Don't put elibc_glibc? ( sys-libs/glibc ) to avoid circular deps between
+# that and gcc. And don't force uClibc to dep on this.
+RDEPEND="!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libintl[${MULTILIB_USEDEP}] ) ) )"
diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest
index bef6e4461f34..e0c44644be0a 100644
--- a/www-apps/postfixadmin/Manifest
+++ b/www-apps/postfixadmin/Manifest
@@ -1 +1 @@
-DIST postfixadmin-2.3.7.tar.gz 1600662 SHA256 761074e711ab618deda425dc013133b9d5968e0859bb883f10164061fd87006e SHA512 2d217874832bb3e70b200d7ddadcfdc81f0e9d3119bb54070fd645e055e4fd69b8fd9470b88af630a38c4053f4dd132425448b0dbe6525966aa5a4a2d8a1e7d0 WHIRLPOOL 7726aa7157834efcde5ac81f62c92db53b8931e868824cd48e43c541921d18908484291a6c5711a40609ad5e8dded954e8edffbdf0b5673d7cd49d647644bf50
+DIST postfixadmin-2.3.8.tar.gz 1600215 SHA256 8969b3312935c6e94ff17508f5b7e78b65828cd52d371adde3bfd9206597d94a SHA512 96cd4212109a9459344dc017a397b0d6abcb8653c7aae4f40f913e9a49581d7f74bd92500046f8758e195bd24e63a3b2373c461edc96c67fa1d01f91f4f489c6 WHIRLPOOL 4c98ad01a69708abf10970dd437f15945d02c0ccf8e3563051369f39be6b78eba0f7d7bd09b1784e73e65976b7454ae419571b77c0142477790e320710f3de21
diff --git a/www-apps/postfixadmin/postfixadmin-2.3.7.ebuild b/www-apps/postfixadmin/postfixadmin-2.3.8.ebuild
index ee91304aadac..2a8d1c4cf551 100644
--- a/www-apps/postfixadmin/postfixadmin-2.3.7.ebuild
+++ b/www-apps/postfixadmin/postfixadmin-2.3.8.ebuild
@@ -53,7 +53,7 @@ src_install() {
fperms 770 /var/spool/vacation/vacation.pl-${SLOT}
dodoc VIRTUAL_VACATION/FILTER_README
newdoc VIRTUAL_VACATION/INSTALL.TXT VIRTUAL_VACATION_INSTALL.TXT
- rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.TXT,tests,FILTER_README}
+ rm -r VIRTUAL_VACATION/{vacation.pl,INSTALL.TXT,tests,FILTER_README} || die
fi
insinto /usr/share/doc/${PF}/
@@ -80,7 +80,7 @@ pkg_postinst() {
chown vacation:vacation "${ROOT}"/var/spool/vacation/
einfo "/var/spool/vacation/vacation.pl symlink was updated to:"
einfo "/var/spool/vacation/vacation.pl-${SLOT}"
- ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},}
+ ln -sf "${ROOT}"/var/spool/vacation/vacation.pl{-${SLOT},} || die
fi
}
@@ -90,7 +90,7 @@ pkg_postrm() {
if [[ ! -e "${ROOT}"/var/spool/vacation/vacation.pl ]] &&
path_exists "${ROOT}"/var/spool/vacation/vacation.pl-*; then
ln -s $(LC_ALL=C ls -1 /var/spool/vacation/vacation.pl-* | tail -n1) \
- "${ROOT}"/var/spool/vacation/vacation.pl
+ "${ROOT}"/var/spool/vacation/vacation.pl || die
ewarn "/var/spool/vacation/vacation.pl was updated to point on most"
ewarn "recent verion, but please, do your own checks"
fi
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index a85b05ccb59a..9d96374b4fa7 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,3 +1,2 @@
DIST epiphany-3.14.2.tar.xz 3063764 SHA256 cc69403b3b7addf30dd6eb703265a77102b8ab3c6194678ad0d2433f251492d0 SHA512 895f70768c4c765fdc221b2d44bfbb6e7599b0231b0af1a7a8a869fd461db6a09cbdd7a0120bda5dfd583d1d667391c574f18caf1aef5971b474d34911581dc7 WHIRLPOOL 0e235b3190b0ef42a9caa241258060dd5db1e8db07275102ec50b5223931badc56b6ad0c7ec32ccf27d74308845d4d9aef736775bbf6e5290a5d9275bd5c669a
-DIST epiphany-3.16.2.tar.xz 3084952 SHA256 a621b5f443bc168980d12452f1a031e0a50d99ffc825989a38b14d398def73e6 SHA512 424408e24bf69f8ad62e4c384d916890e128d164c8ab0c2932fa143f2989f017eb56d0b4a9c5e77518124c1e6d233df152ab6b85e3a1f26f28ddc97200c5aa83 WHIRLPOOL 2c970e2b22742193f7c2e9fd17a55f528132eb77dea0b3c8f83faf3c3f7d530343ccc26de51871a98fb92ab185b691b1d5dab49853b8415852c7b8b8518e6635
DIST epiphany-3.16.3.tar.xz 3082680 SHA256 d527f1770779ec22d955aeb13b148a846a26144e433ff0480c981af80e2390b1 SHA512 68f4dc0e299b929f244818d93a9af14f48ef2c3a93813fe5457c11d37ddb5a5e2b5ae3f93f0d41e8095590f87d8679d2cee5b6298c128475a9ad9eb6aa3c8bae WHIRLPOOL c82ff5051ac3c1ac2480b846f77893f39f52517f0aa0f7a6084e8b24e98f490264a6adecd89671d89719da835ca84f0613019e281280380bb20d980c2294afe9
diff --git a/www-client/epiphany/epiphany-3.14.2.ebuild b/www-client/epiphany/epiphany-3.14.2.ebuild
index 154e4c3c6933..874cc66130bb 100644
--- a/www-client/epiphany/epiphany-3.14.2.ebuild
+++ b/www-client/epiphany/epiphany-3.14.2.ebuild
@@ -50,6 +50,7 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
>=gnome-base/gnome-common-3.6
>=dev-util/intltool-0.50
+ dev-util/itstool
sys-apps/paxctl
sys-devel/gettext
virtual/pkgconfig
@@ -72,8 +73,7 @@ src_configure() {
--disable-static \
--with-distributor-name=Gentoo \
$(use_enable nss) \
- $(use_enable test tests) \
- ITSTOOL=$(type -P true)
+ $(use_enable test tests)
}
src_compile() {
diff --git a/www-client/epiphany/epiphany-3.16.2.ebuild b/www-client/epiphany/epiphany-3.16.2.ebuild
deleted file mode 100644
index eee9b2f4b35e..000000000000
--- a/www-client/epiphany/epiphany-3.16.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-#inherit autotools eutils gnome2 pax-utils versionator virtualx
-inherit eutils gnome2 pax-utils versionator virtualx
-
-DESCRIPTION="GNOME webbrowser based on Webkit"
-HOMEPAGE="https://wiki.gnome.org/Apps/Web"
-
-# TODO: coverage
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+jit +nss test"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-COMMON_DEPEND="
- >=app-crypt/gcr-3.5.5
- >=app-crypt/libsecret-0.14
- >=app-text/iso-codes-0.35
- >=dev-libs/glib-2.38:2[dbus]
- >=dev-libs/libxml2-2.6.12:2
- >=dev-libs/libxslt-1.1.7
- >=gnome-base/gsettings-desktop-schemas-0.0.1
- >=net-dns/avahi-0.6.22[dbus]
- >=net-libs/webkit-gtk-2.7.4:4[jit?]
- >=net-libs/libsoup-2.48:2.4
- >=x11-libs/gtk+-3.13:3
- >=x11-libs/libnotify-0.5.1:=
- gnome-base/gnome-desktop:3=
-
- dev-db/sqlite:3
- x11-libs/libwnck:3
- x11-libs/libX11
-
- x11-themes/gnome-icon-theme
- x11-themes/gnome-icon-theme-symbolic
-
- nss? ( dev-libs/nss )
-"
-# epiphany-extensions support was removed in 3.7; let's not pretend it still works
-RDEPEND="${COMMON_DEPEND}
- !www-client/epiphany-extensions
-"
-# paxctl needed for bug #407085
-# eautoreconf requires gnome-common-3.5.5
-DEPEND="${COMMON_DEPEND}
- >=gnome-base/gnome-common-3.6
- >=dev-util/intltool-0.50
- sys-apps/paxctl
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Fix missing symbol in webextension.so, https://bugzilla.gnome.org/show_bug.cgi?id=728972
- # FIXME: More information needed per https://bugzilla.gnome.org/show_bug.cgi?id=728972#c5
- # If you are able to reproduce the failure, please provide it. Thanks
-# epatch "${FILESDIR}"/${PN}-3.14.0-missing-symbol.patch
-
- # Fix unittests
- # https://bugzilla.gnome.org/show_bug.cgi?id=751591
- epatch "${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
-
- # https://bugzilla.gnome.org/show_bug.cgi?id=751593
- epatch "${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
-
-# eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --enable-shared \
- --disable-static \
- --with-distributor-name=Gentoo \
- $(use_enable nss) \
- $(use_enable test tests)
-}
-
-src_compile() {
- # needed to avoid "Command line `dbus-launch ...' exited with non-zero exit status 1"
- unset DISPLAY
- gnome2_src_compile
-}
-
-src_test() {
- # FIXME: this should be handled at eclass level
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
- unset DISPLAY
- GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
-
-src_install() {
- DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
- gnome2_src_install
- use jit && pax-mark m "${ED}usr/bin/epiphany"
-}
diff --git a/www-client/epiphany/epiphany-3.16.3.ebuild b/www-client/epiphany/epiphany-3.16.3.ebuild
index e0ee4951f0b5..d1a927b5a069 100644
--- a/www-client/epiphany/epiphany-3.16.3.ebuild
+++ b/www-client/epiphany/epiphany-3.16.3.ebuild
@@ -50,6 +50,7 @@ RDEPEND="${COMMON_DEPEND}
DEPEND="${COMMON_DEPEND}
>=gnome-base/gnome-common-3.6
>=dev-util/intltool-0.50
+ dev-util/itstool
sys-apps/paxctl
sys-devel/gettext
virtual/pkgconfig
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index f050e7656d0d..b4134b71612b 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -160,84 +160,84 @@ DIST firefox-38.3.0esr-xh.xpi 450242 SHA256 93f9e1dfe71a596ebce79affb5764ea7057a
DIST firefox-38.3.0esr-zh-CN.xpi 488277 SHA256 1c1def4062ce15660670d7d31ee7672359fc50e9fe4b1f8d80e96f0d8adda199 SHA512 e9fa12f7b3fe537e82e93d9435f64d235c6f9c48b2a13c5fc43c8912c9fa6989eb28d69ea80abc55890f0e706490da56194af3a3af2133aecb4ffe8aa4bc2440 WHIRLPOOL 9de780fa30840d1193bf498cca66f81419c3e8526d1156d3629efc837855c2a771415ad8172bd24a85bcc64733da34a62f39a6f686b22cf8fabf9539d7cf9ccb
DIST firefox-38.3.0esr-zh-TW.xpi 467844 SHA256 1dbaae6ea46991f5298bb5c03f0926b48d77c058ff07c44601377ecbe9837be3 SHA512 2a1b70a5199826983f877e1b435a650150533caa708e43b437ad41ea0f67d48225a54ad6980515eeacbda843c1a901fe0556b7e2362afdc3d63b67831b6b566b WHIRLPOOL 77f09701a72ddfb7610c842c97efef613cad31c573a3b8b4277f15f2c64e01423b2800dd5237b529a8a00b8aec876998a2f7c66d8ccbcc95880e3edc86cfdaf4
DIST firefox-38.3.0esr.source.tar.bz2 181401628 SHA256 809f65502d256568220c52bfe09646588f21653c8c487e8018b10ff87ca67f1c SHA512 e3085663e0692b36cce38ed461d6d0a9b025f7e777aa58a9ee170d904aa1c2de3aa12c480d2d9e37f5d58d4c7d80ad33c913834efc0b350e60b59e55716b180c WHIRLPOOL 1d2aefa907aa19dbd6bdc917cfa615ce6da45e2688d7ff154734e9abdc2c3ebdc497c3dfec9c17b5b5ddfc26d6ee0db9884a969502855cbab9dd0a988a6ee996
-DIST firefox-41.0-af.xpi 486121 SHA256 9a81d311727c1b393eb5a1d420c77a26cc01327b3c326a935b8b31b426977ab0 SHA512 7360b653fba4002ff08e19f955947ac4e5a581ddd93174ad468d1c53caaccf48596a9cc0d50455d2eaace12d8384955c50c23a84423221153c747b85f93a6d91 WHIRLPOOL 9766bc2c596e70f3bd7a672ba534c29d81aafa6f9f8f123d4dfb6ebb379a3767700a992142186840beb764046d77f4ee2fb5121442379830b0b99d0f53bdb485
-DIST firefox-41.0-ar.xpi 521159 SHA256 bb9ee3d703c10f9bc3e12e9f62ea95511955239a20fae81918f0c0529685baf8 SHA512 22a3e417d2cd1ff62e6e05929a1a6318074d3328b57abc34ed5ef07a3b634715d8b8a60092d7548c1ba34f1a63aff4213621b6cf0928ac52b28669ada270b01b WHIRLPOOL ce8a9a7dff478541577d52f84f6d0fbab59cde374e03878500b3976a2336b33a81f10e72d9e4fafa0a1d40e052250823d377973ee3e678c74fad8668f1a1c2de
-DIST firefox-41.0-as.xpi 511219 SHA256 2bb52d1a41ca3955a460f0f2d48efe3e2c99ab579d72f1c183faed70403bb869 SHA512 10f501ad24a4a94b154130f8edc1535e4cd8f0445255df7efe79daa5e0a57225a7a08709f94d6420076a9b417cf5eae9908fed34867eb2387eb86aaeb62647e1 WHIRLPOOL 7365bb0e4bf7647522cb3406a48c651b03479686583dc99d4f2ddcb05e863ea567dc95d2b0c0686442c794b7cb817c99e3b9101d976c2f0105d219ab7256a4d1
-DIST firefox-41.0-ast.xpi 399122 SHA256 2be891b76d75d39310f35c290a7d93aab8b6d4cde87e65f0820760fd230c7985 SHA512 34ab36df4257cd9020502c3598cdcd3b9e2dac62c0b6ccb894b4b2090f652fbdf9e5cdee704ae3c900166c2e4b910db35bd1fc1c1a4debb4ee3425a8f15dba14 WHIRLPOOL ac63e2585a58c599c00c0fb0116aa50640280d16557f1c54e6a916de37ffcad8aa45cceeba319dbcc1c538151f504b291350bf5e224525fd49fd9bd993b6b21d
-DIST firefox-41.0-be.xpi 453403 SHA256 3611cb1cecd6fd6ddfcc57ef936a351704299a54362d000c16779aab7f7399ec SHA512 497daabf1aaec05fb0ce31acd0cad0e4a924c3077bdc2c77ef63d7ad9532681611310ff5716c04d529677526e90baa19fc82c9e5e5496914857a9382be29f2ef WHIRLPOOL 9b3a13ca04ba8e7dc73a723b71ec33502c26ad41a03023d97031d8de9435c54651e88828c68255413f5f2a8d6132ca923afe4a810b6338b6c30f5b4fdc51ccfe
-DIST firefox-41.0-bg.xpi 492965 SHA256 45842f478fbac439a828950fd8a708352e6f249c967d71def55eeae0ec49c78f SHA512 caa8f7da30e3b4eab19e4f33b2e8cc2aa7b1a67a908eb061a3feca2ba9c4fd68c0a577ccff1dd6f025ba963dfcedd46ea0ce555f75914e0dcd2887ac82c2e4eb WHIRLPOOL de8e489948a1095b3fc3ddcc0cb2bcd6a77002326b3cfe168e62996c68d68a442f5a8ca6de9e7c5e872f1789f522a496442a0a38094d3cc6a4e36a15b61e50ba
-DIST firefox-41.0-bn-BD.xpi 527570 SHA256 de27686738705b1291118126d87f9f6f60075a35abc3651ebbe8c62d3624f8ba SHA512 ad44ca81bbcf4f3861736dd688ba17b70b9897f6332db4d4d8ca6c86f98e35817971697302a15964afda7dfc2323e353405e1b4d82a74785d12a22d4b6aa11f0 WHIRLPOOL d2c813aa0f9ee56df5ca82e4b082b71fb4baf2f8d458e26a5277579c250191d1e9869f1ba05d2156f5936d8a0ed3abfe1421b202837646766ffd085d57d2b3d2
-DIST firefox-41.0-bn-IN.xpi 530267 SHA256 bc94787dc80a9afd100c0b784374aae1bdb03e03e496ce6f6cd5b7e3d254056b SHA512 3c4842d8b21718179249d6a849e10c4a0ce69e892bb0abfbb459c1e2679ba248549d04f48fddd24782ed04f45348be951b5858615f1ff4bf2a6e8dc41e672e32 WHIRLPOOL 49baa57523d50a3d789909588c3707b2a5cf9e90dc9fe4b79683b6e310faddbaa038775f2e757a1c47bee27dd2fa943501056fbc62a072f0ceee5e6817fc3ba6
-DIST firefox-41.0-br.xpi 444530 SHA256 98db3d58490a3bd71ef114a8d066fa8515450b6d85c8474316f46cf7e4c0a3be SHA512 93bd12eedd8a87d68523f8f556c918dacdc54260f9f6b5a496fb63981460687ab614f15a3e9585926bcaec9fbe1430290461f788582e4ce005774dc571bfe359 WHIRLPOOL 5bb77519e61adf4c3fab68af264209ac294083adc864052f41be199867de48181a472cb53809193a689970c891189dcb44273a6595ba2758887ea60de7e38bfc
-DIST firefox-41.0-bs.xpi 486281 SHA256 20bb1ecb9f4aa63163c6121e74a25b5d6b55c33b2dbe13531962df1dc52dad10 SHA512 67bb9bcd6f5c8ba7a07f5481eb32d7b836af83e704a831c176f9ef2bae0285ca5f1f6af9126326abeac2365e6e94a890d12e6c40c1985f01818abef953520548 WHIRLPOOL c82de7434d1c78c577b0615b98e3c4a2689f63c429fb8a28e2cf8e98207e59a5bfd8c7f7ba647dc4853e8e9633ee65d64dc331fbdbc8a96b3672d66aae95dce8
-DIST firefox-41.0-ca.xpi 461321 SHA256 4921859dd265dad50f39187b7036e9154a73d4d32d5153f2c55cf529fee38e57 SHA512 36697ba92a072c5fbd3375d4dd6e9be6e4743ea3bd927489d8334aab54347a133cf1f7103173c478e1b8de3fbe2864e41d1ea3ce919c11bb672e1fff3e275101 WHIRLPOOL 893552baaf7c5366713cdcfdccbeab90e924a86c75680df9725eaeb22d131b9b948d4266fc67b207c49a8f8908d47b09d9d5cb7db1b39c71e505b6b74ab3d9be
-DIST firefox-41.0-cs.xpi 450333 SHA256 5fc00e06ade7de4ab82d93fb87f698c990f3764fbe56ea2780ce06af0b752413 SHA512 d5a2fb52ab68de7ed45b4567d80a0d92149a352d12b37463629ea09a523664bee31cb681a732cacc42166ce308bd6ff67ec2194a628f554c3547e8b097228a65 WHIRLPOOL f28f199edecbb84359df9bfe7c9cb2fc161edabf2c1f89903d7c22c4362340753d480b9e2155d82e63bce0132a3ab205c5017ab7b5b65b3df61800977922d60b
-DIST firefox-41.0-cy.xpi 448183 SHA256 25c0e0d472878821b3c45867f910ba90414ee419894f7f01dd9484ff9ff7e973 SHA512 96ab90a1722ca702e6d3a23733769f8fe78cd04c7f3113ae2c2bc58dca27beef42d7185d8b2cee03fea6182abdf0ee97b4400539612b1217f00d69cee6497d11 WHIRLPOOL a0122ce73c5d241a5b0832435c4d4fc7e602c9ee867a1d2e65c5375d4008b928eabedf9a42fd8173de3583d378c2ed33d10ac21636f95880a070a81a17497433
-DIST firefox-41.0-da.xpi 453403 SHA256 96d7193c09620bfe570ae37deaaf356d182399057ecd70341c2777188496e64e SHA512 b552670bf54f2ad316aa3c9ed8c45ec5c2c3d22f0c7b906d0832dd3d29a78614aaf038772ce0cecc92e9d85e29b9258cb1775e28f0c23efc81dd79c46e43b424 WHIRLPOOL 8e73524f09af961f7f3b59e2c8c233115bafca53a75637cb32b2c482711c03a56eb4d9d31e78b0f7920ed9acca575629f4929c94b2f862fd3f6b5435e5df4e9b
-DIST firefox-41.0-de.xpi 455710 SHA256 5a28c5751581e669d0979c62217cbf7b9ac61995dcc35a53ab675e241e374c7f SHA512 1cb61cfaa38326f3b27cf137e41813232839c09981e5979b8921ea7c1d4572ed058e496a621859004b5b088acad064a6553766eaf1fecef66d621ef95501c845 WHIRLPOOL 9ca448a7353a34f178a06fbc69ecf1f814cd0b9cca274ba9bbac7cd0f7d2636c29b8e0acf10bd2af0c49d299437191f70994d2fd4d815276ec316cb17dbf49ac
-DIST firefox-41.0-el.xpi 501619 SHA256 f1437c41e2450d5101c3fe2b5e128157d33f5b93336483db36314f3a5e3c9f96 SHA512 0d76c3d5ea7b32f8873571794abbfba055db6cc7e97ec1ded1e7bb95a997aab01c1e4b134fcc2ad3ad97020d4ddc5ffb0602ee3111bacdd46db50f134504bf8d WHIRLPOOL 4c587afe61c6a2ec680cc017eaff5c2de0933e2ed5f1a89ba02a517c195e5764856bac2de27663d79bf7dddb3fc379a8311fc7617802bade7ea0d93881b35621
-DIST firefox-41.0-en-GB.xpi 441098 SHA256 a419880aa591291868e86d15dd0af1fe20f55cf18e62cfe272e71bf09b2e6b7b SHA512 4c410f1a284feeea914a490211a932185f1c397e8ebfddbaa5d887b8059896f69299ecf14d88da7cdf9ffb2729858d135ff9fa108a33cde91de30d82943f41db WHIRLPOOL e30ecac6cf747e9e3f6d04d987894a802e35da284e241b319c8004302e8a6bf7e8af41424493564df276deff8f4fbf31b09f72027bfcdfbe638b788456e481d5
-DIST firefox-41.0-en-ZA.xpi 444145 SHA256 5dc4e9357ad6f826572f96305ca8d1c5fa74a4c9c82fcbb78b3a7f34d9ecb242 SHA512 4d5e35e2e60e18c64ca235612039de0ebaa067acc76d8fefbd80000fb975445d5a7fe986a2a85f2709ce4de5de46cd469b428d7092a13d01707c3820b47473ef WHIRLPOOL 26817dce4d8fb2b854661d57f9ca16cd3b6cb9b9f108ad82be596b71cdda872721fcd7e48f5409930811f9c3f572db7edde5c8bab3c84b00ca28508c5e8e56b6
-DIST firefox-41.0-eo.xpi 487994 SHA256 15ec1dcf88b51b671e2369346e87a0503b2b1ff8c32b9e91389816a4eadbc8e9 SHA512 c801ba5d8cac36932e2fae88496c16f3623f4511ddecdefd81b5d99f4602927d17835d0a9d3456d167fe88935dd3b3ffac14f76708f871a519efa06f3048b838 WHIRLPOOL fa4d6a37b437ac2f62f779927722c4687a58842d9cdc70fff4832f35b3dda7ff49f8324018bda4f87a3b04a8767d5e8c4bf56e6ebbd80392b4ab4e4fddf10dbf
-DIST firefox-41.0-es-AR.xpi 456517 SHA256 535f578884c390698c97db2717dd91f3d948fb135b8ba4f1b5ec09d796092ce5 SHA512 b104e011d8655c6f884af6e1aadf22eda9505bfec3f8daa12a408670f6a3e8f37bbbf43e33fb9b630ba2c0d810981e98f7ae6f3a31ada727c9321fcd76b32096 WHIRLPOOL 6fe88da24b22b9ebbc9f367b135a7b458d39b5deeeecb7a47cef4e776ae82e2319e21bf912b19b3719955cd57aeba9101361a61e2a1bf4309107f33ea09a5b54
-DIST firefox-41.0-es-CL.xpi 381632 SHA256 b65d4c72e66642d5188bf12686f2541d2b5178be83ee2fb727d82877aa1aaa3a SHA512 afd83956a754af7de3babf4f829e204cc91cea2b3b9490dbd0457a45f85ecc5d892f947dcd343949806a79caecf239051d57ba927cafbd710e4358a9f6b64825 WHIRLPOOL af6da1a91197878f08aee00eaa9dde7afd5eb872cbc43d3412fd6b7ad84e12bd8788bbc68c54194fba33275014585b187d238e238c265d08729271604e374adc
-DIST firefox-41.0-es-ES.xpi 370111 SHA256 ca7968f53f99bcf8e5369926b0e8b23ca7272e54bd15447fa42d8588fdbcdbd6 SHA512 e0a79f007f655d80fd4bb665e6e1d6e91eeb6d7330771764475e17a7539d5770f7c51d7eb66ad906ead815d672d456dbd27712a7ce392de7143ab976dbfbb36d WHIRLPOOL ce903e4dc39c2c9174f3f14dfe36883c870ba32500173f9d6eacb1a3cf92d6d53d9aa3a93e18897fdccd7b2a18258acb10a55c8d1110e95ed61d0b7606784f13
-DIST firefox-41.0-es-MX.xpi 460283 SHA256 a6384d393b6c82d29834089db412c98de0ce58ef7293c59166b6675f236ba0ef SHA512 635cd6c7aa1894d7e0f1277f6910d3f83848133cad8e4e1c885edaab49c43690629942a11c038ea7947f72d84aa3a46999823c067c47be1cf8aa7d5f7444bcdc WHIRLPOOL 69b3fbe36f5307a8e5df9302ef2140633956da6692b8c73ea244a5dca4c01d72d1bdaf8de4d22aa5fa67dd7e423ccc825b243db87e701c1cbfa76c3b4b572596
-DIST firefox-41.0-et.xpi 445439 SHA256 71db72097253d9eb7964e220ac7d559d34dbf0e1214715814349ab5fbcbd2046 SHA512 52ab6237a77bd914bad894707bfb2e2ef85b03f568c5c4d6ba91f889fc7e7fe6645caa2239b431122f4bcdb9699e0e5ccb950bd5c8bb8487a6e514cf69872402 WHIRLPOOL ae0d8c78f79297cd22aa49f4adf5de14e6e4dc3663511c0e99b6bd2bfb7eae815358e739c6405ca1c2276cfbfdf04d37af162dda14e0dfd3dff2e4e85ff223cd
-DIST firefox-41.0-eu.xpi 469716 SHA256 47cc5e46baad2e03a17cdfeb054d0d3f102094b4e9dcb1c8a49d104324f6115d SHA512 253191ce3a5d69a8ee35405c227432c966680a2c543ef7de4db10a32f10c4745fc3d4c007acf9cb7f357127a65cedc5ef0077551c2c8ae8d8239060d04abe6d5 WHIRLPOOL f93d58cbc4c228c317797beebc03b938c6bcafe3182873fd4dce8660170c790e5d39fdab0f012f990725e09dbb9dd7dce465bec34c07fac144e4569a18b91c37
-DIST firefox-41.0-fa.xpi 516157 SHA256 d3c1491021de3477709b2f77a2ed95e4a4b37fdadf37dce2892edf689cbc015b SHA512 2382628af646d24931d313cf8f2a5b2a6d70e33cbeb06da4a3ad6bbb5e867c4adef7339f6a8e80332485636a06332ac0d272e6c0d355c7537ef0e8d4c93ec7a3 WHIRLPOOL 8ec6dfafb853434affbc876e63c827d4195f32e0a9544e1cd562453746c130b019af4bce165980b0ebf4f5043484a4ed7555617e4d42c8f109126a7d3d6477b3
-DIST firefox-41.0-fi.xpi 447174 SHA256 0c919f496c2a0e1503a8f37ded5938100680e810f6025cea0e84ae27f70b06ee SHA512 aa5740c3cf004660e20b12ebac6f23c36c0246e1ee3806a89444d86bfd81e5d3609b4a5a12dd988b55feeec2a78ea8f905fd8c9708def684efc4b68fb98e9d9e WHIRLPOOL fb2ade664af6934dc5282ca1c317af4921225850e7dc1f289f2df814a792397c88c42b93c599498f1c96684bcf552f6f3b3b074d58a170e719962401b3153f27
-DIST firefox-41.0-fr.xpi 465091 SHA256 df5faa391722a201d6f6ecf08de01d393ce96dd122f378434f11440f825e5b10 SHA512 f924b0b4907b0761bb78cd3f2cf9fffb758493b5c0d1c73f8f0487176c006a42291b4ad308493fb2af5d9ae12b4e7ffbd448ef103f8bb1f5ccbe607356e81624 WHIRLPOOL 51b2e33708783aa68b3d66f85898aa9957115af217a6ee50f8be7f810bab98bcd85136b8832288a3480a0e61a053de06034e6900af2ab9ffcb3b39d855762501
-DIST firefox-41.0-fy-NL.xpi 458775 SHA256 8aea345024bd99ceb013899e839170b61e6ae6e1bbb5b9c65cbf92f2f610f35a SHA512 6537659614e3722268f02a61a558da1d9105d0150a07e9bae8f40b50dadcda73a04ea2b2deddb2800509306191c2a38c6b670eaf3b15f4a7195fab6bce3c5b01 WHIRLPOOL ad7ce9a8cf2f2541dd89781453288343b02fd68aaa3e9a60d78d0d27d6b29b5d0cc289a320f642da160146a52b4a6aac10f32a38f540d039c5f605013e18ca3e
-DIST firefox-41.0-ga-IE.xpi 473255 SHA256 ccb6e56af07c093f77db2224abefa80a77690f955d6d54f77a6d857fb672429d SHA512 873447d1dfc39861933f3a0c65958ea3692aeb78bb16be04d18879130b654857aadd61618b30d2785d6cd7afee594722881f8dd5b693c17d2658ee1acaae17da WHIRLPOOL 0c627d36058f310e5ea093123327f0925e8ab52161730b51f172cd501b97ddde46a4be8d7b51b678cea27b9f11c20a4ac5ef4deb27109e77a49a3a0bf5aa8756
-DIST firefox-41.0-gd.xpi 457498 SHA256 12ec59d2dd84dbd1e9efbb6accbda523d93845b1198ed54ed4a1712bd50268ff SHA512 d4d3dd06ae3f2aa815f5578ef7012cca9f8f4ee272a9cbe4ac05690f80902e58c4273a88b0f4e090d822a3af58e2c97a76c835491f7391ccc316895d76c3c8b6 WHIRLPOOL f9386eb4f34ab9273d60c259ed0a3438767176e747db7017f09f09537a3ff437efac26e59cc0f9636f388b7c2eb70c349817e166245a550963b4a893dbd7bf6f
-DIST firefox-41.0-gl.xpi 452610 SHA256 db9f28f2202dc2cbe96729d1afe9cf41ab94ada69e5f1305c4c15d2d0cc6416d SHA512 a6d48410ae15e1dc0b63928fcdbac8491a418d4afebae2d207f6f6b2329b6e153d7fd8443d87250cbbfdb0b1b3e9987e1417336890a23e7a15ae0a3312d01260 WHIRLPOOL 387dbc1a2cbe5572b92e1e063a5df99e4fa749bafd4716f515b1466614eaa4010f0385fcba9817ac6fcc20ebda392a3c2406424c5967cbc7b6dcb79b295e4e66
-DIST firefox-41.0-gu-IN.xpi 487514 SHA256 53463a96319f19c4966cbef96f2a6fdbabe6e7e8f77473e74541e26724516a92 SHA512 2a4018346569539d938ad7ae00a9cf99af2fd1cf34e94edc76f45a5bc87a449e8b4287716fe21dd55c4273780c38d919dede43574df2198456ff4a2d465b432b WHIRLPOOL b2fefa07a638e0aadf30f5d30cf146c6934b1482d4ae06a41db14d7bb92599f1f63fcaf1c87a957fa384b17013ac68f7c50bb57ed53e8e0f1727fde5a7e73265
-DIST firefox-41.0-he.xpi 486489 SHA256 21d0550c2c7a3f017f4e1f83859387929c41f7f1df06db3b073852ac436fc435 SHA512 c1b5bd6ad7cc3235b342a168e94a15de5bafcd5ab369782e442e5cc456e5028061136c4bdc8de6ac310b230524de0e64230eb2c9f79f78506181e1743fdc29a8 WHIRLPOOL 77ad65be57b093b1092b7c36f4b5d87ea6e0749fc1b5a489b270a690b304db5b520e908d92092cbabea4c68892eff1430e7954c30a7a8d0553c82b6f1621f8a0
-DIST firefox-41.0-hi-IN.xpi 509161 SHA256 b15756e16e5998219c2505e06d5a05aa291cfbb73bf31556d55ce57284c535f6 SHA512 616f9194a0334a9ed0298b82bdf2835f0dc6a963d364c452b5657ecb77ef5ec43640815df288afd1ff1ab9e4383018301349a6b967ad6be18344c6432b43763f WHIRLPOOL 4268d599415f8b965bf6f5c5c21c6ed227cd2954641b1509fce8b28c851ac98570249ffd0fab82ca9dd3241f7c2e1870804edd756192f0f4eced078ef526edd7
-DIST firefox-41.0-hr.xpi 481334 SHA256 b7fda3f4bc5a7d6476f8ea5cd4e7f9d9445133dfc21f9257a802e75792543e21 SHA512 38cf93ab0c588fac022a68e10f018cbd2e336ea6236e62357dbf89eb05af0c1e89afeb218f291c654cd3efdfb91394541266c58f188a9498b8d81e18c7328cc7 WHIRLPOOL c6b45d99245ccc62cf146926131947cde793744975ee559813a035edf7b026619a47c59a8ae465b51bad5198b79edef05ed05e0af70d049f8b8cfb1cdd142a9b
-DIST firefox-41.0-hu.xpi 457034 SHA256 ac254be8aae3d7feeb7e871f76d315a0d498bfc18ea706c5d51fad200554d86c SHA512 f4877411b3a14f9460cfb31b8f46fd6841175f6d7c5422fbaf520944aa40a9efda6635977db27ec963f228aa7c4b85db901c53c15107332ae5605f0180abd1e3 WHIRLPOOL e0c4449778d47e7fc6a6ded2ae88ec378b143aa0dc52d32f53d8b647b86e4ee226254779c2da03567e2a918640f8fe750ade895f021c9b295a06cc22657b67ae
-DIST firefox-41.0-hy-AM.xpi 538340 SHA256 86019023a1bba2985fd44dc18fe6eca18faccee769d2702ed4f5be6ee68cd0d2 SHA512 4b36e4ceb71ee5287b8d92ad51027253eab19b1e4c180bf0581547722c4736643d64c4e335e581c8493c74c09c8251275b2a810c99194b86febed04fa36360fd WHIRLPOOL dbe2d6532b05faa9d48593288d5fb10ae068aeebf7f2470b9791322f955a010dd25af244fa752984574e71b0370810ea0ecd990b2b02475424a34a29f31474a9
-DIST firefox-41.0-id.xpi 433970 SHA256 64ba7710b02a8454892dbb2de437e11a1e0ce660a6c072c54f3f2788aaf9ab0d SHA512 c7d7a10670935f47d8cd66ff15a105e9f1e4757bef3e2ad6d22caf710720aa8a40aaf69e8e688fff988a9dfd14976f895dd89101791593255786b5bd9cedb7ef WHIRLPOOL 35130da5afd30b7f72c507758dcf2b02618a6c8013f11e7b7b011cdfd6b6bd6c02e7f37a02a1f7baca32f2325bcff71e929c6424f4e2114407853f79e34255ad
-DIST firefox-41.0-is.xpi 488111 SHA256 ea2916c2eec477ea0baac33c5b506f2cbcee0e4023cf4d96d3a927470c40be5c SHA512 23326bbb11a426831f9e67dc11392624b5b6309e3e1b294059b2584280e2747336c70b7b4f4aecab3285145fbb5dc5844bc4491d27308d1b090e3fe4348d2b34 WHIRLPOOL 52701b4d2e5b18b81f2a25d54de8cde73a376d1cb014cc3772128a5ff7fabe60462bddee7a0caabda82e1f9345c48bf3e7ce97358eb62bf071149246c43b8bf6
-DIST firefox-41.0-it.xpi 363984 SHA256 81c0df60bd9a20f1f3bf6861b085a5172b398fc0dcdfc603e34ce306f80f37e0 SHA512 d5c8a3e3244f7be5f27785fc17552d4ac5a4c9521eea9191edaf39da79b5983e853dcaa7ff5732aba2d67695a89a7897bcaa2c052663ac6e34e0842286761262 WHIRLPOOL 4fc2a4951fa0efa79e4bee5f2c9af44ecb62207b0f755ac77ecd206fb7165c4d587eb61c9c957bc9b33c476e62514e71ecf0b25d2496b0eb790067d885b651c4
-DIST firefox-41.0-ja.xpi 483302 SHA256 32386da85ad191fc2c445759649d929fd7eab3940daea328dd3e1a56533a7c37 SHA512 75faf6e6aa8674893c58432aca01c10a9b53ccdecd331a8d9d65d95838d719a5697d3ec2cf4051c8c985136d6466e06ef1d105511159d134498baa411dce3ab7 WHIRLPOOL 8482142b6a596fbb8864b8784024d3d885c10ca36df2b1e6060ae63504549ef18b8d418a49e7eb92b34d1c057a63dd7d7e4e062120dc3e6b8bf09f5ebaba2264
-DIST firefox-41.0-kk.xpi 508364 SHA256 98e27a0caa00137e3a7908a18220af0b5447371875be40a20caf22678adba9d2 SHA512 2b3e4b70635eac7b1729c7f83ee7736c3ed5aa2c2535af2b0d7566e2325a0d27b352851cafce7787d92b45f802b8c31f2aa16ea5eaba917a31865fc59e4c17ce WHIRLPOOL 9e9b40489503e782ac7a2ce4a9600536788fa640d3644d2afbc41af995c797801eaf1995cd5b0e0afa6a9d05c92801f5747aa1c39e2869e50c9f42f2b1e0968c
-DIST firefox-41.0-km.xpi 571707 SHA256 0391cceb932ff1d7099605e51b8abf9e5cbb311e4fc6d5a0b3f58388428332ca SHA512 53195444765cf8def5ee8b41a7d6963e4958f4208807a5cff3119e1c0c4bf4a78e4cace09eeae107876e755de337a26c2bf8386f1a708a4c6fa97efe93412e5a WHIRLPOOL 50ae47fefbf642e26262d7a6836dd2d61aa077a794b2833db5056271d414d7544ae6d689ec5cffa75d781405b811420ad653665e6e53df66869f8774e1320708
-DIST firefox-41.0-kn.xpi 539237 SHA256 87c7e4b1b00499929fa89cff96ee7b2040bc3b2fa39da43d913b460730e9837a SHA512 40d5e9eb858fd32007b5a6d5eedb6561d63dda615d6c7586e2e902ab4eff49445dbffaf2f4f366a90eb65a6b794b4a76f3f1e4f2f6ae6c0e924feb449951cc1c WHIRLPOOL ce17c4de5b929720e7fd4aa0217ff2f890c294c2baabe1e1e7e4b1ef1eca1a5803a5dcd0c3f50f0f7f754dde861b8aa87311ced2a0ec0be3eed949b25db498c3
-DIST firefox-41.0-ko.xpi 464904 SHA256 bfd714e03b16a6e4e440bd1907186a9856780be70cd0af9daca3374a7a2006ce SHA512 7327fb21b853840e8e783e3206ad0c39af74ec6b07f798b5b2eded4ec496c0093683002264034010ec6cd888c4058864125d280cb805bb874afb5210b38116d4 WHIRLPOOL 6a4a4558770d3b5a48087bbe6407dee8e12658dd8468d54400f130af537f207dfaebadbbe83a885d15e07d0e086bddfdf5630676719c9cd8e5dcd3ed4e01f4b8
-DIST firefox-41.0-lt.xpi 490118 SHA256 46d2bcc9842f74d1a78e41ce470d2197fc8e5243886c0b4b62535ed930c2a01f SHA512 37d6e6714c9100418522f967da7fb28375bc77da513ec98d8e3f942af1d2d66b3bedec9e3529266fcbbc01a30823d86aee599648303e841d6d09c6e06f779576 WHIRLPOOL 53746c2cd388a49bd6e0b35f89a059a4a6cc181ac404848b318e5b23bbdbe45d7d6b8d25d86f03c3478be1fcd340179cd2e8520dfbd4caddfdf1543669dd1f68
-DIST firefox-41.0-lv.xpi 470364 SHA256 9f01b6c0c4647981f595c2827453e1209587c34ca947a5879f6b8fe9707c707f SHA512 135c85f2769353d11316345bf8b33f414cfce65fd9fa356b473718d37945a9c67131c726eb5036d6eddeee66443e3c7f00ba8eae8f50a6fd722588d21b687766 WHIRLPOOL 9b98bcf1f9fa8ac8fdba252d499c0d50b3fd95da9112e279162ef01c42fc8b978fbcfc1acc954dd0edc4620efb782ad8f7d2384785c72f5c45d4ce2f9970a472
-DIST firefox-41.0-mai.xpi 517160 SHA256 f3ececf56f634f8dcf3950d4bf9a7a21508021a45b99dff045135c1c037266c7 SHA512 f95cd6e8d6d47eae36769128da95574248722d1db3bfa7d23e1434113379621e983d8bb908cd7954bfb1e8f80dc0e419c254daea2e80eed3d5fc249c86745dc0 WHIRLPOOL 965f30fd54cf0558f0b48450ac7b02b00af9b5bfc256bfc76404b3d8fa284bb4e849ce8435de38307d27c44354ad45bb6fdfd6c51c2ec494af5a458a3f45784f
-DIST firefox-41.0-mk.xpi 530865 SHA256 1b8e4d2d5cfd8c8768b42b6d394b9132dc806672cab3d3f0acdd475e73d6abd3 SHA512 46a90188559048ef98dc49beba3579d39ca1b535afc5a4da255d84853e230b845be6cde35f57b0ca777274ed6d71005728843c9dc645462922dbc9ce124443b7 WHIRLPOOL fdc80c85875dfc67894a0b9cd2c65bd51a3131bbecc37244dc403bbe89103938be6208145c833a6fefb345ef68df2a3f20d0c8fcceb6503c79074ff15778e27e
-DIST firefox-41.0-ml.xpi 529030 SHA256 602b9759448353e33b8800fb392bc2e3785058d1ec2331528abc91a1021bbabc SHA512 bbcb0ea2fa1237503f49be1b8e8ede709c67e194a9229fb7ef95860669b767e93602011dfff7fc74493e309aa39193533e449bc7ffd543db3f9b6d249b41401f WHIRLPOOL 1a5ee0f39ca5f51bfa6a59fe9c034bfbf800dcfa793177a1fa2b21627922e4072cb386c0a1359bb923205b28dc561b61dd492f0c41489a788fb875cf6571cf42
-DIST firefox-41.0-mr.xpi 511323 SHA256 dbea36f8a4869cf15db2ae9a324d43297295d63c1a3dd8e45dfc4997e5d6676d SHA512 aca504bfa82aac7b5a448b2176f1dcac0f94f13895c707581a3adb54555a24b267d4e3de0c09fd7a29b41fd8ef8062847d2e63d70412f82abc4b0564879f25e5 WHIRLPOOL 1d6146beaacec918e83087f2e526629ecac912409c565d4c3a8eeefe963e39f733f9769220b1cb4cc5e21083ed15722b32de951b1b50397d45c688fcdc9f68d6
-DIST firefox-41.0-nb-NO.xpi 446371 SHA256 b70ff1288f2ebd217c67f0b4fa1c48dcd6800d98ebca03d880d01592eb1f9fe8 SHA512 1fa7a464d38f736aa8b70f8fcbdf46e88f9461f91d56863ae8ed8a6b186be55ee27e85db85c940b21c1903f4c56dad45c495ce34238590da24caacd90b6edc33 WHIRLPOOL 44752ad9b6a5da83a8770f712bdda672c94d22f579e2f22692e9192f873e8346ef1b0c031adcf3706ea702c2f84387756c0b4039cd0ca6e380d6d53318493a1b
-DIST firefox-41.0-nl.xpi 446545 SHA256 82998109c104b4277a54a9c6aad3caca8d40e89290ca33f18e876e85158ad428 SHA512 4d760d5e05c90347bc593eb11129ab18d79ee4c7c5a0f52209114c33d9614b4cb953f277c567277a12df5da176faebc05a32b44f7e3a96d417ce44d015139614 WHIRLPOOL c2e53b6e25c72ab609763ededddedc02ab3008dbc6e27b7758bdb637351243a6d68bf515460d2b85f3ef66d7d0dfc96c7003bae8549ffa87ae2a00e529c9842d
-DIST firefox-41.0-nn-NO.xpi 442561 SHA256 6f39bbb77c7c07bcc5612b1715262f94d4d962b5148384ab2ec052e1a4b64eeb SHA512 8d5a90b95abbb4a2b3d693b90742a9a4b626b665989b0b0af5683cf7070740c4566c33cdaae98599852dfc84269f89f107a57bf5c1ee5a57887039e92b7c954a WHIRLPOOL 00d013308ff1922accb18f2d2f5a2c311633d8bb83f6f8d4a1d66723aa2db0f789852b817b93bd9e64eecfd0102861a31dc4b401d7cc6bc7decff5451922cb41
-DIST firefox-41.0-or.xpi 528104 SHA256 c4fd3a8b1fbc8b79612b3d24b556419acce11a7836e21e7196dbe4e9eb0b4799 SHA512 262a3d43ba4c554de8506227fee57af053c30edea5a58377b05b19f1661d1dc33790267077ddca7b58c32942a2a0a2e72c40e9b59b59bf727d8c921cda8a12db WHIRLPOOL 99e5bad1d719668e0110ac91d75f003c43c5b78d8dfb5ef7292a60b975db16d3035abf2d5f5809a08847e7c19cc07f76dc276ea0293050a0358fa04e0d61f626
-DIST firefox-41.0-pa-IN.xpi 498581 SHA256 5ccc34672873d883693412696e0538dc16b96a712e0decad211fee4de5a2485f SHA512 b19c466277899b568c990dc56dc94cb753e5630d7801c53f27ccf5c8e9920e3708ee943b036cca3d6ba18faf5bd995e5f434343f1b246681079238ca965575ff WHIRLPOOL 029567ffe1aa3944cec7adad55ed64407266561f9c9435df0e264170c4ab9badb1ce0c15f2cd829119497d6b4edb153e122a4c559888ee047f0abdaa0a5bee36
DIST firefox-41.0-patches-01.tar.xz 6328 SHA256 408f9a577d698b3713a112d04552e396ff2af7cb9756f87800efef7cc55dcdba SHA512 a9476a658731b5fdd51bb9855bf4292afc8cfb8e4475250b4fac75cb5166a1e9d384a8fd2ceb38d6f2044759bcb895f956c0cfcb361eb4a60d38481a93c546b0 WHIRLPOOL 9420e7757a0f45889dec228ce3d1fedd23ed6ff9cde1f3461ffef577ccd43bc6cdb5ce3a3200f067bfe9203111067467a91bd90c0861bf81d490b022baf087eb
-DIST firefox-41.0-pl.xpi 400465 SHA256 757411d39b98fbfb71a7e502e44c27f64f01f8a3936bbb84b08f2a33ccf0c2b8 SHA512 24b9851ca85e139266243bddfdf078fcca61af8982f5208c4a874e589dd0c7d0a688ae8a82ea95d110dedce62bd36815f648f92bb1cd14b04796fca593dc1a9b WHIRLPOOL 10ef0929b8cd97e6df4a093a267b963b590f287fad52d52a5edcbf34352e4751a3ce9967a127c7836647e74741046c9bc88715077ba2866acc6625da8ac97492
-DIST firefox-41.0-pt-BR.xpi 463057 SHA256 65ae606a712e05cfffcd2f48a352c6b1b5abf17af7bac53c33a4877957566149 SHA512 9a9e243982ca133e3cd01d4f9b6efdce44a2a5278aac28fea040c8acc64ba67ca2eadf38e92152427009800bc9037adba6a3da8eec14cfeb1c03b85c66be5c73 WHIRLPOOL c5c6358d48e16b5a4de9b178dade343d6af5c474b4d4478d9863b39f7873c9490c16ab4b8b0098dfbca7d3a9d0f5b6d4e0e65e99e4632699590b137f3f5d701f
-DIST firefox-41.0-pt-PT.xpi 443381 SHA256 550605379e3224bc792a9d0c892dfa78253f075fb127779500d36ca17c6f393e SHA512 74300e6d7f18c643dab3aaeca526b91424ded241634f3db981a3203c90b89634d530d8009f9d16a0771cb8626d8dc1262f541ecbb87779b9b9e8c1723288cd72 WHIRLPOOL 0e81c2bdab588eba3fa886a9ceae0c5a6685037da307fd4cdfa0378d7934db7219d35a7f2dd2b6f1aea6e973755f3e3111722270323b7562a91ee6486dd6c6d0
-DIST firefox-41.0-rm.xpi 450638 SHA256 55d2765289fb4c58c9563136f2fcf56f15e955c42a3bf13252aefb3f6545cb28 SHA512 de4062f7ca583aeefec0bc5e0bcbb58d8d30eb61456e2b7efcb70d6ef3192cdea520597b666ebe9726e4ec9546c13e39ebe775271a45e333e58d77d439dc2f37 WHIRLPOOL 84fab748f16b6d71a99faad471424a6c7b5a09e284b86d62d7c96b2f50008adf350255f01ab024b0f7a9365e5d135c114348f021a10836e37c6c1f672360f3a3
-DIST firefox-41.0-ro.xpi 497506 SHA256 4bad82622089310900ce2bb8c51aa9706ead23e5db1f143f2f672ad203777d9f SHA512 4cf069ce082071db014c96e7ca83887be8b740a2d5e14bcfce6b27f8fe098f4a8afd512bee2834b22023e55abb84d0e7d6cda750d88fee4549258e00d415829e WHIRLPOOL 2d65faaa2e559d360455f2119470e5621790a0de7fbdb84553b99409e3ac41de5c467ec947ee118e39c4872d0550fa9cf7547dd8070496ef9cc7bb76c6123363
-DIST firefox-41.0-ru.xpi 412445 SHA256 ecc0253088e310b0c696a6d371f4ba8418c35b9a37af89e6ba6594b458ec289b SHA512 993ca37613ffdb41c0adfe8779abf26934e2e1ef8d4bab6ce4f1518ecf6fde4f1ce3888dd14696a784dfa9b86c09f9d55f7c831b82c8853c8eb7d10e25b6d472 WHIRLPOOL d82b46ca86f28e77375438de982472f618c1d3034ffd3628ef5ef944a8cacbba78fde88732176a404086bfa4bca5e01750ee6ec9c359625f1824c4b3170eaf8a
-DIST firefox-41.0-si.xpi 537933 SHA256 635a596421c06dd5d5b00906fefc46462ffc8124b5dda2bd409bdcf188921e70 SHA512 df3eee2c864cc4fda3f4356460fd6ccaf43733b0445b1bd94feff8477f12e420bdcd5d8bbf2f2ad2a0febc9911a94ccf510db5f22dd0101a3686c3b80aec0fae WHIRLPOOL 52e9a5841835682cafeff0473da9620cace542589c3a1dd120ae4536be130a345626b726ebff295c155533d8aefc36312a575ae0289781e40c122fd4668c4359
-DIST firefox-41.0-sk.xpi 472933 SHA256 c3936ccbc02c6ce91d2f8ad339489ddca1840e7f3d8b17bd22a7dc41a4e11992 SHA512 4902b822938e02e2083ca4d35db1295f7f721f88dbdbbc48e2ae7f16926d5b2000a90991c57d5d77773b1284136b35d106ba7d55e44c0fd3db185a2b40cc1e29 WHIRLPOOL e06f1f128ff8da0d5943fb424d501ddce97e8e47e90d030bca80123b595b402228d0bfb1b3808cb649895c8703f35f20b6752628e1b485b758db7f1decc04b30
-DIST firefox-41.0-sl.xpi 445744 SHA256 38cba1c04cf4f67d1dd5ff906cea46d85f7de0267f16abe6c3d4c907beccd2f9 SHA512 520399638ca7300056be08b639cc3e1b8eaa8e867ce7814274a3d3ec022775e1b52a11da0d36808eb5d831968d5d31c69805654ba7762479814b532a76143db8 WHIRLPOOL 9e2c0a2a7e7925bfb6554f5502fe1c90684cf91bf246df865b309873783473714b51700d3690ebb8623ff8f1e1be28c4d151863f964fc1e59c6dda9245162064
-DIST firefox-41.0-son.xpi 453251 SHA256 24ad972e0cf7101962340eca64fdc56851699f207c629d5ed33dfe425b6d14a7 SHA512 73a35345b7fd828f47da9d887b49fd1c2b84f85e18ba904107e04eb6c285c583f4f8d6f88b52887df5fe9ca75311737f050da0d3d4fbed7c251a9fd42b8f434b WHIRLPOOL 6e6fe9e04c9b110a216d05623ed2c8446147e027dc4fe9fd24544629901cfe8a22882a38a34a1e399ae958441dd5bf9b42363d5a9bfc14160bfc7486335577ec
-DIST firefox-41.0-sq.xpi 491167 SHA256 ca0bd383ad3c871e52e0006ec7489ef590edf72f4894ebea75edb6b52b567953 SHA512 d654bc636058388e1c535bc0fa3dfa223ba3979f0a7c86dec38829ad52ce22054b2113adbeaa0adbfbdf07c6952fff2bec619fa1f7e55102cf964ecbf704542c WHIRLPOOL 1e86939786d34923919613b1dc6fc3db81b712f2d98aaf970932311e22c7d6a050d4c7da24befb595ce3cd4c9a65e9f11d9627f1d0892bb702459422f6d7f829
-DIST firefox-41.0-sr.xpi 482969 SHA256 59be1f67f0de0daa1800f806ec5760e6df852b46a65c4d99ead16dab6d35bab7 SHA512 1e9efb27efcbccfa41152a51179c732446176b279916098ac84d0e954db4a08e247cbde1f544da012d0c76b4e471dceb395cdcf467e1b77a7bf405ed3479913c WHIRLPOOL 70913e6114d11b9134e920758579f17b1a11735d9cbacf829f62fbea7311eaaab6e28b8d1ee87095094f0df3b452577edb61a6dc0e88e5680c6da06b6daa3841
-DIST firefox-41.0-sv-SE.xpi 455381 SHA256 949e99a51e305e35e310b3bb6ce77f57ea9e67adc9609704b240dadeaffc4351 SHA512 fae329b95c99782011ab8425a4722d82e25fba0e63553e5d9aab825cf15347076d5009d7dfe71abebb08ce9fe085b6c4d1688c8438baf875b9d310f48a18ccb2 WHIRLPOOL aa6d9b3e8e18f51e9caeb9c1d2771d51c3c4106f80dc604308f844200d13f0b842081959961b7178f0f4f68a7ee06437604d85def878b9a0484f7a629e2862bd
-DIST firefox-41.0-ta.xpi 509543 SHA256 38b8529a311078571bb3d876576c788b9b299f5d167e2a6820919238c23de979 SHA512 8730793ab21010b7066af29930544068735a9a11970d80d02974d5285989f1da21d9a7691748c90f6e7f06e0509dd9343b7ae03fae91d0b8fefdad440fad5921 WHIRLPOOL 5dbe96f30157e1281206babb199ba152329a4a13b08542d7fbafdb216af97e609c875769c9a82db0e1a8d5d421693fa1c5aaedeb4a2ea3ef2ed8963b673d1802
-DIST firefox-41.0-te.xpi 530202 SHA256 658c162206d3545f59f2b1847e4635a80211cb76bdb9d040e53bcaf52a6fed48 SHA512 87e245dc6eb52ea4a8fec025393fc3690cf97f53db5063d00cc8bc309ec59fe746de39511cedecdcea64ceefc59d6627cdc7b974b25cd3fb935982cef0a686bb WHIRLPOOL fa0bc19f68dea83aaf84d93597179f6640047255a4c7557db4aceb028e05d3ecbee298e8cee0c908fbd30ad0ffd5c2b092cc12da3fbd3c40d5700e7f0690a9c2
-DIST firefox-41.0-th.xpi 539599 SHA256 3d6344bf7c129acd3f5527ffdad07c9388e5351966c7eeec919b23e9653bbb64 SHA512 672eba3e49b62bfbb8623eada2d46b96cc2a542ca96b7c5e52347ead0c2f06ffe74d74b9532b64ad05da0a6c98fe880b60416d4c26235483e2b36b05a7a84b40 WHIRLPOOL da7a435a9901b47cc6b5a1c987212cdc28f834858d7e34261726aa15b5912a885d22cdac2e1f12b20c4b68ac4e1d503a8b543740994e730b46a0f90a55fd55fc
-DIST firefox-41.0-tr.xpi 484231 SHA256 65e7b4601f9dc50dea179b0eaf3e6a41a4634d43c667e2d84eb0b85dd11e5302 SHA512 dc00f3c1faa9166bcacb1a5fae06fb5c9c1f1bed520715ed2ed726bedef77ff511e505ee84be78743210c9159ba4e53196069b098878dbe8bbb766cfe44eef5e WHIRLPOOL 4cec7be98d753dc919a4661b2d1080e1890df43fd006dde9e888a5f4ffcd938dff4100db4357d782d4b5ad2b706d678836e8c9c1e50be8eb9b5d394aa117075a
-DIST firefox-41.0-uk.xpi 500109 SHA256 b53435b077205b2c7455b139f4555251da3df4dbe072e9ce779b72a8d8c19d47 SHA512 e29283e547bbac4fa5bef0bef26bc9fd17cfeb8a9ffdc0ad4d936b7d4eee5bb72e5bb731faa35001be7606b1428d47806432a96e83ea292f6d4606211b455c71 WHIRLPOOL e8a819a06fda3c83a43595b7f932ceea9784605486b44062836b6c5181803c95860f462c0f3e06b652bcb8a4892ba9ce48bffc7d23a3000b8e183ec4eb26d9de
-DIST firefox-41.0-vi.xpi 470334 SHA256 ea794e879c90d30185f61f744490fd29b706334b4d9068b7e65002ca5a51909c SHA512 52d8d1f947e1a85c3f07b049fe4f1d0a93a46fa1736713bca80ef37cb983cfdfc5449ede9247742b35f1fd7b59bd1b65168f4975d6529878db563a8be361266c WHIRLPOOL 16f70be133af5ecb7de7321b05bb7d7f3a82b586f5f2354251e281a96e17ccb67ef987f670f512130c0913c8e5c0ac6164f8d8b529291f884741629f9d5c9e97
-DIST firefox-41.0-xh.xpi 450078 SHA256 8bc89179c1e2e298104dd50f383c93e30ae330978abdeaa1869fd2160aea58dd SHA512 1d7094869e88ed103c373c195ec30227a495357915bd72a117af96009013f5513101b3f0e29ec5044a7d5a001fe01fe5f791744975f2eb8c6acbc696fbd427a3 WHIRLPOOL 27bb7e58e76746bb6f133ce12f8b6d68aeb1d4dc618fc6daed7a9a903fde050c7563bff0760b5cab2763cf6d5d85fa84bc45913b2b2d5c589ed37636c4ccdac8
-DIST firefox-41.0-zh-CN.xpi 486220 SHA256 47fe8497bf214ab2275e5be325edba33c96c28a015f8d450f1be9b57710c8ab8 SHA512 2395908e7082e5f539f9a113b013ff923fa81c49bbc65168eecd50acbe53bd5dbfb3344a8d0d38b5e0cee2a2eb86c4296153a4d4f5db0ac9b73a55a0bca82b69 WHIRLPOOL 879a3a7910258b2e23ee69996f826194bda9719a37bb3dc3b830101c71874b7497135f61dc699f77b1193850929b762d557b643fade7214ff23a9fadb1f0ae29
-DIST firefox-41.0-zh-TW.xpi 479031 SHA256 c0163e959663dfcdb977f5fc87af13d4129b61a4b8d73889cd830f8f9d16ca29 SHA512 5eae24397cdbdff99f960c058d4f1483e31c5563a97bd1f648f55a00e5c780c0d0df59b45faf7e36271971a6a074a168b2b973cc0bdc02e8256208e352f50b39 WHIRLPOOL f8e0462e81ec6fb4db9f59ed75a382e09dc14db06af3fb15712ddca09e7ed3782248c9af716f193d840e2b23078507ae137f4bb584fbeaf29c5f6d121e7f00b0
-DIST firefox-41.0.source.tar.xz 159785356 SHA256 18abb95e93770ab1cc0794349125aacf073eb04fd8b8a93c7a58312c94bf16fd SHA512 d280bd3ee4d8e63e9f0585c4c23241945da4fdc1fb4dba853c116aa96671ca3626bef03f2f50b83cbdeb851c82c11bcefec7763b702cc5cc0e0a166dd7173379 WHIRLPOOL b52420265b99113d8de9dcf2b455ac633fea00a11d2d3d72fcb76adbd6363d6f8b920f540206c3d35ca721db05fe3e570917442c6e52918b5c77662dd9e034e9
+DIST firefox-41.0.1-af.xpi 486122 SHA256 97350ade6c4b818a13c884c2840c196825d246386f11cef04fa7d45eab6329f3 SHA512 11357e648f080a1c9b9f04dc3171adfcc0922aba8dfa631d1b9d3488425218c7c69e293f8692dcfa4d1db911777def9d11acf7a511b97d7da9380ccd56de4f2b WHIRLPOOL 26f49c422c4887f5cd4d4efbc671ab452972d9a49ccf952d95f30bf89370c783d033f96a735c9761167d398e3ad5db5e1055c5bd68dd0147ea1e45a33457d01b
+DIST firefox-41.0.1-ar.xpi 521161 SHA256 53d3aeb3303c1e0f73538a1af76617912c4faf78b5a463b9075c7fb9748bdf04 SHA512 ff099ecbf2778833fdad5b8990cfb148d1657143d665fb8914c53dc3c98379bb369af57726a7da5733bb0050f675eded31a5bca2bca2487bb5c6ff7206c18198 WHIRLPOOL 464874052f0fa19eab547f1c7c7b02f7496e4c9e26a2ba9d91c9f8610a525bbb90ae76919a0a4cc95e3f9b328c431399766f2de1ed5417ec7c9d509eff1da4ad
+DIST firefox-41.0.1-as.xpi 511220 SHA256 12319363d20ae2d4338ef2faefd196c1aa79354266aaa96d5969365b27cf83aa SHA512 6ab50bbdcd7073ec2ecb59a3b95f6c4e5b0606fa9abc60e140baf74e4e8f125d43563c8975418545553da573ac15514a2fbebdfb11af50508238e88076e14846 WHIRLPOOL aee288fe315af256f8cc24096bfd486a970636767d48be2c19580ab20026136da85658e5122bc4fbf97e273d7ebdfcb75fad9644ec71da2917d425d139413947
+DIST firefox-41.0.1-ast.xpi 399124 SHA256 df0b1298c2bd9f6d2957357a5600fca58a5f370fdd9fdb3bc34d4308fe3ef8c5 SHA512 c3989a871b3c6fbf08590260c5c7af4073644d16f9cd4c997e0f1bc26471dd9e0622c54cdae0ed9b9d1ab25333fec172b477814c3282e81a86b592404fd4f2ab WHIRLPOOL 5d96386d9050542551d7a316228fdc0789f0babc53263b3192e26bc1e6812ade738d17b43317e0cae80a3ca7e1f3424762eb0b61744fa4ac70f3b9508f4c42ac
+DIST firefox-41.0.1-be.xpi 453405 SHA256 bdf4c9737194edec2f44b810d9fc5059e9afff25993064edfca55f06d184df86 SHA512 698d890cad57a1d9001ecd5ec33d7286a3459aa510ce8671ec8d09bfbc44b0990ab021be23e9b57f8f1dfe0e856334eda7bb3ce15d21cb5e664086b7b4093511 WHIRLPOOL 052d83a88850583c2f3f886e83a8dc1bf32f71f3675c2cca5596497e5ca7b38033c9a6c81ea0e09eb096c2ae04e1db5326aa90e4f706069b1b8e4409120e6626
+DIST firefox-41.0.1-bg.xpi 492967 SHA256 b367bc4054df488173e914b3e872305f62ea9284ebf5b21828fa7f177c82883c SHA512 cf624a528fa6727a03ac453005d426319f1f0e40ea638149d611e43e4d31a8ef8a5be45f53502f5348866fe3a88f3ced8d9347302d90a6e2852158958df8859f WHIRLPOOL 98d6be18a84da6ae3b33322f2fd291c15866670fc39037b98954cc119875b43aea35da767bb66e2fc9515a1a475cb468a94e319eea865f8c7ed2b10d9eceb7dc
+DIST firefox-41.0.1-bn-BD.xpi 527572 SHA256 8ed5167d4e7fc2a50e4af4da10e1bcf09cc8fbd850fa7ac481fb1654c10be945 SHA512 7abc61d0f7f127678c3ed9ace810845d3449ae313804c0daafeb5b98fdb9bd2d0ff67b821f622642756e9185add03f17f2cdd2dd3eea11332f137f46ef5bd7ce WHIRLPOOL 86252140dbed9d2c18135e4fe6af0d80c268095ff5a82d43b47ef10e112426fa735008018ff817d0b0fdce7155fb9154a9f928cba8acec8124f93c35ed140629
+DIST firefox-41.0.1-bn-IN.xpi 530270 SHA256 1cfd6cea984e69066fea5817366dd64ac491e5f9438b161aae64b427bcd90ca9 SHA512 4e114a8e2319662144a8f080ccab756ef63cdf150d03a343fc530183b41e24e4d76531701c0fe0d8856c1f23b5c1d7ad9bdac4155b192b6e66eca123d06162b0 WHIRLPOOL 14d022a559b3ce0d824483b50fdc3aa851d4ca10546abb3b76c37123d6f62438589929e6a254ff26b94eae123ed7e18b346105aa742c001abb373efd1af6386f
+DIST firefox-41.0.1-br.xpi 444532 SHA256 f8e0b8d5f3c84a40df2661e7a6a2b6c3ae33016136a627454466020626b90a42 SHA512 b169df043f8770d0c9ef64298e4b2313e8c307d3420e64e5f09eee65689f2b8c3ea4b0ae5b078e86802108fc7d834ffe62d1048d80f256f6cab2e4930b49cf45 WHIRLPOOL 7320046b17a8317bbc4ce5e9df2e13a6a9f359216717da3cdeec7778de0eacda58429d84dca9a177ccf5aefdbbc358644bb21b7199a8130ae113f02228bc805f
+DIST firefox-41.0.1-bs.xpi 486282 SHA256 6e5cd1996bc7483cd9e5f2bb7e3064c4f5ebce3cec4425a95269894865cbe70b SHA512 233ec1885ac0c7eea1e1efaa0770217e5936e3b047fde0050a509d1d97ee9ed62c08b6f36f06248398b510b6a85a7e1f1474a54b4be6053728f865b7f524c09a WHIRLPOOL b1434db7d4d234ef461adbcbde702dcfe75b8cb1a3be572079d347f5cd7d38f43409d49a58cee7de005fcb58c8a659fab9eed413026ebce127b509a40ebb5d18
+DIST firefox-41.0.1-ca.xpi 461322 SHA256 8b70cac78f887946d5d50116844c5aa68c979bfc6f2739808d4710eb5694d1ad SHA512 4c8a67bbd8fc3a42b1b496a3b4969602a7774b8c1d56f9600f0129a4479e33cb37883f400d5130c2077c7a4ff3353fbc4fee6724046bfa972c960318a35525d9 WHIRLPOOL 3ab2f6007d173629f232368cf0eedd161a32587bb8006e77fca7ceea12d0399caa4ab0184141b39db6f100f20854e966b71e696ce76bddd09c0d6541d8a992f0
+DIST firefox-41.0.1-cs.xpi 450334 SHA256 514f7c3b1c5d4fdce48fea2e4510999bdc79e21093c665ae8290c0eef00b4539 SHA512 4fcc41f8200ce7560fccd5610a0d10ac445ec4000d428aa78547db08ea8f7c6193f3703d59ddf11d0c49eb41f351a65de2fd57db3c9f0b444e808fbb357bd094 WHIRLPOOL e6ed4b8626201f97f796a1b428650440bb8a140bdb99c5260c8c2ebfa6def2c30df3e263ca4c8e80038d34960fc013aac5d45d4406a930cc4384b5347579730a
+DIST firefox-41.0.1-cy.xpi 448184 SHA256 b9c010802272a374282400216a37690cef3488ab6cd78778241a1039ce9b15a5 SHA512 d68fcf8b86d2629ad9f331e02c2a0de50fffabc651c05ae66cad2db155dac7f3e71099bb0941bd8dca3bc33098d243a1e235b6a4430cd47ec29081e4e5a6d2f4 WHIRLPOOL f19c272d30ee1320bcd0fbdaa36e65f5d26cc8a75471e939e047063faa6ef935f4a4378cc4121f55959e0c9f9e20d69b958d9dcab5aecf6ca988bfdf2dcbd9da
+DIST firefox-41.0.1-da.xpi 453405 SHA256 1aed18769fbd440e811d2893fdbcf48b3f82ada7c2accc2777b4c8128f0e6678 SHA512 88f7cb1f05ecc3a278aaaf7816cfbcfaf514ba29661d2e006e05c6958fdaeb7cf2093d8dc67b607be4396f2fc51f20d3f5f4a7644d055e5eba02a77a7f48931b WHIRLPOOL 3515d4a6f3d00cec65e748988a6b95ab49a7b56cb5dc889e63fc87efcd2a1564aea26eea160ee94e26537377f661ee7e9b7f076cba099ba14b0eaef42e1258c3
+DIST firefox-41.0.1-de.xpi 455711 SHA256 cfd357e6a681f84f7a42db2097f7df5bb8d99cbc72bc6b5d5e7f7af731b26c34 SHA512 56d3f46b1e43dd2eff3a27b7edbccaa28a6d197d0e671e2c0c7fb513feaf2df6bd2e8bb4f42731fa87bd7d09e4731dac79bb8a13450364584202bbff859b3d38 WHIRLPOOL dabf69b91eacfbef4bc6454b6a89f55e100d5f1c3b5500451d02acd25b69edf71d7aaeddf038cfc1ce86de8478fb4652dc1d961f3e08388ad930c90aa69b63fc
+DIST firefox-41.0.1-el.xpi 501621 SHA256 84e9c334fb97228e153801abebb364b140c8d83b5c0c74821a469d41cf1d2f63 SHA512 034a352845db91f6acc2ea2a85ba3feb154aabe7b2ee5db41a3e4671e909fb3f65b51fc033ff405b06f607aa7fd8f30b3308f4886b31746b9ef8c6c47bb9be10 WHIRLPOOL 57d8700f7b46374381b38b120ff43ff3abc365a9e4e938f7c61bc0c7eae115aad68d5eb2e9f1e248311c312561f748fb97098dbba26187c8a57cc0420a507073
+DIST firefox-41.0.1-en-GB.xpi 441100 SHA256 cf29e810731e19fcffb1175f45dc2ade21cfc0fdcd96dc5176b83dccbc685767 SHA512 06526e9bf229f07fc0740ad88be7094aaf20ce5da1ca050f80a8e069560927f82c5ad66ffd7b99f4996439c4c6d1e3fcbddf1b0050b496330898b35a1f0c2313 WHIRLPOOL cf0ed5fcfce3eff1590d03f53fed3521e382ecd6f1ac12f7fc902f8f00b534b8707cb3e364bf500298d2df4d4b5615fefb4fbfad76a34e238aa3332788f9c02b
+DIST firefox-41.0.1-en-ZA.xpi 444146 SHA256 968c4df0bde7ffb93247b0dfb301efe60027cd75e1ed55a07471776615122572 SHA512 33c794b41934630b0e75e024396d73918a258fcacc1cb19d1f667c5d586d3cbf0aeaf8b03b93a8ac9311b6e12a37747d9a1aa7df8bd9da494527c41b59dda99b WHIRLPOOL dd97a0e569330411c487ee12ea195bb7b91aa4895858bbca4d814888026edca12902c1643a747b61f3ed74336f3997cc2bc8809fdfddadceb20250a04da0590a
+DIST firefox-41.0.1-eo.xpi 487996 SHA256 b132eb82edc724df6a52169e443f1e625c615fabbc2de144f58cd11d597908e5 SHA512 bd587376330dfc6be88a15da00ca105c3ca0aa6dcb51c1ed75f9e5e2d75a4265be0a3f40a2e76acc7bafd4df085fbf7fdd769253f61188cd95ebbc4e64ac3258 WHIRLPOOL 96f3281c5b56c7d92329b3c90d46e2af05310d8afe9988e97615408d9dcf69a79193ad075be92c5cd6a68201a964025742d8dce0fb761d945940e334b92282ec
+DIST firefox-41.0.1-es-AR.xpi 456519 SHA256 9652be3eae31056f27e3b6fdcecedded4b0a095721c2fb762f6d1c6c4c50e57c SHA512 82a91c33ca4b73c98e3c78c025c529e832cc8d13b89ae6bede95af874598239e04be9cd65dd5c133ed2b83e6a81a7961581f0ef0f2c3fad0c781ce42859d1807 WHIRLPOOL 9ff76ca69c76086d7d2b469c334908df51b410c12e06c6bbb89051b2f304cfa334a65136206893a5dd14a40f7067360f1e081773bd8ae57a22559b3f94392ec9
+DIST firefox-41.0.1-es-CL.xpi 381634 SHA256 0efc3546792328ab46d5772b10a02c43430be0ffed4e64a4cccd563ccfc84b12 SHA512 6ecc80d07a788bedacce8a2cb23779a900d0d9b703f6b4290cd29960554dd770b3c03f50881ec014d6604dfc56eeb8822fca619d1146c6a48d8d7ccc7ef45366 WHIRLPOOL 54b16167c5ef6e0b6f8faf6d2d4077a267bf8157bf14791b22a4d2649a65a01e21f16f898836db89dab08c11afcc78782644e4686bbb0394f0ea9341db8ca563
+DIST firefox-41.0.1-es-ES.xpi 370112 SHA256 a6542c99b51a1661d1ffaa51e48c3d60b97ef2881bbff2fbeefca581fa5f5046 SHA512 7e0c3bf26563b18d266c7a32567a11b06f4d6709938284c75669a4792c527d66b26885741d819efb566737c5999587091fa41fd6e99c9db3ba7f99945ae7aa7c WHIRLPOOL 10b427ef192cb006148cb203592fcbc9800a85ce9d1c9a0f505dba17ce46e4ba6bb4dbb785c7b35ccfbe53b4375374e3c072bfc0ec8541795cd140ab95a32929
+DIST firefox-41.0.1-es-MX.xpi 460285 SHA256 ace4555517392aedd9a03b20a4f2caa2efc426e2042c91e83b83290cc5f3ac9b SHA512 04259ad63d20bafa6c82ba7b3e16c6aa0d893a7d01c597b5f6b37e0dd55e9bcc5557e78f50b28f266fca7a154834e7e8bfc4f2a076964501bf8f516956d3a54c WHIRLPOOL aa3679e5d4c0edb6bf66ed5e40ef2d0dc15f48d18076965a11c75e11bf9f9034aaae96626ddb5a3763536b102088815837c6cc1e540102d04ab79b421ae86e5f
+DIST firefox-41.0.1-et.xpi 445440 SHA256 c90315bd392a6300942d399ca3faa19fe93e18718661e6f6e088eb671c481ecd SHA512 86f5c813d4ca220a65b61a30165146390a5915f3bd252cc006392432917623313964f9fff378d04ca171b4dffdf7ad2df2c3e2c7cf99338676cc8694967b2d99 WHIRLPOOL 01651ba6524803839a177af6625268e4b20563ac3d4c6ce82a99c9cc243b412075228bf6c999f9132449418a172ca60cb6d2bf90b1f7d464bd54bc04badcc25a
+DIST firefox-41.0.1-eu.xpi 469718 SHA256 810e08f3fcac50e287fe4fdefeca3c76407b25b1147c08a850ac830f7b3c2027 SHA512 b4fcc753e2f4b408cfe788a744f05c75b21c24ba25e3cb3bb031a4c9bc70d1ff5ce494a26faf6eb94c71d63f8e793a1011dff93ee5155f1ada86f282f6006ae7 WHIRLPOOL 38f032d3ab975357ee90a7e897d409ae52e8c4b796081fabd697e95b8904d36876888f59e5a069cf371de993ed01dfe5c01d8dbb54c11841e34b8d456576de9c
+DIST firefox-41.0.1-fa.xpi 516159 SHA256 ebfd410f2ad1d12ff076ece62c665a7c25b97db8aa2fde3c16c0ac8964ad032e SHA512 6962e09f8e77f6b2a4d6197dbbfd0db02960c4f5a66df490bae4a9c775c4367db4ab1d75006fee5aa0cd56109897050a58fccfa22674f98ba55706e6865d7671 WHIRLPOOL a7b614fd1c0e21e30fdf5d790278fa0461d81779efae18f3cf9e420e5113148582a4896e06331cfda0901554ea50233a5371482099b0d766f170ced9e4ff7928
+DIST firefox-41.0.1-fi.xpi 447176 SHA256 3384c59af108f186f6787291726216fdeabbba9837707139744f4a2336bb7b9c SHA512 e7583a9ea4d62c85fae3022a66e09d9c7d6c97f9602ed4ed961918b611c7fa5d90fbeb56bfdc931266ff0f0685d09ee48848922e4d74c1fc3187c7a9e12a35b5 WHIRLPOOL b17ab200b5431cc665b9ee4d3a06cba5aafe0ddc66c4a5b484bb8bb79474dc9e88d49a74178c3e4c95f9a06bdacfa70bf1ee8fed315029d8740a7204811c28be
+DIST firefox-41.0.1-fr.xpi 465093 SHA256 418a9119af70f689eba32e8a45bae02b2c27bd37cc439f58293d9d5e5bdfdfaa SHA512 b812853fe7e7a0d79feebe566c57fb7c2f6cc11556410b783c584efebefa12758ee892a794f1a268bc2a0cbf02c40095a42cb3b0ed936506b2cc7f38c2f6611e WHIRLPOOL 8053721de33654fcc5d2dd8995339a7d16055d7dc5e598bbc06fa17b735f96aaacc9a957befca49dcbdbeda56a2448c1512ccbabe3266a13ee7b6d83ae6769b7
+DIST firefox-41.0.1-fy-NL.xpi 458776 SHA256 65622f493c782108b259e384c6af1d5bfd17701f0f350c35c4de465cd617951d SHA512 092544e8ccf4ef28d4999e47b03824c6df291b9d91de3f908f1533abb1d1146bd281388d1082cab64855256194bd4aeb092b91284db5940e41a20dd17de91cf6 WHIRLPOOL 990bba15eae60aa263de9b7162816e9a039cca7390aba2dbdb86c2be5c124aee5e2b608e734b62b9035feadb2b24f0825952992fd6ea05707f89f139c7b7adbf
+DIST firefox-41.0.1-ga-IE.xpi 473257 SHA256 de10c4a3136b24412a926c72836eabf982b51158f2257f1703d06782ff4a2acd SHA512 41fadf56b3272df3042f37f2f59206fd0d706266c63f5cddfb17396aaf8e09fbdeb5659f1f7a3a181407a41560c56297ff22f77b5074ee5996a1a212bc8abd8b WHIRLPOOL a2f969930f35133d26576a20450a3e2b68095cdd1352c53142e2ea6302b830c647b6a92c115e1362f5347d1fd701eb4cef0bc54de352de2cb21c0081f72ea134
+DIST firefox-41.0.1-gd.xpi 457500 SHA256 bd5bb07fdaf9dc081d4135590862f929f88166e25cb29692627a6aad07c8dcaf SHA512 f8b32da1129920a12fb2676548a9b5ea24ba619af678e244e326bdc11e585478e73567250b75f0b5d54dde07eb3c04fb7ec8e7e1a8e0649f911f3e3499ee52a2 WHIRLPOOL a1a90f0b5c20871ca171ce8e6e053572c0b79f2ce5a27f87c18a0ee44f9da2527030a91fbed7a5ba755d69e654934315711c35666e4c483c933121a6bd4e2612
+DIST firefox-41.0.1-gl.xpi 452612 SHA256 54ca7876a1ce3c9add20e1f0434da6e130c69ac6009e6704d1df18fd644f0e9e SHA512 f108d0b2cf8eab8e36640e21380a887deccbfd9bfd935c1e84559430ac5b0b432615a6ee93c3826430dc7ce21bef3ab1c6f3b7bdd6075a7ba508820a505357d1 WHIRLPOOL 357c5227d80dbddb7286c393c56d02a88b0bcfd1c662b4dfcc65e97edf812fe0fb08767180bd0d5ff3b1a74f191bf168704cebb91cc59c938c70f1d6ad4095b8
+DIST firefox-41.0.1-gu-IN.xpi 487516 SHA256 e055bba4858a257f7562b32ed3eb316d42b5afca98f92cd3b5f42b336db3482b SHA512 261ef5555df2c8da8d0bbc345e6b704576e8278fb2537547be0eae8b3659fd67751fbae01b3163252d470d2ebc89a9d77873c68eb49f6b93929152c2ad9787cd WHIRLPOOL 92fa956d41bc53eddac0d1162c4803065e4527f6defed6ea442cd90482d5c51dc8e40e9b3eb4f4b0677ff267a33c15dbd2c5134ca4bb6db8abaf58ed33d00ea2
+DIST firefox-41.0.1-he.xpi 486490 SHA256 fc4ec10279c6cd322e31cb43904667247c3b69aa7a1cc9f9354da307a06cf1c4 SHA512 610599bc66f04f3bc43217590741bfd1d785e0beafd8cfdea1a4abcd4829b650893c5d4bfe5b3c387fa0c09fb5d8d5a8b598092651ac719521a32719e28454ea WHIRLPOOL 36676ae697567104774eac136790f9577a3f72f2270ef743a96d8310c0e96643bb512de1a07994d8a0d374714777cc51908e3232936de3665dfe4e23f918b805
+DIST firefox-41.0.1-hi-IN.xpi 509163 SHA256 45a4656849c4367a545c6e1aedbcaee9a2e2d7312a64c6e7f56f95615f50ff0e SHA512 03a4ee95d2d1a9060c212d58ca94508ff14a1f46d5bca5c6acdf0463b3bdb3f8d34a0432fa2b1e100cd258e85ccec1d44082fe4664ee37ccda38ac941e65408d WHIRLPOOL a0c8c06e9f3911186c9bffd069b51199d3c36240d532fec59a0536bfd7d35e3334b5f3cb6c7d8f5c2f6f35241d5525c7b29b8f7497550ba09a8f8f6a2bd2ef11
+DIST firefox-41.0.1-hr.xpi 481336 SHA256 81e5cf9a8c318fdd46570284a324ec8f52dc172f0b2d583478375af27c497ecb SHA512 7b1afb4483af4c678a9be7b60c32c4f2ceb5c1c7b767fa8da90c5955db4314d8c86bd7bcc79944f439818f3614cf6ebf11e4e435c91fb676ead4eef329659069 WHIRLPOOL d874fb4f3ec21130f6245db06468189799d5d6331c42d0810b85f83eb4c77574af76a4d9f3ef7f37ad0b9bb9c5d52e589e02df1a28858e8109ad226dcd92bd4e
+DIST firefox-41.0.1-hu.xpi 457035 SHA256 1b088745a37f2c29e384cb370c6fec7eb2dbdb4ec9698d2a7908daaedabf961a SHA512 bea3ef784d7c0efd52deb986f1bd037b02b7106a083abc377dafa18ae5e85a819b0d1420a4aadc5452ff5764c87fa46f8136bda5af97add3ebb595af36fbbe47 WHIRLPOOL 15b866153e2ff7c6a16f6bb7c8e6f4bb3d1fb328b80e7a5619822d6dce991a78a7995291d56c41b5532eb643dd0014ac2be26b3ca34d5cfd67ab2e1d8d9497f2
+DIST firefox-41.0.1-hy-AM.xpi 538341 SHA256 cc6ca6d9035244c85fcc6cfb6c9df05b4b93614ddd7d015688c83d70cf686686 SHA512 522406730390c88c4e770ed76ead91c3370ca877b48edc1a7a27232e9523f8c11251bde2df3eca044dc3b5a9b9aad67200c0052c1dc90e90916cc3771535dcc9 WHIRLPOOL 147faadd1c2510156d8205db09722259079e959f549da57d7068300d2b6416e5b22f6cf9a2003113164a4c3468788bc48849c53441ad367a80f86f3d37ef9917
+DIST firefox-41.0.1-id.xpi 433972 SHA256 fe3dfe15e08da87a913c6483689870b5a7e64393b792e8bca9daf0692193682f SHA512 d80889c905cd7c260e357c3aecceae4850d9f8c6e245abd55be9292f68620a5a4514d91fbc900e0896735e32f0227456c3ccbd1d1778955ec717b9c694aac756 WHIRLPOOL c3172071211e77cfc00b2f41dd5495df6e372b8c8ef8f3082f1a45ed5122159981ec1ca70db7977fe12fd8eb02a2945c54ed94f811fbb731ccec19f294aabdd2
+DIST firefox-41.0.1-is.xpi 488113 SHA256 7ca5c3d7506328b7e2cc92b2f631c97bcac87869f983318cf5b1f99384424e6d SHA512 f1d094a506cececc6e6384f66b098d3ed3fb2c7896bce3cd24ef5ee5e1a4859c36a14eb47116834e570dcbf1e63bb7da7069b7b37d1ab0abcbcea9b12d02d6b7 WHIRLPOOL 1c3f2db4e92b9a8e8c13f2b97ae27146778aa87e5e44ee640b0ee22e5c7933cee19b034e3bf773b102a3591fe6f939d36b904a83cd2c77327c8333a1c6a51519
+DIST firefox-41.0.1-it.xpi 363986 SHA256 5755fe268cb7f79120abb5c49143b6f00e4830b4adb296bcaf797feca9cb158a SHA512 869cbbeb144f5e1856cfe31ea79b726395fb743856a3e6ca6241ead5f64c2f0f2b5be996217f8e412b0333647cb564a96cb5cb3663bdce967f72ea3d980e75b0 WHIRLPOOL 1449dd76dd956e5c0b7d05315c4a92953c61f081f19a52235d11203afdd299370e6928ea2ba086b74349e1840eab5ea02a9ae240787f5b65dd35eab003a196e2
+DIST firefox-41.0.1-ja.xpi 483304 SHA256 33fef07433a939b9d53ab18638c31676df709538c747ff72fd889c4fc940c61a SHA512 b04163cc4426adfe56714fce2e0ddb40a42d6f671a0f51340b255b2f9a932891b0e5fac89f39888c2b3cdf7b36286a31cb4c2ea4a583dd64dd54f603a1f989dc WHIRLPOOL 8894737478a61852e306741ae78805fbcce084ed32fb21618e3f347d9ef7257aea72d8250f124e199987c7f3d44b864a26c200581f34b0e7df719d739984c66b
+DIST firefox-41.0.1-kk.xpi 508365 SHA256 64fbfa53fed92d8e456b1bfbb2eee8116596de671521ffa623b8997711860d0f SHA512 5c3bed894f7a8e34bea9d0a348ce46fab62abbaa9eec7300b3b6dd1bdf264dff21d8b298e9155e747ef2a8edc2e4a96ef40bc8813935f18c558cafc00f7c2218 WHIRLPOOL 386a0eef2f9c6350fcee270dcf46a9ad046c5e1a46ba9358ba8b0f804f25539f81e24d90e90f7bd0c450431bc0e5ac2eb3b20ccb603d4a8e7b330d68cd1417d9
+DIST firefox-41.0.1-km.xpi 571709 SHA256 4fc735b224cdea455ed105e0d776c0e607503c7f64c1657ef894d943f4ef917a SHA512 62969b0d978734260c43736971f39ab292cc696c160bb4cc4b23c571da0962ae0a2959aa9851045d6cb0f2a41b5dcefd71faaeca6e7c2ed5e8cbb5bc8f34cd4f WHIRLPOOL 9686a3a39a3103269a7c2256c46b76180550dc9c8d75d0f3e95ee17548ec0d9f4b8c0e7eb24e8d11cc5b9e266f4a0d840e5c841289b826234492a88fcdac6600
+DIST firefox-41.0.1-kn.xpi 539239 SHA256 a6399f7890d658b6f808cbbb65ba7f3ee3f746bb3b30410a79cf9623936a35b9 SHA512 1934e327ae43e1f4b99bd61befcb238f2ecda9c4a198fe51eba31c102d3d1989a668c578c2c44d20cc1f783b1c94845403b97e3dd38559cf41ceb842fe843eec WHIRLPOOL 9c66321bb07d7c5a15300f2f0a807c77eafa2d8c8ef03444ae27dd57b1c98f76445f9be4183dc8658d11c0709ec273b5e9b51517eb908daed4f4063ad270947b
+DIST firefox-41.0.1-ko.xpi 464905 SHA256 0a32fd625b1d6254b7cc11839ddda1d354d65188cf79e4a695a9f72ed71d77a7 SHA512 73b5e74c2c9103daa46685262f421291a094154b5a073a3cd2e70d12fed641e10c0982b57267f69c867e697a64edb77e74e6cae48b6ebfdd2d6f16596f8cf4aa WHIRLPOOL 4a57a729544a49f97c0357204ad0761422b5b10c1eafe305d838c18b04e4372c2a3572178e12ed792182cfac609616dcf999b9741ced3d7a47f977a0b24b57d3
+DIST firefox-41.0.1-lt.xpi 490119 SHA256 a9255f0f3ee96e5a0779a72b68b5c55fd3de773803ef0a5ad3a78ed2461733b7 SHA512 0215b43cf71d069fd7b0dafe970f79ffda909527bee5eda79909165bb52ec5063c5cd43493c32a3419ce5c4287d832d315635457b4c7a2e6790674e683ce403b WHIRLPOOL 8217f6e19f4b418866f1ad7853253e587e7fcf488012b538ccd959a9d9e83b9d6e87572ed37ad0d18ea2619c4cf7eb2695fb5b3e90e5f743db12fdb2bd8f60fa
+DIST firefox-41.0.1-lv.xpi 470365 SHA256 57ab2c15cd4b40aa551ea1d7574108f16742fec42d7bb2022f096fddfe130f95 SHA512 7e8c85f3bd4dddc2b0882cfd2a06441f221cf7918363827dd793c1f82f75fce0c2493998537799df94ad9cb343ce6eb6031ca4266f95c498363d736aaeb4ae3f WHIRLPOOL a3ac1c37715002297b4a094cb1197d6f31b97449725af39068ff01ee3b84a0d5fbe52fd259fafd09709a006f3797379ea890555824705c478733eb08a2756c28
+DIST firefox-41.0.1-mai.xpi 517161 SHA256 1fb55aaeee4a2a9b46f375940383c59c827aae1ffab508276c4b90969f695ccd SHA512 f814113da490c3ae8116ca99f488172a8cafda0181bd52a0cdfe917140b60533a443455bad7f013b67b742df5be4329811e8af400d1342f4e759731ff5c83ccd WHIRLPOOL 15847223b34c900ef19be4ccab0753d351faef99ee202e4cf4e7e7e985d3b64a97ae4ac313eda419057ad2dcc4c34cb49de62d2cd326a30d43b45c5da213df95
+DIST firefox-41.0.1-mk.xpi 530866 SHA256 39113b209f9e17825d87253dcb77101fc4e4d18f67ba5b0efc32077894a64c29 SHA512 212adbe4575012a5b470f655ad4dc2262a655337bf733182a440dd0b7dc4c8e0112ce9eb94c4db92431db2d2bb4ea07f41e98fd601367aaa1bf84a99e10e6f61 WHIRLPOOL eaa1f04a580670c266aeae09ae2a6ba014ef0b4d4dbdf75f329ea48bdd7796c33555425572e37ce0dead12e5137991bd1070917bab1218ea09e07545c1cfd322
+DIST firefox-41.0.1-ml.xpi 529032 SHA256 d52d8c7d614a0454ffe10c040b2a939ba428dee68d20d87005a50e9d7e67923b SHA512 f7285a684ae7eaa01a2f31604ad8a60e90cd71f083f62ac034e5e417ecf1b4d862124ee48afabe005646b9e25cde723578bc7c271dbe569be0eac4a32afe4c2f WHIRLPOOL 81b412173dfd6ada2eb4724299b1b6c48ed818f2d8034ffae5ae9e4c25dbc7217edfc153238644f52dc852ea21f945b9059514ecaa92abcbf1f72212c38bdff2
+DIST firefox-41.0.1-mr.xpi 511325 SHA256 61fafdbfa825d695d6c5d38512c4ebf1559f7b39ad71de2351ea0584de965125 SHA512 98622a1c2c2ee8b993895e8022a5d140a4d51aeec7b0af9e5ca57a3f968e13b45787210dcd65164de1b032b4210d695f6420563f48c540f1dcb7d4a5d25628f3 WHIRLPOOL 4dc77d38dafb6e6b754130171548d33a1bf11c56311e52c9d605be6d4e47c3622b2e5dbdef95a0b25d3905bdb3a41ac29da7118d0110de8f35f1822bd2ab2263
+DIST firefox-41.0.1-nb-NO.xpi 446372 SHA256 09c2e095dc6ee63dfbae0122c47d28e39b2764c398bb08d432253c1d123cb43e SHA512 f2038f1c786d4e0751a1f5cee1147dedc882a168ca0a7c0e387a573c3a21bef695ace1905d91b279e82e39ce624b89cee723ab28f26761b1aaf634005d1c0032 WHIRLPOOL 623f7a89b88ade29885902f92c483cd457fb489b2df09231b9baac04a4ec4adb3799cc0865e49a108509a584f6c26a9d212d04dd182fa428db78b7e48b45b60c
+DIST firefox-41.0.1-nl.xpi 446548 SHA256 8c0a359d85490b71af556e095592c466896b7d4cc80ad59c21a5bff67737c24b SHA512 1d50484df9920c2a10c72ff59ea9a30a0fc891da11c67bfbe5e92515493b8743379ed8b2481d65e7aa799636e0a201e3f3797f7bea2f19265aa3f8e2896b4e15 WHIRLPOOL 8c47616f306ee672147ed37367acc90465ef50747b388fb29a5f478ee92112ac447cd812b877c634aa8d5cb3fa65bbfb7bd68380986e76032132fef793337e5a
+DIST firefox-41.0.1-nn-NO.xpi 442563 SHA256 cd1ea65e70986de0bf36ca8ce68c822def20bf67c1aab1086902fd5a3193f76a SHA512 5561db96ad40d9a858aa40a7a6e16137faba3528348be89b0fe43a0a217577378474e2a515ccb9ee0d745133e57bbcb82bca0e41f9b94050cd6811ed518d4fb0 WHIRLPOOL 856a1ece57fe581ed5ae8a463169d0fc6ac6ffb6723963a7e918ef92c1ab280a04716d3e24d1b52602cbafbc7e890b6ebfd9efaf54d4fb8f6d5b9281416ecc66
+DIST firefox-41.0.1-or.xpi 528106 SHA256 274c5f764c47d357104acb27baf52546307ebefb649e0b99731863a91094ad47 SHA512 16b5d39a57b64500af4555ac4e87dd2eafd04272f5a7b5dbbb9ea3e2aaf55d40742122510bd54e6c925bd52c17b097b806d42b41ce1b9463d416b8a5c9b4e41e WHIRLPOOL 3b68943aa100bc85f1b855b8d0e3ebde870cae934a933b3b4b87d261464d7a69abb267cac5a72c276095e2c3fb9d774f34219974c59978da4e0f2a8ffa3e8f88
+DIST firefox-41.0.1-pa-IN.xpi 498583 SHA256 7ae13e9687eb86499a624d72f71cc37e43a2346517be4b0f7319270495906fc4 SHA512 316b4b51329e19becbf3e7f1c0dd12a4a022fc58962ea1ba9073342fd485eb72d47ca24ce83dfeb815aa2a2c9b5f00ad332d2ec02ac2745bba198c380a4d8b99 WHIRLPOOL 0d790329962177100d229f31acef40660c2779bf9c7889a4757bd1abe00c2e11ccd2ec4d52d08414c4408bc7ecdee1089775da0c6a4e9a02a846c7212a2a9fe2
+DIST firefox-41.0.1-pl.xpi 400466 SHA256 fad85972b99e17b959cdc0f79786f6900b9719e9c8bf503e746e53313d72ef8a SHA512 9e2050c61ce1138631646ae318b5426f525bc93946710d02dec6876ee3222aa15d604d636b6990da52571058454fa0db971f04ce75761987b700b42e8f24a1ca WHIRLPOOL 4ed8336fbb6dadd4e945bffd655b6b932ad58fcf9aaa86b2a67363595e34c45b57f7e6be4b140a596ac295e66228eb32846c784de694631df9ddd7eb5ecee51d
+DIST firefox-41.0.1-pt-BR.xpi 463059 SHA256 ad65a013ef7044cc7946f31b6d4c81b287250c59165317107b591b9add998c8c SHA512 a35bd63b1d4632806f7a430f5977ef4a24d595ce77ab8850f1a1b28e58d07b33f3dda336e9f3e40e80a11c5d35c6bee10ec92f8698949d0394bb0b1282cede4c WHIRLPOOL b98b092d6fdee8dd7bc406d701966fb42b6b3832d7f6fe8a52fa79abffad7d302852cc7255134075e7254ab14eb587be935af69f993d6c7355b0eb347c6a3502
+DIST firefox-41.0.1-pt-PT.xpi 443383 SHA256 f30c6297d6446087a6d1466b15e9f21ffbab89508ab0b4bdde3bf22f779fcd6f SHA512 bf0e898100d2f577b3600f01d2d1756497f73633388ddf3ae00b57171e53131f9496a556a89bf2650be41bc0e73a43a3d7034a5798604b91ed4b9674bb5391b3 WHIRLPOOL 29e976fcee01c7bf56ea2573cc57af707f3c96cfb6338661356dd35f1760e97d4d97ef8e885c40464980936534fba66e9fc36966c9a2c6cc25033c710d312a69
+DIST firefox-41.0.1-rm.xpi 450640 SHA256 8dcc565897afa57fb7c4e53aa3eff9abd4522a11be5ad4924a9dbe2e83bf7b42 SHA512 54a9c6fe5173a03041a1b3d67bc27fd7ef5b6f925a011a0540bf1fb11a979507783f367ac395f9eeebcc6c233f0cf48bca661d84650f761124101c6b69052709 WHIRLPOOL 94ea4f8ddb72678e34ccb261d0a17ee4912cda3e62b8bc09225e481b2573880bbb86e0b98813467b8fb45cd3cc89f5c1380cc7634654948ba0d789688e730d3b
+DIST firefox-41.0.1-ro.xpi 497507 SHA256 0bbb369d396282e79b111398733174a84bc6c92268bbf3e040d0c8a363e05a50 SHA512 f0984e7e2abb52c039d5ce07c22ff9c7a7c908f23dd799de06b46d04bf1b38dc17ef5309e37b4de21eb9534e43f45ccbbb1906919e5e9feed8578cb1ef8966d6 WHIRLPOOL 4f68127b69c2a901b50ce28e1fbfac39128f621b281a2b5fc97a921e9d6319bd2eff8ab93cf2d7c79f9144ed02da0a3c7d133089e401ff333cc1a78db9ce5d58
+DIST firefox-41.0.1-ru.xpi 412447 SHA256 824111f820b81de57bbdbde11ea18bc590c1b35b6a90c857129eacd9fc12226a SHA512 67d4c2b039f7f4a618473f1213d889083a0f07c08fd0f900925e255589a4593227c4b0a9382d8c22595fad4aa5b2ed0f1e3f46d582931a825f06b04706623667 WHIRLPOOL b84dd312855ae39a343e1b8d8ec7cec550d27e8bff9e270da505fcab820a226c96df99bcdb3c6d17265f8af504dc84e19088c5f60b737d566d363e8723865e75
+DIST firefox-41.0.1-si.xpi 537934 SHA256 1c133f62d128f647b361cbb9e717009855908893b5bc6da869812a7e2cf48a79 SHA512 b8dc930643becd16cf29f13b1f0f9e5fa97eb9b75739aba2529b1b8d70974ca90d13abea515b0391f466dd354ea0f16e72ce35d3003eff08c2b5ea8678b91770 WHIRLPOOL 23bf5f9fa6947fb98e42d1d64c55be07ac47b70eacbce573829bc08112b50931ef9127aeefc25e11297263f52799e90324d996969754d5ceaf13bc366d2b42ed
+DIST firefox-41.0.1-sk.xpi 472935 SHA256 05108f1c11115fba1c4271103b9466ae8cf357516c42f4a273f8b3b9de087063 SHA512 45bd6f53ae9ce41cc106e365ff3503791727c774bcf66648a4e5aa29ee83581d2db498b55778e8eb5e9cc3da88e03a414f91104dd2d9e50c8e6251868e9df6ac WHIRLPOOL 52b918a6cc4c6956dac7a7a8a441a5bccd6d3bc60171f6bc7319c71f543e6b98d4465f429fc74581da8d6dc30c3c76cb9ca067ead2be14be5a5a27695ac92490
+DIST firefox-41.0.1-sl.xpi 445746 SHA256 3ce7b9d2517dadd947f1849d58edeacea42a8c7a68ec1ef86f06e7111006c0c3 SHA512 9dd2b3647f4c5fcaef37bdd68bc8f0ebdec878852dffdcbeb50c5922897930ce5d779a4a7f4c1bb3591798cc8ee42cefd3828f307c499c8ab91e594eeaba19d2 WHIRLPOOL 7c4eb60843373e1c9f3c7476e8728771044af6a06a3feefc25bf70177883f5d2b42e5d2dd89b824e3927c3b7a9897007f5f8c6bc3e0ed15f453b4757258a521d
+DIST firefox-41.0.1-son.xpi 453253 SHA256 66daa25c3f9e448ff9b9906fd5ff17393d8aa31ae68109a35d376a2c28e31b6c SHA512 e4642c9f559fa514409a607a7b49535ea86492f84718cf18e6cc5e42e30024541b26f9aa30795ce9be2baa36ac4a6a083aa2f102713898c6b9839f733393dbb3 WHIRLPOOL fa27e970c92ae3b53e62cde975e5257b2ec1415743367115e0187721c9141895f285cf824702a531e11d6701693c41d4c622dab50d85859a87a73dd5cd0fbb81
+DIST firefox-41.0.1-sq.xpi 491168 SHA256 e764b9cb6583aebf52e071f539237bbfe535a715d1939d5a664b60c35b0f668e SHA512 6870aca0663dda06a04d65e0628af910687eebb26c9edbb795015fe973e35919bf898d87c8ce4d2c6977575dc6a8f3d2dbad22c0a63fc614a581dad6cdeb1765 WHIRLPOOL 7fcda6a1f70a8f311916e6b6869047ba8316dd8889d80012663e5385338b9fe2b426ad42b1f90785ecab62f8c49bc80f3b19ebb49bbbfd908f12ee2d9c60232b
+DIST firefox-41.0.1-sr.xpi 482971 SHA256 e39ee04fc8ca4fe6543708ec3a5e49fc99b8801de4e323e33e8f5c3f11842c12 SHA512 fed8d4df627cda627660766f7cbbd4e9fd91f926454c578390823d8f273e972ebe71b1417f3366272efd308822b5ea4098eabf818609e75471804ffcab1f4371 WHIRLPOOL 36f3e52a4674895754b9d0b122c29a30b6fe40432b175493853550e30b960cc40c8af0e935aa9e265b69b87928ac9547e304a3af7c15d0fad91c0a7cf94fa6ac
+DIST firefox-41.0.1-sv-SE.xpi 455382 SHA256 447097907572849eab9b8ca1a60d87fc7df071808cac82297f8ea5f2ac46b0f4 SHA512 92525ed16457cf0612abb5c30c70ef27aa29b1c4ae58a97ac2b3e75e43374ff294e1150821b70523fbed6865a043e4998e1921a01a0fb8ce6e9786525f07329b WHIRLPOOL ff7570dfbbefdf89509655456347cbf950fcd45c676314c76cbf832da3929562a26a44df742129aec12e0d7ec85e5a3bc44716e0c0df5922c41b3e074815f831
+DIST firefox-41.0.1-ta.xpi 509545 SHA256 ce187fb6594319345a668607ee36436384e06b0908086d2e89e801b27fe478ad SHA512 384a00c1e7d9270abfda711a7b424baf8d4e388b213c51b888e07848bfaf38d303de5d9a5129568243e2d9ed00a3ccfa7f66dbe823ae672b44c23df765d932e7 WHIRLPOOL 1523fa41bd638779486db98c7a81d8bc596d64243f9ff6f79e5533e2b8457ca34b811cb03d115f78ae29e05c7fe6dbebffadabb9adae5e07f6157b6e47f5dc47
+DIST firefox-41.0.1-te.xpi 530204 SHA256 a0290f5bd0b877433a4afcc2b447f96c14087c1b6e143dc5962d7da4a10dc6b3 SHA512 6f5b2e586bdacded503c719a49ec079e85f07f1f351f16acc8702f8993ceea8a6ede7d34b91c13bfc4615060394e4b57a3bfe47fc36235282e5bf3b5dea9bb03 WHIRLPOOL 43e005c5170791508c906532c9f0f216c2465c0ada0c292015084f8d5b1daf92bbdfe4e4a35a5bb187fdf36eff84e876700a11c4b38bf167eae02f947c2ab477
+DIST firefox-41.0.1-th.xpi 539600 SHA256 67bcf41773e6fd389a96db578029f904d0d54a8ec46086e7382c1eff2eefdc8d SHA512 f47b1d06c540a9816f050b4a3dd5dedc730ab6db7ce64b2de426566965321365106f72997e40f1fcba4f4b72f885995166788d99adfa8e348e4d7dfc833f1002 WHIRLPOOL a8f9b3cbc723b4295a6e4d594b64cfeaacba2e0420738b83557e0c2fa44c2723dcdc778260dae8f8aaa882eed5231c0cd34074ce7d233304c7cf8c87e1c1a2d8
+DIST firefox-41.0.1-tr.xpi 484232 SHA256 56250792a6768763153178be68998bd912cc6d2d33366023e83a92cfafc4bb85 SHA512 93b569600faaece6e2a8a2206da3b37107a9d38976454dd880cbc19ab3a6673ecfa6729d86933d96cf35aef014970b4d738e6db44fcd7c4f318ec8f1dc6d2e36 WHIRLPOOL 612b2283ab66a6e515ae472c3813dec5e7508e8401f71478577669ed0726a2a47397a0a29b53028d58124cfcb03b009085e67c143e75287a53bf1071075ea146
+DIST firefox-41.0.1-uk.xpi 500110 SHA256 bfc13862f69b9270ec45595e5f42cbd2ac893a06d193c1e57b6bcfe0a47928c1 SHA512 db7f93108e01bb32cc39a09b87a219fd99ed48d38c014894702800caddcb2bf83b8ef2e2ed8db515c359be7b2712f902a33dc54ab51c2f7ab6820f3ae178dd96 WHIRLPOOL a74da8ed2a7389f0011d4bb1961c0d7b6c0ac49a8e87dc7d7e49d9936deb37dd0b5fe1b29a112c6361fe269fad447cecdcc2f711ebbf90811e0d596518f48253
+DIST firefox-41.0.1-vi.xpi 470336 SHA256 949eca406e118a6508912d379babde3cde6d20154da59260e760c1ef07d2dbb3 SHA512 113abac652fdc9396bb7166955864fb61cabc9d0211e241958ed4d0e237bba7671159533cb2cbff4661dd1af96f5adf71a1d602aa865d2f123ab5b4a9fda6d64 WHIRLPOOL d7e3bd146dc9398e87adeaa6f399938633fe33ef5c85e1560f2236791bdb3febdbc4020098bd015157126df1ebf6062da5a23ef63f5949977b5c3081a043e2f8
+DIST firefox-41.0.1-xh.xpi 450079 SHA256 791d68f4e7b43201478c4334dea7bd9812f1df2e82a36c6b89af62bf1ca88cd4 SHA512 b4c100ddaedb3aff5ca0457d5236f45a063a33203d835d239931c48290f2b64d4e56d5fdf69e429d61872537f99775a29562c3bf4cdcd64b8bb6a53b87dcb0f4 WHIRLPOOL d05862206e206953e47417bff7053ddb22951f0140812e7ca866b0bb396f196ac773929a262f908d995036028bc8ef4762cc9b6ced7d41b115f29ae0bfcf1841
+DIST firefox-41.0.1-zh-CN.xpi 486222 SHA256 6719c7ab93c9ccba84630247ab33c4f61971e8052bb73442ea196e37de90d7cc SHA512 3e50ce9ac5aa6f0b62b857b7af41db726de418ef6be580d0fc6155fcd5cb22889a7d53db043748f55b7b72420c605c74247f36428e6c183a0ba9921f3a7e7b7c WHIRLPOOL f655c89388bdcf65f4daa0eabd680b65005317c28d09f7ac9168cd8ae64f4097d52143a2cb87db0d490f4fcd2a040f3d5162a1277d8ab1373bf17fead639c8ed
+DIST firefox-41.0.1-zh-TW.xpi 479033 SHA256 c14373d6b8d5e978864a29ce35d50d2c0430d12befd9cc284dd8b63f86356b1b SHA512 01793e9e081892f0c8cda34dad5433df8ad7d4a8a6e41302e6d299c2c7a7b5900521b57a4cb2d17bba7a965796d1015c535186bb81d48d2d355be59fac5dcdd4 WHIRLPOOL b9be1364acd8a902629c5051164422ee3a3a65b0972e59e586f1821bee5e9ccedd1914c74e972194e79e244008494362a39aed417165d8eac31e8cfafd7383c7
+DIST firefox-41.0.1.source.tar.xz 159761132 SHA256 47b2cfc26b17559c26b95a584ab14b6efba132ca371b8aa30da2e2167e0612c3 SHA512 b27b6c240dcad4ef88ef172cf568152e750c648ad3e0636cd5ef1d4198cdd94f607d685d696ac18c3369814ee31dcbf2d6d6c570444b2d8830b457042e2c2a32 WHIRLPOOL 74f00154cf3e72525e0f50dff9d113522e55abfc8546788ceef3a52fc97305b621e27ed6ba6a5d73886dec741cc10384ecb5fc60aa3d99ba35c3b3651bb7c554
diff --git a/www-client/firefox/firefox-41.0-r1.ebuild b/www-client/firefox/firefox-41.0.1.ebuild
index 9064c79905ec..9064c79905ec 100644
--- a/www-client/firefox/firefox-41.0-r1.ebuild
+++ b/www-client/firefox/firefox-41.0.1.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index bbd1f3074c8b..e02f718eecad 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,4 +1,2 @@
-DIST vivaldi-1.0.288.3_p1-amd64.deb 39924644 SHA256 86bee895601dbee6f3808b8846e65d2f6a786d2d0ea213c6767fdbea561c3480 SHA512 55919c588391d548f1623fdea43997da297e58f708bad742e8e3334945044dc8734729fbb3f5985c4ee5ccd8e3d8a07d8e94efffbabb16adada03beabb769465 WHIRLPOOL 06ff1132aeade8d1b1c2036be8d7e0a303196020bb75651a978a741cc72aa2531bb57030495f0fab06a7c7a880e26afaddcfdbc9fcb1e384518aa94cca4c4855
-DIST vivaldi-1.0.288.3_p1-i386.deb 40121952 SHA256 27f323d6c138cba6095dfa4dc17672096f421b02161c09d16394a70440242347 SHA512 4813f36cbe999a6d7a801667cb6093d2bb6289ba8c1221e427bd3ec459f07e44949494b3f9c1d41b013fb459dc07d5f641ad6f16423714d98d4b24de94bac013 WHIRLPOOL 7d01912f6f2f64285cfe6ebc330da68467996e387ed7373b814e77248ddf6d167b2b126836cf41c25f47dc0d4eb2986d4edacf994894d17c0993bf10f0978b02
DIST vivaldi-1.0.291.18_p1-amd64.deb 40035786 SHA256 057fd309ac396dcb1170a83dcc0ea9d1804839e6846dd607d92189d25530ed08 SHA512 1fc5508aed4f850ecf097e0551b0342dca9f29745a2f6161301ef993f289eaa82a10538ba47c64e53bd0b85cf4c5ea3358f680811c7dfa30649f36993e4960c1 WHIRLPOOL dda5ce0c847c80ccfdb4b94a6421297cecb95e6da59e24986d6162dd8c51fb52601e3f3316fb5008b1f921bc0fae8f2301ecc1ba55f7440d361978755a9b0fbe
DIST vivaldi-1.0.291.18_p1-i386.deb 40162732 SHA256 f66debe9282d34e56f2b9309bce0e9d5f3f002165dc16c3e1931b27edf12f261 SHA512 e5caf75aae4dac7054e79ba36604a32363550dd94da5eeb0f9a217d512058e368d81c2fb1ef3a050ce725acaa239a323d0450ee724d6b4c5e73ad7a109fe8216 WHIRLPOOL 22e0d087aeb4a2c66eadbb73fb3b827c9480df46e8f132e7e2605335118a70cdb041842da5f2c8f34c60f2bfbec18be3915071a747bacbf2bfc1cf819464cb21
diff --git a/www-client/vivaldi/files/vivaldi-1.0.275.3_p1-flash.patch b/www-client/vivaldi/files/vivaldi-1.0.275.3_p1-flash.patch
index e1fc56f14236..ee8d0c736e2b 100644
--- a/www-client/vivaldi/files/vivaldi-1.0.275.3_p1-flash.patch
+++ b/www-client/vivaldi/files/vivaldi-1.0.275.3_p1-flash.patch
@@ -4,8 +4,8 @@
FLASH_PATH="/usr/lib64/chromium/PepperFlash/libpepflashplayer.so" # openSuse 64-bit
elif [ -f "/usr/lib/pepflashplugin-installer/libpepflashplayer.so" ]; then
FLASH_PATH="/usr/lib/pepflashplugin-installer/libpepflashplayer.so" # ppa:skunk/pepper-flash
-+elif [ -f "/usr/lib64/chromium-browser/PepperFlash/libpepflashplayer.so" ]; then
-+ FLASH_PATH="/usr/lib64/chromium-browser/PepperFlash/libpepflashplayer.so" # www-plugins/chrome-binary-plugins
++elif [ -f "/usr/@LIBDIR@/chromium-browser/PepperFlash/libpepflashplayer.so" ]; then
++ FLASH_PATH="/usr/@LIBDIR@/chromium-browser/PepperFlash/libpepflashplayer.so" # www-plugins/chrome-binary-plugins
fi
if [ -f $FLASH_PATH ]; then
FLASH_VERSION=`grep -m 1 -a -o "LNX [[:digit:]]\+,[[:digit:]]\+,[[:digit:]]\+,[[:digit:]]\+" $FLASH_PATH | cut -c 5- | sed -e "s/,/./g"`
diff --git a/www-client/vivaldi/vivaldi-1.0.288.3_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.288.3_p1.ebuild
deleted file mode 100644
index 6378a5a54217..000000000000
--- a/www-client/vivaldi/vivaldi-1.0.288.3_p1.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
-CHROMIUM_LANGS="
- am ar bg bn ca cs da de el en_GB en_US es_419 es et fa fil fi fr gu he hi
- hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv
- sw ta te th tr uk vi zh_CN zh_TW
-"
-inherit chromium eutils multilib unpacker toolchain-funcs
-
-DESCRIPTION="A new browser for our friends"
-HOMEPAGE="http://vivaldi.com/"
-VIVALDI_BASE_URI="${HOMEPAGE}download/snapshot/${PN}-snapshot_${PV/_p/-}_"
-SRC_URI="
- amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
- x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RESTRICT="bindist mirror"
-
-S=${WORKDIR}
-
-RDEPEND="
- dev-libs/expat
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- >=dev-libs/openssl-1.0.1:0
- gnome-base/gconf:2
- media-libs/alsa-lib
- media-libs/fontconfig
- media-libs/freetype
- net-misc/curl
- net-print/cups
- sys-apps/dbus
- sys-libs/libcap
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:2
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-VIVALDI_HOME="opt/${PN}-snapshot"
-
-src_unpack() {
- unpack_deb ${A}
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.0.275.3_p1-flash.patch
-
- sed -i \
- -e 's|vivaldi-snapshot|vivaldi|g' \
- usr/share/applications/${PN}-snapshot.desktop \
- usr/share/xfce4/helpers/${PN}-snapshot.desktop || die
-
- mv usr/share/doc/${PN}-snapshot usr/share/doc/${PF} || die
-
- rm etc/cron.daily/${PN}-snapshot || die
- rmdir etc/cron.daily/ || die
- rmdir etc/ || die
-
- rm usr/bin/${PN}-snapshot || die
- rm _gpgbuilder || die
-
- local c d
- for d in 16 22 24 32 48 64 128 256; do
- mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
- cp \
- ${VIVALDI_HOME}/product_logo_${d}.png \
- usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die
- done
-
- pushd "${VIVALDI_HOME}/locales" > /dev/null || die
- chromium_remove_language_paks
- popd > /dev/null || die
-
-}
-
-src_install() {
- mv * "${D}" || die
- dosym /${VIVALDI_HOME}/${PN}-snapshot /usr/bin/${PN}
-
- fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}
diff --git a/www-client/vivaldi/vivaldi-1.0.291.18_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.291.18_p1-r1.ebuild
index 6378a5a54217..c40dd917fbf3 100644
--- a/www-client/vivaldi/vivaldi-1.0.291.18_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.0.291.18_p1-r1.ebuild
@@ -67,6 +67,9 @@ src_unpack() {
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.0.275.3_p1-flash.patch
+ sed -i \
+ -e "s|@LIBDIR@|$(get_libdir)|g" \
+ opt/vivaldi-snapshot/vivaldi-snapshot || die
sed -i \
-e 's|vivaldi-snapshot|vivaldi|g' \
diff --git a/www-misc/monitorix/monitorix-3.5.1.ebuild b/www-misc/monitorix/monitorix-3.5.1.ebuild
index b638a226b887..a1aeb7942fbe 100644
--- a/www-misc/monitorix/monitorix-3.5.1.ebuild
+++ b/www-misc/monitorix/monitorix-3.5.1.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
inherit eutils systemd user
DESCRIPTION="A lightweight system monitoring tool"
-HOMEPAGE="http://www.${PN}.org/"
+HOMEPAGE="http://www.monitorix.org/"
SRC_URI="http://www.${PN}.org/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.3-r1.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..6f410bdda7ec
--- /dev/null
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.3-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MIN_VERSION="2.8.8"
+
+inherit cmake-utils multilib
+
+LICENSE="MIT"
+HOMEPAGE="https://github.com/i-rinat/freshplayerplugin"
+DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers"
+SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT=0
+IUSE="gtk3 jack libav libressl pulseaudio vaapi vdpau"
+
+KEYWORDS="~amd64 ~x86"
+
+HWDEC_DEPEND="
+ libav? ( media-video/libav:0=[vaapi?,vdpau?,x264] )
+ !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?,x264] )
+ x11-libs/libva
+ x11-libs/libvdpau
+"
+
+CDEPEND="
+ dev-libs/glib:2=
+ dev-libs/libevent:=[threads]
+ media-libs/alsa-lib:=
+ media-libs/freetype:2=
+ media-libs/libv4l:0=
+ media-libs/mesa:=[egl,gles2]
+ x11-libs/libXrandr:=
+ x11-libs/libXrender:=
+ x11-libs/libdrm:=
+ x11-libs/pango:=[X]
+ jack? ( media-sound/jack-audio-connection-kit )
+ pulseaudio? ( media-sound/pulseaudio )
+ !gtk3? ( x11-libs/gtk+:2= )
+ gtk3? ( x11-libs/gtk+:3= )
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
+ vaapi? ( ${HWDEC_DEPEND} )
+ vdpau? ( ${HWDEC_DEPEND} )
+"
+
+DEPEND="${CDEPEND}
+ dev-util/ragel
+ virtual/pkgconfig
+ "
+RDEPEND="${CDEPEND}
+ || (
+ www-plugins/chrome-binary-plugins[flash]
+ www-client/google-chrome
+ www-client/google-chrome-beta
+ www-client/google-chrome-unstable
+ )
+ "
+
+PATCHES=( "${FILESDIR}/0.2.4-cmake.patch" )
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_with jack JACK)
+ $(cmake-utils_use_with pulseaudio PULSEAUDIO)
+ -DWITH_GTK=$(usex gtk3 3 2)
+ -DCMAKE_SKIP_RPATH=1
+ )
+ if use vaapi || use vdpau ; then
+ mycmakeargs+=( -DWITH_HWDEC=1 )
+ else
+ mycmakeargs+=( -DWITH_HWDEC=0 )
+ fi
+ cmake-utils_src_configure
+}
+
+src_install() {
+ dodoc ChangeLog data/freshwrapper.conf.example README.md
+ exeinto /usr/$(get_libdir)/nsbrowser/plugins
+ doexe "${BUILD_DIR}/libfreshwrapper-flashplayer.so"
+}
diff --git a/www-servers/bozohttpd/bozohttpd-20140708-r1.ebuild b/www-servers/bozohttpd/bozohttpd-20140708-r1.ebuild
new file mode 100644
index 000000000000..1b68c2184741
--- /dev/null
+++ b/www-servers/bozohttpd/bozohttpd-20140708-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit toolchain-funcs
+
+DESCRIPTION="bozohttpd is a small and secure http server"
+HOMEPAGE="http://www.eterna.com.au/bozohttpd/"
+SRC_URI="http://www.eterna.com.au/bozohttpd/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE="libressl"
+
+DEPEND="!libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}
+ virtual/logger"
+
+src_prepare() {
+ mv Makefile{.boot,} || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" OPT="${CFLAGS}"
+}
+
+src_install() {
+ dobin bozohttpd
+ doman bozohttpd.8
+
+ newconfd "${FILESDIR}"/${PN}.conffile bozohttpd
+ newinitd "${FILESDIR}"/${PN}.initscript bozohttpd
+}
diff --git a/www-servers/cherokee/Manifest b/www-servers/cherokee/Manifest
index d62c4198dccf..8574268ea02c 100644
--- a/www-servers/cherokee/Manifest
+++ b/www-servers/cherokee/Manifest
@@ -1,3 +1 @@
-DIST cherokee-1.2.103.zip 5783906 SHA256 0e125cba2ad2d0dc48ecca3af4894b92ec5fab422a9d7d27fd0c7a74751e5f35 SHA512 63ba5d41f61d2816df7dce3b572616eca5fc09dd2e9dca9efa2cbf28a38d6d5e1840e4cd302a0eb5780b1a0abe7632232511c77d9e383f0b945d3eca960af4ab WHIRLPOOL 00f592bc41eecd6422a95d6e36bf5c46b4845afe2adad756635d0d2c1e5c1bfde03e633bcbde8cab207c31050dc055e26fcdbf69512a8b61422242905b792754
DIST cherokee-1.2.104.zip 6200164 SHA256 1acc80de22ed0aa4a0d95aa643ac92a2cce435480258081213214bec05da4098 SHA512 9c9f44643d0d2636f2e3e61ef8e2918d91d9bb6099be761826c8ffad01d339739ed40984d01151044c2e536d4754b5157d6d20c37627ce49eecdb404a716cd9d WHIRLPOOL b0c13205014daee461538d0b7968bf255fd6633dbf3defeb2505ce463772c6f56b06ef91ff6b055bd589a15d19974d794fcbe039c1552b04a6bd1228a690f417
-DIST cherokee-ctk-master.zip 415092 SHA256 dede313f1d396f1deaf78d9fd9a1270820d2e91761efe827a207b46061f27993 SHA512 c933f15aa7197f5001b3120fd27898b2e97b78998e0bd0d68e7ced16a57950b7e85e4d731ca0420cd8a0fb292b4cd34b9497928183ccca22c9aa3a16285f9ef7 WHIRLPOOL 92453d3478ae238e5d9422fc2e8f0f1406576f9753ba0ed644ae8e093862b72c8c634bdaaeec4c0f725bdef8f4bc5c7113a916c2cdd8fbb0a14db61e54173c57
diff --git a/www-servers/cherokee/cherokee-1.2.103-r2.ebuild b/www-servers/cherokee/cherokee-1.2.103-r2.ebuild
deleted file mode 100644
index 1d87b9ec2d41..000000000000
--- a/www-servers/cherokee/cherokee-1.2.103-r2.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-WANT_AUTOMAKE="1.11"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-r1 eutils multilib pam systemd user
-
-DESCRIPTION="An extremely fast and tiny web server"
-SRC_URI="https://github.com/cherokee/webserver/archive/v${PV}.zip -> ${P}.zip
- https://github.com/cherokee/CTK/archive/master.zip -> ${PN}-ctk-master.zip"
-HOMEPAGE="http://www.cherokee-project.com/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php rrdtool ssl static static-libs"
-
-COMMON_DEPEND="dev-libs/libpcre
- >=sys-libs/zlib-1.1.4-r1
- ffmpeg? ( virtual/ffmpeg )
- geoip? ( dev-libs/geoip )
- ldap? ( net-nds/openldap )
- mysql? ( >=virtual/mysql-5 )
- nls? ( virtual/libintl )
- pam? ( virtual/pam )
- php? ( || (
- dev-lang/php[fpm]
- dev-lang/php[cgi]
- ) )
- ssl? ( dev-libs/openssl )"
-DEPEND="${COMMON_DEPEND}
- nls? ( sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}
- rrdtool? ( net-analyzer/rrdtool )"
-
-RESTRICT="test"
-
-WEBROOT="/var/www/localhost"
-
-src_unpack() {
- unpack ${A}
- mv "webserver-${PV}" "${S}" || die
- rmdir "${S}/admin/CTK" || die
- mv "CTK-master" "${S}/admin/CTK" || die
-}
-
-pkg_setup() {
- enewgroup cherokee
- enewuser cherokee -1 -1 /var/www cherokee
-}
-
-src_prepare() {
- python_setup
- epatch \
- "${FILESDIR}/${PN}-1.2.99-gentoo.patch" \
- "${FILESDIR}/${PN}-1.2.103-linux3.patch"
-
- "${S}/po/admin/generate_POTFILESin.py" > po/admin/POTFILES.in
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use admin ; then
- myconf="${myconf} --enable-admin --with-python=/usr/bin/python"
- else
- myconf="${myconf} --disable-admin"
- fi
-
- # Uses autodetect because --with-php requires path to php-{fpm,cgi}.
- if ! use php ; then
- myconf="${myconf} --without-php"
- fi
-
- if use static ; then
- myconf="${myconf} --enable-static-module=all"
- fi
-
- local os="Unknown"
- case "${CHOST}" in
- *-freebsd*)
- os="FreeBSD" ;;
- *-netbsd*)
- os="NetBSD" ;;
- *-openbsd*)
- os="OpenBSD" ;;
- *)
- os="Linux" ;;
- esac
-
- econf \
- $(use_enable debug trace) \
- $(use_enable debug backtraces) \
- $(use_enable ipv6) \
- $(use_enable kernel_linux epoll) \
- $(use_enable nls) \
- $(use_enable pam) \
- $(use_enable static-libs static) \
- $(use_with ffmpeg) \
- $(use_with geoip) \
- $(use_with ldap) \
- $(use_with mysql) \
- $(use_with ssl libssl) \
- --disable-dependency-tracking \
- --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
- --enable-os-string="Gentoo ${os}" \
- --enable-tmpdir="${EPREFIX}/var/tmp" \
- --localstatedir="${EPREFIX}/var" \
- --with-wwwroot="${EPREFIX}${WEBROOT}/htdocs" \
- --with-cgiroot="${EPREFIX}${WEBROOT}/cgi-bin" \
- --with-wwwuser=cherokee \
- --with-wwwgroup=cherokee \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- if ! use static-libs ; then
- find "${ED}" -name '*.la' -delete || die
- elif ! use static ; then
- find "${ED}/usr/$(get_libdir)/cherokee" '(' -name '*.la' -o -name '*.a' ')' -delete || die
- fi
-
- dodoc AUTHORS NEWS README.rst
-
- if use pam ; then
- pamd_mimic system-auth cherokee auth account session || die
- fi
-
- newinitd "${FILESDIR}/${PN}-initd-1.2.99" ${PN}
- newconfd "${FILESDIR}/${PN}-confd-1.2.98" ${PN}
-
- if ! use admin ; then
- rm -r \
- "${ED}"/usr/bin/cherokee-admin-launcher \
- "${ED}"/usr/bin/CTK-run \
- "${ED}"/usr/sbin/cherokee-admin \
- "${ED}"/usr/share/cherokee/admin || die
- fi
-
- exeinto /usr/share/doc/${PF}/contrib
- doexe contrib/{bin2buffer.py,make-cert.sh,make-dh_params.sh,tracelor.py}
-
- #move the htdocs to docdir, bug #429632
- docompress -x /usr/share/doc/"${PF}"/htdocs.dist
- mv "${ED}"${WEBROOT}/htdocs \
- "${ED}"/usr/share/doc/"${PF}"/htdocs.dist
- mkdir "${ED}"${WEBROOT}/htdocs
-
- keepdir \
- "${WEBROOT}"/htdocs \
- /var/log/cherokee \
- /var/lib/cherokee/graphs/images
- fowners cherokee:cherokee \
- /var/log/cherokee \
- /var/lib/cherokee/graphs \
- /var/lib/cherokee/graphs/images
-
- # logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/${PN}.logrotate-r1 ${PN}
-
- systemd_dounit "${FILESDIR}"/cherokee.service
-}
-
-pkg_postinst() {
- elog
- if use admin ; then
- elog "Just run '/usr/sbin/cherokee-admin' and go to: http://localhost:9090"
- elog
- elog "Cherokee currently supports configuration versioning, so from now on,"
- elog "whenever a change is made to the configuration file format,"
- elog "Cherokee-Admin will be able to automatically convert yours to the new"
- elog "release. You simply have to load Cherokee-Admin and it will be converted"
- elog "once you proceed to saving it."
- elog
- elog "There is also a command line utility that you can use to do the exact"
- elog "same thing. Config format can change in different versions. It is"
- elog "provided under:"
- elog " ${EPREFIX}/usr/share/cherokee/admin/upgrade_config.py"
- else
- elog "Try USE=admin if you want an easy way to configure cherokee."
- fi
- elog
- elog "emerge www-servers/spawn-fcgi if you use Ruby on Rails with ${PN}."
- elog
-}
diff --git a/www-servers/cherokee/cherokee-1.2.104.ebuild b/www-servers/cherokee/cherokee-1.2.104.ebuild
index a78bc089d0e4..6d4655bbea00 100644
--- a/www-servers/cherokee/cherokee-1.2.104.ebuild
+++ b/www-servers/cherokee/cherokee-1.2.104.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.cherokee-project.com/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
-IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap mysql nls pam php rrdtool ssl static static-libs"
+IUSE="admin ffmpeg debug geoip ipv6 kernel_linux ldap libressl mysql nls pam php rrdtool ssl static static-libs"
COMMON_DEPEND="dev-libs/libpcre
>=sys-libs/zlib-1.1.4-r1
@@ -28,10 +28,14 @@ COMMON_DEPEND="dev-libs/libpcre
nls? ( virtual/libintl )
pam? ( virtual/pam )
php? ( || (
- dev-lang/php[fpm]
- dev-lang/php[cgi]
+ dev-lang/php:*[fpm]
+ dev-lang/php:*[cgi]
) )
- ssl? ( dev-libs/openssl )"
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ "
DEPEND="${COMMON_DEPEND}
nls? ( sys-devel/gettext )"
RDEPEND="${COMMON_DEPEND}
diff --git a/www-servers/cherokee/files/cherokee-1.2.103-linux3.patch b/www-servers/cherokee/files/cherokee-1.2.103-linux3.patch
deleted file mode 100644
index 7f96f68ab97e..000000000000
--- a/www-servers/cherokee/files/cherokee-1.2.103-linux3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur webserver-1.2.103.orig/admin/SystemStats.py webserver-1.2.103/admin/SystemStats.py
---- webserver-1.2.103.orig/admin/SystemStats.py 2013-01-26 17:52:44.000000000 -0500
-+++ webserver-1.2.103/admin/SystemStats.py 2013-07-15 07:27:11.000000000 -0400
-@@ -39,7 +39,7 @@
- global _stats
-
- if not _stats:
-- if sys.platform == 'linux2':
-+ if sys.platform == 'linux2' or sys.platform == 'linux3':
- _stats = System_stats__Linux()
- elif sys.platform == 'darwin':
- _stats = System_stats__Darwin()
-diff -Naur webserver-1.2.103.orig/admin/util.py webserver-1.2.103/admin/util.py
---- webserver-1.2.103.orig/admin/util.py 2013-01-26 17:52:44.000000000 -0500
-+++ webserver-1.2.103/admin/util.py 2013-07-15 07:29:12.000000000 -0400
-@@ -341,7 +341,7 @@
- def os_get_document_root():
- if sys.platform == 'darwin':
- return "/Library/WebServer/Documents"
-- elif sys.platform == 'linux2':
-+ elif sys.platform == 'linux2' or sys.platform == 'linux3':
- if os.path.exists ("/etc/redhat-release"):
- return '/var/www'
- elif os.path.exists ("/etc/fedora-release"):
-diff -Naur webserver-1.2.103.orig/admin/wizards/php.py webserver-1.2.103/admin/wizards/php.py
---- webserver-1.2.103.orig/admin/wizards/php.py 2013-01-26 17:52:44.000000000 -0500
-+++ webserver-1.2.103/admin/wizards/php.py 2013-07-15 07:29:47.000000000 -0400
-@@ -607,7 +607,7 @@
- first_group = str(root_group)
-
- # Systems
-- if sys.platform == 'linux2':
-+ if sys.platform == 'linux2' or sys.platform == 'linux3':
- if os.getuid() == 0:
- return root_group
- return first_group
diff --git a/www-servers/gatling/gatling-0.13-r1.ebuild b/www-servers/gatling/gatling-0.13-r1.ebuild
new file mode 100644
index 000000000000..2c6b7b17e9ab
--- /dev/null
+++ b/www-servers/gatling/gatling-0.13-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs user
+
+DESCRIPTION="High performance web server"
+HOMEPAGE="http://www.fefe.de/gatling/"
+SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="libressl ssl diet"
+REQUIRED_USE="ssl? ( !diet )"
+
+DEPEND=">=dev-libs/libowfat-0.25[diet=]
+ diet? ( dev-libs/dietlibc )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ rm Makefile # leaves us with GNUmakefile
+ epatch "${FILESDIR}/${P}-compile.patch"
+}
+
+src_compile() {
+ local DIET=
+ use diet && DIET='/usr/bin/diet'
+
+ local targets='gatling'
+ use ssl && targets+=' tlsgatling'
+
+ emake DIET="${DIET}" CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS} -I${ROOT}usr/include/libowfat" \
+ LDFLAGS="${LDFLAGS}" prefix=/usr ${targets} \
+ || die "emake ${targets} failed"
+}
+
+src_install() {
+ doman gatling.1 || die "installing manpage failed"
+
+ newconfd "${FILESDIR}/gatling.confd" gatling || die
+ newinitd "${FILESDIR}/gatling.initd-2" gatling || die
+ dodoc README.{ftp,http} || die "installing docs failed"
+
+ dobin gatling || die "installing gatling binary failed"
+ use ssl && {
+ dodoc README.tls || die "installing docs failed"
+ dobin tlsgatling || die "installing tlsgatling binary failed"
+ }
+}
+
+pkg_setup() {
+ ebegin "Creating gatling user and group"
+ enewgroup gatling
+ enewuser ${PN} -1 -1 /var/www/localhost ${PN}
+}
diff --git a/www-servers/pound/pound-2.7f-r1.ebuild b/www-servers/pound/pound-2.7f-r1.ebuild
new file mode 100644
index 000000000000..4efc7af38573
--- /dev/null
+++ b/www-servers/pound/pound-2.7f-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+MY_P=${P/p/P}
+DESCRIPTION="A http/https reverse-proxy and load-balancer"
+HOMEPAGE="http://www.apsis.ch/pound/"
+SRC_URI="http://www.apsis.ch/pound/${MY_P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="libressl"
+
+DEPEND="dev-libs/libpcre
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+ dodir /usr/sbin
+ cp "${S}"/pound "${D}"/usr/sbin/
+ cp "${S}"/poundctl "${D}"/usr/sbin/
+
+ doman pound.8
+ doman poundctl.8
+ dodoc README FAQ
+
+ dodir /etc/init.d
+ newinitd "${FILESDIR}"/pound.init-1.9 pound
+
+ insinto /etc
+ newins "${FILESDIR}"/pound-2.2.cfg pound.cfg
+}
+
+pkg_postinst() {
+ elog "No demo-/sample-configfile is included in the distribution -"
+ elog "read the man-page for more info."
+ elog "A sample (localhost:8888 -> localhost:80) for gentoo is given in \"/etc/pound.cfg\"."
+ echo
+ ewarn "You will have to upgrade you configuration file, if you are"
+ ewarn "upgrading from a version <= 2.0."
+ echo
+ ewarn "The 'WebDAV' config statement is no longer supported!"
+ ewarn "Please adjust your configuration, if necessary."
+ echo
+}
diff --git a/www-servers/pshs/pshs-0.3-r1.ebuild b/www-servers/pshs/pshs-0.3-r1.ebuild
new file mode 100644
index 000000000000..d07609f7153a
--- /dev/null
+++ b/www-servers/pshs/pshs-0.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Pretty small HTTP server -- a command-line tool to share files"
+HOMEPAGE="https://bitbucket.org/mgorny/pshs/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +magic +netlink qrcode ssl upnp"
+
+RDEPEND=">=dev-libs/libevent-2:0=
+ magic? ( sys-apps/file:0= )
+ qrcode? ( media-gfx/qrencode:0= )
+ ssl? ( >=dev-libs/libevent-2.1:0=[ssl]
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
+ upnp? ( net-libs/miniupnpc:0= )"
+DEPEND="${RDEPEND}
+ netlink? ( sys-apps/iproute2
+ >=sys-kernel/linux-headers-2.6.27 )"
+# libnetlink is static only ATM
+
+src_configure() {
+ local myconf=(
+ $(use_enable magic libmagic)
+ $(use_enable netlink)
+ $(use_enable qrcode qrencode)
+ $(use_enable ssl)
+ $(use_enable upnp)
+ )
+
+ econf "${myconf[@]}"
+}
diff --git a/www-servers/pshs/pshs-9999.ebuild b/www-servers/pshs/pshs-9999.ebuild
index 6d71ea0c59aa..8e23ff2e77a3 100644
--- a/www-servers/pshs/pshs-9999.ebuild
+++ b/www-servers/pshs/pshs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,13 +17,15 @@ SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="+magic +netlink qrcode ssl upnp"
+IUSE="libressl +magic +netlink qrcode ssl upnp"
RDEPEND=">=dev-libs/libevent-2:0=
magic? ( sys-apps/file:0= )
qrcode? ( media-gfx/qrencode:0= )
ssl? ( >=dev-libs/libevent-2.1:0=[ssl]
- dev-libs/openssl:0= )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )
upnp? ( net-libs/miniupnpc:0= )"
DEPEND="${RDEPEND}
netlink? ( sys-apps/iproute2
diff --git a/www-servers/uwsgi/uwsgi-2.0.11.2-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.11.2-r1.ebuild
new file mode 100644
index 000000000000..7982b6f000ba
--- /dev/null
+++ b/www-servers/uwsgi/uwsgi-2.0.11.2-r1.ebuild
@@ -0,0 +1,402 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby19 ruby20 ruby21"
+
+PHP_EXT_INI="no"
+PHP_EXT_NAME="dummy"
+PHP_EXT_OPTIONAL_USE="php"
+USE_PHP="php5-4 php5-5 php5-6" # deps must be registered separately below
+
+MY_P="${P/_/-}"
+
+inherit apache-module distutils-r1 eutils flag-o-matic multilib pax-utils php-ext-source-r2 python-r1 ruby-ng versionator
+
+DESCRIPTION="uWSGI server for Python web applications"
+HOMEPAGE="http://projects.unbit.it/uwsgi/"
+SRC_URI="https://github.com/unbit/uwsgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+UWSGI_PLUGINS_STD=( ping cache carbon nagios rpc rrdtool
+ http ugreen signal syslog rsyslog
+ router_{uwsgi,redirect,basicauth,rewrite,http,cache,static,memcached,redis,hash,expires,metrics}
+ {core,fast,raw,ssl}router
+ redislog mongodblog log{file,socket}
+ spooler cheaper_busyness symcall
+ transformation_{chunked,gzip,offload,tofile}
+ zergpool )
+UWSGI_PLUGINS_OPT=( alarm_{curl,xmpp} clock_{monotonic,realtime} curl_cron
+ dumbloop echo emperor_{amqp,pg,zeromq} forkptyrouter
+ geoip graylog2 legion_cache_fetch ldap log{crypto,pipe} notfound pam
+ rados router_{access,radius,spnego,xmldir}
+ sqlite ssi stats_pusher_statsd
+ systemd_logger transformation_toupper tuntap webdav xattr xslt zabbix )
+
+LANG_SUPPORT_SIMPLE=( cgi mono perl ) # plugins which can be built in the main build process
+LANG_SUPPORT_EXTENDED=( lua php pypy python python_asyncio python_gevent ruby )
+
+# plugins to be ignored (for now):
+# cheaper_backlog2: example plugin
+# coroae: TODO
+# cplusplus: partially example code, needs explicit class
+# dummy: no idea
+# example: example plugin
+# exception_log: example plugin
+# *go*: TODO
+# *java*: TODO
+# v8: TODO
+# matheval: TODO
+IUSE="apache2 +caps debug +embedded expat jemalloc json libressl +pcre +routing +ssl +xml yajl yaml zeromq"
+
+for plugin in ${UWSGI_PLUGINS_STD[@]} ; do IUSE="${IUSE} +uwsgi_plugins_${plugin}" ; done
+for plugin in ${UWSGI_PLUGINS_OPT[@]} ; do IUSE="${IUSE} uwsgi_plugins_${plugin}" ; done
+IUSE="${IUSE} ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]}"
+
+REQUIRED_USE="|| ( ${LANG_SUPPORT_SIMPLE[@]} ${LANG_SUPPORT_EXTENDED[@]} )
+ uwsgi_plugins_logcrypto? ( ssl )
+ uwsgi_plugins_sslrouter? ( ssl )
+ routing? ( pcre )
+ uwsgi_plugins_emperor_zeromq? ( zeromq )
+ uwsgi_plugins_forkptyrouter? ( uwsgi_plugins_corerouter )
+ uwsgi_plugins_router_xmldir? ( xml )
+ pypy? ( python_targets_python2_7 )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ python_asyncio? ( python_targets_python3_4 python_gevent )
+ python_gevent? ( python )
+ expat? ( xml )"
+
+# util-linux is required for libuuid when requesting zeromq support
+# Order:
+# 1. Unconditional
+# 2. General features
+# 3. Plugins
+# 4. Language/app support
+CDEPEND="sys-libs/zlib
+ caps? ( sys-libs/libcap )
+ json? ( !yajl? ( dev-libs/jansson )
+ yajl? ( dev-libs/yajl ) )
+ pcre? ( dev-libs/libpcre:3 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ xml? ( !expat? ( dev-libs/libxml2 )
+ expat? ( dev-libs/expat ) )
+ yaml? ( dev-libs/libyaml )
+ zeromq? ( net-libs/zeromq sys-apps/util-linux )
+ uwsgi_plugins_alarm_curl? ( net-misc/curl )
+ uwsgi_plugins_alarm_xmpp? ( net-libs/gloox )
+ uwsgi_plugins_curl_cron? ( net-misc/curl )
+ uwsgi_plugins_emperor_pg? ( dev-db/postgresql:= )
+ uwsgi_plugins_geoip? ( dev-libs/geoip )
+ uwsgi_plugins_ldap? ( net-nds/openldap )
+ uwsgi_plugins_pam? ( virtual/pam )
+ uwsgi_plugins_sqlite? ( dev-db/sqlite:3 )
+ uwsgi_plugins_rados? ( sys-cluster/ceph )
+ uwsgi_plugins_router_access? ( sys-apps/tcp-wrappers )
+ uwsgi_plugins_router_spnego? ( virtual/krb5 )
+ uwsgi_plugins_rsyslog? ( app-admin/rsyslog )
+ uwsgi_plugins_systemd_logger? ( sys-apps/systemd )
+ uwsgi_plugins_webdav? ( dev-libs/libxml2 )
+ uwsgi_plugins_xslt? ( dev-libs/libxslt )
+ lua? ( dev-lang/lua:= )
+ mono? ( =dev-lang/mono-2* )
+ perl? ( dev-lang/perl:= )
+ php? (
+ php_targets_php5-4? ( dev-lang/php:5.4[embed] )
+ php_targets_php5-5? ( dev-lang/php:5.5[embed] )
+ )
+ pypy? ( virtual/pypy )
+ python? ( ${PYTHON_DEPS} )
+ python_gevent? ( >=dev-python/gevent-1.0.1[$(python_gen_usedep 'python2*')] )
+ ruby? ( $(ruby_implementations_depend) )"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ uwsgi_plugins_rrdtool? ( net-analyzer/rrdtool )"
+
+want_apache2
+
+S="${WORKDIR}/${MY_P}"
+APXS2_S="${S}/apache2"
+APACHE2_MOD_CONF="42_mod_uwsgi-r2 42_mod_uwsgi"
+
+src_unpack() {
+ default
+}
+
+pkg_setup() {
+ python_setup
+ use ruby && ruby-ng_pkg_setup
+ depend.apache_pkg_setup
+}
+
+src_prepare() {
+ sed -i \
+ -e "s|'-O2', ||" \
+ -e "s|'-Werror', ||" \
+ -e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
+ uwsgiconfig.py || die "sed failed"
+
+ sed -i \
+ -e "s|/lib|/$(get_libdir)|" \
+ plugins/php/uwsgiplugin.py || die "sed failed"
+}
+
+src_configure() {
+ local embedded_plugins=()
+ local plugins=()
+ local malloc_impl="libc"
+ local json="false"
+ local xml="false"
+
+ for p in ${UWSGI_PLUGINS_STD[@]} ${UWSGI_PLUGINS_OPT[@]} ; do
+ use uwsgi_plugins_${p} && embedded_plugins+=("${p}")
+ done
+ for p in ${LANG_SUPPORT_SIMPLE[@]} ; do
+ use ${p} && plugins+=("${p}")
+ done
+
+ # do not embed any plugins
+ if ! use embedded ; then
+ plugins=( ${plugins[@]} ${embedded_plugins[@]} )
+ embedded_plugins=()
+ fi
+
+ # flatten the arrays
+ plugins=${plugins[@]}
+ embedded_plugins=${embedded_plugins[@]}
+
+ # rename some of the use flags, language plugins are always real plugins
+ plugins="${plugins/perl/psgi}"
+ plugins="${plugins/sqlite/sqlite3}"
+ embedded_plugins="${embedded_plugins/sqlite/sqlite3}"
+
+ # override defaults as requested by the user
+ if use xml; then
+ use expat && xml="expat" || xml="libxml2"
+ fi
+ if use json; then
+ use yajl && json="yajl" || json="jansson"
+ fi
+ use jemalloc && malloc_impl="jemalloc"
+
+ # prepare the buildconf for gentoo
+ cp "${FILESDIR}"/gentoo.buildconf buildconf/gentoo.ini
+ sed -i \
+ -e "s|VAR_XML|${xml}|" \
+ -e "s|VAR_YAML|$(usex yaml true false)|" \
+ -e "s|VAR_JSON|${json}|" \
+ -e "s|VAR_SSL|$(usex ssl true false)|" \
+ -e "s|VAR_PCRE|$(usex pcre true false)|" \
+ -e "s|VAR_ZMQ|$(usex zeromq true false)|" \
+ -e "s|VAR_ROUTING|$(usex routing true false)|" \
+ -e "s|VAR_DEBUG|$(usex debug true false)|" \
+ -e "s|VAR_MALLOC|${malloc_impl}|" \
+ -e "s|VAR_PLUGINS|${plugins// /, }|" \
+ -e "s|VAR_PLUGIN_DIR|/usr/$(get_libdir)/uwsgi|" \
+ -e "s|VAR_BUILD_DIR|${T}/plugins|" \
+ -e "s|VAR_EMBEDDED|${embedded_plugins// /, }|" \
+ buildconf/gentoo.ini || die "sed failed"
+
+ use caps || sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+ use zeromq || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+
+ if use uwsgi_plugins_emperor_pg ; then
+ PGPV="$(best_version dev-db/postgresql)"
+ PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-})"
+ sed -i \
+ -e "s|pg_config|pg_config${PGSLOT/.}|" \
+ plugins/emperor_pg/uwsgiplugin.py || die "sed failed"
+ fi
+}
+
+each_ruby_compile() {
+ cd "${WORKDIR}/${MY_P}" || die "sed failed"
+
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo fiber_${RUBY##*/}|| die "building fiber plugin for ${RUBY} failed"
+ UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rbthreads gentoo rbthreads_${RUBY##*/}|| die "building rbthreads plugin for ${RUBY} failed"
+}
+
+python_compile_plugins() {
+ local EPYV
+ local PYV
+ EPYV=${EPYTHON/.}
+ PYV=${EPYV/python}
+
+ if [[ ${EPYTHON} == pypy* ]] ; then
+ echo "skipping because pypy is not meant to build plugins on its own"
+ return
+ fi
+
+ ${PYTHON} uwsgiconfig.py --plugin plugins/python gentoo ${EPYV} || die "building plugin for ${EPYTHON} failed"
+
+ if use python_asyncio ; then
+ if [[ "${PYV}" == "34" || "${PYV}" == "35" ]] ; then
+ ${PYTHON} uwsgiconfig.py --plugin plugins/asyncio gentoo asyncio${PYV} || die "building plugin for asyncio-support in ${EPYTHON} failed"
+ fi
+ fi
+
+ if use python_gevent ; then
+ if [[ "${PYV}" == "27" ]] ; then
+ ${PYTHON} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${PYV} || die "building plugin for gevent-support in ${EPYTHON} failed"
+ fi
+ fi
+
+ if use pypy ; then
+ if [[ "${PYV}" == "27" ]] ; then
+ # TODO: do some proper patching ? The wiki didn't help... I gave up for now.
+ # QA: RWX --- --- usr/lib64/uwsgi/pypy_plugin.so
+ append-ldflags -Wl,-z,noexecstack
+ ${PYTHON} uwsgiconfig.py --plugin plugins/pypy gentoo pypy || die "building plugin for pypy-support in ${EPYTHON} failed"
+ fi
+ fi
+}
+
+python_install_symlinks() {
+ dosym uwsgi /usr/bin/uwsgi_${EPYTHON/.}
+}
+
+src_compile() {
+ mkdir -p "${T}/plugins"
+
+ python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
+
+ if use lua ; then
+ # setting the name for the pkg-config file to lua, since we don't have
+ # slotted lua
+ UWSGICONFIG_LUAPC="lua" python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
+ fi
+
+ if use php ; then
+ for s in $(php_get_slots); do
+ UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
+ done
+ fi
+
+ if use python ; then
+ python_foreach_impl python_compile_plugins
+ fi
+
+ if use ruby ; then
+ ruby-ng_src_compile
+ fi
+
+ if use apache2 ; then
+ for m in proxy_uwsgi Ruwsgi uwsgi ; do
+ APXS2_ARGS="-c mod_${m}.c"
+ apache-module_src_compile
+ done
+ fi
+}
+
+src_install() {
+ dobin uwsgi
+ pax-mark m "${D}"/usr/bin/uwsgi
+
+ insinto /usr/$(get_libdir)/uwsgi
+ doins "${T}/plugins"/*.so
+
+ use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
+ use lua && dosym uwsgi /usr/bin/uwsgi_lua
+ use mono && dosym uwsgi /usr/bin/uwsgi_mono
+ use perl && dosym uwsgi /usr/bin/uwsgi_psgi
+
+ if use php ; then
+ for s in $(php_get_slots); do
+ dosym uwsgi /usr/bin/uwsgi_${s/.}
+ done
+ fi
+
+ if use python ; then
+ python_foreach_impl python_install_symlinks
+ python_foreach_impl python_domodule uwsgidecorators.py
+ fi
+
+ if use apache2; then
+ for m in proxy_uwsgi Ruwsgi uwsgi ; do
+ APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so"
+ apache-module_src_install
+ done
+ fi
+
+ newinitd "${FILESDIR}"/uwsgi.initd-r6 uwsgi
+ newconfd "${FILESDIR}"/uwsgi.confd-r3 uwsgi
+ keepdir /etc/"${PN}".d
+ use uwsgi_plugins_spooler && keepdir /var/spool/"${PN}"
+}
+
+pkg_postinst() {
+ if use apache2 ; then
+ elog "Three Apache modules have been installed: mod_proxy_uwsgi, mod_uwsgi and mod_Ruwsgi."
+ elog "You can enable them with -D PROXY_UWSGI, -DUWSGI or -DRUWSGI in /etc/conf.d/apache2."
+ elog "mod_uwsgi and mod_Ruwsgi have the same configuration interface and define the same symbols."
+ elog "Therefore you can enable only one of them at a time."
+ elog "mod_uwsgi is commercially supported by Unbit and stable but a bit hacky."
+ elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
+ elog "mod_proxy_uwsgi is a proxy module, considered stable and is now the recommended module."
+ fi
+
+ elog "Append the following options to the uwsgi call to load the respective language plugin:"
+ use cgi && elog " '--plugins cgi' for cgi"
+ use lua && elog " '--plugins lua' for lua"
+ use mono && elog " '--plugins mono' for mono"
+ use perl && elog " '--plugins psgi' for perl"
+
+ if use php ; then
+ for s in $(php_get_slots); do
+ elog " '--plugins ${s/.}' for ${s}"
+ done
+ fi
+
+ python_pkg_postinst() {
+ local EPYV
+ local PYV
+ EPYV=${EPYTHON/.}
+ PYV=${EPYV/python}
+
+ if [[ ${EPYTHON} == pypy* ]] ; then
+ elog " '--plugins pypy' for pypy"
+ return
+ fi
+
+ elog " "
+ elog " '--plugins ${EPYV}' for ${EPYTHON}"
+ if use python_asyncio ; then
+ if [[ ${EPYV} == python34 ]] ; then
+ elog " '--plugins ${EPYV},asyncio${PYV}' for asyncio support in ${EPYTHON}"
+ else
+ elog " (asyncio is only supported in python3.4)"
+ fi
+ fi
+ if use python_gevent ; then
+ if [[ ${EPYTHON} == python2* ]] ; then
+ elog " '--plugins ${EPYV},gevent${PYV}' for gevent support in ${EPYTHON}"
+ else
+ elog " (gevent is currently not supported in ${EPYTHON})"
+ fi
+ fi
+ }
+
+ use python && python_foreach_impl python_pkg_postinst
+
+ if use ruby ; then
+ for ruby in $USE_RUBY; do
+ if use ruby_targets_${ruby} ; then
+ elog " '--plugins rack_${ruby/.}' for ${ruby}"
+ elog " '--plugins fiber_${ruby/.}' for ${ruby} fibers"
+ elog " '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads"
+ fi
+ done
+ fi
+}
diff --git a/www-servers/webfs/webfs-1.21-r4.ebuild b/www-servers/webfs/webfs-1.21-r4.ebuild
new file mode 100644
index 000000000000..219938b780d0
--- /dev/null
+++ b/www-servers/webfs/webfs-1.21-r4.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Lightweight HTTP server for static content"
+SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz"
+HOMEPAGE="http://linux.bytesex.org/misc/webfs.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~arm-linux ~x86-linux"
+IUSE="libressl ssl threads"
+
+DEPEND="
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
+ )"
+
+RDEPEND="${DEPEND}
+ app-misc/mime-types"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-Variables.mk-dont-strip-binaries-on-install.patch"
+ epatch "${FILESDIR}/${P}-CVE-2013-0347.patch"
+ sed -e "s:/etc/mime.types:${EPREFIX}\\0:" -i GNUmakefile || die "sed failed"
+}
+
+src_compile() {
+ local myconf
+ use ssl || myconf="${myconf} USE_SSL=no"
+ use threads && myconf="${myconf} USE_THREADS=yes"
+
+ emake prefix="${EPREFIX}/usr" ${myconf}
+}
+
+src_install() {
+ local myconf
+ use ssl || myconf="${myconf} USE_SSL=no"
+ use threads && myconf="${myconf} USE_THREADS=yes"
+ einstall ${myconf} mandir="${ED}/usr/share/man"
+ newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ dodoc README
+}
+
+pkg_preinst() {
+ # Fix existing log permissions for bug #458892.
+ chmod 0600 "${EROOT}/var/log/webfsd.log" 2>/dev/null
+}
diff --git a/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild b/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild
new file mode 100644
index 000000000000..3001951b1ef3
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.17.2-r2.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal nptl selinux +suid systemd tslib +udev unwind wayland"
+
+CDEPEND=">=app-eselect/eselect-opengl-1.3.0
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ media-libs/freetype
+ >=x11-apps/iceauth-1.0.2
+ >=x11-apps/rgb-1.0.3
+ >=x11-apps/xauth-1.0.3
+ x11-apps/xkbcomp
+ >=x11-libs/libdrm-2.4.46
+ >=x11-libs/libpciaccess-0.12.901
+ >=x11-libs/libXau-1.0.4
+ >=x11-libs/libXdmcp-1.0.2
+ >=x11-libs/libXfont-1.4.2
+ >=x11-libs/libxkbfile-1.0.4
+ >=x11-libs/libxshmfence-1.1
+ >=x11-libs/pixman-0.27.2
+ >=x11-libs/xtrans-1.3.5
+ >=x11-misc/xbitmaps-1.0.1
+ >=x11-misc/xkeyboard-config-2.4.1-r3
+ dmx? (
+ x11-libs/libXt
+ >=x11-libs/libdmx-1.0.99.1
+ >=x11-libs/libX11-1.1.5
+ >=x11-libs/libXaw-1.0.4
+ >=x11-libs/libXext-1.0.99.4
+ >=x11-libs/libXfixes-5.0
+ >=x11-libs/libXi-1.2.99.1
+ >=x11-libs/libXmu-1.0.3
+ x11-libs/libXrender
+ >=x11-libs/libXres-1.0.3
+ >=x11-libs/libXtst-1.0.99.2
+ )
+ glamor? (
+ media-libs/libepoxy
+ >=media-libs/mesa-10.3.4-r1[egl,gbm]
+ !x11-libs/glamor
+ )
+ kdrive? (
+ >=x11-libs/libXext-1.0.5
+ x11-libs/libXv
+ )
+ xephyr? (
+ x11-libs/libxcb
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-renderutil
+ x11-libs/xcb-util-wm
+ )
+ !minimal? (
+ >=x11-libs/libX11-1.1.5
+ >=x11-libs/libXext-1.0.5
+ >=media-libs/mesa-10.3.4-r1[nptl=]
+ )
+ tslib? ( >=x11-libs/tslib-1.0 )
+ udev? ( >=virtual/udev-150 )
+ unwind? ( sys-libs/libunwind )
+ wayland? (
+ >=dev-libs/wayland-1.3.0
+ media-libs/libepoxy
+ )
+ >=x11-apps/xinit-1.3.3-r1
+ systemd? (
+ sys-apps/dbus
+ sys-apps/systemd
+ )"
+
+DEPEND="${CDEPEND}
+ sys-devel/flex
+ >=x11-proto/bigreqsproto-1.1.0
+ >=x11-proto/compositeproto-0.4
+ >=x11-proto/damageproto-1.1
+ >=x11-proto/fixesproto-5.0
+ >=x11-proto/fontsproto-2.1.3
+ >=x11-proto/glproto-1.4.17-r1
+ >=x11-proto/inputproto-2.2.99.1
+ >=x11-proto/kbproto-1.0.3
+ >=x11-proto/randrproto-1.4.0
+ >=x11-proto/recordproto-1.13.99.1
+ >=x11-proto/renderproto-0.11
+ >=x11-proto/resourceproto-1.2.0
+ >=x11-proto/scrnsaverproto-1.1
+ >=x11-proto/trapproto-3.4.3
+ >=x11-proto/videoproto-2.2.2
+ >=x11-proto/xcmiscproto-1.2.0
+ >=x11-proto/xextproto-7.2.99.901
+ >=x11-proto/xf86dgaproto-2.0.99.1
+ >=x11-proto/xf86rushproto-1.1.2
+ >=x11-proto/xf86vidmodeproto-2.2.99.1
+ >=x11-proto/xineramaproto-1.1.3
+ >=x11-proto/xproto-7.0.26
+ >=x11-proto/presentproto-1.0
+ >=x11-proto/dri3proto-1.0
+ dmx? (
+ >=x11-proto/dmxproto-2.2.99.1
+ doc? (
+ || (
+ www-client/links
+ www-client/lynx
+ www-client/w3m
+ )
+ )
+ )
+ !minimal? (
+ >=x11-proto/xf86driproto-2.1.0
+ >=x11-proto/dri2proto-2.8
+ )"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-xserver )
+ !x11-drivers/xf86-video-modesetting
+"
+
+PDEPEND="
+ xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+ || ( ${IUSE_SERVERS} )
+ )
+ xephyr? ( kdrive )"
+
+#UPSTREAMED_PATCHES=(
+# "${WORKDIR}/patches/"
+#)
+
+PATCHES=(
+ "${UPSTREAMED_PATCHES[@]}"
+ "${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch
+ "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+ # needed for new eselect-opengl, bug #541232
+ "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch
+ "${FILESDIR}"/${PN}-1.17.2-uninit-clientsWritable.patch
+)
+
+pkg_pretend() {
+ # older gcc is not supported
+ [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+ die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
+}
+
+src_configure() {
+ # localstatedir is used for the log location; we need to override the default
+ # from ebuild.sh
+ # sysconfdir is used for the xorg.conf location; same applies
+ # NOTE: fop is used for doc generating ; and i have no idea if gentoo
+ # package it somewhere
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_enable dmx)
+ $(use_enable glamor)
+ $(use_enable kdrive)
+ $(use_enable kdrive kdrive-kbd)
+ $(use_enable kdrive kdrive-mouse)
+ $(use_enable kdrive kdrive-evdev)
+ $(use_enable suid install-setuid)
+ $(use_enable tslib)
+ $(use_enable unwind libunwind)
+ $(use_enable wayland xwayland)
+ $(use_enable !minimal record)
+ $(use_enable !minimal xfree86-utils)
+ $(use_enable !minimal install-libxf86config)
+ $(use_enable !minimal dri)
+ $(use_enable !minimal dri2)
+ $(use_enable !minimal glx)
+ $(use_enable xephyr)
+ $(use_enable xnest)
+ $(use_enable xorg)
+ $(use_enable xvfb)
+ $(use_enable nptl glx-tls)
+ $(use_enable udev config-udev)
+ $(use_with doc doxygen)
+ $(use_with doc xmlto)
+ $(use_with systemd systemd-daemon)
+ $(use_enable systemd systemd-logind)
+ --enable-libdrm
+ --sysconfdir="${EPREFIX}"/etc/X11
+ --localstatedir="${EPREFIX}"/var
+ --with-fontrootdir="${EPREFIX}"/usr/share/fonts
+ --with-xkb-output="${EPREFIX}"/var/lib/xkb
+ --disable-config-hal
+ --disable-linux-acpi
+ --without-dtrace
+ --without-fop
+ --with-os-vendor=Gentoo
+ --with-sha1=libcrypto
+ )
+
+ xorg-2_src_configure
+}
+
+src_install() {
+ xorg-2_src_install
+
+ server_based_install
+
+ if ! use minimal && use xorg; then
+ # Install xorg.conf.example into docs
+ dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+ fi
+
+ newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+ newinitd "${FILESDIR}"/xdm.initd-11 xdm
+ newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+ # install the @x11-module-rebuild set for Portage
+ insinto /usr/share/portage/config/sets
+ newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+ # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+ eselect opengl set xorg-x11 --use-old
+}
+
+pkg_postrm() {
+ # Get rid of module dir to ensure opengl-update works properly
+ if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+ rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+ fi
+}
+
+server_based_install() {
+ if ! use xorg; then
+ rm "${ED}"/usr/share/man/man1/Xserver.1x \
+ "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+ "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+ "${ED}"/usr/share/man/man1/Xserver.1x
+ fi
+}
diff --git a/x11-drivers/xf86-video-freedreno/Manifest b/x11-drivers/xf86-video-freedreno/Manifest
index a2df8d6070fd..d7528129970f 100644
--- a/x11-drivers/xf86-video-freedreno/Manifest
+++ b/x11-drivers/xf86-video-freedreno/Manifest
@@ -1,3 +1,4 @@
DIST xf86-video-freedreno-1.0.0.tar.bz2 310884 SHA256 6f11ce10a86b154c2a827632c6be4d33d32c4f982a72c355680f8c3bb22db767 SHA512 80d1d8a5d69dd36df2c23f72460c40604d1873389bc3ab446b876587500dac4c88b10512552a884809bdc886207649ba3815d5a0e576d23ea723823055ac4877 WHIRLPOOL e23ef483791a9dccfd8284af71631a3c9289ea665d321215e3a36c8c79924ee5c6300a09fc667d4f9d1e2f8400bc5c6d96f74856accbdf37e5cfd387de30925f
DIST xf86-video-freedreno-1.1.0.tar.bz2 324575 SHA256 7ac0a972d4a5610a1ca32ae0aee2733db907fd017c1c8b9c4c0482540bb985cf SHA512 f4dfa1e246340b59ebf49826b71edc8d69ae9fea3ff41780d0a11fe5fab8e714b094cc8bd7e8d20537eac52d489518a8ae3848fd13d584ed764d14066d0cf117 WHIRLPOOL 2844805c73f61d5e7e67449c954eed806e31ddedf0cc5354318e847dc3a76678cbc28acd79a046f0e727e320ba1d99907497295b8e5300cffc7b34f87b2c43f3
DIST xf86-video-freedreno-1.3.0.tar.bz2 327153 SHA256 1c9d872d1e7389c7771c33e0070f6eb730c406511afcda63867b096aa3d9301d SHA512 f897cf0f7dda36212ef44379cd23d838f1a01832911b3ca52771ccbca6c3722da2c9218bac78679b610d8c3a7f56d05ba3823bea7cbbaef3366b4b14e9e311fd WHIRLPOOL 4d06a33160da61477e22f7c19788b9f66027a20db8958c61ffc0018260d29d966a60c2770d65fda5911fbd631eb9d21632bf007d5f5ac9b078e0c9eda7b1c71e
+DIST xf86-video-freedreno-1.4.0.tar.bz2 312898 SHA256 f5abdd0b09b7ba4bab13440667b00b9be72e734a343d35d8876f08e1b93dc6c1 SHA512 5bc7c35bd79e8ff90d8da5360413b03c497ba3dec9399c78fc85e8f1d2bf8955c27c6b225dfbbcdb73a16a4b539cfa131e309866e42289cb577d0e9bfc15b6ca WHIRLPOOL 9af8cc95f0a5b17e90bcd55e506dc3a7177890a03f23885ae593615a68bcbc90c93fa49c0e0afa36f164fd115abb3e14074e18e7e6e59bffde4b942e6c02776b
diff --git a/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.4.0.ebuild b/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.4.0.ebuild
new file mode 100644
index 000000000000..f0c33a3c1845
--- /dev/null
+++ b/x11-drivers/xf86-video-freedreno/xf86-video-freedreno-1.4.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="Driver for Adreno mobile GPUs"
+KEYWORDS="~arm"
+IUSE=""
+
+RDEPEND=">=media-libs/mesa-10.2[xa]
+ virtual/libudev
+ >=x11-libs/libdrm-2.4.54[video_cards_freedreno]"
+DEPEND="${RDEPEND}"
diff --git a/x11-drivers/xf86-video-omap/Manifest b/x11-drivers/xf86-video-omap/Manifest
index 2b479a3b884c..1b6990ce0a58 100644
--- a/x11-drivers/xf86-video-omap/Manifest
+++ b/x11-drivers/xf86-video-omap/Manifest
@@ -1,2 +1,3 @@
DIST xf86-video-omap-0.4.2.tar.bz2 310629 SHA256 1343fe5be6eeb375bbad0731685d05cb649faef773eba927645cef536bb206ff SHA512 9c3160af5dcd97463ef36ef6d24be1382466095b9df5c2946b74f1ba00671bd6c08dcfb52c6b6f7c72b97dbc5124b842c59448ecd7ada3c22da097ba55e4fb83 WHIRLPOOL 2621dfbe4f715875f0eb26d363947d6a4b574fa48b6d720e521196a8d72d9ec96d84c76e0eabd9810327d6210f349ee584a29f70312aff4c749708230d021424
DIST xf86-video-omap-0.4.3.tar.bz2 316093 SHA256 db1e0e69fd4c4c8fdca5ef2cb0447bccd7518a718495876a6904bef57b39986d SHA512 278cbe478acc67a966a1c3080ada2a13458011fc0b50d122811da803d4e051a5827bcccd48517e1ed2f416da1d5fee062aa1c8796f152048c449594aed55b310 WHIRLPOOL 0db24e2aaeff75f6c3602f5def850111dbb171cf4c9453219c366639b9f7771a4f1cf41bd700e54a0124d1ded0d6069b87866fba70f101849d75c12708e3c9a0
+DIST xf86-video-omap-0.4.4.tar.bz2 300380 SHA256 a7192690b8638f5c8d611a1bae07cc13081e22edd4070f37a2f5c3f8d79e7ebc SHA512 584056c660dd7c31568c8b7783727e095173071bb5a0d9d07cac906f40aac563740d225c0dc3a46ca0af5ed8018b49409429f9ec3d8d09227ed021472cd7e118 WHIRLPOOL 19b1cb1cf9b8eeb242e67e58197b73fc5aef1fe1dc676a953b4d32a92ec13dd627e0526d3037a2ecce1e7cdfec100e9c68b2b5e90e90941de8ca90631ee81815
diff --git a/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.4.ebuild b/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.4.ebuild
new file mode 100644
index 000000000000..6b3ff1437a49
--- /dev/null
+++ b/x11-drivers/xf86-video-omap/xf86-video-omap-0.4.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="OMAP video driver"
+
+KEYWORDS="~arm"
+
+RDEPEND=">=x11-base/xorg-server-1.3
+ >=x11-libs/libdrm-2.4.36[video_cards_omap]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index 3bbc8ef7816b..a6dadd3c99c4 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1 +1,2 @@
DIST gdk-pixbuf-2.30.8.tar.xz 1336788 SHA256 4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be SHA512 2888cf035b70330e8d3ac87af54b69b2c990440fd59922464088d2a685e90022ad39c83d1ce1ccccfac3872b55ce9445ec4a3e9c7ab6371e20b19e20df7f261d WHIRLPOOL e7f69807ed629c5703750a91cc7a95ee2b3aa178a74c9197c20f863648436a023d140cf1274ba38369e8da3d77216bb1fcc66bae5b612ee8ee33ee4b42e11d65
+DIST gdk-pixbuf-2.32.1.tar.xz 2427908 SHA256 4432b74f25538c7d6bcb3ca51adabdd666168955f25812a2568dc9637697f3bc SHA512 4c744f166e86c17cafebe0db9434794666b64850a60597e34675cf9b902e48e89c3ff45032a10899944ae59b6c0db63c1ff33c4d2c50846393e77bad3a3adec2 WHIRLPOOL 566b73752c1e478fdf7011c3d2222ea39eb13052741c70a0dffd6a0800e892e951207856b90e0d20c352981565682dec28c51fc4951f2236767e97c838d239a2
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch
new file mode 100644
index 000000000000..273956ea402e
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.32.1-gint64-shift-overflow.patch
@@ -0,0 +1,81 @@
+From 2fb6bce8b3fdae67b8cdd93f253dad3743fc01b8 Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+Date: Tue, 6 Oct 2015 11:46:24 -0500
+Subject: [PATCH] pixops: use gint64 in more places to avoid overflow when
+ shifting
+
+---
+ gdk-pixbuf/pixops/pixops.c | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
+index b0abecd..6a4a096 100644
+--- a/gdk-pixbuf/pixops/pixops.c
++++ b/gdk-pixbuf/pixops/pixops.c
+@@ -354,11 +354,11 @@ pixops_composite_nearest (guchar *dest_buf,
+ double scale_y,
+ int overall_alpha)
+ {
+- int i;
+- int x;
+- int x_step = (1 << SCALE_SHIFT) / scale_x;
+- int y_step = (1 << SCALE_SHIFT) / scale_y;
+- int xmax, xstart, xstop, x_pos, y_pos;
++ gint64 i;
++ gint64 x;
++ gint64 x_step = (1 << SCALE_SHIFT) / scale_x;
++ gint64 y_step = (1 << SCALE_SHIFT) / scale_y;
++ gint64 xmax, xstart, xstop, x_pos, y_pos;
+ const guchar *p;
+ unsigned int a0;
+
+@@ -524,13 +524,13 @@ pixops_composite_color_nearest (guchar *dest_buf,
+ guint32 color1,
+ guint32 color2)
+ {
+- int i, j;
+- int x;
+- int x_step = (1 << SCALE_SHIFT) / scale_x;
+- int y_step = (1 << SCALE_SHIFT) / scale_y;
++ gint64 i, j;
++ gint64 x;
++ gint64 x_step = (1 << SCALE_SHIFT) / scale_x;
++ gint64 y_step = (1 << SCALE_SHIFT) / scale_y;
+ int r1, g1, b1, r2, g2, b2;
+ int check_shift = get_check_shift (check_size);
+- int xmax, xstart, xstop, x_pos, y_pos;
++ gint64 xmax, xstart, xstop, x_pos, y_pos;
+ const guchar *p;
+ unsigned int a0;
+
+@@ -1338,20 +1338,20 @@ pixops_process (guchar *dest_buf,
+ PixopsLineFunc line_func,
+ PixopsPixelFunc pixel_func)
+ {
+- int i, j;
+- int x, y; /* X and Y position in source (fixed_point) */
++ gint64 i, j;
++ gint64 x, y; /* X and Y position in source (fixed_point) */
+
+ guchar **line_bufs;
+ int *filter_weights;
+
+- int x_step;
+- int y_step;
++ gint64 x_step;
++ gint64 y_step;
+
+ int check_shift;
+- int scaled_x_offset;
++ gint64 scaled_x_offset;
+
+- int run_end_x;
+- int run_end_index;
++ gint64 run_end_x;
++ gint64 run_end_index;
+
+ x_step = (1 << SCALE_SHIFT) / scale_x; /* X step in source (fixed point) */
+ y_step = (1 << SCALE_SHIFT) / scale_y; /* Y step in source (fixed point) */
+--
+2.6.1
+
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild
deleted file mode 100644
index 4ef0c9efaf9f..000000000000
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
-
-DESCRIPTION="Image loading library for GTK+"
-HOMEPAGE="http://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+X debug +introspection jpeg jpeg2k tiff test"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
- >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
- introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
- tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
- X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/gtk-doc-am-1.20
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-"
-# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
-RDEPEND="${COMMON_DEPEND}
- !<gnome-base/gail-1000
- !<gnome-base/librsvg-2.31.0
- !<x11-libs/gtk+-2.21.3:2
- !<x11-libs/gtk+-2.90.4:3
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-gtklibs-20131008-r2
- !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
- )
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gdk-pixbuf-query-loaders
-)
-
-src_prepare() {
- # This will avoid polluting the pkg-config file with versioned libpng,
- # which is causing problems with libpng14 -> libpng15 upgrade
- # See upstream bug #667068
- # First check that the pattern is present, to catch upstream changes on bumps,
- # because sed doesn't return failure code if it doesn't do any replacements
- grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
- sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
- [[ ${CHOST} == *-solaris* ]] && append-libs intl
-
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- # png always on to display icons
- ECONF_SOURCE="${S}" \
- gnome2_src_configure \
- $(usex debug --enable-debug=yes "") \
- $(use_with jpeg libjpeg) \
- $(use_with jpeg2k libjasper) \
- $(use_with tiff libtiff) \
- $(multilib_native_use_enable introspection) \
- $(use_with X x11) \
- --with-libpng
-}
-
-multilib_src_install() {
- # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
- MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
-
- multilib_pkg_preinst() {
- # Make sure loaders.cache belongs to gdk-pixbuf alone
- local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
-
- if [[ -e ${EROOT}${cache} ]]; then
- cp "${EROOT}"${cache} "${ED}"/${cache} || die
- else
- touch "${ED}"/${cache} || die
- fi
- }
-
- multilib_foreach_abi multilib_pkg_preinst
-}
-
-pkg_postinst() {
- # causes segfault if set, see bug 375615
- unset __GL_NO_DSO_FINALIZER
-
- multilib_foreach_abi gnome2_pkg_postinst
-
- # Migration snippet for when this was handled by gtk+
- if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
- elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
- elog "to do that you can use qfile from portage-utils:"
- elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
- fi
-}
-
-pkg_postrm() {
- gnome2_pkg_postrm
-
- if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
- rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
- fi
-}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild
index d611493e3fda..a4bdcca68fa8 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r1.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.32.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+X debug +introspection jpeg jpeg2k tiff test"
COMMON_DEPEND="
@@ -27,7 +27,7 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
>=dev-util/gtk-doc-am-1.20
- >=sys-devel/gettext-0.17
+ >=sys-devel/gettext-0.19
virtual/pkgconfig
"
# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
@@ -47,9 +47,8 @@ MULTILIB_CHOST_TOOLS=(
)
src_prepare() {
- # Upstream patches from 2.31.x
- epatch "${FILESDIR}"/${PN}-2.30.8-divide-by-zero.patch \
- "${FILESDIR}"/${PN}-2.30.8-pixops-overflow.patch #556314
+ # Upstream patches from 2.32.x
+ epatch "${FILESDIR}"/${P}-gint64-shift-overflow.patch
# This will avoid polluting the pkg-config file with versioned libpng,
# which is causing problems with libpng14 -> libpng15 upgrade
diff --git a/x11-misc/sddm/sddm-0.12.0.ebuild b/x11-misc/sddm/sddm-0.12.0.ebuild
index 5c9380124891..14af057498d8 100644
--- a/x11-misc/sddm/sddm-0.12.0.ebuild
+++ b/x11-misc/sddm/sddm-0.12.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit cmake-utils user
DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/${PN}/${PN}"
+HOMEPAGE="https://github.com/sddm/sddm"
SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
diff --git a/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 7a95728d9334..7e79bb00de51 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}.berlios/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="branding pam consolekit"
REQUIRED_USE="consolekit? ( pam )"
diff --git a/x11-wm/jwm/jwm-2.3.2.ebuild b/x11-wm/jwm/jwm-2.3.2.ebuild
index 6263aefa10ae..64d42ed4eaa8 100644
--- a/x11-wm/jwm/jwm-2.3.2.ebuild
+++ b/x11-wm/jwm/jwm-2.3.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=5
inherit eutils
DESCRIPTION="Very fast and lightweight still powerful window manager for X"
@@ -21,8 +21,8 @@ RDEPEND="xpm? ( x11-libs/libXpm )
x11-libs/libXau
x11-libs/libXdmcp
truetype? ( x11-libs/libXft )
- png? ( media-libs/libpng )
- jpeg? ( virtual/jpeg )
+ png? ( media-libs/libpng:0= )
+ jpeg? ( virtual/jpeg:0= )
bidi? ( dev-libs/fribidi )
dev-libs/expat"
DEPEND="${RDEPEND}
@@ -44,23 +44,20 @@ src_configure() {
}
src_install() {
- dodir /usr/bin
dodir /etc
+ dodir /usr/bin
dodir /usr/share/man
- emake BINDIR="${D}/usr/bin" SYSCONF="${D}/etc" \
- MANDIR="${D}/usr/share/man" install
- rm "${D}"/etc/system.jwmrc
- echo "#!/bin/sh" > jwm
- echo "exec /usr/bin/jwm" >> jwm
- exeinto /etc/X11/Sessions
- doexe jwm
+ default
+
+ make_wrapper "${PN}" "/usr/bin/${PN}" "" "" "/etc/X11/Sessions"
dodoc README.md example.jwmrc ChangeLog
}
pkg_postinst() {
- einfo "Put an appropriate configuration file in /etc/system.jwmrc"
- einfo "or in ~/.jwmrc."
+ einfo "JWM can be configured system-wide with ${EROOT}/etc/system.jwmrc"
+ einfo "or per-user by creating a configuration file in ~/.jwmrc"
+ einfo
einfo "An example file can be found in ${EROOT}/usr/share/doc/${PF}/"
}