summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Delaney <idella4@gentoo.org>2016-03-07 14:42:48 +0800
committerIan Delaney <idella4@gentoo.org>2016-03-07 16:06:56 +0800
commit2ce51dd9de78846a6d3a34877c097b8939056f15 (patch)
treedde0fa62df10b5a7ea380ec532a70f3c546d6965
parentMerge remote-tracking branch 'remotes/sbraz/pysrt' (diff)
parentnet-p2p/syncthing: remove old (diff)
downloadgentoo-2ce51dd9.tar.gz
gentoo-2ce51dd9.tar.bz2
gentoo-2ce51dd9.zip
Merge remote-tracking branch 'remotes/sbraz/syncthing'
Pull Request: https://github.com/gentoo/gentoo/pull/990
-rw-r--r--app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild2
-rw-r--r--app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild2
-rw-r--r--app-accessibility/caribou/caribou-0.4.20.ebuild2
-rw-r--r--app-accessibility/orca/orca-3.18.2.ebuild2
-rw-r--r--app-admin/apache-tools/apache-tools-2.4.18.ebuild2
-rw-r--r--app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild4
-rw-r--r--app-admin/eselect/eselect-1.4.5.ebuild2
-rw-r--r--app-admin/logrotate/logrotate-3.9.2.ebuild2
-rw-r--r--app-admin/passwordsafe/Manifest1
-rw-r--r--app-admin/passwordsafe/metadata.xml13
-rw-r--r--app-admin/passwordsafe/passwordsafe-0.98.1_beta.ebuild88
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.3.4.ebuild2
-rw-r--r--app-admin/pydf/pydf-12.ebuild2
-rw-r--r--app-admin/ulogd/metadata.xml3
-rw-r--r--app-arch/engrampa/engrampa-1.8.1-r1.ebuild2
-rw-r--r--app-arch/file-roller/file-roller-3.16.4-r1.ebuild2
-rw-r--r--app-arch/pax/Manifest1
-rw-r--r--app-arch/pax/pax-20160306.ebuild55
-rw-r--r--app-arch/unrar/unrar-5.3.11.ebuild2
-rw-r--r--app-backup/fsarchiver/Manifest1
-rw-r--r--app-backup/fsarchiver/fsarchiver-0.6.21.ebuild36
-rw-r--r--app-cdr/brasero/brasero-3.12.1-r1.ebuild2
-rw-r--r--app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild2
-rw-r--r--app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild2
-rw-r--r--app-crypt/acme/Manifest2
-rw-r--r--app-crypt/acme/acme-0.4.2.ebuild (renamed from app-crypt/acme/acme-0.4.1.ebuild)0
-rw-r--r--app-crypt/gcr/gcr-3.18.0.ebuild2
-rw-r--r--app-crypt/letsencrypt/Manifest2
-rw-r--r--app-crypt/letsencrypt/letsencrypt-0.4.2.ebuild (renamed from app-crypt/letsencrypt/letsencrypt-0.4.1.ebuild)0
-rw-r--r--app-crypt/libsecret/libsecret-0.18.4.ebuild2
-rw-r--r--app-crypt/mit-krb5/mit-krb5-1.14.1.ebuild2
-rw-r--r--app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild2
-rw-r--r--app-crypt/seahorse/seahorse-3.18.0.ebuild2
-rw-r--r--app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild2
-rw-r--r--app-dicts/myspell-de/myspell-de-2015.12.28.ebuild2
-rw-r--r--app-doc/gnucash-docs/gnucash-docs-2.6.11.ebuild2
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild6
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild6
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-25.0.92.ebuild6
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild6
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130.ebuild6
-rw-r--r--app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild6
-rw-r--r--app-editors/emacs/emacs-18.59-r11.ebuild2
-rw-r--r--app-editors/emacs/emacs-24.5-r1.ebuild8
-rw-r--r--app-editors/focuswriter/focuswriter-1.5.5.ebuild2
-rw-r--r--app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild2
-rw-r--r--app-editors/gedit/gedit-3.18.3.ebuild2
-rw-r--r--app-editors/ghex/ghex-3.18.0.ebuild2
-rw-r--r--app-editors/latexila/latexila-3.18.2.ebuild2
-rw-r--r--app-emacs/auctex/auctex-11.89.ebuild2
-rw-r--r--app-emulation/libvirt/libvirt-1.3.1.ebuild2
-rw-r--r--app-emulation/rkt/rkt-1.1.0.ebuild14
-rw-r--r--app-emulation/rkt/rkt-9999.ebuild153
-rw-r--r--app-emulation/virtualbox-additions/Manifest4
-rw-r--r--app-emulation/virtualbox-additions/virtualbox-additions-4.3.32.ebuild2
-rw-r--r--app-emulation/virtualbox-additions/virtualbox-additions-4.3.36.ebuild (renamed from app-emulation/virtualbox-additions/virtualbox-additions-5.0.12.ebuild)2
-rw-r--r--app-emulation/virtualbox-additions/virtualbox-additions-5.0.16.ebuild (renamed from app-emulation/virtualbox-additions/virtualbox-additions-4.3.28.ebuild)6
-rw-r--r--app-emulation/virtualbox-bin/Manifest16
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild2
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-4.3.36.105129.ebuild (renamed from app-emulation/virtualbox-bin/virtualbox-bin-4.3.28.100309.ebuild)4
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-5.0.16.105871.ebuild (renamed from app-emulation/virtualbox-bin/virtualbox-bin-5.0.12.104815.ebuild)2
-rw-r--r--app-emulation/virtualbox-extpack-oracle/Manifest4
-rw-r--r--app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.32.103443.ebuild2
-rw-r--r--app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.36.105129.ebuild (renamed from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.28.100309.ebuild)4
-rw-r--r--app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.16.105871.ebuild (renamed from app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.12.104815.ebuild)4
-rw-r--r--app-emulation/virtualbox-guest-additions/Manifest4
-rw-r--r--app-emulation/virtualbox-guest-additions/files/vboxguest-4.1.0-log-use-c99.patch4
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.32.ebuild2
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.36.ebuild (renamed from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.28.ebuild)4
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.16.ebuild (renamed from app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.12.ebuild)8
-rw-r--r--app-emulation/virtualbox-modules/Manifest4
-rw-r--r--app-emulation/virtualbox-modules/virtualbox-modules-4.3.32.ebuild2
-rw-r--r--app-emulation/virtualbox-modules/virtualbox-modules-4.3.36.ebuild (renamed from app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild)4
-rw-r--r--app-emulation/virtualbox-modules/virtualbox-modules-5.0.16.ebuild (renamed from app-emulation/virtualbox-modules/virtualbox-modules-5.0.12.ebuild)6
-rw-r--r--app-emulation/virtualbox/Manifest4
-rw-r--r--app-emulation/virtualbox/virtualbox-4.3.32.ebuild2
-rw-r--r--app-emulation/virtualbox/virtualbox-4.3.36.ebuild (renamed from app-emulation/virtualbox/virtualbox-4.3.28.ebuild)39
-rw-r--r--app-emulation/virtualbox/virtualbox-5.0.16.ebuild (renamed from app-emulation/virtualbox/virtualbox-5.0.12.ebuild)2
-rw-r--r--app-emulation/wine/Manifest5
-rw-r--r--app-emulation/wine/files/wine-1.9.5-multilib-portage.patch22
-rw-r--r--app-emulation/wine/metadata.xml6
-rw-r--r--app-emulation/wine/wine-1.9.4.ebuild426
-rw-r--r--app-emulation/wine/wine-9999.ebuild34
-rw-r--r--app-misc/bijiben/bijiben-3.18.2.ebuild2
-rw-r--r--app-misc/ckb/Manifest1
-rw-r--r--app-misc/ckb/ckb-0.2.3.ebuild46
-rw-r--r--app-misc/dateutils/Manifest1
-rw-r--r--app-misc/dateutils/dateutils-0.3.5.ebuild33
-rw-r--r--app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild2
-rw-r--r--app-misc/geoclue/geoclue-2.4.1.ebuild2
-rw-r--r--app-misc/gnote/gnote-3.18.1.ebuild2
-rw-r--r--app-misc/note/note-1.3.3-r1.ebuild4
-rw-r--r--app-misc/rlwrap/Manifest2
-rw-r--r--app-misc/rlwrap/rlwrap-0.37.ebuild27
-rw-r--r--app-misc/rlwrap/rlwrap-0.41.ebuild27
-rw-r--r--app-misc/rlwrap/rlwrap-0.42.ebuild4
-rw-r--r--app-misc/task/Manifest1
-rw-r--r--app-misc/task/task-2.5.1.ebuild55
-rw-r--r--app-misc/tracker/tracker-1.6.1.ebuild2
-rw-r--r--app-misc/vifm/vifm-0.8.1a.ebuild2
-rw-r--r--app-misc/vifm/vifm-0.8.ebuild4
-rw-r--r--app-misc/vit/files/vit-allow-nonsudo-install.patch36
-rw-r--r--app-misc/vit/files/vit-fix-man-installs.patch19
-rw-r--r--app-misc/vit/metadata.xml10
-rw-r--r--app-misc/vit/vit-1.2.ebuild39
-rw-r--r--app-misc/vit/vit-9999.ebuild39
-rw-r--r--app-office/gnucash/gnucash-2.6.11.ebuild2
-rw-r--r--app-office/gnumeric/gnumeric-1.12.27.ebuild2
-rw-r--r--app-office/pinpoint/pinpoint-0.1.8.ebuild2
-rw-r--r--app-office/upwork/Manifest2
-rw-r--r--app-office/upwork/upwork-4.0.144.0.ebuild50
-rw-r--r--app-portage/conf-update/conf-update-1.0.3-r1.ebuild2
-rw-r--r--app-portage/grs/Manifest1
-rw-r--r--app-portage/grs/grs-0.3.ebuild45
-rw-r--r--app-portage/grs/grs-0.5.ebuild2
-rw-r--r--app-shells/mksh/Manifest1
-rw-r--r--app-shells/mksh/mksh-52c.ebuild49
-rw-r--r--app-shells/posh/posh-0.12.6.ebuild2
-rw-r--r--app-text/atril/atril-1.8.1.ebuild2
-rw-r--r--app-text/bdf2psf/bdf2psf-1.104.ebuild2
-rw-r--r--app-text/evince/evince-3.18.2.ebuild2
-rw-r--r--app-text/gspell/gspell-0.1.2.ebuild2
-rw-r--r--app-text/gtkspell/gtkspell-3.0.7.ebuild2
-rw-r--r--app-text/iso-codes/iso-codes-3.65.ebuild2
-rw-r--r--app-text/pdfminer/pdfminer-20140328-r1.ebuild31
-rw-r--r--app-text/q-text-as-data/Manifest1
-rw-r--r--app-text/q-text-as-data/metadata.xml (renamed from dev-java/bytecode/metadata.xml)7
-rw-r--r--app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild40
-rw-r--r--app-text/ronn/ronn-0.7.3-r3.ebuild8
-rw-r--r--app-text/yelp-tools/yelp-tools-3.18.0.ebuild2
-rw-r--r--dev-cpp/atkmm/atkmm-2.24.2.ebuild2
-rw-r--r--dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild2
-rw-r--r--dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild2
-rw-r--r--dev-cpp/glibmm/glibmm-2.46.3.ebuild2
-rw-r--r--dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0-r1.ebuild2
-rw-r--r--dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild2
-rw-r--r--dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild2
-rw-r--r--dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild2
-rw-r--r--dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild2
-rw-r--r--dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild2
-rw-r--r--dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild2
-rw-r--r--dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild2
-rw-r--r--dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r2.ebuild2
-rw-r--r--dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild2
-rw-r--r--dev-cpp/mm-common/mm-common-0.9.10.ebuild2
-rw-r--r--dev-cpp/pangomm/pangomm-2.38.1.ebuild2
-rw-r--r--dev-db/barman/Manifest1
-rw-r--r--dev-db/barman/barman-1.6.0.ebuild26
-rw-r--r--dev-db/mariadb/mariadb-10.1.12.ebuild2
-rw-r--r--dev-db/sqlite/Manifest3
-rw-r--r--dev-db/sqlite/sqlite-3.11.1.ebuild239
-rw-r--r--dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild2
-rw-r--r--dev-games/wfmath/wfmath-1.0.2.ebuild2
-rw-r--r--dev-go/cli/Manifest1
-rw-r--r--dev-go/cli/cli-20160227.ebuild18
-rw-r--r--dev-go/cli/metadata.xml11
-rw-r--r--dev-haskell/cgi/metadata.xml2
-rw-r--r--dev-haskell/hslua/metadata.xml5
-rw-r--r--dev-haskell/uuagc/metadata.xml4
-rw-r--r--dev-java/bytecode/Manifest1
-rw-r--r--dev-java/bytecode/bytecode-20081007.ebuild35
-rw-r--r--dev-java/fastutil/Manifest1
-rw-r--r--dev-java/fastutil/fastutil-7.0.10.ebuild39
-rw-r--r--dev-java/gnu-regexp/Manifest1
-rw-r--r--dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild46
-rw-r--r--dev-java/ibm-jdk-bin/Manifest4
-rw-r--r--dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p1.ebuild280
-rw-r--r--dev-java/ibm-jre-bin/Manifest4
-rw-r--r--dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p1.ebuild196
-rw-r--r--dev-java/jal/jal-20031117-r4.ebuild3
-rw-r--r--dev-java/jlfgr/jlfgr-1.0-r2.ebuild31
-rw-r--r--dev-java/jrexx/jrexx-1.1.1-r2.ebuild5
-rw-r--r--dev-java/jtreemap/Manifest1
-rw-r--r--dev-java/jtreemap/jtreemap-1.1.0-r1.ebuild41
-rw-r--r--dev-java/juel/juel-2.1.0-r2.ebuild39
-rw-r--r--dev-java/junitperf/junitperf-1.9.1-r2.ebuild51
-rw-r--r--dev-java/jzlib/jzlib-1.0.7-r2.ebuild2
-rw-r--r--dev-java/rundoc/Manifest1
-rw-r--r--dev-java/rundoc/rundoc-0.11-r1.ebuild35
-rw-r--r--dev-java/sablecc/Manifest1
-rw-r--r--dev-java/sablecc/files/sablecc2
-rw-r--r--dev-java/sablecc/sablecc-3.2.ebuild35
-rw-r--r--dev-java/sablecc/sablecc-3.7.ebuild2
-rw-r--r--dev-java/sax/Manifest1
-rw-r--r--dev-java/sax/sax-2.2.1-r3.ebuild38
-rw-r--r--dev-java/snip/Manifest1
-rw-r--r--dev-java/snip/snip-0.11-r1.ebuild35
-rw-r--r--dev-java/spice-jndikit/Manifest1
-rw-r--r--dev-java/spice-jndikit/spice-jndikit-1.4.ebuild41
-rw-r--r--dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild2
-rw-r--r--dev-java/ws-commons-util/ws-commons-util-1.0.1.ebuild42
-rw-r--r--dev-java/xml-xmlbeans/Manifest1
-rw-r--r--dev-java/xml-xmlbeans/files/xml-xmlbeans-gentoo.patch156
-rw-r--r--dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild61
-rw-r--r--dev-lang/python-exec/python-exec-2.0.2.ebuild2
-rw-r--r--dev-lang/swi-prolog/Manifest1
-rw-r--r--dev-lang/swi-prolog/swi-prolog-7.3.18.ebuild143
-rw-r--r--dev-lang/vala/vala-0.30.1.ebuild2
-rw-r--r--dev-lang/yap/Manifest2
-rw-r--r--dev-lang/yap/yap-6.3.3.ebuild2
-rw-r--r--dev-libs/appstream-glib/appstream-glib-0.5.9.ebuild2
-rw-r--r--dev-libs/atk/atk-2.18.0.ebuild2
-rw-r--r--dev-libs/btparser/btparser-0.26.ebuild2
-rw-r--r--dev-libs/cdk/cdk-5.0.20141106.ebuild2
-rw-r--r--dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild2
-rw-r--r--dev-libs/folks/folks-0.11.2.ebuild2
-rw-r--r--dev-libs/gdl/gdl-3.18.0.ebuild2
-rw-r--r--dev-libs/geoip/geoip-1.6.9.ebuild2
-rw-r--r--dev-libs/glib/glib-2.46.2-r2.ebuild2
-rw-r--r--dev-libs/gobject-introspection-common/gobject-introspection-common-1.46.0.ebuild2
-rw-r--r--dev-libs/gobject-introspection/gobject-introspection-1.46.0.ebuild2
-rw-r--r--dev-libs/gom/gom-0.3.2.ebuild2
-rw-r--r--dev-libs/libcroco/libcroco-0.6.11.ebuild2
-rw-r--r--dev-libs/libgcrypt/libgcrypt-1.5.5.ebuild2
-rw-r--r--dev-libs/libgdata/libgdata-0.17.4-r1.ebuild2
-rw-r--r--dev-libs/libgit2-glib/Manifest1
-rw-r--r--dev-libs/libgit2-glib/libgit2-glib-0.23.10-r1.ebuild (renamed from dev-libs/libgit2-glib/libgit2-glib-0.23.10.ebuild)5
-rw-r--r--dev-libs/libgit2-glib/libgit2-glib-0.23.8.ebuild48
-rw-r--r--dev-libs/libgit2/Manifest1
-rw-r--r--dev-libs/libgit2/libgit2-0.23.4.ebuild2
-rw-r--r--dev-libs/libgit2/libgit2-0.24.0.ebuild76
-rw-r--r--dev-libs/libgusb/libgusb-0.2.8.ebuild2
-rw-r--r--dev-libs/libgweather/libgweather-3.18.1.ebuild2
-rw-r--r--dev-libs/libinput/Manifest1
-rw-r--r--dev-libs/libinput/libinput-1.1.5.ebuild2
-rw-r--r--dev-libs/libinput/libinput-1.2.1.ebuild55
-rw-r--r--dev-libs/libpeas/libpeas-1.16.0.ebuild2
-rw-r--r--dev-libs/libsigc++/libsigc++-2.6.2.ebuild2
-rw-r--r--dev-libs/libtomcrypt/Manifest1
-rw-r--r--dev-libs/libtomcrypt/libtomcrypt-1.17.ebuild26
-rw-r--r--dev-libs/libtomcrypt/metadata.xml8
-rw-r--r--dev-libs/libtomfloat/metadata.xml5
-rw-r--r--dev-libs/libtommath/libtommath-1.0.ebuild2
-rw-r--r--dev-libs/libtommath/metadata.xml5
-rw-r--r--dev-libs/libtompoly/libtompoly-0.04.ebuild4
-rw-r--r--dev-libs/libtompoly/metadata.xml5
-rw-r--r--dev-libs/libvterm/Manifest1
-rw-r--r--dev-libs/libvterm/libvterm-0.0_pre20160305.ebuild33
-rw-r--r--dev-libs/libxml2/libxml2-2.9.3.ebuild2
-rw-r--r--dev-libs/mpfr/Manifest2
-rw-r--r--dev-libs/mpfr/files/3.1.2/patch0145
-rw-r--r--dev-libs/mpfr/files/3.1.2/patch02605
-rw-r--r--dev-libs/mpfr/files/3.1.2/patch03129
-rw-r--r--dev-libs/mpfr/files/3.1.2/patch0484
-rw-r--r--dev-libs/mpfr/files/3.1.2/patch0542
-rw-r--r--dev-libs/mpfr/files/3.1.2/patch0643
-rw-r--r--dev-libs/mpfr/files/3.1.2/patch0771
-rw-r--r--dev-libs/mpfr/files/3.1.2/patch08254
-rw-r--r--dev-libs/mpfr/files/3.1.2/patch09166
-rw-r--r--dev-libs/mpfr/files/3.1.2/patch10138
-rw-r--r--dev-libs/mpfr/mpfr-3.1.4.ebuild (renamed from dev-libs/mpfr/mpfr-3.1.2_p10.ebuild)14
-rw-r--r--dev-libs/ntl/Manifest1
-rw-r--r--dev-libs/ntl/files/ntl-9.6.4-sanitize-makefile.patch160
-rw-r--r--dev-libs/ntl/ntl-9.6.4.ebuild85
-rw-r--r--dev-libs/openssl/openssl-1.0.2g-r2.ebuild2
-rw-r--r--dev-libs/qcustomplot/qcustomplot-1.3.2.ebuild2
-rw-r--r--dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild2
-rw-r--r--dev-libs/uchardet/metadata.xml1
-rw-r--r--dev-libs/vala-common/vala-common-0.30.1.ebuild2
-rw-r--r--dev-ml/cppo/cppo-1.3.1-r1.ebuild (renamed from dev-ml/cppo/cppo-1.3.1.ebuild)6
-rw-r--r--dev-ml/ocamlnet/Manifest1
-rw-r--r--dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild78
-rw-r--r--dev-ml/pxp/Manifest1
-rw-r--r--dev-ml/pxp/pxp-1.2.8.ebuild51
-rw-r--r--dev-perl/Canary-Stability/Canary-Stability-2006.ebuild2
-rw-r--r--dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r1.ebuild (renamed from dev-perl/crypt-cbc/crypt-cbc-2.330.0-r1.ebuild)5
-rw-r--r--dev-perl/Crypt-CBC/Manifest (renamed from dev-perl/crypt-cbc/Manifest)0
-rw-r--r--dev-perl/Crypt-CBC/metadata.xml (renamed from dev-perl/crypt-cbc/metadata.xml)0
-rw-r--r--dev-perl/Crypt-DES_EDE3/Crypt-DES_EDE3-0.10.0-r1.ebuild (renamed from dev-perl/crypt-des-ede3/crypt-des-ede3-0.10.0-r1.ebuild)3
-rw-r--r--dev-perl/Crypt-DES_EDE3/Manifest (renamed from dev-perl/crypt-des-ede3/Manifest)0
-rw-r--r--dev-perl/Crypt-DES_EDE3/metadata.xml (renamed from dev-perl/crypt-des-ede3/metadata.xml)0
-rw-r--r--dev-perl/Crypt-DH/Crypt-DH-0.70.0-r1.ebuild (renamed from dev-perl/crypt-dh/crypt-dh-0.70.0-r1.ebuild)5
-rw-r--r--dev-perl/Crypt-DH/Manifest (renamed from dev-perl/crypt-dh/Manifest)0
-rw-r--r--dev-perl/Crypt-DH/metadata.xml (renamed from dev-perl/crypt-dh/metadata.xml)0
-rw-r--r--dev-perl/Crypt-DSA/Crypt-DSA-1.170.0.ebuild (renamed from dev-perl/crypt-dsa/crypt-dsa-1.170.0.ebuild)3
-rw-r--r--dev-perl/Crypt-DSA/Manifest (renamed from dev-perl/crypt-dsa/Manifest)0
-rw-r--r--dev-perl/Crypt-DSA/files/crypt-dsa-1.16-dsaparam.patch (renamed from dev-perl/crypt-dsa/files/crypt-dsa-1.16-dsaparam.patch)0
-rw-r--r--dev-perl/Crypt-DSA/metadata.xml (renamed from dev-perl/crypt-dsa/metadata.xml)0
-rw-r--r--dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0.ebuild (renamed from dev-perl/crypt-idea/crypt-idea-1.100.0.ebuild)3
-rw-r--r--dev-perl/Crypt-IDEA/Manifest (renamed from dev-perl/crypt-idea/Manifest)0
-rw-r--r--dev-perl/Crypt-IDEA/metadata.xml (renamed from dev-perl/crypt-idea/metadata.xml)0
-rw-r--r--dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.70.0.ebuild10
-rw-r--r--dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r1.ebuild (renamed from dev-perl/crypt-primes/crypt-primes-0.500.0-r1.ebuild)5
-rw-r--r--dev-perl/Crypt-Primes/Manifest (renamed from dev-perl/crypt-primes/Manifest)0
-rw-r--r--dev-perl/Crypt-Primes/metadata.xml (renamed from dev-perl/crypt-primes/metadata.xml)0
-rw-r--r--dev-perl/Crypt-RSA/Crypt-RSA-1.990.0-r1.ebuild (renamed from dev-perl/crypt-rsa/crypt-rsa-1.990.0-r1.ebuild)9
-rw-r--r--dev-perl/Crypt-RSA/Manifest (renamed from dev-perl/crypt-rsa/Manifest)0
-rw-r--r--dev-perl/Crypt-RSA/metadata.xml (renamed from dev-perl/crypt-rsa/metadata.xml)0
-rw-r--r--dev-perl/Crypt-Random/Crypt-Random-1.250.0-r1.ebuild (renamed from dev-perl/crypt-random/crypt-random-1.250.0-r1.ebuild)3
-rw-r--r--dev-perl/Crypt-Random/Manifest (renamed from dev-perl/crypt-random/Manifest)0
-rw-r--r--dev-perl/Crypt-Random/metadata.xml (renamed from dev-perl/crypt-random/metadata.xml)0
-rw-r--r--dev-perl/DBD-Pg/DBD-Pg-2.19.3-r1.ebuild42
-rw-r--r--dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild2
-rw-r--r--dev-perl/DBD-Pg/Manifest1
-rw-r--r--dev-perl/DBD-SQLite/DBD-SQLite-1.350.0-r1.ebuild35
-rw-r--r--dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild2
-rw-r--r--dev-perl/DBD-SQLite/Manifest1
-rw-r--r--dev-perl/Date-Calc/Date-Calc-6.300.0-r1.ebuild24
-rw-r--r--dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild2
-rw-r--r--dev-perl/Date-Calc/Manifest1
-rw-r--r--dev-perl/Error/Error-0.170.240.ebuild4
-rw-r--r--dev-perl/File-Slurper/File-Slurper-0.0.800.ebuild2
-rw-r--r--dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.97.0.ebuild2
-rw-r--r--dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild2
-rw-r--r--dev-perl/HTML-Strip/HTML-Strip-2.90.0.ebuild2
-rw-r--r--dev-perl/HTML-TableExtract/HTML-TableExtract-2.110.0-r1.ebuild21
-rw-r--r--dev-perl/HTML-TableExtract/HTML-TableExtract-2.130.0.ebuild2
-rw-r--r--dev-perl/HTML-TableExtract/Manifest1
-rw-r--r--dev-perl/HTML-TableParser/HTML-TableParser-0.380.0-r1.ebuild23
-rw-r--r--dev-perl/HTML-TableParser/HTML-TableParser-0.400.0.ebuild2
-rw-r--r--dev-perl/HTML-TableParser/Manifest1
-rw-r--r--dev-perl/HTML-Template/HTML-Template-2.940.0.ebuild17
-rw-r--r--dev-perl/HTML-Template/HTML-Template-2.950.0.ebuild2
-rw-r--r--dev-perl/HTML-Template/Manifest1
-rw-r--r--dev-perl/HTTP-DAV/HTTP-DAV-0.470.0-r1.ebuild24
-rw-r--r--dev-perl/HTTP-DAV/HTTP-DAV-0.480.0.ebuild2
-rw-r--r--dev-perl/HTTP-DAV/Manifest1
-rw-r--r--dev-perl/HTTP-Message/HTTP-Message-6.110.0.ebuild2
-rw-r--r--dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.440.0-r1.ebuild24
-rw-r--r--dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.510.0.ebuild2
-rw-r--r--dev-perl/HTTP-Server-Simple/Manifest1
-rw-r--r--dev-perl/IO-AIO/IO-AIO-4.330.0.ebuild2
-rw-r--r--dev-perl/IO-HTML/IO-HTML-1.1.0.ebuild2
-rw-r--r--dev-perl/IO-Interface/IO-Interface-1.90.0.ebuild2
-rw-r--r--dev-perl/IO-Multiplex/IO-Multiplex-1.130.0-r1.ebuild17
-rw-r--r--dev-perl/IO-Multiplex/IO-Multiplex-1.160.0.ebuild2
-rw-r--r--dev-perl/IO-Multiplex/Manifest1
-rw-r--r--dev-perl/IO-Pager/IO-Pager-0.310.0-r1.ebuild25
-rw-r--r--dev-perl/IO-Pager/IO-Pager-0.350.0.ebuild2
-rw-r--r--dev-perl/IO-Pager/Manifest1
-rw-r--r--dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.24.0.ebuild4
-rw-r--r--dev-perl/IO-stringy/IO-stringy-2.110.0-r1.ebuild17
-rw-r--r--dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild2
-rw-r--r--dev-perl/IO-stringy/Manifest1
-rw-r--r--dev-perl/IPC-Run/IPC-Run-0.920.0-r1.ebuild22
-rw-r--r--dev-perl/IPC-Run/IPC-Run-0.940.0.ebuild2
-rw-r--r--dev-perl/IPC-Run/Manifest1
-rw-r--r--dev-perl/Image-Info/Image-Info-1.360.0.ebuild22
-rw-r--r--dev-perl/Image-Info/Image-Info-1.380.0.ebuild2
-rw-r--r--dev-perl/Image-Info/Manifest1
-rw-r--r--dev-perl/Image-Size/Image-Size-3.232.0-r1.ebuild25
-rw-r--r--dev-perl/Image-Size/Image-Size-3.300.0.ebuild2
-rw-r--r--dev-perl/Image-Size/Manifest1
-rw-r--r--dev-perl/Import-Into/Import-Into-1.2.0.ebuild17
-rw-r--r--dev-perl/Import-Into/Import-Into-1.2.5.ebuild2
-rw-r--r--dev-perl/Import-Into/Manifest1
-rw-r--r--dev-perl/Inline-Files/Inline-Files-0.680.0-r1.ebuild19
-rw-r--r--dev-perl/Inline-Files/Inline-Files-0.690.0.ebuild2
-rw-r--r--dev-perl/Inline-Files/Manifest1
-rw-r--r--dev-perl/Inline/Inline-0.790.0.ebuild33
-rw-r--r--dev-perl/Inline/Inline-0.800.0.ebuild2
-rw-r--r--dev-perl/Inline/Manifest1
-rw-r--r--dev-perl/Module-Signature/Module-Signature-0.770.0.ebuild14
-rw-r--r--dev-perl/Module-Signature/Module-Signature-0.790.0.ebuild14
-rw-r--r--dev-perl/Net-OpenID-Consumer/Net-OpenID-Consumer-1.30.0-r1.ebuild4
-rw-r--r--dev-perl/Net-OpenSSH/Manifest2
-rw-r--r--dev-perl/Net-OpenSSH/Net-OpenSSH-0.700.0.ebuild (renamed from dev-perl/Net-OpenSSH/Net-OpenSSH-0.590.0.ebuild)22
-rw-r--r--dev-perl/Net-SFTP-Foreign/Manifest1
-rw-r--r--dev-perl/Net-SFTP-Foreign/Net-SFTP-Foreign-1.810.0.ebuild40
-rw-r--r--dev-perl/Net-SFTP-Foreign/files/1.81-test-server-path.patch11
-rw-r--r--dev-perl/Net-SMTPS/Manifest1
-rw-r--r--dev-perl/Net-SMTPS/Net-SMTPS-0.40.0.ebuild22
-rw-r--r--dev-perl/Net-SSH-Any/Manifest1
-rw-r--r--dev-perl/Net-SSH-Any/Net-SSH-Any-0.40.0.ebuild21
-rw-r--r--dev-perl/Net-SSH-Any/metadata.xml16
-rw-r--r--dev-perl/Net-SSH2/Manifest1
-rw-r--r--dev-perl/Net-SSH2/Net-SSH2-0.580.0.ebuild45
-rw-r--r--dev-perl/Net-SSLeay/Manifest1
-rw-r--r--dev-perl/Net-SSLeay/Net-SSLeay-1.720.0.ebuild64
-rw-r--r--dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch20
-rw-r--r--dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch20
-rw-r--r--dev-perl/Net-Server-Mail/Manifest1
-rw-r--r--dev-perl/Net-Server-Mail/Net-Server-Mail-0.230.0.ebuild26
-rw-r--r--dev-perl/Net-Telnet/Manifest1
-rw-r--r--dev-perl/Net-Telnet/Net-Telnet-3.40.0.ebuild20
-rw-r--r--dev-perl/Net-Twitter/Manifest2
-rw-r--r--dev-perl/Net-Twitter/Net-Twitter-4.000.60-r1.ebuild42
-rw-r--r--dev-perl/Net-Twitter/Net-Twitter-4.10.100.ebuild69
-rw-r--r--dev-perl/Net-Twitter/metadata.xml1
-rw-r--r--dev-perl/Net-UPnP/Manifest1
-rw-r--r--dev-perl/Net-UPnP/Net-UPnP-1.4.3.ebuild31
-rw-r--r--dev-perl/Net-Whois-IP/Manifest1
-rw-r--r--dev-perl/Net-Whois-IP/Net-Whois-IP-1.190.0.ebuild36
-rw-r--r--dev-perl/Pango/Pango-1.224.0-r1.ebuild2
-rw-r--r--dev-perl/convert-pem/convert-pem-0.80.0-r1.ebuild4
-rw-r--r--dev-perl/net-ssh-perl/net-ssh-perl-1.360.0-r1.ebuild10
-rw-r--r--dev-perl/tie-encryptedhash/tie-encryptedhash-1.240.0-r1.ebuild4
-rw-r--r--dev-python/click/click-6.3.ebuild2
-rw-r--r--dev-python/fonttools/fonttools-3.0.ebuild2
-rw-r--r--dev-python/gst-python/gst-python-1.6.2.ebuild2
-rw-r--r--dev-python/libvirt-python/libvirt-python-1.3.1.ebuild2
-rw-r--r--dev-python/llvmlite/Manifest1
-rw-r--r--dev-python/llvmlite/llvmlite-0.9.0.ebuild47
-rw-r--r--dev-python/numba/Manifest1
-rw-r--r--dev-python/numba/numba-0.24.0.ebuild68
-rw-r--r--dev-python/peewee/peewee-2.7.4.ebuild2
-rw-r--r--dev-python/phonenumbers/Manifest1
-rw-r--r--dev-python/phonenumbers/phonenumbers-7.2.6.ebuild26
-rw-r--r--dev-python/pyatspi/pyatspi-2.18.0.ebuild2
-rw-r--r--dev-python/pygobject/pygobject-3.18.2.ebuild2
-rw-r--r--dev-python/pygsl/pygsl-0.9.5-r1.ebuild2
-rw-r--r--dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild38
-rw-r--r--dev-python/pytest-httpbin/Manifest1
-rw-r--r--dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild38
-rw-r--r--dev-python/python-caja/python-caja-1.8.1.ebuild2
-rw-r--r--dev-python/wtf-peewee/Manifest1
-rw-r--r--dev-python/wtf-peewee/wtf-peewee-0.2.5.ebuild36
-rw-r--r--dev-qt/assistant/assistant-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/designer/designer-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/linguist-tools/linguist-tools-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/linguist/linguist-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/pixeltool/pixeltool-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qdbus/qdbus-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qdbusviewer/qdbusviewer-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qdoc/qdoc-5.5.1.ebuild2
-rw-r--r--dev-qt/qtconcurrent/qtconcurrent-5.5.1.ebuild2
-rw-r--r--dev-qt/qtcore/qtcore-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtdbus/qtdbus-5.5.1.ebuild2
-rw-r--r--dev-qt/qtdeclarative/qtdeclarative-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtgui/qtgui-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qthelp/qthelp-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtimageformats/qtimageformats-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtmultimedia/qtmultimedia-5.5.1-r2.ebuild2
-rw-r--r--dev-qt/qtnetwork/qtnetwork-5.5.1.ebuild2
-rw-r--r--dev-qt/qtopengl/qtopengl-5.5.1.ebuild2
-rw-r--r--dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtpositioning/qtpositioning-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtprintsupport/qtprintsupport-5.5.1.ebuild2
-rw-r--r--dev-qt/qtquick1/qtquick1-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtquickcontrols/qtquickcontrols-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtscript/qtscript-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtsensors/qtsensors-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtsql/qtsql-5.5.1.ebuild2
-rw-r--r--dev-qt/qtsvg/qtsvg-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qttest/qttest-5.5.1.ebuild2
-rw-r--r--dev-qt/qttranslations/qttranslations-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtwayland/qtwayland-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtwidgets/qtwidgets-5.5.1-r1.ebuild2
-rw-r--r--dev-qt/qtx11extras/qtx11extras-5.5.1.ebuild2
-rw-r--r--dev-qt/qtxml/qtxml-5.5.1.ebuild2
-rw-r--r--dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1-r1.ebuild2
-rw-r--r--dev-ros/audio_capture/Manifest1
-rw-r--r--dev-ros/audio_capture/audio_capture-0.2.12.ebuild29
-rw-r--r--dev-ros/audio_common_msgs/Manifest1
-rw-r--r--dev-ros/audio_common_msgs/audio_common_msgs-0.2.12.ebuild20
-rw-r--r--dev-ros/audio_play/Manifest1
-rw-r--r--dev-ros/audio_play/audio_play-0.2.12.ebuild29
-rw-r--r--dev-ros/diagnostic_aggregator/Manifest1
-rw-r--r--dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.8.9.ebuild27
-rw-r--r--dev-ros/diagnostic_analysis/Manifest1
-rw-r--r--dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.9.ebuild25
-rw-r--r--dev-ros/diagnostic_common_diagnostics/Manifest1
-rw-r--r--dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.9.ebuild25
-rw-r--r--dev-ros/diagnostic_updater/Manifest1
-rw-r--r--dev-ros/diagnostic_updater/diagnostic_updater-1.8.9.ebuild26
-rw-r--r--dev-ros/eigen_conversions/Manifest1
-rw-r--r--dev-ros/eigen_conversions/eigen_conversions-1.11.8.ebuild25
-rw-r--r--dev-ros/kdl_conversions/Manifest1
-rw-r--r--dev-ros/kdl_conversions/kdl_conversions-1.11.8.ebuild22
-rw-r--r--dev-ros/self_test/Manifest1
-rw-r--r--dev-ros/self_test/self_test-1.8.9.ebuild25
-rw-r--r--dev-ros/sound_play/Manifest1
-rw-r--r--dev-ros/sound_play/sound_play-0.2.12.ebuild35
-rw-r--r--dev-ros/test_diagnostic_aggregator/Manifest1
-rw-r--r--dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.8.9.ebuild25
-rw-r--r--dev-ros/test_tf2/Manifest1
-rw-r--r--dev-ros/test_tf2/test_tf2-0.5.13.ebuild35
-rw-r--r--dev-ros/tf/Manifest1
-rw-r--r--dev-ros/tf/tf-1.11.8.ebuild39
-rw-r--r--dev-ros/tf2/Manifest1
-rw-r--r--dev-ros/tf2/tf2-0.5.13.ebuild24
-rw-r--r--dev-ros/tf2_bullet/Manifest1
-rw-r--r--dev-ros/tf2_bullet/tf2_bullet-0.5.13.ebuild22
-rw-r--r--dev-ros/tf2_geometry_msgs/Manifest1
-rw-r--r--dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.5.13.ebuild26
-rw-r--r--dev-ros/tf2_kdl/Manifest1
-rw-r--r--dev-ros/tf2_kdl/tf2_kdl-0.5.13.ebuild27
-rw-r--r--dev-ros/tf2_msgs/Manifest1
-rw-r--r--dev-ros/tf2_msgs/tf2_msgs-0.5.13.ebuild21
-rw-r--r--dev-ros/tf2_py/Manifest1
-rw-r--r--dev-ros/tf2_py/tf2_py-0.5.13.ebuild22
-rw-r--r--dev-ros/tf2_ros/Manifest1
-rw-r--r--dev-ros/tf2_ros/tf2_ros-0.5.13.ebuild31
-rw-r--r--dev-ros/tf2_sensor_msgs/Manifest1
-rw-r--r--dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.5.13.ebuild27
-rw-r--r--dev-ros/tf2_tools/Manifest1
-rw-r--r--dev-ros/tf2_tools/tf2_tools-0.5.13.ebuild26
-rw-r--r--dev-ros/tf_conversions/Manifest1
-rw-r--r--dev-ros/tf_conversions/tf_conversions-1.11.8.ebuild28
-rw-r--r--dev-ruby/GeoRuby/GeoRuby-2.2.1-r2.ebuild4
-rw-r--r--dev-ruby/GeoRuby/GeoRuby-2.2.1-r3.ebuild29
-rw-r--r--dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild4
-rw-r--r--dev-ruby/RubyInline/RubyInline-3.12.3-r1.ebuild47
-rw-r--r--dev-ruby/RubyInline/RubyInline-3.12.3.ebuild4
-rw-r--r--dev-ruby/RubyInline/RubyInline-3.12.4.ebuild4
-rw-r--r--dev-ruby/asciidoctor/Manifest2
-rw-r--r--dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild43
-rw-r--r--dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild46
-rw-r--r--dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch31
-rw-r--r--dev-ruby/awesome_print/Manifest1
-rw-r--r--dev-ruby/awesome_print/awesome_print-1.2.0-r2.ebuild21
-rw-r--r--dev-ruby/awesome_print/awesome_print-1.6.1.ebuild6
-rw-r--r--dev-ruby/bcat/bcat-0.6.2-r1.ebuild6
-rw-r--r--dev-ruby/bcat/bcat-0.6.2-r2.ebuild6
-rw-r--r--dev-ruby/bcrypt-ruby/Manifest1
-rw-r--r--dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.11.ebuild60
-rw-r--r--dev-ruby/blankslate/Manifest1
-rw-r--r--dev-ruby/blankslate/blankslate-2.1.2.4.ebuild6
-rw-r--r--dev-ruby/blankslate/blankslate-3.1.2.ebuild44
-rw-r--r--dev-ruby/blankslate/blankslate-3.1.3.ebuild6
-rw-r--r--dev-ruby/bourne/Manifest1
-rw-r--r--dev-ruby/bourne/bourne-1.5.0-r1.ebuild32
-rw-r--r--dev-ruby/bourne/bourne-1.6.0.ebuild6
-rw-r--r--dev-ruby/celluloid/Manifest1
-rw-r--r--dev-ruby/celluloid/celluloid-0.16.0.ebuild39
-rw-r--r--dev-ruby/celluloid/celluloid-0.17.2.ebuild45
-rw-r--r--dev-ruby/childprocess/Manifest1
-rw-r--r--dev-ruby/childprocess/childprocess-0.5.3.ebuild6
-rw-r--r--dev-ruby/childprocess/childprocess-0.5.8.ebuild35
-rw-r--r--dev-ruby/colorize/Manifest1
-rw-r--r--dev-ruby/colorize/colorize-0.7.5.ebuild24
-rw-r--r--dev-ruby/colorize/colorize-0.7.7.ebuild6
-rw-r--r--dev-ruby/countdownlatch/countdownlatch-1.0.0-r1.ebuild6
-rw-r--r--dev-ruby/crass/crass-1.0.2.ebuild6
-rw-r--r--dev-ruby/daemon_controller/daemon_controller-1.2.0-r1.ebuild6
-rw-r--r--dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild2
-rw-r--r--dev-ruby/hashdiff/Manifest2
-rw-r--r--dev-ruby/hashdiff/hashdiff-0.2.2.ebuild22
-rw-r--r--dev-ruby/hashdiff/hashdiff-0.2.3.ebuild22
-rw-r--r--dev-ruby/hashr/hashr-0.0.22.ebuild6
-rw-r--r--dev-ruby/hashr/hashr-1.0.0.ebuild6
-rw-r--r--dev-ruby/hashr/hashr-2.0.0.ebuild4
-rw-r--r--dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild2
-rw-r--r--dev-ruby/httpauth/httpauth-0.2.1.ebuild6
-rw-r--r--dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild6
-rw-r--r--dev-ruby/jeweler/jeweler-2.0.1-r2.ebuild6
-rw-r--r--dev-ruby/kramdown/Manifest2
-rw-r--r--dev-ruby/kramdown/kramdown-1.8.0.ebuild55
-rw-r--r--dev-ruby/kramdown/kramdown-1.9.0.ebuild55
-rw-r--r--dev-ruby/log4r/log4r-1.1.10-r1.ebuild6
-rw-r--r--dev-ruby/log4r/log4r-1.1.10-r2.ebuild6
-rw-r--r--dev-ruby/logging/Manifest1
-rw-r--r--dev-ruby/logging/logging-1.8.2.ebuild27
-rw-r--r--dev-ruby/logging/logging-2.0.0.ebuild6
-rw-r--r--dev-ruby/modernizr/modernizr-2.6.2.ebuild6
-rw-r--r--dev-ruby/mustache/Manifest1
-rw-r--r--dev-ruby/mustache/mustache-0.99.5-r1.ebuild39
-rw-r--r--dev-ruby/mustache/mustache-1.0.1.ebuild42
-rw-r--r--dev-ruby/mustache/mustache-1.0.2.ebuild2
-rw-r--r--dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r1.ebuild6
-rw-r--r--dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild6
-rw-r--r--dev-ruby/oauth/Manifest1
-rw-r--r--dev-ruby/oauth/oauth-0.5.1.ebuild45
-rw-r--r--dev-ruby/oauth2/Manifest1
-rw-r--r--dev-ruby/oauth2/oauth2-1.0.0.ebuild41
-rw-r--r--dev-ruby/octokit/Manifest1
-rw-r--r--dev-ruby/octokit/octokit-4.3.0.ebuild32
-rw-r--r--dev-ruby/permutation/permutation-0.1.8-r1.ebuild6
-rw-r--r--dev-ruby/posix-spawn/Manifest2
-rw-r--r--dev-ruby/posix-spawn/posix-spawn-0.3.10.ebuild33
-rw-r--r--dev-ruby/posix-spawn/posix-spawn-0.3.11.ebuild6
-rw-r--r--dev-ruby/posix-spawn/posix-spawn-0.3.9.ebuild33
-rw-r--r--dev-ruby/psych/Manifest2
-rw-r--r--dev-ruby/psych/psych-2.0.15.ebuild40
-rw-r--r--dev-ruby/psych/psych-2.0.16.ebuild40
-rw-r--r--dev-ruby/psych/psych-2.0.17.ebuild4
-rw-r--r--dev-ruby/rake-compiler/Manifest1
-rw-r--r--dev-ruby/rake-compiler/rake-compiler-0.9.5.ebuild2
-rw-r--r--dev-ruby/rake-compiler/rake-compiler-0.9.6.ebuild62
-rw-r--r--dev-ruby/rake-remote_task/rake-remote_task-2.3.0.ebuild8
-rw-r--r--dev-ruby/rgen/Manifest1
-rw-r--r--dev-ruby/rgen/rgen-0.7.0.ebuild33
-rw-r--r--dev-ruby/rouge/Manifest2
-rw-r--r--dev-ruby/rouge/rouge-1.10.1.ebuild6
-rw-r--r--dev-ruby/rouge/rouge-1.9.0.ebuild28
-rw-r--r--dev-ruby/rouge/rouge-1.9.1.ebuild28
-rw-r--r--dev-ruby/rr/rr-1.1.2-r1.ebuild6
-rw-r--r--dev-ruby/rr/rr-1.1.2.ebuild6
-rw-r--r--dev-ruby/rspec-core/Manifest2
-rw-r--r--dev-ruby/rspec-core/rspec-core-3.2.3-r1.ebuild95
-rw-r--r--dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild7
-rw-r--r--dev-ruby/rspec-core/rspec-core-3.4.2.ebuild101
-rw-r--r--dev-ruby/rspec-core/rspec-core-3.4.3.ebuild1
-rw-r--r--dev-ruby/rspec-expectations/Manifest2
-rw-r--r--dev-ruby/rspec-expectations/rspec-expectations-3.2.1.ebuild62
-rw-r--r--dev-ruby/rspec-expectations/rspec-expectations-3.3.0.ebuild62
-rw-r--r--dev-ruby/rspec-mocks/Manifest2
-rw-r--r--dev-ruby/rspec-mocks/rspec-mocks-3.2.1.ebuild63
-rw-r--r--dev-ruby/rspec-mocks/rspec-mocks-3.3.1.ebuild63
-rw-r--r--dev-ruby/rspec-rails/Manifest3
-rw-r--r--dev-ruby/rspec-rails/rspec-rails-3.2.3.ebuild44
-rw-r--r--dev-ruby/rspec-rails/rspec-rails-3.3.2.ebuild52
-rw-r--r--dev-ruby/rspec-rails/rspec-rails-3.4.0.ebuild56
-rw-r--r--dev-ruby/rspec-support/Manifest1
-rw-r--r--dev-ruby/rspec-support/rspec-support-3.2.1.ebuild43
-rw-r--r--dev-ruby/rspec/Manifest1
-rw-r--r--dev-ruby/rspec/rspec-3.2.0.ebuild28
-rw-r--r--dev-ruby/ruby-gettext/Manifest3
-rw-r--r--dev-ruby/ruby-gettext/ruby-gettext-3.1.1.ebuild6
-rw-r--r--dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild6
-rw-r--r--dev-ruby/ruby-gettext/ruby-gettext-3.1.6.ebuild63
-rw-r--r--dev-ruby/ruby-gettext/ruby-gettext-3.1.7.ebuild66
-rw-r--r--dev-ruby/ruby-gettext/ruby-gettext-3.1.9.ebuild4
-rw-r--r--dev-ruby/ruby-gettext/ruby-gettext-3.2.0.ebuild66
-rw-r--r--dev-ruby/ruby-gettext/ruby-gettext-3.2.1.ebuild2
-rw-r--r--dev-ruby/ruby-ldap/Manifest1
-rw-r--r--dev-ruby/ruby-ldap/ruby-ldap-0.9.18.ebuild42
-rw-r--r--dev-ruby/rubygems/Manifest1
-rw-r--r--dev-ruby/rubygems/rubygems-2.6.1.ebuild111
-rw-r--r--dev-ruby/safe_yaml/safe_yaml-1.0.4-r1.ebuild33
-rw-r--r--dev-ruby/safe_yaml/safe_yaml-1.0.4-r2.ebuild4
-rw-r--r--dev-ruby/safe_yaml/safe_yaml-1.0.4.ebuild6
-rw-r--r--dev-ruby/sass/Manifest2
-rw-r--r--dev-ruby/sass/sass-3.3.14.ebuild40
-rw-r--r--dev-ruby/sass/sass-3.4.19.ebuild40
-rw-r--r--dev-ruby/sass/sass-3.4.20.ebuild40
-rw-r--r--dev-ruby/sawyer/sawyer-0.7.0.ebuild5
-rw-r--r--dev-ruby/seed-fu/Manifest3
-rw-r--r--dev-ruby/seed-fu/seed-fu-2.2.0.ebuild31
-rw-r--r--dev-ruby/seed-fu/seed-fu-2.3.3.ebuild31
-rw-r--r--dev-ruby/seed-fu/seed-fu-2.3.4.ebuild31
-rw-r--r--dev-ruby/seed-fu/seed-fu-2.3.5.ebuild6
-rw-r--r--dev-ruby/semantic_puppet/semantic_puppet-0.1.1.ebuild6
-rw-r--r--dev-ruby/sfl/sfl-2.2-r1.ebuild6
-rw-r--r--dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild2
-rw-r--r--dev-ruby/simplecov-html/simplecov-html-0.10.0.ebuild4
-rw-r--r--dev-ruby/sinatra/sinatra-1.4.6-r1.ebuild34
-rw-r--r--dev-ruby/sinatra/sinatra-1.4.6.ebuild6
-rw-r--r--dev-ruby/slim/Manifest1
-rw-r--r--dev-ruby/slim/slim-2.0.3.ebuild40
-rw-r--r--dev-ruby/slim/slim-2.1.0.ebuild6
-rw-r--r--dev-ruby/slim/slim-3.0.6.ebuild4
-rw-r--r--dev-ruby/stomp/stomp-1.3.4.ebuild2
-rw-r--r--dev-ruby/tilt/Manifest1
-rw-r--r--dev-ruby/tilt/tilt-2.0.1-r1.ebuild49
-rw-r--r--dev-ruby/turbolinks/Manifest1
-rw-r--r--dev-ruby/turbolinks/turbolinks-2.5.1.ebuild24
-rw-r--r--dev-ruby/uglifier/Manifest2
-rw-r--r--dev-ruby/uglifier/uglifier-2.7.0.ebuild27
-rw-r--r--dev-ruby/uglifier/uglifier-2.7.1.ebuild27
-rw-r--r--dev-ruby/vcr/Manifest1
-rw-r--r--dev-ruby/vcr/vcr-1.11.3.ebuild6
-rw-r--r--dev-ruby/vcr/vcr-2.9.3.ebuild6
-rw-r--r--dev-ruby/vcr/vcr-3.0.0.ebuild24
-rw-r--r--dev-ruby/vlad/Manifest2
-rw-r--r--dev-ruby/vlad/vlad-2.6.3.ebuild29
-rw-r--r--dev-ruby/vlad/vlad-2.6.4.ebuild29
-rw-r--r--dev-ruby/vlad/vlad-2.6.5.ebuild6
-rw-r--r--dev-ruby/xml-simple/Manifest1
-rw-r--r--dev-ruby/xml-simple/xml-simple-1.1.3.ebuild6
-rw-r--r--dev-ruby/xml-simple/xml-simple-1.1.4.ebuild20
-rw-r--r--dev-ruby/xml-simple/xml-simple-1.1.5.ebuild6
-rw-r--r--dev-ruby/xpath/xpath-0.1.4-r1.ebuild4
-rw-r--r--dev-ruby/xpath/xpath-2.0.0-r1.ebuild4
-rw-r--r--dev-ruby/yajl-ruby/Manifest1
-rw-r--r--dev-ruby/yajl-ruby/yajl-ruby-1.1.0-r1.ebuild4
-rw-r--r--dev-ruby/yajl-ruby/yajl-ruby-1.2.0.ebuild35
-rw-r--r--dev-ruby/yajl-ruby/yajl-ruby-1.2.1.ebuild4
-rw-r--r--dev-ruby/zentest/zentest-4.11.0.ebuild16
-rw-r--r--dev-ruby/zentest/zentest-4.9.5.ebuild6
-rw-r--r--dev-scheme/slib/slib-3.2.2.ebuild2
-rw-r--r--dev-tcltk/tclpython/tclpython-4.1-r5.ebuild56
-rw-r--r--dev-tex/latex-beamer/latex-beamer-3.36.ebuild1
-rw-r--r--dev-util/anjuta/anjuta-3.18.2.ebuild2
-rw-r--r--dev-util/astyle/Manifest2
-rw-r--r--dev-util/astyle/astyle-2.02.1.ebuild71
-rw-r--r--dev-util/astyle/astyle-2.03.ebuild71
-rw-r--r--dev-util/byacc/byacc-20150711.ebuild2
-rw-r--r--dev-util/catkin/Manifest1
-rw-r--r--dev-util/catkin/catkin-0.7.0.ebuild99
-rw-r--r--dev-util/devhelp/devhelp-3.18.1.ebuild2
-rw-r--r--dev-util/dogtail/Manifest1
-rw-r--r--dev-util/dogtail/dogtail-0.9.9.ebuild66
-rw-r--r--dev-util/dogtail/files/dogtail-0.9.9-gentoo-paths.patch64
-rw-r--r--dev-util/dogtail/files/dogtail-0.9.9-get-user.patch43
-rw-r--r--dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild2
-rw-r--r--dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild2
-rw-r--r--dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild2
-rw-r--r--dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild2
-rw-r--r--dev-util/idea-ultimate/Manifest3
-rw-r--r--dev-util/idea-ultimate/idea-ultimate-14.1.5.141.3056.5.ebuild55
-rw-r--r--dev-util/idea-ultimate/idea-ultimate-16.0.0.145.184.1_pre.ebuild73
-rw-r--r--dev-util/insight/insight-6.8.1-r1.ebuild2
-rw-r--r--dev-util/meld/meld-3.14.2.ebuild2
-rw-r--r--dev-util/pkgconfig/Manifest1
-rw-r--r--dev-util/pkgconfig/pkgconfig-0.29.1.ebuild103
-rw-r--r--dev-util/trinity/Manifest1
-rw-r--r--dev-util/trinity/files/trinity-1.6-cflags.patch11
-rw-r--r--dev-util/trinity/trinity-1.6.ebuild45
-rw-r--r--dev-vcs/git-num/Manifest1
-rw-r--r--dev-vcs/git-num/git-num-2.0.1.ebuild26
-rw-r--r--dev-vcs/git-num/metadata.xml11
-rw-r--r--dev-vcs/gitg/gitg-3.18.0.ebuild2
-rw-r--r--eclass/latex-package.eclass11
-rw-r--r--games-action/openclonk/openclonk-7.0.ebuild2
-rw-r--r--games-arcade/gnome-nibbles/gnome-nibbles-3.18.2.ebuild2
-rw-r--r--games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild2
-rw-r--r--games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild2
-rw-r--r--games-board/gnome-chess/gnome-chess-3.18.0.ebuild2
-rw-r--r--games-board/gnome-mahjongg/gnome-mahjongg-3.18.0.ebuild2
-rw-r--r--games-board/gnome-mines/gnome-mines-3.18.2.ebuild2
-rw-r--r--games-board/iagno/iagno-3.18.2.ebuild2
-rw-r--r--games-board/pychess/Manifest1
-rw-r--r--games-board/pychess/pychess-0.12.3.ebuild71
-rw-r--r--games-board/tali/tali-3.18.0.ebuild2
-rw-r--r--games-emulation/dolphin/dolphin-9999.ebuild4
-rw-r--r--games-fps/doomsday/doomsday-1.15.7.ebuild2
-rw-r--r--games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild2
-rw-r--r--games-puzzle/five-or-more/five-or-more-3.18.0.ebuild2
-rw-r--r--games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild2
-rw-r--r--games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild2
-rw-r--r--games-puzzle/gnome-taquin/gnome-taquin-3.18.2.ebuild2
-rw-r--r--games-puzzle/gnome-tetravex/gnome-tetravex-3.18.0.ebuild2
-rw-r--r--games-puzzle/hitori/hitori-3.16.2.ebuild2
-rw-r--r--games-puzzle/lightsoff/lightsoff-3.18.0.ebuild2
-rw-r--r--games-puzzle/quadrapassel/quadrapassel-3.18.0.ebuild2
-rw-r--r--games-puzzle/swell-foop/swell-foop-3.18.1.ebuild2
-rw-r--r--games-puzzle/xbomb/xbomb-2.2b.ebuild2
-rw-r--r--gnome-base/dconf-editor/dconf-editor-3.18.2.ebuild2
-rw-r--r--gnome-base/gconf/gconf-3.2.6-r4.ebuild2
-rw-r--r--gnome-base/gdm/gdm-3.18.2.ebuild2
-rw-r--r--gnome-base/gnome-common/gnome-common-3.18.0.ebuild2
-rw-r--r--gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild2
-rw-r--r--gnome-base/gnome-core-apps/gnome-core-apps-3.18.0.ebuild2
-rw-r--r--gnome-base/gnome-core-libs/gnome-core-libs-3.18.0.ebuild2
-rw-r--r--gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild2
-rw-r--r--gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0-r2.ebuild86
-rw-r--r--gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0.ebuild2
-rw-r--r--gnome-base/gnome-keyring/gnome-keyring-3.18.3.ebuild2
-rw-r--r--gnome-base/gnome-light/gnome-light-3.18.0.ebuild2
-rw-r--r--gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild2
-rw-r--r--gnome-base/gnome-session/gnome-session-3.18.1.2.ebuild2
-rw-r--r--gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.2.ebuild2
-rw-r--r--gnome-base/gnome-shell/gnome-shell-3.18.3.ebuild2
-rw-r--r--gnome-base/gnome/gnome-3.18.0.ebuild2
-rw-r--r--gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.1.ebuild2
-rw-r--r--gnome-base/gvfs/gvfs-1.26.3.ebuild2
-rw-r--r--gnome-base/libgtop/libgtop-2.32.0.ebuild2
-rw-r--r--gnome-base/librsvg/librsvg-2.40.13.ebuild2
-rw-r--r--gnome-base/nautilus/nautilus-3.18.5.ebuild2
-rw-r--r--gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild2
-rw-r--r--gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild2
-rw-r--r--gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.0.ebuild2
-rw-r--r--gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild2
-rw-r--r--gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild2
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild2
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild2
-rw-r--r--gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild2
-rw-r--r--gnome-extra/cinnamon/cinnamon-2.8.6.ebuild2
-rw-r--r--gnome-extra/cjs/cjs-2.8.0.ebuild2
-rw-r--r--gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild2
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-3.18.5.ebuild2
-rw-r--r--gnome-extra/evolution-ews/evolution-ews-3.18.5.ebuild2
-rw-r--r--gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild2
-rw-r--r--gnome-extra/gnome-calculator/gnome-calculator-3.18.3.ebuild2
-rw-r--r--gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild2
-rw-r--r--gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild2
-rw-r--r--gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild2
-rw-r--r--gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild2
-rw-r--r--gnome-extra/gnome-contacts/gnome-contacts-3.18.1.ebuild2
-rw-r--r--gnome-extra/gnome-documents/gnome-documents-3.18.2-r1.ebuild2
-rw-r--r--gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.2.ebuild2
-rw-r--r--gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild2
-rw-r--r--gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild2
-rw-r--r--gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.3.ebuild2
-rw-r--r--gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild2
-rw-r--r--gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.2.ebuild2
-rw-r--r--gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r1.ebuild2
-rw-r--r--gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild2
-rw-r--r--gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild2
-rw-r--r--gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild2
-rw-r--r--gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild2
-rw-r--r--gnome-extra/gucharmap/gucharmap-3.18.2.ebuild2
-rw-r--r--gnome-extra/libgda/libgda-5.2.4-r1.ebuild2
-rw-r--r--gnome-extra/libgsf/libgsf-1.14.36.ebuild2
-rw-r--r--gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild2
-rw-r--r--gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.1.ebuild2
-rw-r--r--gnome-extra/nemo/nemo-2.8.6.ebuild2
-rw-r--r--gnome-extra/nm-applet/nm-applet-1.0.10.ebuild2
-rw-r--r--gnome-extra/sushi/sushi-3.18.0.ebuild2
-rw-r--r--gnome-extra/yelp-xsl/yelp-xsl-3.18.1.ebuild2
-rw-r--r--gnome-extra/yelp/yelp-3.18.1-r1.ebuild2
-rw-r--r--gnome-extra/zenity/zenity-3.18.1.1.ebuild2
-rw-r--r--kde-apps/akonadiconsole/akonadiconsole-4.14.10.ebuild2
-rw-r--r--kde-apps/akregator/akregator-4.14.10.ebuild2
-rw-r--r--kde-apps/amor/amor-15.08.3.ebuild2
-rw-r--r--kde-apps/attica/attica-15.08.3.ebuild2
-rw-r--r--kde-apps/audiocd-kio/audiocd-kio-15.08.3.ebuild2
-rw-r--r--kde-apps/blogilo/blogilo-4.14.10.ebuild2
-rw-r--r--kde-apps/calendarjanitor/calendarjanitor-4.14.10.ebuild2
-rw-r--r--kde-apps/cervisia/cervisia-15.08.3.ebuild2
-rw-r--r--kde-apps/dolphin/dolphin-4.14.3-r1.ebuild2
-rw-r--r--kde-apps/drkonqi/drkonqi-15.08.3.ebuild2
-rw-r--r--kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.3.ebuild2
-rw-r--r--kde-apps/gpgmepp/gpgmepp-4.14.10.ebuild2
-rw-r--r--kde-apps/jovie/jovie-15.08.3.ebuild2
-rw-r--r--kde-apps/juk/juk-15.08.3.ebuild2
-rw-r--r--kde-apps/kabcclient/kabcclient-4.14.10.ebuild2
-rw-r--r--kde-apps/kaccessible/kaccessible-15.08.3.ebuild2
-rw-r--r--kde-apps/kaddressbook/kaddressbook-4.14.10.ebuild2
-rw-r--r--kde-apps/kajongg/kajongg-15.08.3.ebuild2
-rw-r--r--kde-apps/kalarm/kalarm-4.14.10.ebuild2
-rw-r--r--kde-apps/kamera/kamera-15.08.3.ebuild2
-rw-r--r--kde-apps/kcachegrind/kcachegrind-15.08.3.ebuild2
-rw-r--r--kde-apps/kcmshell/kcmshell-15.08.3.ebuild2
-rw-r--r--kde-apps/kcolorchooser/kcolorchooser-15.08.3.ebuild2
-rw-r--r--kde-apps/kcontrol/kcontrol-15.08.3.ebuild2
-rw-r--r--kde-apps/kde-base-artwork/kde-base-artwork-15.08.3.ebuild2
-rw-r--r--kde-apps/kde-dev-utils/kde-dev-utils-15.08.3.ebuild2
-rw-r--r--kde-apps/kde-meta/kde-meta-4.14.3-r1.ebuild2
-rw-r--r--kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild2
-rw-r--r--kde-apps/kde4-l10n/kde4-l10n-15.08.3-r2.ebuild2
-rw-r--r--kde-apps/kdeartwork-colorschemes/kdeartwork-colorschemes-15.08.3.ebuild2
-rw-r--r--kde-apps/kdeartwork-desktopthemes/kdeartwork-desktopthemes-15.08.3.ebuild2
-rw-r--r--kde-apps/kdeartwork-emoticons/kdeartwork-emoticons-15.08.3.ebuild2
-rw-r--r--kde-apps/kdeartwork-iconthemes/kdeartwork-iconthemes-15.08.3.ebuild2
-rw-r--r--kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-15.08.3-r1.ebuild2
-rw-r--r--kde-apps/kdeartwork-styles/kdeartwork-styles-15.08.3.ebuild2
-rw-r--r--kde-apps/kdeartwork-wallpapers/kdeartwork-wallpapers-15.08.3.ebuild2
-rw-r--r--kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-15.08.3.ebuild2
-rw-r--r--kde-apps/kdebase-data/kdebase-data-15.08.3.ebuild2
-rw-r--r--kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-15.08.3.ebuild2
-rw-r--r--kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.08.3.ebuild2
-rw-r--r--kde-apps/kdebase-menu-icons/kdebase-menu-icons-15.08.3.ebuild2
-rw-r--r--kde-apps/kdebase-menu/kdebase-menu-15.08.3.ebuild2
-rw-r--r--kde-apps/kdebase-meta/kdebase-meta-4.14.3-r2.ebuild2
-rw-r--r--kde-apps/kdebugdialog/kdebugdialog-15.08.3.ebuild2
-rw-r--r--kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-15.08.3.ebuild2
-rw-r--r--kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.08.3.ebuild2
-rw-r--r--kde-apps/kdepasswd/kdepasswd-15.08.3.ebuild2
-rw-r--r--kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.10.ebuild2
-rw-r--r--kde-apps/kdepim-icons/kdepim-icons-4.14.10.ebuild2
-rw-r--r--kde-apps/kdepim-kresources/kdepim-kresources-4.14.10.ebuild2
-rw-r--r--kde-apps/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild2
-rw-r--r--kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild2
-rw-r--r--kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild2
-rw-r--r--kde-apps/kdepim-runtime/kdepim-runtime-4.14.10.ebuild2
-rw-r--r--kde-apps/kdepimlibs/kdepimlibs-4.14.10.ebuild2
-rw-r--r--kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-15.08.3.ebuild2
-rw-r--r--kde-apps/kdesu/kdesu-15.08.3.ebuild2
-rw-r--r--kde-apps/kdf/kdf-15.08.3.ebuild2
-rw-r--r--kde-apps/kdialog/kdialog-15.08.3.ebuild2
-rw-r--r--kde-apps/kdontchangethehostname/kdontchangethehostname-15.08.3.ebuild2
-rw-r--r--kde-apps/keditbookmarks/keditbookmarks-15.08.3.ebuild2
-rw-r--r--kde-apps/keditfiletype/keditfiletype-15.08.3.ebuild2
-rw-r--r--kde-apps/kfile/kfile-15.08.3.ebuild2
-rw-r--r--kde-apps/kfilereplace/kfilereplace-15.08.3.ebuild2
-rw-r--r--kde-apps/kfind/kfind-15.08.3.ebuild2
-rw-r--r--kde-apps/kfloppy/kfloppy-15.08.3.ebuild2
-rw-r--r--kde-apps/kfmclient/kfmclient-15.08.3.ebuild2
-rw-r--r--kde-apps/kget/kget-15.08.3.ebuild2
-rw-r--r--kde-apps/kglobalaccel/kglobalaccel-15.08.3.ebuild2
-rw-r--r--kde-apps/kgoldrunner/kgoldrunner-15.08.3.ebuild2
-rw-r--r--kde-apps/kgpg/kgpg-15.08.3.ebuild2
-rw-r--r--kde-apps/kiconfinder/kiconfinder-15.08.3.ebuild2
-rw-r--r--kde-apps/kigo/kigo-15.08.3.ebuild2
-rw-r--r--kde-apps/kimagemapeditor/kimagemapeditor-15.08.3.ebuild2
-rw-r--r--kde-apps/kimgio/kimgio-15.08.3.ebuild2
-rw-r--r--kde-apps/kioclient/kioclient-15.08.3.ebuild2
-rw-r--r--kde-apps/kjots/kjots-4.14.10.ebuild2
-rw-r--r--kde-apps/kleopatra/kleopatra-4.14.10.ebuild2
-rw-r--r--kde-apps/klickety/klickety-15.08.3.ebuild2
-rw-r--r--kde-apps/kmag/kmag-15.08.3.ebuild2
-rw-r--r--kde-apps/kmahjongg/kmahjongg-15.08.3.ebuild2
-rw-r--r--kde-apps/kmail/kmail-4.14.10.ebuild2
-rw-r--r--kde-apps/kmimetypefinder/kmimetypefinder-15.08.3.ebuild2
-rw-r--r--kde-apps/kmix/kmix-4.14.3-r1.ebuild2
-rw-r--r--kde-apps/kmousetool/kmousetool-15.08.3.ebuild2
-rw-r--r--kde-apps/kmouth/kmouth-15.08.3.ebuild2
-rw-r--r--kde-apps/knavalbattle/knavalbattle-15.08.3.ebuild2
-rw-r--r--kde-apps/knetattach/knetattach-15.08.3.ebuild2
-rw-r--r--kde-apps/knewstuff/knewstuff-15.08.3.ebuild2
-rw-r--r--kde-apps/knode/knode-4.14.10.ebuild2
-rw-r--r--kde-apps/knotes/knotes-4.14.10.ebuild2
-rw-r--r--kde-apps/knotify/knotify-15.08.3.ebuild2
-rw-r--r--kde-apps/kolf/kolf-15.08.3.ebuild2
-rw-r--r--kde-apps/kolourpaint/kolourpaint-15.08.3.ebuild2
-rw-r--r--kde-apps/kommander/kommander-15.08.3.ebuild2
-rw-r--r--kde-apps/konq-plugins/konq-plugins-15.08.3.ebuild2
-rw-r--r--kde-apps/konqueror/konqueror-15.08.3.ebuild2
-rw-r--r--kde-apps/konquest/konquest-15.08.3.ebuild2
-rw-r--r--kde-apps/konsole/konsole-4.14.3-r2.ebuild2
-rw-r--r--kde-apps/konsolekalendar/konsolekalendar-4.14.10.ebuild2
-rw-r--r--kde-apps/konsolepart/konsolepart-4.14.3.ebuild2
-rw-r--r--kde-apps/kontact/kontact-4.14.10.ebuild2
-rw-r--r--kde-apps/kopete/kopete-15.08.3.ebuild2
-rw-r--r--kde-apps/korganizer/korganizer-4.14.10.ebuild2
-rw-r--r--kde-apps/kpasswdserver/kpasswdserver-15.08.3.ebuild2
-rw-r--r--kde-apps/kppp/kppp-15.08.3.ebuild2
-rw-r--r--kde-apps/kquitapp/kquitapp-15.08.3.ebuild2
-rw-r--r--kde-apps/krdc/krdc-15.08.3.ebuild2
-rw-r--r--kde-apps/kreadconfig/kreadconfig-15.08.3.ebuild2
-rw-r--r--kde-apps/kremotecontrol/kremotecontrol-15.08.3.ebuild2
-rw-r--r--kde-apps/kreversi/kreversi-15.08.3.ebuild2
-rw-r--r--kde-apps/krfb/krfb-15.08.3.ebuild2
-rw-r--r--kde-apps/ksaneplugin/ksaneplugin-15.08.3.ebuild2
-rw-r--r--kde-apps/kscd/kscd-15.08.3.ebuild2
-rw-r--r--kde-apps/ksirk/ksirk-15.08.3.ebuild2
-rw-r--r--kde-apps/ksnakeduel/ksnakeduel-15.08.3.ebuild2
-rw-r--r--kde-apps/ksnapshot/ksnapshot-15.08.3-r1.ebuild2
-rw-r--r--kde-apps/kspaceduel/kspaceduel-15.08.3.ebuild2
-rw-r--r--kde-apps/kstart/kstart-15.08.3.ebuild2
-rw-r--r--kde-apps/ksudoku/ksudoku-15.08.3.ebuild2
-rw-r--r--kde-apps/ksystemlog/ksystemlog-15.08.3.ebuild2
-rw-r--r--kde-apps/ktimetracker/ktimetracker-4.14.10.ebuild2
-rw-r--r--kde-apps/ktimezoned/ktimezoned-15.08.3.ebuild2
-rw-r--r--kde-apps/ktnef/ktnef-4.14.10.ebuild2
-rw-r--r--kde-apps/ktraderclient/ktraderclient-15.08.3.ebuild2
-rw-r--r--kde-apps/ktuberling/ktuberling-15.08.3.ebuild2
-rw-r--r--kde-apps/ktux/ktux-15.08.3.ebuild2
-rw-r--r--kde-apps/kubrick/kubrick-15.08.3.ebuild2
-rw-r--r--kde-apps/kuiserver/kuiserver-15.08.3.ebuild2
-rw-r--r--kde-apps/kurifilter-plugins/kurifilter-plugins-15.08.3.ebuild2
-rw-r--r--kde-apps/kuser/kuser-15.08.3.ebuild2
-rw-r--r--kde-apps/kwalletd/kwalletd-15.08.3.ebuild2
-rw-r--r--kde-apps/kwalletmanager/kwalletmanager-15.04.3.ebuild2
-rw-r--r--kde-apps/kwalletmanager/kwalletmanager-15.08.3-r1.ebuild2
-rw-r--r--kde-apps/libkcddb/libkcddb-15.08.3.ebuild2
-rw-r--r--kde-apps/libkcompactdisc/libkcompactdisc-15.08.3.ebuild2
-rw-r--r--kde-apps/libkdcraw/libkdcraw-15.08.3.ebuild2
-rw-r--r--kde-apps/libkdegames/libkdegames-4.14.3-r1.ebuild2
-rw-r--r--kde-apps/libkexiv2/libkexiv2-15.08.3.ebuild2
-rw-r--r--kde-apps/libkgeomap/libkgeomap-15.08.3.ebuild2
-rw-r--r--kde-apps/libkipi/libkipi-15.08.3.ebuild2
-rw-r--r--kde-apps/libkonq/libkonq-15.08.3.ebuild2
-rw-r--r--kde-apps/libksane/libksane-15.08.3.ebuild2
-rw-r--r--kde-apps/lskat/lskat-15.08.3.ebuild2
-rw-r--r--kde-apps/mplayerthumbs/mplayerthumbs-15.08.3.ebuild2
-rw-r--r--kde-apps/nsplugins/nsplugins-15.08.3.ebuild2
-rw-r--r--kde-apps/okular/okular-15.08.3-r1.ebuild2
-rw-r--r--kde-apps/pairs/pairs-15.04.3.ebuild2
-rw-r--r--kde-apps/palapeli/palapeli-15.08.3.ebuild2
-rw-r--r--kde-apps/phonon-kde/phonon-kde-15.08.3.ebuild2
-rw-r--r--kde-apps/plasma-apps/plasma-apps-15.08.3.ebuild2
-rw-r--r--kde-apps/plasma-runtime/plasma-runtime-15.08.3.ebuild2
-rw-r--r--kde-apps/poxml/poxml-15.08.3.ebuild2
-rw-r--r--kde-apps/renamedlg-plugins/renamedlg-plugins-15.08.3.ebuild2
-rw-r--r--kde-apps/solid-runtime/solid-runtime-15.08.3.ebuild2
-rw-r--r--kde-apps/superkaramba/superkaramba-15.08.3.ebuild2
-rw-r--r--kde-apps/svgpart/svgpart-15.08.3.ebuild2
-rw-r--r--kde-apps/sweeper/sweeper-15.08.3.ebuild2
-rw-r--r--kde-apps/thumbnailers/thumbnailers-15.08.3.ebuild2
-rw-r--r--kde-apps/zeroconf-ioslave/zeroconf-ioslave-15.08.3.ebuild2
-rw-r--r--kde-base/freespacenotifier/freespacenotifier-4.11.22.ebuild2
-rw-r--r--kde-base/kactivities/kactivities-4.13.3-r2.ebuild2
-rw-r--r--kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild2
-rw-r--r--kde-base/kcheckpass/kcheckpass-4.11.22-r1.ebuild2
-rw-r--r--kde-base/kcminit/kcminit-4.11.22.ebuild2
-rw-r--r--kde-base/kdebase-cursors/kdebase-cursors-4.11.22.ebuild2
-rw-r--r--kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild2
-rw-r--r--kde-base/kdelibs/kdelibs-4.14.16.ebuild2
-rw-r--r--kde-base/kdm/kdm-4.11.22.ebuild2
-rw-r--r--kde-base/kephal/kephal-4.11.22.ebuild2
-rw-r--r--kde-base/khotkeys/khotkeys-4.11.22.ebuild2
-rw-r--r--kde-base/kinfocenter/kinfocenter-4.11.22.ebuild2
-rw-r--r--kde-base/klipper/klipper-4.11.22.ebuild2
-rw-r--r--kde-base/kmenuedit/kmenuedit-4.11.22.ebuild2
-rw-r--r--kde-base/krunner/krunner-4.11.22.ebuild2
-rw-r--r--kde-base/kscreensaver/kscreensaver-4.11.22.ebuild2
-rw-r--r--kde-base/ksmserver/ksmserver-4.11.22.ebuild2
-rw-r--r--kde-base/ksplash/ksplash-4.11.22.ebuild2
-rw-r--r--kde-base/kstartupconfig/kstartupconfig-4.11.22.ebuild2
-rw-r--r--kde-base/kstyles/kstyles-4.11.22.ebuild2
-rw-r--r--kde-base/ksysguard/ksysguard-4.11.22.ebuild2
-rw-r--r--kde-base/ksystraycmd/ksystraycmd-4.11.22.ebuild2
-rw-r--r--kde-base/kwin/kwin-4.11.22.ebuild2
-rw-r--r--kde-base/kwrited/kwrited-4.11.22.ebuild2
-rw-r--r--kde-base/legacy-icons/legacy-icons-4.11.22.ebuild2
-rw-r--r--kde-base/libkgreeter/libkgreeter-4.11.22.ebuild2
-rw-r--r--kde-base/libkworkspace/libkworkspace-4.11.22.ebuild2
-rw-r--r--kde-base/liboxygenstyle/liboxygenstyle-4.11.22.ebuild2
-rw-r--r--kde-base/libplasmaclock/libplasmaclock-4.11.22.ebuild2
-rw-r--r--kde-base/libplasmagenericshell/libplasmagenericshell-4.11.22.ebuild2
-rw-r--r--kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild2
-rw-r--r--kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild2
-rw-r--r--kde-base/powerdevil/powerdevil-4.11.22.ebuild2
-rw-r--r--kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild2
-rw-r--r--kde-base/solid-actions-kcm/solid-actions-kcm-4.11.22.ebuild2
-rw-r--r--kde-base/systemsettings/systemsettings-4.11.22-r1.ebuild2
-rw-r--r--kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.17.0.ebuild2
-rw-r--r--kde-frameworks/kapidox/kapidox-5.17.0.ebuild2
-rw-r--r--kde-frameworks/kf-env/kf-env-3.ebuild2
-rw-r--r--licenses/sun-concurrent-util51
-rw-r--r--mail-client/evolution/evolution-3.18.5.1.ebuild2
-rw-r--r--mail-client/trojita/trojita-0.5.ebuild2
-rw-r--r--mail-mta/exim/exim-4.86.2.ebuild5
-rw-r--r--mate-base/caja/caja-1.8.2-r1.ebuild2
-rw-r--r--mate-base/mate-applets/mate-applets-1.8.1.ebuild2
-rw-r--r--mate-base/mate-control-center/mate-control-center-1.8.3.ebuild2
-rw-r--r--mate-base/mate-settings-daemon/mate-settings-daemon-1.8.2.ebuild2
-rw-r--r--mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild2
-rw-r--r--mate-extra/mate-screensaver/mate-screensaver-1.8.1-r1.ebuild2
-rw-r--r--mate-extra/mate-user-share/mate-user-share-1.8.0-r1.ebuild2
-rw-r--r--mate-extra/mate-utils/mate-utils-1.8.1.ebuild2
-rw-r--r--media-fonts/cantarell/cantarell-0.0.24.ebuild2
-rw-r--r--media-fonts/noto/Manifest1
-rw-r--r--media-fonts/noto/noto-20160305.ebuild24
-rw-r--r--media-fonts/terminus-font/terminus-font-4.39-r1.ebuild4
-rw-r--r--media-fonts/ubuntu-font-family/ubuntu-font-family-0.83.ebuild4
-rw-r--r--media-fonts/unifont/unifont-8.0.01.ebuild2
-rw-r--r--media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild2
-rw-r--r--media-gfx/cptutils/Manifest3
-rw-r--r--media-gfx/cptutils/cptutils-1.54.ebuild27
-rw-r--r--media-gfx/cptutils/cptutils-1.62.ebuild (renamed from media-gfx/cptutils/cptutils-1.59.ebuild)2
-rw-r--r--media-gfx/eog-plugins/eog-plugins-3.16.3.ebuild2
-rw-r--r--media-gfx/eog/eog-3.18.2.ebuild2
-rw-r--r--media-gfx/eom/eom-1.8.1.ebuild2
-rw-r--r--media-gfx/fotowall/fotowall-0.9-r2.ebuild2
-rw-r--r--media-gfx/geeqie/geeqie-1.2.2-r2.ebuild2
-rw-r--r--media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild2
-rw-r--r--media-gfx/gnome-screenshot/gnome-screenshot-3.18.0.ebuild2
-rw-r--r--media-gfx/gphoto2/gphoto2-2.5.9.ebuild2
-rw-r--r--media-gfx/graphicsmagick/Manifest1
-rw-r--r--media-gfx/graphicsmagick/graphicsmagick-1.3.23.ebuild128
-rw-r--r--media-gfx/graphite2/graphite2-1.3.5-r1.ebuild2
-rw-r--r--media-gfx/graphite2/graphite2-1.3.5.ebuild2
-rw-r--r--media-gfx/mypaint/Manifest1
-rw-r--r--media-gfx/mypaint/mypaint-1.2.0.ebuild84
-rw-r--r--media-gfx/nomacs/Manifest2
-rw-r--r--media-gfx/nomacs/files/nomacs-2.4.2-include.patch10
-rw-r--r--media-gfx/nomacs/nomacs-2.4.2.ebuild58
-rw-r--r--media-gfx/nomacs/nomacs-2.4.4.ebuild59
-rw-r--r--media-gfx/nomacs/nomacs-2.4.6.ebuild2
-rw-r--r--media-gfx/simple-scan/simple-scan-3.18.2.ebuild2
-rw-r--r--media-libs/babl/babl-0.1.16.ebuild3
-rw-r--r--media-libs/babl/metadata.xml3
-rw-r--r--media-libs/clutter-gst/clutter-gst-3.0.16.ebuild2
-rw-r--r--media-libs/clutter-gtk/clutter-gtk-1.6.6-r1.ebuild2
-rw-r--r--media-libs/clutter/clutter-1.24.2.ebuild2
-rw-r--r--media-libs/cogl/cogl-1.22.0-r2.ebuild2
-rw-r--r--media-libs/exiftool/Manifest5
-rw-r--r--media-libs/exiftool/exiftool-10.00.ebuild24
-rw-r--r--media-libs/exiftool/exiftool-10.07.ebuild24
-rw-r--r--media-libs/exiftool/exiftool-10.10.ebuild2
-rw-r--r--media-libs/exiftool/exiftool-10.12.ebuild (renamed from media-libs/exiftool/exiftool-10.09.ebuild)2
-rw-r--r--media-libs/exiftool/exiftool-9.98.ebuild24
-rw-r--r--media-libs/ffmpegsource/metadata.xml3
-rw-r--r--media-libs/glfw/glfw-3.1.2.ebuild2
-rw-r--r--media-libs/grilo/grilo-0.2.15.ebuild2
-rw-r--r--media-libs/gst-plugins-bad/gst-plugins-bad-1.6.3.ebuild2
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.6.3.ebuild2
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-1.6.3.ebuild2
-rw-r--r--media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.3.ebuild2
-rw-r--r--media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild2
-rw-r--r--media-libs/gstreamer/gstreamer-1.6.3.ebuild2
-rw-r--r--media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild2
-rw-r--r--media-libs/harfbuzz/harfbuzz-1.1.3.ebuild2
-rw-r--r--media-libs/libchamplain/libchamplain-0.12.12.ebuild2
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.5.9.ebuild2
-rw-r--r--media-libs/libmediainfo/Manifest1
-rw-r--r--media-libs/libmediainfo/libmediainfo-0.7.83.ebuild79
-rw-r--r--media-libs/libmp3splt/libmp3splt-0.9.2.ebuild2
-rw-r--r--media-libs/libvisio/libvisio-0.1.5.ebuild2
-rw-r--r--media-libs/libzen/Manifest1
-rw-r--r--media-libs/libzen/libzen-0.4.33.ebuild65
-rw-r--r--media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild2
-rw-r--r--media-libs/tiff/tiff-4.0.6.ebuild2
-rw-r--r--media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild2
-rw-r--r--media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-pulse/gst-plugins-pulse-0.10.31-r2.ebuild2
-rw-r--r--media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild2
-rw-r--r--media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.3.ebuild2
-rw-r--r--media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.3.ebuild2
-rw-r--r--media-plugins/live/Manifest1
-rw-r--r--media-plugins/live/live-2016.02.22.ebuild129
-rw-r--r--media-sound/apulse/Manifest1
-rw-r--r--media-sound/apulse/apulse-0.1.4.ebuild28
-rw-r--r--media-sound/apulse/apulse-0.1.6.ebuild28
-rw-r--r--media-sound/banshee/banshee-2.6.2.ebuild2
-rw-r--r--media-sound/flacon/flacon-2.0.1.ebuild2
-rw-r--r--media-sound/flacon/metadata.xml8
-rw-r--r--media-sound/gnome-music/gnome-music-3.18.2.ebuild2
-rw-r--r--media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2-r1.ebuild2
-rw-r--r--media-sound/kid3/kid3-3.3.1.ebuild2
-rw-r--r--media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2.ebuild2
-rw-r--r--media-sound/pulseaudio/pulseaudio-8.0.ebuild2
-rw-r--r--media-sound/qmmp/Manifest2
-rw-r--r--media-sound/qmmp/qmmp-0.9.6.ebuild128
-rw-r--r--media-sound/qmmp/qmmp-0.9.7-r1.ebuild (renamed from media-sound/qmmp/qmmp-0.9.7.ebuild)1
-rw-r--r--media-sound/qmmp/qmmp-1.0.6-r1.ebuild (renamed from media-sound/qmmp/qmmp-1.0.5.ebuild)86
-rw-r--r--media-sound/qmmp/qmmp-9999.ebuild1
-rw-r--r--media-sound/rhythmbox/rhythmbox-3.3.ebuild2
-rw-r--r--media-sound/sound-juicer/sound-juicer-3.18.1.ebuild2
-rw-r--r--media-sound/soundconverter/soundconverter-2.1.6.ebuild2
-rw-r--r--media-video/aegisub/metadata.xml2
-rw-r--r--media-video/cheese/cheese-3.18.1-r1.ebuild2
-rw-r--r--media-video/mediainfo/Manifest1
-rw-r--r--media-video/mediainfo/mediainfo-0.7.83.ebuild72
-rw-r--r--media-video/mplayer/mplayer-1.2.1.ebuild2
-rw-r--r--media-video/mpv/metadata.xml2
-rw-r--r--media-video/pitivi/pitivi-0.95.ebuild2
-rw-r--r--media-video/snappy/snappy-1.0-r1.ebuild2
-rw-r--r--media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild2
-rw-r--r--media-video/totem/totem-3.18.1.ebuild2
-rw-r--r--media-video/ushare/files/08_all_gcc5.patch45
-rw-r--r--media-video/ushare/ushare-1.1a-r8.ebuild63
-rw-r--r--net-analyzer/sslscan/sslscan-1.11.3.ebuild2
-rw-r--r--net-analyzer/tcpreplay/tcpreplay-4.1.1.ebuild2
-rw-r--r--net-dialup/moserial/Manifest1
-rw-r--r--net-dialup/moserial/moserial-3.0.10.ebuild5
-rw-r--r--net-dialup/moserial/moserial-3.0.9.ebuild28
-rw-r--r--net-dns/dnsmasq/dnsmasq-2.75.ebuild2
-rw-r--r--net-dns/dnstop/dnstop-20140915.ebuild2
-rw-r--r--net-dns/rbldnsd/rbldnsd-0.998.ebuild2
-rw-r--r--net-im/bitlbee/bitlbee-3.4.1.ebuild2
-rw-r--r--net-im/skypetab-ng/Manifest1
-rw-r--r--net-im/skypetab-ng/files/skypetab-ng-0.5.2_p20150201-isdigit.patch14
-rw-r--r--net-im/skypetab-ng/skypetab-ng-0.5.2_p20150201.ebuild42
-rw-r--r--net-im/skypetab-ng/skypetab-ng-9999.ebuild8
-rw-r--r--net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild16
-rw-r--r--net-irc/eggdrop/files/eggdrop-1.6.21-fix-gcc5-remove-inline.patch52
-rw-r--r--net-irc/eggdrop/files/eggdrop-1.6.21-fix-memset.patch11
-rw-r--r--net-irc/eggdrop/metadata.xml14
-rw-r--r--net-irc/polari/polari-3.18.1-r1.ebuild33
-rw-r--r--net-irc/polari/polari-3.18.1.ebuild2
-rw-r--r--net-libs/glib-networking/glib-networking-2.46.1.ebuild2
-rw-r--r--net-libs/gnome-online-accounts/gnome-online-accounts-3.18.4.ebuild2
-rw-r--r--net-libs/gssdp/gssdp-0.14.14.ebuild2
-rw-r--r--net-libs/gupnp-av/gupnp-av-0.12.8.ebuild2
-rw-r--r--net-libs/gupnp/gupnp-0.20.16.ebuild2
-rw-r--r--net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild2
-rw-r--r--net-libs/libsoup/libsoup-2.52.2.ebuild2
-rw-r--r--net-libs/nghttp2/Manifest1
-rw-r--r--net-libs/nghttp2/nghttp2-1.8.0.ebuild62
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild2
-rw-r--r--net-misc/gsutil/gsutil-3.42.ebuild3
-rw-r--r--net-misc/gsutil/gsutil-4.15.ebuild3
-rw-r--r--net-misc/gsutil/gsutil-4.16.ebuild3
-rw-r--r--net-misc/gsutil/gsutil-4.17.ebuild3
-rw-r--r--net-misc/i2pd/Manifest1
-rw-r--r--net-misc/i2pd/i2pd-2.5.0.ebuild80
-rw-r--r--net-misc/iputils/iputils-20121221-r2.ebuild9
-rw-r--r--net-misc/iputils/iputils-20150815.ebuild163
-rw-r--r--net-misc/openssh/metadata.xml8
-rw-r--r--net-misc/putty/Manifest1
-rw-r--r--net-misc/putty/putty-0.67.ebuild88
-rw-r--r--net-misc/socat/files/socat-1.7.3.1-stddef_h.patch38
-rw-r--r--net-misc/socat/socat-1.7.3.1.ebuild5
-rw-r--r--net-misc/socat/socat-2.0.0_beta9.ebuild6
-rw-r--r--net-misc/socat/socat-9999.ebuild3
-rw-r--r--net-misc/strongswan/strongswan-5.3.4-r1.ebuild2
-rw-r--r--net-misc/taylor-uucp/files/taylor-uucp-1.07-fprintf.patch11
-rw-r--r--net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild58
-rw-r--r--net-misc/vinagre/vinagre-3.18.2.ebuild2
-rw-r--r--net-misc/vino/vino-3.18.1.ebuild2
-rw-r--r--net-misc/youtube-viewer/Manifest1
-rw-r--r--net-misc/youtube-viewer/youtube-viewer-3.1.1.ebuild91
-rw-r--r--net-p2p/gtk-gnutella/Manifest1
-rw-r--r--net-p2p/gtk-gnutella/gtk-gnutella-1.1.9.ebuild86
-rw-r--r--net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild2
-rw-r--r--net-p2p/syncthing/Manifest2
-rw-r--r--net-p2p/syncthing/syncthing-0.12.18.ebuild42
-rw-r--r--net-p2p/syncthing/syncthing-0.12.20.ebuild54
-rw-r--r--net-p2p/transmission/files/transmission-daemon.initd.1023
-rw-r--r--net-p2p/transmission/transmission-2.90-r1.ebuild (renamed from net-p2p/transmission/transmission-2.90.ebuild)0
-rw-r--r--net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild2
-rw-r--r--net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.2.ebuild2
-rw-r--r--profiles/arch/arm64/package.use.mask4
-rw-r--r--profiles/default/linux/x86/13.0/systemd/eapi1
-rw-r--r--profiles/default/linux/x86/13.0/systemd/parent2
-rw-r--r--profiles/license_groups2
-rw-r--r--profiles/package.mask61
-rw-r--r--profiles/prefix/parent2
-rw-r--r--profiles/profiles.desc13
-rw-r--r--profiles/updates/1Q-20168
-rw-r--r--ros-meta/audio_common/Manifest1
-rw-r--r--ros-meta/audio_common/audio_common-0.2.12.ebuild23
-rw-r--r--ros-meta/diagnostics/Manifest1
-rw-r--r--ros-meta/diagnostics/diagnostics-1.8.9.ebuild25
-rw-r--r--ros-meta/geometry/Manifest1
-rw-r--r--ros-meta/geometry/geometry-1.11.8.ebuild23
-rw-r--r--ros-meta/geometry_experimental/Manifest1
-rw-r--r--ros-meta/geometry_experimental/geometry_experimental-0.5.13.ebuild29
-rw-r--r--sci-astronomy/stellarium/stellarium-0.14.2.ebuild2
-rw-r--r--sci-biology/biojava/Manifest2
-rw-r--r--sci-biology/biojava/biojava-1.6.ebuild73
-rw-r--r--sci-biology/biojava/biojava-1.7.ebuild73
-rw-r--r--sci-biology/biojava/metadata.xml12
-rw-r--r--sci-biology/mauve/mauve-9999.ebuild54
-rw-r--r--sci-biology/mauve/metadata.xml8
-rw-r--r--sci-biology/mauvealigner/mauvealigner-9999.ebuild35
-rw-r--r--sci-biology/mauvealigner/metadata.xml8
-rw-r--r--sci-biology/primer3/primer3-2.3.6.ebuild2
-rw-r--r--sci-biology/seaview/seaview-4.5.4.ebuild2
-rw-r--r--sci-electronics/magic/metadata.xml2
-rw-r--r--sci-electronics/netgen/metadata.xml2
-rw-r--r--sci-electronics/xcircuit/metadata.xml2
-rw-r--r--sci-geosciences/josm/Manifest1
-rw-r--r--sci-geosciences/josm/josm-8800.ebuild10
-rw-r--r--sci-geosciences/josm/josm-9060.ebuild10
-rw-r--r--sci-geosciences/josm/josm-9900.ebuild69
-rw-r--r--sci-geosciences/josm/josm-99999.ebuild (renamed from sci-geosciences/josm/josm-9999.ebuild)12
-rw-r--r--sci-libs/lemon/metadata.xml7
-rw-r--r--sci-libs/libbufr/Manifest1
-rw-r--r--sci-libs/libbufr/files/libbufr-000405-makefile.patch80
-rw-r--r--sci-libs/libbufr/libbufr-000405.ebuild206
-rw-r--r--sci-libs/libbufr/metadata.xml17
-rw-r--r--sci-mathematics/calc/Manifest4
-rw-r--r--sci-mathematics/calc/calc-2.12.1.5.ebuild40
-rw-r--r--sci-mathematics/calc/calc-2.12.4.13-r1.ebuild (renamed from sci-mathematics/calc/calc-2.12.4.13.ebuild)8
-rw-r--r--sci-mathematics/calc/calc-2.12.4.3.ebuild53
-rw-r--r--sci-mathematics/calc/calc-2.12.5.4.ebuild (renamed from sci-mathematics/calc/calc-2.12.4.4.ebuild)28
-rw-r--r--sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch161
-rw-r--r--sci-mathematics/cgal/Manifest2
-rw-r--r--sci-mathematics/cgal/cgal-4.6.1-r1.ebuild (renamed from sci-mathematics/cgal/cgal-4.6.1.ebuild)5
-rw-r--r--sci-mathematics/cgal/cgal-4.7.ebuild81
-rw-r--r--sci-mathematics/cgal/files/cgal-4.7-fix-buildsystem.patch19
-rw-r--r--sci-mathematics/cgal/metadata.xml1
-rw-r--r--sci-mathematics/isabelle/Manifest10
-rw-r--r--sci-mathematics/isabelle/files/isabelle-2011.1-gentoo-settings.patch39
-rw-r--r--sci-mathematics/isabelle/files/isabelle-2011.1-graphbrowser.patch11
-rw-r--r--sci-mathematics/isabelle/files/isabelle-2011.1-libsha1.patch11
-rw-r--r--sci-mathematics/isabelle/files/isabelle-2011.1-proofgeneral-gentoo-path.patch39
-rw-r--r--sci-mathematics/isabelle/files/isabelle-2011.1-reverse-line-editor-order.patch12
-rw-r--r--sci-mathematics/isabelle/files/isabelle-2012-gentoo-settings.patch62
-rw-r--r--sci-mathematics/isabelle/files/isabelle-2012-redundant-equations-in-function-definitions-error.patch35
-rw-r--r--sci-mathematics/isabelle/files/isabelle-2012-signal-handling.patch8
-rw-r--r--sci-mathematics/isabelle/files/isabelle-2013-HOL-Predicate_Compile_Examples.patch82
-rw-r--r--sci-mathematics/isabelle/files/isabelle-2013-classpath.patch149
-rw-r--r--sci-mathematics/isabelle/files/isabelle-2013.2-classpath.patch135
-rw-r--r--sci-mathematics/isabelle/isabelle-2011.1-r2.ebuild254
-rw-r--r--sci-mathematics/isabelle/isabelle-2011.1.ebuild142
-rw-r--r--sci-mathematics/isabelle/isabelle-2012-r1.ebuild320
-rw-r--r--sci-mathematics/isabelle/isabelle-2013-r2.ebuild353
-rw-r--r--sci-mathematics/isabelle/isabelle-2013.2-r1.ebuild375
-rw-r--r--sci-mathematics/isabelle/metadata.xml15
-rw-r--r--sci-mathematics/maxima/maxima-5.37.3-r4.ebuild2
-rw-r--r--sci-visualization/gwyddion/metadata.xml10
-rw-r--r--sci-visualization/veusz/veusz-1.23.2-r1.ebuild78
-rw-r--r--sys-apps/baobab/baobab-3.18.1.ebuild2
-rw-r--r--sys-apps/dbus/dbus-1.10.6.ebuild2
-rw-r--r--sys-apps/etckeeper/etckeeper-1.18.1.ebuild2
-rw-r--r--sys-apps/findutils/findutils-4.6.0.ebuild2
-rw-r--r--sys-apps/gentoo-systemd-integration/Manifest1
-rw-r--r--sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-5.ebuild45
-rw-r--r--sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild39
-rw-r--r--sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.3.1.ebuild2
-rw-r--r--sys-apps/hwids/Manifest1
-rw-r--r--sys-apps/hwids/hwids-20160306.ebuild73
-rw-r--r--sys-apps/hwids/hwids-99999999.ebuild2
-rw-r--r--sys-apps/hwids/metadata.xml8
-rw-r--r--sys-apps/openrc/openrc-0.19.1.ebuild2
-rw-r--r--sys-apps/systemd/Manifest2
-rw-r--r--sys-apps/systemd/systemd-229.ebuild490
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild28
-rw-r--r--sys-apps/udevil/Manifest2
-rw-r--r--sys-apps/udevil/files/udevil-0.4.1-automake-1.13.patch11
-rw-r--r--sys-apps/udevil/files/udevil-0.4.1-flags.patch46
-rw-r--r--sys-apps/udevil/udevil-0.4.1.ebuild71
-rw-r--r--sys-apps/udevil/udevil-0.4.3.ebuild71
-rw-r--r--sys-apps/udevil/udevil-0.4.4.ebuild72
-rw-r--r--sys-apps/xinetd/xinetd-2.3.15-r3.ebuild2
-rw-r--r--sys-auth/otpcalc/otpcalc-0.97-r8.ebuild2
-rw-r--r--sys-auth/skey/skey-1.1.5-r10.ebuild2
-rw-r--r--sys-block/gparted/gparted-0.25.0.ebuild2
-rw-r--r--sys-boot/grub/Manifest3
-rw-r--r--sys-boot/grub/files/2.02_beta3-10_linux-UUID.patch27
-rw-r--r--sys-boot/grub/files/gfxpayload.patch29
-rw-r--r--sys-boot/grub/grub-2.02_beta2-r9.ebuild2
-rw-r--r--sys-boot/grub/grub-2.02_beta3-r1.ebuild290
-rw-r--r--sys-boot/grub/grub-9999-r1.ebuild94
-rw-r--r--sys-devel/autogen/autogen-5.18.4.ebuild2
-rw-r--r--sys-fs/lvm2/lvm2-2.02.116-r4.ebuild2
-rw-r--r--sys-fs/udev/Manifest1
-rw-r--r--sys-fs/udev/udev-229-r1.ebuild440
-rw-r--r--sys-fs/udev/udev-229-r2.ebuild440
-rw-r--r--sys-fs/udisks/Manifest1
-rw-r--r--sys-fs/udisks/udisks-2.1.7.ebuild107
-rw-r--r--sys-kernel/gentoo-sources/Manifest9
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-3.18.28.ebuild29
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.1.19.ebuild31
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.4.4.ebuild31
-rw-r--r--sys-kernel/git-sources/Manifest1
-rw-r--r--sys-kernel/git-sources/git-sources-4.5_rc7.ebuild40
-rw-r--r--sys-kernel/pf-sources/Manifest4
-rw-r--r--sys-kernel/pf-sources/pf-sources-4.3_p4.ebuild76
-rw-r--r--sys-kernel/pf-sources/pf-sources-4.4_p5.ebuild76
-rw-r--r--sys-kernel/vanilla-sources/Manifest10
-rw-r--r--sys-kernel/vanilla-sources/vanilla-sources-3.10.99.ebuild (renamed from sys-kernel/vanilla-sources/vanilla-sources-3.10.98.ebuild)0
-rw-r--r--sys-kernel/vanilla-sources/vanilla-sources-3.14.63.ebuild (renamed from sys-kernel/vanilla-sources/vanilla-sources-3.14.62.ebuild)0
-rw-r--r--sys-kernel/vanilla-sources/vanilla-sources-3.18.28.ebuild (renamed from sys-kernel/vanilla-sources/vanilla-sources-3.18.27.ebuild)0
-rw-r--r--sys-kernel/vanilla-sources/vanilla-sources-4.1.19.ebuild (renamed from sys-kernel/vanilla-sources/vanilla-sources-4.1.18.ebuild)0
-rw-r--r--sys-kernel/vanilla-sources/vanilla-sources-4.4.4.ebuild (renamed from sys-kernel/vanilla-sources/vanilla-sources-4.4.3.ebuild)0
-rw-r--r--sys-libs/libosinfo/libosinfo-0.3.0.ebuild2
-rw-r--r--sys-libs/libseccomp/libseccomp-2.2.3.ebuild2
-rw-r--r--www-apps/trac/trac-1.0.9.ebuild2
-rw-r--r--www-client/chromium/chromium-49.0.2623.75.ebuild5
-rw-r--r--www-client/epiphany/epiphany-3.18.4.ebuild2
-rw-r--r--www-client/opera-beta/Manifest4
-rw-r--r--www-client/opera-beta/opera-beta-35.0.2066.35.ebuild85
-rw-r--r--www-client/opera-beta/opera-beta-36.0.2130.2.ebuild85
-rw-r--r--www-client/opera-beta/opera-beta-36.0.2130.26.ebuild (renamed from www-client/opera-developer/opera-developer-36.0.2120.0.ebuild)0
-rw-r--r--www-client/opera-developer/Manifest6
-rw-r--r--www-client/opera-developer/opera-developer-37.0.2157.0.ebuild (renamed from www-client/opera-developer/opera-developer-36.0.2129.0.ebuild)0
-rw-r--r--www-client/opera/Manifest2
-rw-r--r--www-client/opera/opera-35.0.2066.92.ebuild (renamed from www-client/opera/opera-35.0.2066.68.ebuild)0
-rw-r--r--www-client/seamonkey/Manifest28
-rw-r--r--www-client/seamonkey/seamonkey-2.40_pre4.ebuild365
-rw-r--r--www-client/vivaldi/Manifest6
-rw-r--r--www-client/vivaldi/vivaldi-1.0.403.15_p1.ebuild109
-rw-r--r--www-client/vivaldi/vivaldi-1.0.403.24_p1.ebuild (renamed from www-client/vivaldi/vivaldi-1.0.390.3_p1.ebuild)20
-rw-r--r--www-servers/apache/apache-2.4.18.ebuild2
-rw-r--r--www-servers/nginx/Manifest5
-rw-r--r--www-servers/nginx/nginx-1.9.10-r3.ebuild761
-rw-r--r--www-servers/nginx/nginx-1.9.10.ebuild695
-rw-r--r--x11-drivers/xf86-video-virtualbox/Manifest4
-rw-r--r--x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch4
-rw-r--r--x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.32.ebuild2
-rw-r--r--x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.36.ebuild (renamed from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28-r1.ebuild)4
-rw-r--r--x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.16.ebuild (renamed from x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.12.ebuild)23
-rw-r--r--x11-libs/goffice/goffice-0.10.27.ebuild2
-rw-r--r--x11-libs/gtk+/gtk+-2.24.29.ebuild2
-rw-r--r--x11-libs/gtk+/gtk+-3.18.7.ebuild2
-rw-r--r--x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild2
-rw-r--r--x11-libs/libwnck/libwnck-3.14.1.ebuild2
-rw-r--r--x11-libs/pango/pango-1.38.1.ebuild2
-rw-r--r--x11-libs/vte/vte-0.42.4.ebuild2
-rw-r--r--x11-misc/albert/Manifest1
-rw-r--r--x11-misc/albert/albert-0.8.1.ebuild40
-rw-r--r--x11-misc/dmenu/dmenu-4.6.ebuild2
-rw-r--r--x11-misc/lightdm/Manifest2
-rw-r--r--x11-misc/lightdm/lightdm-1.16.7.ebuild129
-rw-r--r--x11-misc/lightdm/lightdm-1.17.5.ebuild129
-rw-r--r--x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.1.ebuild2
-rw-r--r--x11-misc/spacefm/Manifest5
-rw-r--r--x11-misc/spacefm/spacefm-0.9.3.ebuild85
-rw-r--r--x11-misc/spacefm/spacefm-0.9.4.ebuild85
-rw-r--r--x11-misc/spacefm/spacefm-1.0.0.ebuild88
-rw-r--r--x11-misc/spacefm/spacefm-1.0.2.ebuild88
-rw-r--r--x11-misc/spacefm/spacefm-1.0.3.ebuild88
-rw-r--r--x11-plugins/gkrelltop/gkrelltop-2.2.13-r1.ebuild2
-rw-r--r--x11-terms/gnome-terminal/Manifest1
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild2
-rw-r--r--x11-terms/gnome-terminal/gnome-terminal-3.18.3.ebuild79
-rw-r--r--x11-terms/mate-terminal/mate-terminal-1.8.1.ebuild2
-rw-r--r--x11-terms/pangoterm/Manifest1
-rw-r--r--x11-terms/pangoterm/pangoterm-0.0_pre20160305.ebuild29
-rw-r--r--x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild2
-rw-r--r--x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.0.ebuild2
-rw-r--r--x11-themes/gnome-themes-standard/gnome-themes-standard-3.18.0.ebuild2
-rw-r--r--x11-themes/mate-themes/mate-themes-1.8.1.ebuild2
-rw-r--r--x11-wm/fluxbox/Manifest2
-rw-r--r--x11-wm/fluxbox/fluxbox-1.3.2.ebuild106
-rw-r--r--x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild113
-rw-r--r--x11-wm/fluxbox/fluxbox-1.3.5.ebuild108
-rw-r--r--x11-wm/fluxbox/fluxbox-1.3.7-r1.ebuild112
-rw-r--r--x11-wm/fluxbox/fluxbox-1.3.7.ebuild109
-rw-r--r--x11-wm/i3/Manifest1
-rw-r--r--x11-wm/i3/i3-4.12.ebuild73
-rw-r--r--x11-wm/marco/marco-1.8.2.ebuild2
-rw-r--r--x11-wm/muffin/muffin-2.8.4.ebuild2
-rw-r--r--x11-wm/mutter/mutter-3.18.2-r1.ebuild2
-rw-r--r--xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild2
1396 files changed, 11870 insertions, 13289 deletions
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild
index ea2dba3fcc63..ec67450bab9d 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
LICENSE="LGPL-2+"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
COMMON_DEPEND="
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild
index ab61bf9f2144..4d1ea46a418c 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.18.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
LICENSE="LGPL-2+"
SLOT="2"
IUSE="X +introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
# x11-libs/libSM is needed until upstream #719808 is solved either
# making the dep unneeded or fixing their configure
diff --git a/app-accessibility/caribou/caribou-0.4.20.ebuild b/app-accessibility/caribou/caribou-0.4.20.ebuild
index 4804eb814073..77a349079ddd 100644
--- a/app-accessibility/caribou/caribou-0.4.20.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.20.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-accessibility/orca/orca-3.18.2.ebuild b/app-accessibility/orca/orca-3.18.2.ebuild
index 7d2b6adcbe24..d27b3f9dcf90 100644
--- a/app-accessibility/orca/orca-3.18.2.ebuild
+++ b/app-accessibility/orca/orca-3.18.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="+braille"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/apache-tools/apache-tools-2.4.18.ebuild b/app-admin/apache-tools/apache-tools-2.4.18.ebuild
index 560cbb77812f..9728647c505a 100644
--- a/app-admin/apache-tools/apache-tools-2.4.18.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
IUSE="libressl ssl"
RESTRICT="test"
diff --git a/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild b/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
index 97ae64fb9028..e677518ef22c 100644
--- a/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
+++ b/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -27,7 +27,7 @@ RDEPEND="app-portage/gentoolkit[${PYTHON_USEDEP}]
dev-libs/libgamin[python,${PYTHON_USEDEP}]
dev-python/lxml[${PYTHON_USEDEP}]
dev-python/nose[${PYTHON_USEDEP}]
- virtual/fam )"
+ !kernel_linux? ( virtual/fam ) )"
python_compile_all() {
if use doc; then
diff --git a/app-admin/eselect/eselect-1.4.5.ebuild b/app-admin/eselect/eselect-1.4.5.ebuild
index ec6d0a046a6d..b21a2d8d912e 100644
--- a/app-admin/eselect/eselect-1.4.5.ebuild
+++ b/app-admin/eselect/eselect-1.4.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc emacs vim-syntax"
RDEPEND="sys-apps/sed
diff --git a/app-admin/logrotate/logrotate-3.9.2.ebuild b/app-admin/logrotate/logrotate-3.9.2.ebuild
index 25550cc6d004..cb868c6d4854 100644
--- a/app-admin/logrotate/logrotate-3.9.2.ebuild
+++ b/app-admin/logrotate/logrotate-3.9.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/logrotate/logrotate/archive/${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="acl +cron selinux"
CDEPEND="
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
new file mode 100644
index 000000000000..6e8cf279a5f1
--- /dev/null
+++ b/app-admin/passwordsafe/Manifest
@@ -0,0 +1 @@
+DIST passwordsafe-0.98.1_beta.tar.gz 13836527 SHA256 d44bd032ac92503b118e59c19d6d8cccae85e4abe3561f72a4ae58bffd33e2a5 SHA512 42eecb9d2f3ccfaab2dff3b4dedee3fcb97645632f7596c724dc0eeacef55d88fad7438b863990cb2964b3fdf6272aec2bb53be53bb185d9fe593eb351a459ab WHIRLPOOL 0303c5c7d092290143925ba8edf6972dfc901e27bdb6f02f2e14a3e234b8dd47eeb131be015356a2378254d6ea76ae2020c04149a9b9c65139b16c48ff78429f
diff --git a/app-admin/passwordsafe/metadata.xml b/app-admin/passwordsafe/metadata.xml
new file mode 100644
index 000000000000..f2cd1ade6c33
--- /dev/null
+++ b/app-admin/passwordsafe/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mrueg@gentoo.org</email>
+ <name>Manuel Rüger</name>
+ </maintainer>
+ <use>
+ <flag name="minimal">Avoid collision with <pkg>app-misc/pwsafe</pkg></flag>
+ <flag name="yubikey">Enable support for Yubikey</flag>
+ <flag name="xml">Enable XML import support</flag>
+ </use>
+</pkgmetadata>
diff --git a/app-admin/passwordsafe/passwordsafe-0.98.1_beta.ebuild b/app-admin/passwordsafe/passwordsafe-0.98.1_beta.ebuild
new file mode 100644
index 000000000000..3634dffc3100
--- /dev/null
+++ b/app-admin/passwordsafe/passwordsafe-0.98.1_beta.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit eutils flag-o-matic wxwidgets cmake-utils
+
+MY_PV="${PV/_beta/BETA}"
+DESCRIPTION="Password manager with wxGTK based frontend"
+HOMEPAGE="https://pwsafe.org/ https://github.com/pwsafe/pwsafe/"
+SRC_URI="https://github.com/pwsafe/pwsafe/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="minimal test yubikey +xml"
+
+RDEPEND="xml? ( dev-libs/xerces-c )
+ sys-apps/util-linux
+ x11-libs/libXt
+ x11-libs/libXtst
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
+ !minimal? ( !!app-misc/pwsafe )
+ yubikey? ( sys-auth/ykpers )"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ test? ( dev-cpp/gtest )"
+
+S=${WORKDIR}/pwsafe-${MY_PV}
+
+pkg_pretend() {
+ einfo "Checking for -std=c++11 support in compiler"
+ test-flags-CXX -std=c++11 > /dev/null || die
+}
+
+src_prepare() {
+ # binary name pwsafe is in use by app-misc/pwsafe, we use passwordsafe
+ # instead. Perform required changes in linking files
+ sed -i install/desktop/pwsafe.desktop -e "s/pwsafe/${PN}/g" || die
+ sed -i docs/pwsafe.1 \
+ -e 's/PWSAFE/PASSWORDSAFE/' \
+ -e "s/^.B pwsafe/.B ${PN}/" || die
+ use test || sed -i -e '/find_package(GTest REQUIRED)/s/^/#/' \
+ -e '/add_subdirectory (src\/test)/s/^/#/' CMakeLists.txt || die
+}
+
+src_configure() {
+ need-wxwidgets unicode
+
+ local mycmakeargs=( $(usex yubikey '' '-DNO_YUBI=ON')
+ $(usex xml '' '-DNO_XML=ON') )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ pushd "${BUILD_DIR}" || die
+ if use minimal; then
+ newbin pwsafe ${PN}
+ else
+ dobin pwsafe
+ dosym pwsafe /usr/bin/${PN}
+ fi
+ insinto /usr/share/locale
+ doins -r src/ui/wxWidgets/I18N/mos/*
+
+ # The upstream Makefile builds this .zip file from html source material for
+ # use by the package's internal help system. Must prevent
+ # Portage from applying additional compression.
+ docompress -x /usr/share/doc/${PN}/help
+ insinto /usr/share/doc/${PN}/help
+ doins help/*.zip
+
+ popd || die
+
+ newman docs/pwsafe.1 ${PN}.1
+
+ dodoc README.txt docs/{ReleaseNotes.txt,ChangeLog.txt}
+
+ insinto /usr/share/pwsafe/xml
+ doins xml/*
+
+ newicon install/graphics/pwsafe.png ${PN}.png
+ newmenu install/desktop/pwsafe.desktop ${PN}.desktop
+}
diff --git a/app-admin/puppet-agent/puppet-agent-1.3.4.ebuild b/app-admin/puppet-agent/puppet-agent-1.3.4.ebuild
index a757b0a3a83d..ec288901e79b 100644
--- a/app-admin/puppet-agent/puppet-agent-1.3.4.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.3.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="puppetdb selinux"
RESTRICT="strip"
diff --git a/app-admin/pydf/pydf-12.ebuild b/app-admin/pydf/pydf-12.ebuild
index fe141d98ac76..335290452769 100644
--- a/app-admin/pydf/pydf-12.ebuild
+++ b/app-admin/pydf/pydf-12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://kassiopeia.juls.savba.sk/~garabik/software/pydf/${PN}_${PV}.tar.
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 arm ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-admin/ulogd/metadata.xml b/app-admin/ulogd/metadata.xml
index cb3692902602..1ca7b9931efb 100644
--- a/app-admin/ulogd/metadata.xml
+++ b/app-admin/ulogd/metadata.xml
@@ -20,4 +20,7 @@
<flag name="nfacct">Build NFACCT input plugin to support traffic accounting via nfnetlink_acct.</flag>
<flag name="ulog">Build ULOG input plugin to support deprecated packet-based logging via ULOG target.</flag>
</use>
+ <upstream>
+ <bugs-to>https://bugzilla.netfilter.org/enter_bug.cgi?product=ulogd</bugs-to>
+ </upstream>
</pkgmetadata>
diff --git a/app-arch/engrampa/engrampa-1.8.1-r1.ebuild b/app-arch/engrampa/engrampa-1.8.1-r1.ebuild
index 53334556e9e8..70f87cc1f4d4 100644
--- a/app-arch/engrampa/engrampa-1.8.1-r1.ebuild
+++ b/app-arch/engrampa/engrampa-1.8.1-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="caja"
diff --git a/app-arch/file-roller/file-roller-3.16.4-r1.ebuild b/app-arch/file-roller/file-roller-3.16.4-r1.ebuild
index ba6dcb4ebf6d..5bc4c12e9cba 100644
--- a/app-arch/file-roller/file-roller-3.16.4-r1.ebuild
+++ b/app-arch/file-roller/file-roller-3.16.4-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0"
IUSE="nautilus packagekit"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
# gdk-pixbuf used extensively in the source
# cairo used in eggtreemultidnd.c
diff --git a/app-arch/pax/Manifest b/app-arch/pax/Manifest
index 559fd39ef0ec..2d573c7352d7 100644
--- a/app-arch/pax/Manifest
+++ b/app-arch/pax/Manifest
@@ -1 +1,2 @@
DIST pax-3.4-12.fc16.src.rpm 171016 SHA256 b86ca0556b12600d3dd4777900baae5118e71ce9e026e42e3bb51aed23853932 SHA512 78704cd1b66288acdaa8fdf4ca0a97c12b1e843e024be4d3fac88a6b42049928c6bfe69a72a58a00a9bf755c23e1e8e0b7d30bc72ba08a83830495dd5f6d9be1 WHIRLPOOL 8a674356efa939ceff0f502de926688d81f17da48c98f24674a76f11043f420c33aa9f47eb66fb1e896ddc4ca4c64cec554d7397379d1ccc884bf02b37eb9b29
+DIST paxmirabilis-20160306.cpio.gz 147448 SHA256 4e36fabfabc01a15e0d01eee0306cef79a7f374586f46254dae139eb866ae81b SHA512 65c9613f235d973f23d829d87b93963f4b21beca4d7158abb8243f7f0ba8eb883544bbd0c16bde82f0e55ab2fbf33e3dfb155a50c0f5be3bf6d88eaf95e1037f WHIRLPOOL 5945f45cc69cfd25d7754a9b6b25db98170de2fc926ffe3a661402d95bc41517e40ff059998d682cc65e32fd7e70a78e222525012eb98dde54c1d67c0c6c2277
diff --git a/app-arch/pax/pax-20160306.ebuild b/app-arch/pax/pax-20160306.ebuild
new file mode 100644
index 000000000000..1cfdaa455475
--- /dev/null
+++ b/app-arch/pax/pax-20160306.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit unpacker toolchain-funcs
+
+DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool"
+HOMEPAGE="https://www.mirbsd.org/pax.htm"
+SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${PV}.cpio.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/libbsd"
+DEPEND="${RDEPEND}
+ $(unpacker_src_uri_depends)"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+ # Newer C libraries omit this include from sys/types.h.
+ sed -i '1i#include <sys/sysmacros.h>' extern.h || die
+}
+
+src_configure() {
+ tc-export CC PKG_CONFIG
+}
+
+src_compile() {
+ # We can't rely on LFS flags as it uses the fts.h interface which lacks 64-bit support.
+ set -- \
+ ${CC} ${CPPFLAGS} ${CFLAGS} \
+ -DHAVE_STRLCPY -DHAVE_VIS -DHAVE_STRMODE \
+ -DLONG_OFF_T -DHAVE_LINKAT \
+ $(${PKG_CONFIG} --cflags libbsd-overlay) \
+ -Wall ${LDFLAGS} *.c -o ${PN} \
+ $(${PKG_CONFIG} --libs libbsd-overlay)
+ echo "$@"
+ "$@" || die
+}
+
+src_install() {
+ dobin ${PN}
+ doman ${PN}.1
+
+ dosym pax /usr/bin/paxcpio
+ newman cpio.1 paxcpio.1
+
+ dosym pax /usr/bin/paxtar
+ newman tar.1 paxtar.1
+}
diff --git a/app-arch/unrar/unrar-5.3.11.ebuild b/app-arch/unrar/unrar-5.3.11.ebuild
index 1f580235b731..ce0d40ffd39a 100644
--- a/app-arch/unrar/unrar-5.3.11.ebuild
+++ b/app-arch/unrar/unrar-5.3.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
LICENSE="unRAR"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
diff --git a/app-backup/fsarchiver/Manifest b/app-backup/fsarchiver/Manifest
index cbce1e368d01..7aba189720ed 100644
--- a/app-backup/fsarchiver/Manifest
+++ b/app-backup/fsarchiver/Manifest
@@ -1 +1,2 @@
DIST fsarchiver-0.6.19.tar.gz 244972 SHA256 9ba4d3262059a0cb108de564340d947a4d75d34ba3b8e35a767d543afbf24dbb SHA512 28c2b7c59fcdedd47c5451867540696e1859d954259670419df01fb94b626f169a2ff97b9eb96caaba69421ff2560cebbd6c7743b2a89172591f0747716a0471 WHIRLPOOL 78200870521adb927b042e3ada778ebb552f84c0164cf628fa5214f84f42a853fe71871d2ee27a6c485fa1db3c229002e52c6f11e58ef9766b38df6723e93f24
+DIST fsarchiver-0.6.21.tar.gz 260895 SHA256 aed7a7d5c4a9277f84d0d023f0232baef6700b84b079244a53722066150c2ab9 SHA512 b9941288270e3ad6850103be2cea26cbb74111ce9361b4118c34992f69c0b594d4148d153a88eb4cd80ea774c329bf4e59ad1ed4f645e78febb2dd83d07f602c WHIRLPOOL aa4e12cfded8d99b1b4668c58138a2d106e852b383ee86e8d06030aab22d1f1578f8ab7ceb6f33ad7a450d816d3b2f84f21509ee64a83b4db5fe085449e9704d
diff --git a/app-backup/fsarchiver/fsarchiver-0.6.21.ebuild b/app-backup/fsarchiver/fsarchiver-0.6.21.ebuild
new file mode 100644
index 000000000000..e5ff09afd489
--- /dev/null
+++ b/app-backup/fsarchiver/fsarchiver-0.6.21.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils
+
+DESCRIPTION="Flexible filesystem archiver for backup and deployment tool"
+HOMEPAGE="http://www.fsarchiver.org"
+SRC_URI="https://github.com/fdupoux/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug lzma lzo static"
+
+DEPEND="dev-libs/libgcrypt:0
+ >=sys-fs/e2fsprogs-1.41.4
+ lzma? ( >=app-arch/xz-utils-4.999.9_beta )
+ lzo? ( >=dev-libs/lzo-2.02 )
+ static? ( lzma? ( app-arch/xz-utils[static-libs] ) )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -i -e 's/^\([a-z]*_CFLAGS.*\)-ggdb/\1/' src/Makefile.am || die "seding
+ failed"
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable lzma) \
+ $(use_enable lzo) \
+ $(use_enable static) \
+ $(use_enable debug devel)
+}
diff --git a/app-cdr/brasero/brasero-3.12.1-r1.ebuild b/app-cdr/brasero/brasero-3.12.1-r1.ebuild
index 374380c4370a..a60877df7c42 100644
--- a/app-cdr/brasero/brasero-3.12.1-r1.ebuild
+++ b/app-cdr/brasero/brasero-3.12.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
LICENSE="GPL-2+ CC-BY-SA-3.0"
SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
IUSE="+css +introspection +libburn mp3 nautilus packagekit playlist test tracker"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
COMMON_DEPEND="
>=dev-libs/glib-2.29.14:2
diff --git a/app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild b/app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild
index 0e97839c5d2d..0352d83d38f6 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.3-r2.ebuild
@@ -17,7 +17,7 @@ fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE="gcdmaster encode mad vorbis"
RDEPEND="virtual/cdrtools
diff --git a/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild b/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild
index 6e0334718427..aa099072af2f 100644
--- a/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild
+++ b/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.vanhemert.co.uk/disc-cover.html"
SRC_URI="http://www.vanhemert.co.uk/files/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
IUSE=""
SLOT="0"
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 368895baf0a6..3e6ebc0af0b3 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,2 +1,2 @@
DIST letsencrypt-0.1.0.tar.gz 524821 SHA256 1c1ac7b41e5e0fc0e41a7ef159ac9147a4aafff54453d57b519eb05bf52ade14 SHA512 6a786290362741ac97dcb4b59bc4cba56f3e8b5193bbc10be19086d462f76e6124259c42bac36afe9eb818f4bb9edec34f8e2a02bd8c855e3b35404f4ee81f96 WHIRLPOOL cdc41a3466de54ab8ddfeedea9935205d78383028769dcfbc876be0c2ef80c2d14f5d0e4a9c56a751163718f5ababb07848822989a060de7031ea8ebdf6424a0
-DIST letsencrypt-0.4.1.tar.gz 672827 SHA256 750c4a2966ec21009e4f7d510eceb3f97f941f6c19eda8b58b7030ef8518cef9 SHA512 8b782ddf352c33c513e26bff0525932c9ab154a7a2545093be8958f851418700b449b3092fb8c4e1d45f6ededed979650c2593668a2dd1294760666702271182 WHIRLPOOL 6ba5bc2c1646880d8d24baad4311b8fd761765e7c8a2e8c5755627d31aad85634af545415098c0bbf28ef7ee9610709f7a6cf72d07ec7a11df6ef1fca6b3eb62
+DIST letsencrypt-0.4.2.tar.gz 674494 SHA256 0f55c0f292829a9c6c1da7a57860290285cfa5da8615a87b8c268a946ab656b2 SHA512 cce6a69b7903b65aa93aa794fa5353701944d6d0736393f68e3f17316116929efa864310fb7275d62c94ab30921cae694fb7c2cd13c08164344c2e3a533cd434 WHIRLPOOL 1e6a482090e92b6fafb43a74c3956be0f25c37edd90e43a240e41aba15a97ff2c881f63eba920da4b7c2b24ef0d912df739c9918c6fb7f35892646d5e20b71c0
diff --git a/app-crypt/acme/acme-0.4.1.ebuild b/app-crypt/acme/acme-0.4.2.ebuild
index a527e0fe1781..a527e0fe1781 100644
--- a/app-crypt/acme/acme-0.4.1.ebuild
+++ b/app-crypt/acme/acme-0.4.2.ebuild
diff --git a/app-crypt/gcr/gcr-3.18.0.ebuild b/app-crypt/gcr/gcr-3.18.0.ebuild
index c896b7f9913a..8b0e333ee5c1 100644
--- a/app-crypt/gcr/gcr-3.18.0.ebuild
+++ b/app-crypt/gcr/gcr-3.18.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0/1" # subslot = suffix of libgcr-3
IUSE="debug gtk +introspection vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
COMMON_DEPEND="
>=app-crypt/gnupg-2
diff --git a/app-crypt/letsencrypt/Manifest b/app-crypt/letsencrypt/Manifest
index 8ce784e5482a..79c6c1b13883 100644
--- a/app-crypt/letsencrypt/Manifest
+++ b/app-crypt/letsencrypt/Manifest
@@ -1 +1 @@
-DIST letsencrypt-0.4.1.tar.gz 672827 SHA256 750c4a2966ec21009e4f7d510eceb3f97f941f6c19eda8b58b7030ef8518cef9 SHA512 8b782ddf352c33c513e26bff0525932c9ab154a7a2545093be8958f851418700b449b3092fb8c4e1d45f6ededed979650c2593668a2dd1294760666702271182 WHIRLPOOL 6ba5bc2c1646880d8d24baad4311b8fd761765e7c8a2e8c5755627d31aad85634af545415098c0bbf28ef7ee9610709f7a6cf72d07ec7a11df6ef1fca6b3eb62
+DIST letsencrypt-0.4.2.tar.gz 674494 SHA256 0f55c0f292829a9c6c1da7a57860290285cfa5da8615a87b8c268a946ab656b2 SHA512 cce6a69b7903b65aa93aa794fa5353701944d6d0736393f68e3f17316116929efa864310fb7275d62c94ab30921cae694fb7c2cd13c08164344c2e3a533cd434 WHIRLPOOL 1e6a482090e92b6fafb43a74c3956be0f25c37edd90e43a240e41aba15a97ff2c881f63eba920da4b7c2b24ef0d912df739c9918c6fb7f35892646d5e20b71c0
diff --git a/app-crypt/letsencrypt/letsencrypt-0.4.1.ebuild b/app-crypt/letsencrypt/letsencrypt-0.4.2.ebuild
index 0ef00d4fa434..0ef00d4fa434 100644
--- a/app-crypt/letsencrypt/letsencrypt-0.4.1.ebuild
+++ b/app-crypt/letsencrypt/letsencrypt-0.4.2.ebuild
diff --git a/app-crypt/libsecret/libsecret-0.18.4.ebuild b/app-crypt/libsecret/libsecret-0.18.4.ebuild
index a5f757226e0e..88ba2be8dbd1 100644
--- a/app-crypt/libsecret/libsecret-0.18.4.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.4.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
IUSE="+crypt +introspection test vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
RDEPEND="
>=dev-libs/glib-2.38:2
diff --git a/app-crypt/mit-krb5/mit-krb5-1.14.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.14.1.ebuild
index 7e15a1e67036..a1b8ed118c8b 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.14.1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.14.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="doc +keyutils libressl openldap +pkinit selinux +threads test xinetd"
CDEPEND="
diff --git a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild
index 6e45e716b406..af42f04f78a6 100644
--- a/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild
+++ b/app-crypt/seahorse-sharing/seahorse-sharing-3.8.0_p20151117.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~eva/distfiles/${PN}/${P//_p*}-19-g61de83c.tar.g
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
COMMON_DEPEND="
diff --git a/app-crypt/seahorse/seahorse-3.18.0.ebuild b/app-crypt/seahorse/seahorse-3.18.0.ebuild
index b2ed12f03202..a63563f2c9f7 100644
--- a/app-crypt/seahorse/seahorse-3.18.0.ebuild
+++ b/app-crypt/seahorse/seahorse-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
IUSE="debug ldap zeroconf"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
COMMON_DEPEND="
>=app-crypt/gcr-3.11.91:=
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild
index f659f814ef36..eeb2d1d5788c 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
SLOT="0/9" # subslot = suffix of libgdict-1.0.so
IUSE="+introspection ipv6"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
COMMON_DEPEND="
>=dev-libs/glib-2.39:2[dbus]
diff --git a/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild b/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild
index bc11de169712..1bd80d61d333 100644
--- a/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild
+++ b/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild
@@ -44,7 +44,7 @@ SRC_URI="
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
src_prepare() {
diff --git a/app-doc/gnucash-docs/gnucash-docs-2.6.11.ebuild b/app-doc/gnucash-docs/gnucash-docs-2.6.11.ebuild
index f14b10a2060d..7d6452ff5287 100644
--- a/app-doc/gnucash-docs/gnucash-docs-2.6.11.ebuild
+++ b/app-doc/gnucash-docs/gnucash-docs-2.6.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gnucash/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2 FDL-1.1"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="test"
RDEPEND="!<=app-office/gnucash-2.2.1"
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
index d045c3a64598..2b7b1e753aa2 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.50_pre20151113.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="25"
-IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
+IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses:0
@@ -39,13 +39,13 @@ RDEPEND="sys-libs/ncurses:0
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
dbus? ( sys-apps/dbus )
- gnutls? ( net-libs/gnutls )
gpm? ( sys-libs/gpm )
hesiod? ( net-dns/hesiod )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
+ ssl? ( net-libs/gnutls )
zlib? ( sys-libs/zlib )
X? (
x11-libs/libXmu
@@ -223,12 +223,12 @@ src_configure() {
--with-file-notification=$(usev inotify || usev gfile || echo no) \
$(use_enable acl) \
$(use_with dbus) \
- $(use_with gnutls) \
$(use_with gpm) \
$(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
+ $(use_with ssl gnutls) \
$(use_with wide-int) \
$(use_with zlib) \
${myconf}
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild
index c86711715db0..4dbd79a1912e 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.90.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="25"
-IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses:0
@@ -39,13 +39,13 @@ RDEPEND="sys-libs/ncurses:0
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
dbus? ( sys-apps/dbus )
- gnutls? ( net-libs/gnutls )
gpm? ( sys-libs/gpm )
hesiod? ( net-dns/hesiod )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
+ ssl? ( net-libs/gnutls )
zlib? ( sys-libs/zlib )
X? (
x11-libs/libXmu
@@ -236,12 +236,12 @@ src_configure() {
--with-file-notification=$(usev inotify || usev gfile || echo no) \
$(use_enable acl) \
$(use_with dbus) \
- $(use_with gnutls) \
$(use_with gpm) \
$(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
+ $(use_with ssl gnutls) \
$(use_with wide-int) \
$(use_with zlib) \
${myconf}
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.92.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.92.ebuild
index 4a551eda5d7d..8ed254de8d14 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.92.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.92.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="25"
-IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses:0
@@ -39,13 +39,13 @@ RDEPEND="sys-libs/ncurses:0
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
dbus? ( sys-apps/dbus )
- gnutls? ( net-libs/gnutls )
gpm? ( sys-libs/gpm )
hesiod? ( net-dns/hesiod )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
+ ssl? ( net-libs/gnutls )
zlib? ( sys-libs/zlib )
X? (
x11-libs/libXmu
@@ -236,12 +236,12 @@ src_configure() {
--with-file-notification=$(usev inotify || usev gfile || echo no) \
$(use_enable acl) \
$(use_with dbus) \
- $(use_with gnutls) \
$(use_with gpm) \
$(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
+ $(use_with ssl gnutls) \
$(use_with wide-int) \
$(use_with zlib) \
${myconf}
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
index 4a551eda5d7d..8ed254de8d14 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.0.9999-r2.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="25"
-IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses:0
@@ -39,13 +39,13 @@ RDEPEND="sys-libs/ncurses:0
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
dbus? ( sys-apps/dbus )
- gnutls? ( net-libs/gnutls )
gpm? ( sys-libs/gpm )
hesiod? ( net-dns/hesiod )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
+ ssl? ( net-libs/gnutls )
zlib? ( sys-libs/zlib )
X? (
x11-libs/libXmu
@@ -236,12 +236,12 @@ src_configure() {
--with-file-notification=$(usev inotify || usev gfile || echo no) \
$(use_enable acl) \
$(use_with dbus) \
- $(use_with gnutls) \
$(use_with gpm) \
$(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
+ $(use_with ssl gnutls) \
$(use_with wide-int) \
$(use_with zlib) \
${myconf}
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130.ebuild
index faaea0a6c8c7..974a56929480 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.1.50_pre20160130.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="25"
-IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
+IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses:0
@@ -39,13 +39,13 @@ RDEPEND="sys-libs/ncurses:0
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
dbus? ( sys-apps/dbus )
- gnutls? ( net-libs/gnutls )
gpm? ( sys-libs/gpm )
hesiod? ( net-dns/hesiod )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
+ ssl? ( net-libs/gnutls )
zlib? ( sys-libs/zlib )
X? (
x11-libs/libXmu
@@ -223,12 +223,12 @@ src_configure() {
--with-file-notification=$(usev inotify || usev gfile || echo no) \
$(use_enable acl) \
$(use_with dbus) \
- $(use_with gnutls) \
$(use_with gpm) \
$(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
+ $(use_with ssl gnutls) \
$(use_with wide-int) \
$(use_with zlib) \
${myconf}
diff --git a/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild b/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild
index 0569edeedcfa..5beabba7f9f0 100644
--- a/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-25.1.9999-r1.ebuild
@@ -29,7 +29,7 @@ HOMEPAGE="https://www.gnu.org/software/emacs/"
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="25"
-IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
+IUSE="acl alsa aqua athena cairo dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses:0
@@ -39,13 +39,13 @@ RDEPEND="sys-libs/ncurses:0
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
dbus? ( sys-apps/dbus )
- gnutls? ( net-libs/gnutls )
gpm? ( sys-libs/gpm )
hesiod? ( net-dns/hesiod )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
+ ssl? ( net-libs/gnutls )
zlib? ( sys-libs/zlib )
X? (
x11-libs/libXmu
@@ -236,12 +236,12 @@ src_configure() {
--with-file-notification=$(usev inotify || usev gfile || echo no) \
$(use_enable acl) \
$(use_with dbus) \
- $(use_with gnutls) \
$(use_with gpm) \
$(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
+ $(use_with ssl gnutls) \
$(use_with wide-int) \
$(use_with zlib) \
${myconf}
diff --git a/app-editors/emacs/emacs-18.59-r11.ebuild b/app-editors/emacs/emacs-18.59-r11.ebuild
index e78983d9dcc9..b1c61383083f 100644
--- a/app-editors/emacs/emacs-18.59-r11.ebuild
+++ b/app-editors/emacs/emacs-18.59-r11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz
LICENSE="GPL-1+ GPL-2+ BSD" #HPND
SLOT="18"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="abi_x86_x32"
RDEPEND=">=app-eselect/eselect-emacs-1.16
diff --git a/app-editors/emacs/emacs-24.5-r1.ebuild b/app-editors/emacs/emacs-24.5-r1.ebuild
index c16f16fcd172..0a6ccda0b921 100644
--- a/app-editors/emacs/emacs-24.5-r1.ebuild
+++ b/app-editors/emacs/emacs-24.5-r1.ebuild
@@ -13,8 +13,8 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="24"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="acl alsa aqua athena dbus games gconf gfile gif gnutls gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
REQUIRED_USE="?? ( aqua X )"
RDEPEND="sys-libs/ncurses:0
@@ -24,13 +24,13 @@ RDEPEND="sys-libs/ncurses:0
acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
dbus? ( sys-apps/dbus )
- gnutls? ( net-libs/gnutls )
gpm? ( sys-libs/gpm )
hesiod? ( net-dns/hesiod )
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
+ ssl? ( net-libs/gnutls )
zlib? ( sys-libs/zlib )
X? (
x11-libs/libXmu
@@ -196,12 +196,12 @@ src_configure() {
--with-file-notification=$(usev inotify || usev gfile || echo no) \
$(use_enable acl) \
$(use_with dbus) \
- $(use_with gnutls) \
$(use_with gpm) \
$(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
+ $(use_with ssl gnutls) \
$(use_with wide-int) \
$(use_with zlib) \
${myconf}
diff --git a/app-editors/focuswriter/focuswriter-1.5.5.ebuild b/app-editors/focuswriter/focuswriter-1.5.5.ebuild
index f2e23064f6b9..1c6435392ac9 100644
--- a/app-editors/focuswriter/focuswriter-1.5.5.ebuild
+++ b/app-editors/focuswriter/focuswriter-1.5.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://gottcode.org/${PN}/${P}-src.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="debug"
RDEPEND="app-text/hunspell
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild
index 7e3576106130..68c2f27b9fbe 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.18.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Official plugins for gedit"
HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
LICENSE="GPL-2+"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
SLOT="0"
IUSE_plugins="charmap git terminal vala zeitgeist"
diff --git a/app-editors/gedit/gedit-3.18.3.ebuild b/app-editors/gedit/gedit-3.18.3.ebuild
index 455abdaa13e2..16e0839bcf6d 100644
--- a/app-editors/gedit/gedit-3.18.3.ebuild
+++ b/app-editors/gedit/gedit-3.18.3.ebuild
@@ -25,7 +25,7 @@ REQUIRED_USE="
python? ( ^^ ( $(python_gen_useflags '*') ) )
"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
# X libs are not needed for OSX (aqua)
COMMON_DEPEND="
diff --git a/app-editors/ghex/ghex-3.18.0.ebuild b/app-editors/ghex/ghex-3.18.0.ebuild
index cfaff3fb49c2..3ee0917268b5 100644
--- a/app-editors/ghex/ghex-3.18.0.ebuild
+++ b/app-editors/ghex/ghex-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Ghex"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="2"
-KEYWORDS="amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc x86 ~x86-interix ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/app-editors/latexila/latexila-3.18.2.ebuild b/app-editors/latexila/latexila-3.18.2.ebuild
index b2bcfdef0e36..5772193d3331 100644
--- a/app-editors/latexila/latexila-3.18.2.ebuild
+++ b/app-editors/latexila/latexila-3.18.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/LaTeXila"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+introspection +latexmk rubber"
# gspell-0.1 is required for this cycle
diff --git a/app-emacs/auctex/auctex-11.89.ebuild b/app-emacs/auctex/auctex-11.89.ebuild
index f563da89f202..d9b5a807dc45 100644
--- a/app-emacs/auctex/auctex-11.89.ebuild
+++ b/app-emacs/auctex/auctex-11.89.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3+ FDL-1.3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE="preview-latex"
DEPEND="virtual/latex-base
diff --git a/app-emulation/libvirt/libvirt-1.3.1.ebuild b/app-emulation/libvirt/libvirt-1.3.1.ebuild
index d1be49be67c7..0efd3ccce76c 100644
--- a/app-emulation/libvirt/libvirt-1.3.1.ebuild
+++ b/app-emulation/libvirt/libvirt-1.3.1.ebuild
@@ -24,7 +24,7 @@ else
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"
+ KEYWORDS="amd64 ~x86"
SLOT="0/${PV}"
fi
diff --git a/app-emulation/rkt/rkt-1.1.0.ebuild b/app-emulation/rkt/rkt-1.1.0.ebuild
index 309c760b441c..5e3a55dd4b97 100644
--- a/app-emulation/rkt/rkt-1.1.0.ebuild
+++ b/app-emulation/rkt/rkt-1.1.0.ebuild
@@ -70,25 +70,27 @@ src_unpack() {
src_prepare() {
# disable git fetch of systemd
- sed -e 's|^include makelib/git.mk$|'\
+ sed -e 's~^include makelib/git.mk$~'\
'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
-'get_systemd_sources: $(UFS_SYSTEMDDIR)\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
'else\n'\
'\t\0\n'\
-'endif|' -i stage1/usr_from_src/usr_from_src.mk || die
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
# disable git fetch of kvmtool
- sed -e 's|^include makelib/git.mk$|'\
+ sed -e 's~^include makelib/git.mk$~'\
'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
-'get_lkvm_sources: $(LKVM_TMPDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
'else\n'\
'\t\0\n'\
-'endif|' -i stage1/usr_from_kvm/lkvm.mk || die
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
# disable fetch of kernel sources
sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
diff --git a/app-emulation/rkt/rkt-9999.ebuild b/app-emulation/rkt/rkt-9999.ebuild
index 72c10a9e6dc1..89add2f6fb7b 100644
--- a/app-emulation/rkt/rkt-9999.ebuild
+++ b/app-emulation/rkt/rkt-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,19 +7,27 @@ EAPI=5
AUTOTOOLS_AUTORECONF=yes
AUTOTOOLS_IN_SOURCE_BUILD=yes
-inherit autotools-utils flag-o-matic systemd toolchain-funcs
-inherit git-r3
-
-EGIT_REPO_URI="https://github.com/coreos/rkt.git"
+inherit git-r3 autotools-utils flag-o-matic systemd toolchain-funcs
KEYWORDS=""
-PXE_VERSION="738.1.0"
-EGIT_BRANCH="master"
+EGIT_REPO_URI="https://github.com/coreos/rkt.git"
+PXE_VERSION="794.1.0"
+PXE_SYSTEMD_VERSION="v222"
+KVM_LINUX_VERSION="4.3.1"
+KVMTOOL_VERSION="3c8aec9e2b5066412390559629dabeb7816ee8f2"
PXE_URI="http://alpha.release.core-os.net/amd64-usr/${PXE_VERSION}/coreos_production_pxe_image.cpio.gz"
PXE_FILE="${PN}-pxe-${PXE_VERSION}.img"
-SRC_URI="rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )"
+[[ ${PV} == *9999* ]] || SRC_URI+=" https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+="
+rkt_stage1_coreos? ( $PXE_URI -> $PXE_FILE )
+rkt_stage1_kvm? (
+ https://kernel.googlesource.com/pub/scm/linux/kernel/git/will/kvmtool/+archive/${KVMTOOL_VERSION}.tar.gz -> kvmtool-${KVMTOOL_VERSION}.tar.gz
+ mirror://kernel/linux/kernel/v4.x/linux-${KVM_LINUX_VERSION}.tar.xz
+ ${PXE_URI} -> ${PXE_FILE}
+)
+rkt_stage1_src? ( https://github.com/systemd/systemd/archive/${PXE_SYSTEMD_VERSION}.tar.gz -> systemd-${PXE_SYSTEMD_VERSION#v}.tar.gz )"
DESCRIPTION="A CLI for running app containers, and an implementation of the App
Container Spec."
@@ -27,39 +35,105 @@ HOMEPAGE="https://github.com/coreos/rkt"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="doc examples +rkt_stage1_coreos rkt_stage1_host rkt_stage1_src +actool systemd"
-REQUIRED_USE="^^ ( rkt_stage1_coreos rkt_stage1_host rkt_stage1_src )"
+IUSE="doc examples +rkt_stage1_coreos +rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src +actool systemd"
+REQUIRED_USE="|| ( rkt_stage1_coreos rkt_stage1_fly rkt_stage1_host rkt_stage1_kvm rkt_stage1_src ) rkt_stage1_host? ( systemd )"
DEPEND=">=dev-lang/go-1.4.1
app-arch/cpio
app-crypt/trousers
sys-fs/squashfs-tools
- dev-perl/Capture-Tiny
- rkt_stage1_src? (
- >=sys-apps/systemd-222
- app-shells/bash:0
- )"
+ dev-perl/Capture-Tiny"
+
RDEPEND="!app-emulation/rocket
- rkt_stage1_host? (
+ rkt_stage1_host? ( systemd? (
>=sys-apps/systemd-222
app-shells/bash:0
- )"
+ ) )"
BUILDDIR="build-${P}"
+STAGE1_DEFAULT_LOCATION="/usr/share/rkt/stage1.aci"
+
+src_unpack() {
+ [[ ${PV} == *9999* ]] && git-r3_src_unpack
+ local x
+ for x in ${A}; do
+ case ${x} in
+ *.img|linux-*) continue ;;
+ kvmtool-*)
+ mkdir kvmtool || die
+ pushd kvmtool >/dev/null || die
+ unpack ${x}
+ popd >/dev/null || die
+ ;;
+ *)
+ unpack ${x}
+ esac
+ done
+}
+
+src_prepare() {
+ # disable git fetch of systemd
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(RKT_STAGE1_SYSTEMD_SRC)),)\n\n'\
+'get_systemd_sources: | $(UFS_SYSTEMDDIR)\n'\
+'\tmv "$(RKT_STAGE1_SYSTEMD_SRC)" "$(UFS_SYSTEMD_SRCDIR)"\n\n'\
+'$(UFS_SYSTEMD_CONFIGURE): get_systemd_sources\n\n'\
+'else ifneq ($(wildcard $(UFS_SYSTEMD_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_src/usr_from_src.mk || die
+
+ # disable git fetch of kvmtool
+ sed -e 's~^include makelib/git.mk$~'\
+'ifneq ($(wildcard $(shell echo "$${WORKDIR}/kvmtool")),)\n\n'\
+'$(call forward-vars, get_lkvm_sources, LKVM_SRCDIR)\n'\
+'get_lkvm_sources: | $(LKVM_TMPDIR)\n'\
+'\tmv "$${WORKDIR}/kvmtool" "$(LKVM_SRCDIR)"\n\n'\
+'$(LKVM_PATCH_STAMP): get_lkvm_sources\n\n'\
+'else ifneq ($(wildcard $(LKVM_SRCDIR)),)\n\n'\
+'else\n'\
+'\t\0\n'\
+'endif~' -i stage1/usr_from_kvm/lkvm.mk || die
+
+ # disable fetch of kernel sources
+ sed -e 's|wget .*|ln -s "$${DISTDIR}/linux-'${KVM_LINUX_VERSION}'.tar.xz" "$@"|' \
+ -i stage1/usr_from_kvm/kernel.mk || die
+
+ if use rkt_stage1_host; then
+ # Make systemdUnitsPath consistent with host
+ sed -e 's|\(systemdUnitsPath := \).*|\1"'$(systemd_get_systemunitdir)'"|' \
+ -i stage1/init/init.go || die
+ fi
+
+ autotools-utils_src_prepare
+}
src_configure() {
- local myeconfargs=(
- --with-stage1-image-path="/usr/share/rkt/stage1.aci"
+ local flavors myeconfargs=(
+ --with-stage1-default-images-directory="/usr/share/rkt"
+ --with-stage1-default-location="${STAGE1_DEFAULT_LOCATION}"
)
- if use rkt_stage1_host; then
- myeconfargs+=( --with-stage1="host" )
- elif use rkt_stage1_src; then
- myeconfargs+=( --with-stage1="src" )
- elif use rkt_stage1_coreos; then
- myeconfargs+=( --with-stage1="coreos" )
- mkdir -p "${BUILDDIR}/tmp/usr_from_coreos/" || die
- cp "${DISTDIR}/${PXE_FILE}" "${BUILDDIR}/tmp/usr_from_coreos/pxe.img" || die
+ # enable flavors (first is default)
+ use rkt_stage1_host && flavors+=",host"
+ use rkt_stage1_src && flavors+=",src"
+ use rkt_stage1_coreos && flavors+=",coreos"
+ use rkt_stage1_fly && flavors+=",fly"
+ use rkt_stage1_kvm && flavors+=",kvm"
+ myeconfargs+=( --with-stage1-flavors="${flavors#,}" )
+
+ if use rkt_stage1_src; then
+ myeconfargs+=(
+ --with-stage1-systemd-version=${PXE_SYSTEMD_VERSION}
+ --with-stage1-systemd-src="${WORKDIR}/systemd-${PXE_SYSTEMD_VERSION#v}"
+ )
+ fi
+
+ if use rkt_stage1_coreos || use rkt_stage1_kvm; then
+ myeconfargs+=(
+ --with-coreos-local-pxe-image-path="${DISTDIR}/${PXE_FILE}"
+ --with-coreos-local-pxe-image-systemd-version="${PXE_SYSTEMD_VERSION}"
+ )
fi
# Go's 6l linker does not support PIE, disable so cgo binaries
@@ -79,6 +153,14 @@ src_configure() {
autotools-utils_src_configure
}
+src_compile() {
+ local arch=${ARCH}
+ case ${arch} in
+ amd64) arch=x86_64;;
+ esac
+ ARCH=${arch} autotools-utils_src_compile
+}
+
src_install() {
dodoc README.md
use doc && dodoc -r Documentation
@@ -87,8 +169,21 @@ src_install() {
dobin "${S}/${BUILDDIR}/bin/rkt"
- insinto /usr/share/rkt/
- doins "${S}/${BUILDDIR}/bin/stage1.aci"
+ insinto /usr/share/rkt
+ doins "${S}/${BUILDDIR}/bin/"*.aci
+
+ # create symlink for default stage1 image path
+ if use rkt_stage1_host; then
+ dosym stage1-host.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_src; then
+ dosym stage1-src.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_coreos; then
+ dosym stage1-coreos.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_fly; then
+ dosym stage1-fly.aci "${STAGE1_DEFAULT_LOCATION}"
+ elif use rkt_stage1_kvm; then
+ dosym stage1-kvm.aci "${STAGE1_DEFAULT_LOCATION}"
+ fi
systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.service
systemd_dounit "${S}"/dist/init/systemd/${PN}-gc.timer
diff --git a/app-emulation/virtualbox-additions/Manifest b/app-emulation/virtualbox-additions/Manifest
index 2bbb6f9b0a44..8731d77c2b1a 100644
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@@ -1,5 +1,5 @@
-DIST VBoxGuestAdditions_4.3.28.iso 58241024 SHA256 9f52e186d6c9407b2676d4b2ed1cdf96940ec129cc2bd92e54b24526271a9733 SHA512 78055f389dc1a7bd62577f1fa670b8f8899ab3a58a87953d30fcaea1cd0c77f8662e15fea932c434309747971a2a61b61854b6f087654d9d2fb2de07fb6f1b5c WHIRLPOOL 64275e44c01f4f260899a7c16aaeb494ebe81277e7cbdec87e487736833cc239338f3c32c00759244b3be55c5754788593b81d06dab7d9ab26991369fa9d65fd
DIST VBoxGuestAdditions_4.3.32.iso 58349568 SHA256 187f49b567dea056d9de255c155f8eaa3449dffe08ccf22ae8ab1dda708f78fe SHA512 3938ade4fd030f2471b34b11296af3874c3936659c635a9d7e222697f2dc72c65fc4f73f42800def8a8bcc518951bb9a3504156811af18e00722a6f61c03b6a4 WHIRLPOOL 8e5f25709ea1b74f94f303f29ef7d1601f29681515981b2f16fddd4af4c9bec842101bfab7626112777284c3f243f8e4a66a23d09a23af353e4f1e0645043618
DIST VBoxGuestAdditions_4.3.34.iso 58361856 SHA256 a6f20f5b8ec11ae127ae48bcb19c20de488d38dbf807a8608a6468da7353a9a8 SHA512 b243558b510548518e1ed863bc4a5d8c849573f7664ce6c398766a10fe9cb5aa0f34e8ff4f9ac948e06929033800e8e2fa3583fcb92ecd44fb0cd755521be236 WHIRLPOOL 29019b8e14a9a28622b7c07c7049153aab7b846aa58713e7537d66addebe5a6627dcedbcd36944bc1a2ebe382f2f3acc3f793e2c2cee9bab9805f931e88b870e
-DIST VBoxGuestAdditions_5.0.12.iso 58990592 SHA256 61a19c9ec4b449cbc6bb41b636b03a16bf5a47ffa4943423d262863017e8bc9b SHA512 9232752f1d71fde887755e917b9e146d53fabe3cc2736e96216a04b1a3faf692d00da47458f7c700587d424b5817debb56c375c068e3e5baa925b7f6732d0ab4 WHIRLPOOL a87eb9877c0a4d7c432d32c3d4ec408d1167d152a09feaf037bc37dc8c31be0287af93e2c6eb73d01cdda859430f7517e1a1a2aabaf92301aabb9d5a81ff8955
+DIST VBoxGuestAdditions_4.3.36.iso 58388480 SHA256 adba31edc86b4043d5d9a1700f2adf9806220125549cd83fc010e1f2770f0b79 SHA512 67ea2b618debf2936a1953d461b2fef10e4ea00e3220b5d75f4995b087659d3ea44d663b924468a05edf4987ce3d32e7c1d59facae0946d2a2e07c53c4ddecff WHIRLPOOL ab5abe6c183015500e993688872e28dc09351a85eb61e2c2c7b69e1a9bd28ed75daded7a2cea1847350b144bfbd53cca0ac33d0ffcb2d5e8e8e97f7849e9cd84
DIST VBoxGuestAdditions_5.0.14.iso 59015168 SHA256 cec0df18671adfe62a34d3810543f76f76206b212b2b61791fe026214c77507c SHA512 4c4acf385260faa1339c27989ec712b4d0ecc2f873e8e3868d3aa79a34cb7b9d315ffeb7a3390afff26fbf4116f51251a8d4c55182d92c0fab72d5e86bf7136b WHIRLPOOL 3268930d2e3a2d341d578b6f8b9c9995bdc0adda953c6c94b90848bcfc3fc86ac84780ab246dcc3e8d8c0619e32fd23f96fced2d5a3ce38a67d4fc203b508da0
+DIST VBoxGuestAdditions_5.0.16.iso 60063744 SHA256 8190f1e4031f8195971c2a97d2d3b1cf2d86fc83219f750d05cee9255c7dad85 SHA512 8a9d3fcb96a450163f357b92f8149f58700ec65c127fb872b103554417979fbe624a9e1bced3bb6cbf4b0bb6a5c3bbcae9581836cc5d3fde7a034d4032e519f9 WHIRLPOOL 89ed9064014a715a892388b5dbe3c4b577a5a813580be4fd2bd604672354f258b00a619980ba1369aeaceff6a77c6d370cc2b6bf3c17d2cd73a5c8fc9dcad1e8
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.3.32.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.3.32.ebuild
index af9693e69017..2a3252b24929 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.3.32.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.3.32.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RESTRICT="mirror"
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.12.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-4.3.36.ebuild
index e46434cb5133..45e9b02a6125 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.12.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-4.3.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-4.3.28.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.16.ebuild
index 2a3252b24929..681471fe6929 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-4.3.28.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.16.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils
@@ -17,7 +17,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RESTRICT="mirror"
diff --git a/app-emulation/virtualbox-bin/Manifest b/app-emulation/virtualbox-bin/Manifest
index a980caf93598..6734efc73bd7 100644
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@@ -1,20 +1,20 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz 15961939 SHA256 72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1 SHA512 57ad44a99a7abcad195e6ceccc1fe7b494979da65601a52e0be8336bb819812d5cef48a8bc0fe9f74f3a05238e6fd29562ac678d4ef7e0c78587fe81c287a65e WHIRLPOOL fb08189c53841664119bffb4de6a76d6f72fb035f887ed5e948f38faa5be2891e35de0806da02d299e818370285bcddba06eb84bea7db4d3cfa09d92f8042db7
DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.32-103443.tar.gz 15994576 SHA256 3f041c019985c35974bf034a9f7d941149fcc3e23a6200b47579140405af5f88 SHA512 212c21f6fc0af093e2d409827348d776377164b9c78b6c01dc710d4a63f53fa7ef52a66491d81b96dc64af4747d79ca0d0df55b052cf6b1c8ceb239c32dc1c75 WHIRLPOOL d67b55c409c6e06080010a25a4a64e660dcd0efaadffe2311166bed06c3f494a5f20cff131a42e07e82aba3cab7f53dea101fb3e5fabeecc2bdb0dd4a167c0ce
DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.34-104062.tar.gz 15994268 SHA256 b9c03b6db79de16f70134884c18cb4854a8c24cb36f90e3a9d2b93eb09fb6b37 SHA512 39b06eb26fcc01dc70de0a9d099a8919c53f72d9a74133d803bb5d10ea06cd390a6dd3853a024b311695c57805d6e2b664ec667fa0d882142f4a33fdfb01b642 WHIRLPOOL 1a3e98def84beeb73a8cc531bc1bfb98cdb3a3c02373aff910c89b023c85d22eb46d349a2c6ca19f37032113bad2dbc7f61b0960f7af3b2ca4d4c63a301a27f7
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.12-104815.tar.gz 16937595 SHA256 ac1bc8452b7fdf183325272149e9f18b9810cc07adf18e48755385a9cd1b236d SHA512 4a21cd155d1e60d3b6a4f4864cd8ca8ccd75f02448e832d72b42284dde5aa3c4aeba7f7297e3e7e198e4b4c665d770ac65c1aeca3df1dfa6a8454c47553baad7 WHIRLPOOL bcf032d0e72b57be37fdfd40d3c2f418eab10e04bfcbf1b99374b1fa9d2b5ced38c5cfc560b1c13492144a32a3c035b72649d9ae57851f6d430a4e59897cebe2
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.36-105129.tar.gz 16003080 SHA256 b067d1497499ed5d0218c8e500e0a5c1bc2c1bb3d74e5addd6d77cd801133ecb SHA512 e885e21f3b4fa634630eeb8308bbe5e79c8837f701fad668701a42d4444c1724e59d104e3e1f20000ed3a330cc64cd40f4a675f7bb8bc34c246c5e870d68f36d WHIRLPOOL f2f431ff0a493eb4455b1288ebd1e0ee38767128bd6e4d7ca6b8fc0bf5663e4dd82ced1f93d304701b9b9e3ca38d37b7ae8a5c070eab47f37681796f9059af30
DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.14-105127.tar.gz 16939032 SHA256 4a404b0d09dfd3952107e314ab63262293b2fb0a4dc6837b57fb7274bd016865 SHA512 b71cd8562d8bcd10a051d9b3c69183aa17d42b0866fc597b8412c28d5690d3369f9b4bcfae98c609df7ad19f84dcebe6057e6b9b0a44b650acdb573b7ce3b4f0 WHIRLPOOL abd49e5ec7dce4aeb74998b8e1e6d6174ba47808ac4d041a51b237cf32ec595b0c1d95bd992bd1a4f186bdf6722263898f9b99cb00ca21ba7f84695b4d3e4010
-DIST VirtualBox-4.3.28-100309-Linux_amd64.run 85677523 SHA256 8c862533f876dc32fbfae993597b1123e2feac81a302c60e73b7ee891e17a77f SHA512 75dc2cd257b187b0a497b87c2f1e576a57ceece290327a98804c903810522444b0a64a704bc51a25945dbaa5c0caf30898ba258829577e2f17f7c736fcf59bb0 WHIRLPOOL c8d5d885807ad633bf1c4c6f98cac8dddf4002dc2e21ed2d2fb2f0a859f447b7ce06d1c49c4daff4147b25ca4992da14b6b75b39f47075c861732e6ef00091d1
-DIST VirtualBox-4.3.28-100309-Linux_x86.run 85083598 SHA256 aeb224d7136314865db8175db665408a3dc08f50ed68fbd4bf1568b32b7ea2f6 SHA512 110e20a45657c7677fcab0158d31052c909893b8f618adad2a2c95ad119d47d7c35d4aedf3692dd650fda62ba0747acf202364c14034e5c10d17cd45a9918707 WHIRLPOOL 35c97248985d11c77194ac03448357331e08b7ef64a77ba416564b6051eaf74ffb5a0acdf835bfcf71657c5fdd58066947b0ba1c42e91d34dbf026434f662f67
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.16-105871.tar.gz 16896587 SHA256 c234e158c49f4f92c38e41918c117d756a81236ff1030a896e44faf88284ecc7 SHA512 39a7c6726e57c89a970e771f80369617c95e154498174deed025ca953e85197981215dd1250317285213a8e9bf6b7140e06311bd6df464613bfe90a37ef1c3c8 WHIRLPOOL 8bdf4a499e8d2d463249fb98ea35ee3a91d81004418e171396c0a26d91f3de9eda6fe632a1d85df58e1de1c32c5c939a365277ad836c685f83600277bd7282bf
DIST VirtualBox-4.3.32-103443-Linux_amd64.run 81100243 SHA256 e99dbf0e382081fa78cbc5803b473e2fe4bc945eb50cf0b5717853f4cdb34da3 SHA512 c68cf69de524ec0229d07943087bc433b0902710f48ddd67106f0f10500d38d38a0e3ff97e40bc81495f12f2bcd68ee0f3d19fda46c999960fd1b3f64bf220f3 WHIRLPOOL 15aa5ce0b49ac7c75fc6191e4a0283a721db247a667f63b94f04dbf1f00122958c8945181f4ec5791b1a6ba6425f98a3bf92f80eebf29b831260cc8274cf1cd7
DIST VirtualBox-4.3.32-103443-Linux_x86.run 80496078 SHA256 89e3493052b43574454c1f6bed2a1ddf3504dbcf5096cb2f541b242dd6636cfc SHA512 66455075385879364afe7c77051d7b7873dff543647bbbdcdb9e0e63ef9fa2c49a11a45ac3c2cb96cbb59fe75e5e502c3d4cd99ac1ba8c580e65ae3e3da5c427 WHIRLPOOL bdbd2b62fc8bf83604ffa217f5e592ff48058a6f6c10e0fb07e214847d6cc915f858fef03b6c196625339f3d31f2ce6c4614b9ae206eacfb35957253893bea06
DIST VirtualBox-4.3.34-104062-Linux_amd64.run 81212882 SHA256 4deaf99020c73b0a4911434579afb3659e87bfdc2d44bdc50d64902eead35706 SHA512 83b2da49ed126353532b6414a33fcbec0e260aae8bdd8a1205e63d1c5d8ea42722706e934fcc8e97e416913a8c6ad48d3166c2b1af5365ea2b5992f2f0457c09 WHIRLPOOL 3f09680e4b09d2aaf5691a24969b0372f8b7b8b25ccbb1ae02f35e21bbcffaf341f861785b92739783d926da6c20aae8fbc218610a803e57b5cafaee04f3595e
DIST VirtualBox-4.3.34-104062-Linux_x86.run 80567757 SHA256 c113c44582898436cec4374b0c1dd2e150227add4507a836664a5717e2bf8655 SHA512 cd47ee3fafaea2f43cfd01db29d380f9dde883039ad07ed9bc79a0b4884bfb0c9e1c97a9750642e73b6969af501cc34b59929b6ee6ac28e60d95ab2fdf41d24e WHIRLPOOL 5047c599b3a7f091f012a68889792d37e5463213ee5be151f1e2665c38f991aadf1bcf85df2495d9bf3e62e35f3e2627c103a0d293119d9550beed8d20b4dffb
-DIST VirtualBox-5.0.12-104815-Linux_amd64.run 84592081 SHA256 5f182a1c98f72888c973d9ebb8429835fef8c48e9bd2ed436dd7cbeebe0e0f02 SHA512 6a14d92794bab5fdf7b79e48b02afe91863d693aa5d94f15e5d69ac377c1597fe3b6e0e390cf5ae5b0de77f85f52aa07b776bb50f3ed4a89e504b38d28da0411 WHIRLPOOL 6c9531c6833bad16486300c04635e454e96ff15c1dfaed1f85602eadd21a269e2ede3499dfd2a0641527cf49276e7f1ccfa80578e3f296f03d86d5c3b1725e77
-DIST VirtualBox-5.0.12-104815-Linux_x86.run 83752398 SHA256 a428cc9e260ec6c730fe4efdd99ac4fb14d1523d57dc97f8e38f3dd6bbdb073e SHA512 4a89eaa5a269ac6624d7c9bc0d3937d77cfb0d024629850e9e3b9bb616282e8cf252aa23acc69008d9380cfbd20f99c0cd7f5e74f6edd1912094cf037ee51e71 WHIRLPOOL e016412b5ff2bf256a4a4e5d37b2ea73f12f55e0d3f10d17c090185a6dbfee1b1de474e99739de72dbbd898151db6ee51470e71453b4fedf98918e195e98ae90
+DIST VirtualBox-4.3.36-105129-Linux_amd64.run 81284561 SHA256 6ed1f7e968c13e6cbbcab60bcd340a4bbfd860095ed4c139a0e860f0475666d1 SHA512 62613b0b2a4d18103ae32f38659efd418e106866a8efa3ed4c4a85ed583886435317203e24ea1be9a00634789a656a54a6ca1c884cf5f595a6757475438d925b WHIRLPOOL 1f3186a92194879b8aed246ff3fc930161c2fc5c3ef24cfdd3b76e7f4a227c67603acf0559d6c48b5dc269e3818726235fb704a9dcc306ca9ac6de42de1df54a
+DIST VirtualBox-4.3.36-105129-Linux_x86.run 80639438 SHA256 bb8f179de11f559bd81ec4c2d9156d7a11ecdadd1941980c00991edabfd5ccee SHA512 21fffc752ea682ef3f96910528eed15e21620f83c707e17bfa88b6d1d6feb34ca8b7259d7ea431e575adfed9bd0b2a6b6b695fa0f9ec688731fec34efd00d5da WHIRLPOOL 4b325a4cd26c98f34ffc3f351a78e768ffbc8fe2f4f76405294449afaa823decf3ea84efc39ae78377dc90770f0bfa5c9b1d8e44fdc71ccc15a392c301ffd3df
DIST VirtualBox-5.0.14-105127-Linux_amd64.run 84714962 SHA256 1c05ca5038dd299f28a6e5e253ddc01adb029a2ae2cac40c5d7affc8b2541945 SHA512 f5002a642eef08912172c52f5ff58febfcb62320b0920c8e2da93578cda51514a72094ef60fac41b57003236236f2b89fbccfa828741de5fa0b39d0d72a4019e WHIRLPOOL 688cfc2fa4e4ed67caeba3aeef74ef638b8c67edb16137fc0c02192def4f5fbd78d6ba035938d3f58a21016f9f9cc33c317c1b442552c77eb40556731063b45f
DIST VirtualBox-5.0.14-105127-Linux_x86.run 83865038 SHA256 0014c6557a8c5b67b3d71a237f9abbd33ec809a8e9d8ad221397eb6fa812a171 SHA512 7f17957bfa46a0bc3cec9974d2b1c979ed6f1cd1ec6a5c35c0bb73460c3ed59d4da0081089b373375f828731ee893f06100faee1291f25b403011eaf96a6b231 WHIRLPOOL db2fed44be4c0a59478ad9e7995a92758e589a71307be26276fb01502b1f20bd99c58205d34a7e13651dddbd4ce26dcf05476bed34b80ce5700d7695f851386f
-DIST VirtualBoxSDK-4.3.28-100309.zip 11698378 SHA256 fe0cc316cecb3dfe9bbb925e6c023620d4cfd8e137b2a9b9f40f22f527af16fa SHA512 6af7d2107cff080281a356cbf522961b2e9d1917e861e410b169ce5ca3cefe05cc87e4e01f78ae171f8716f7006c031f14fc01d8d282a872a4f619638049b11a WHIRLPOOL 23a77dbc410a28b2799264da88d79b2c4335c07da67dd8bf4be26cac271e3ed38a9bf4fb2966ec0a3c06fb869bb252f5fa6a34a9a9c62cbb9a2fb0ad76442f66
+DIST VirtualBox-5.0.16-105871-Linux_amd64.run 85913042 SHA256 2fc30af485c67162a8f1fafb5a0d9c6cbab4dc17ec362e6d8d2487071b4daa47 SHA512 706159c25ad144a489d7519dcc5a9fa6ee47415bac8fc48bb56fbbe72953f5e65fcdf9d045fbe686520ea676dbf511a19208adfd81f199c804e1b632de581f6b WHIRLPOOL 298235fe47a08136232916b990675b4b26dbab7155fd00c82d2405170fd7d255cfa5f93c07a13a89cdc0a129662f3a14d3386be17e11c02bbd3a564de554bcf3
+DIST VirtualBox-5.0.16-105871-Linux_x86.run 84909518 SHA256 46421f6ebed4de2466d32193597fbcfe71c2a89c5fd5ac1493856b509d6259e1 SHA512 a16e5a9ee4c643985d48c6ac8e7224074dd2a775bf05b9ef712fff898962493a2126bb1ced20b5ec525ddd86d0ce6c42c06e286f03758aad5d39d58b87db51a8 WHIRLPOOL dbc4af908d3e2879388426defd733539f3bbff10a4f957858f42ae7c328a5cbd0480667b50777a69e860be475d8c66a392badb79503d9f22c267688edc6a1e4e
DIST VirtualBoxSDK-4.3.32-103443.zip 11435565 SHA256 84ff42f0e9d8f8945387247e7f57123d37cc2c53035ab1eca5414ca82102613a SHA512 914951d91adfa0d77e29863c7108d2e116a01562d0e0454b1203ae7d6e7e0a224f65a51cbf1e83b8067cb40da65708d2022ab5be35f2905a28f032653c827869 WHIRLPOOL 2e53a6f2d6e6e4f328139b03de8bf09b1a72ca3981addef7a2d02d8dbc02e8ea6c319b16facdcdb1be5d941d7d24b64598990112d3d52ca5e5c9b0a2c4d8e89e
DIST VirtualBoxSDK-4.3.34-104062.zip 11436429 SHA256 5663713e2eb0eb248941e332f8bd06c2e98c3411f7ec354bbc32d5460c2044ad SHA512 cb3a85317370788ac8aa23d12110feb5a821c51acb27fc83ee8912cb3e38391897b9174eea54c88be139c0083f637bbf0146253d92fbdc83cf0a377b27bf68f7 WHIRLPOOL c885e99160e7fe94879692cbaae7532542b5af74c18f3f68b09d0c9a190cd009978ae24c7321e27828b247e48ddaaedf6e42cdc3d1b6d05a3651113c868f5f4e
-DIST VirtualBoxSDK-5.0.12-104815.zip 9632898 SHA256 2abc87108dfbca1e1818c7d420d2aa6cc382d7722f29edce2f7fa1c63772f0af SHA512 1acf69cfe33ecea59b8294f758150c8ed6d64d209c700e0555ef17abb4e66e81398ee1512406d14f5833d10d7a61f9446a020e68ed360a228946824f4bae9cee WHIRLPOOL ae2f33d10c13ab2927c5457bde024c10badf63b440820c25302cea216ca684eb28983c68f49de2c1fb0200cb48d6741c7270cb99a8075177ec60183c8b5777b2
+DIST VirtualBoxSDK-4.3.36-105129.zip 11435309 SHA256 e8391909f609d8d6be17aadd25111d87b90489b2088efbcb03541ff7697d342c SHA512 7a1df66cb332f31f9cf0761334abaede3eabf7d29ffe8461fa39dc9b5b67394b3f2182090bd9a36c99a040a9e3cc9f7eef240144ab235d32bcba7d1c44285ecc WHIRLPOOL 4ec8ff0118f5a3df9540260f2794195462b94e624e4a92c81e2c66d4bd0944320671705ca385f44941065393f05671be53fc0a359d028e6c9885b69e0fb5ab2f
DIST VirtualBoxSDK-5.0.14-105127.zip 9637074 SHA256 83ef500188bd10e30d0f4c7d2265ddd00ff55dc5a38fb986a6e47c1b5ffcf2b0 SHA512 691833d07c62025bf03a96e998bcf04d2a411bb42ab9b100c9374e70b659abf3c55f8849dc09184fcaa1fb8674b00e1b7369bf1e02408adfb13f43ced80e9d21 WHIRLPOOL a4e6364602dcac32cc602ec46264261e80827b488b85f3e60999029e0c18760007eba65e3d0c3c35ec98f66b5877c5be4fd9f0b98f5f0e73ffe232ccf0500808
+DIST VirtualBoxSDK-5.0.16-105871.zip 9639569 SHA256 df1bd5ed7f7fe9c401555498a1abed6f1f98e001c0069f16d401ccf3afe3061b SHA512 f4e1af1d97a26818722124fbbaffa6d61369b1a5f3b350b749284afdde038802f4a0e93e9bbb4c9ab0f49aad1f4fa19bbc4b0bdb04aa172a433a77a538816e25 WHIRLPOOL 0598061b47e5d0ef775665300ab61ad7b94638d32fb358a9c189536b00b2456ce4c90dfbcc00bac86da736289253e84a3b586b8b7d1da4087db76e8845a8ca33
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild
index 8790327b7918..8da4bd43fb05 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.32.103443.ebuild
@@ -35,7 +35,7 @@ SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd
LICENSE="GPL-2 PUEL"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
RESTRICT="mirror"
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.28.100309.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.36.105129.ebuild
index e000c4b1cfae..2241c6d8ec3d 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-4.3.28.100309.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-4.3.36.105129.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -35,7 +35,7 @@ SRC_URI="amd64? ( http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_amd
LICENSE="GPL-2 PUEL"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
RESTRICT="mirror"
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.12.104815.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.16.105871.ebuild
index be7050520b60..386cb6118f82 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.12.104815.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.16.105871.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-emulation/virtualbox-extpack-oracle/Manifest b/app-emulation/virtualbox-extpack-oracle/Manifest
index b9e517eca474..549d38dec1b1 100644
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@@ -1,5 +1,5 @@
-DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.28-100309.tar.gz 15961939 SHA256 72e101d9dc5eabeb76d1ab5bd6d2f817a11c89adfe8bb72cc5d614a2eef532d1 SHA512 57ad44a99a7abcad195e6ceccc1fe7b494979da65601a52e0be8336bb819812d5cef48a8bc0fe9f74f3a05238e6fd29562ac678d4ef7e0c78587fe81c287a65e WHIRLPOOL fb08189c53841664119bffb4de6a76d6f72fb035f887ed5e948f38faa5be2891e35de0806da02d299e818370285bcddba06eb84bea7db4d3cfa09d92f8042db7
DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.32-103443.tar.gz 15994576 SHA256 3f041c019985c35974bf034a9f7d941149fcc3e23a6200b47579140405af5f88 SHA512 212c21f6fc0af093e2d409827348d776377164b9c78b6c01dc710d4a63f53fa7ef52a66491d81b96dc64af4747d79ca0d0df55b052cf6b1c8ceb239c32dc1c75 WHIRLPOOL d67b55c409c6e06080010a25a4a64e660dcd0efaadffe2311166bed06c3f494a5f20cff131a42e07e82aba3cab7f53dea101fb3e5fabeecc2bdb0dd4a167c0ce
DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.34-104062.tar.gz 15994268 SHA256 b9c03b6db79de16f70134884c18cb4854a8c24cb36f90e3a9d2b93eb09fb6b37 SHA512 39b06eb26fcc01dc70de0a9d099a8919c53f72d9a74133d803bb5d10ea06cd390a6dd3853a024b311695c57805d6e2b664ec667fa0d882142f4a33fdfb01b642 WHIRLPOOL 1a3e98def84beeb73a8cc531bc1bfb98cdb3a3c02373aff910c89b023c85d22eb46d349a2c6ca19f37032113bad2dbc7f61b0960f7af3b2ca4d4c63a301a27f7
-DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.12-104815.tar.gz 16937595 SHA256 ac1bc8452b7fdf183325272149e9f18b9810cc07adf18e48755385a9cd1b236d SHA512 4a21cd155d1e60d3b6a4f4864cd8ca8ccd75f02448e832d72b42284dde5aa3c4aeba7f7297e3e7e198e4b4c665d770ac65c1aeca3df1dfa6a8454c47553baad7 WHIRLPOOL bcf032d0e72b57be37fdfd40d3c2f418eab10e04bfcbf1b99374b1fa9d2b5ced38c5cfc560b1c13492144a32a3c035b72649d9ae57851f6d430a4e59897cebe2
+DIST Oracle_VM_VirtualBox_Extension_Pack-4.3.36-105129.tar.gz 16003080 SHA256 b067d1497499ed5d0218c8e500e0a5c1bc2c1bb3d74e5addd6d77cd801133ecb SHA512 e885e21f3b4fa634630eeb8308bbe5e79c8837f701fad668701a42d4444c1724e59d104e3e1f20000ed3a330cc64cd40f4a675f7bb8bc34c246c5e870d68f36d WHIRLPOOL f2f431ff0a493eb4455b1288ebd1e0ee38767128bd6e4d7ca6b8fc0bf5663e4dd82ced1f93d304701b9b9e3ca38d37b7ae8a5c070eab47f37681796f9059af30
DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.14-105127.tar.gz 16939032 SHA256 4a404b0d09dfd3952107e314ab63262293b2fb0a4dc6837b57fb7274bd016865 SHA512 b71cd8562d8bcd10a051d9b3c69183aa17d42b0866fc597b8412c28d5690d3369f9b4bcfae98c609df7ad19f84dcebe6057e6b9b0a44b650acdb573b7ce3b4f0 WHIRLPOOL abd49e5ec7dce4aeb74998b8e1e6d6174ba47808ac4d041a51b237cf32ec595b0c1d95bd992bd1a4f186bdf6722263898f9b99cb00ca21ba7f84695b4d3e4010
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.0.16-105871.tar.gz 16896587 SHA256 c234e158c49f4f92c38e41918c117d756a81236ff1030a896e44faf88284ecc7 SHA512 39a7c6726e57c89a970e771f80369617c95e154498174deed025ca953e85197981215dd1250317285213a8e9bf6b7140e06311bd6df464613bfe90a37ef1c3c8 WHIRLPOOL 8bdf4a499e8d2d463249fb98ea35ee3a91d81004418e171396c0a26d91f3de9eda6fe632a1d85df58e1de1c32c5c939a365277ad836c685f83600277bd7282bf
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.32.103443.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.32.103443.ebuild
index 3be31d0bc4e7..23846b4705a8 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.32.103443.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.32.103443.ebuild
@@ -24,7 +24,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack
LICENSE="PUEL"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RESTRICT="mirror strip"
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.28.100309.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.36.105129.ebuild
index 23846b4705a8..025a28a1a5f8 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.28.100309.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-4.3.36.105129.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -24,7 +24,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpack
LICENSE="PUEL"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
RESTRICT="mirror strip"
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.12.104815.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.16.105871.ebuild
index 19d40ce0c134..43995b1ee9a0 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.12.104815.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.16.105871.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils multilib versionator
diff --git a/app-emulation/virtualbox-guest-additions/Manifest b/app-emulation/virtualbox-guest-additions/Manifest
index 712f840d25b6..a6ce5bceb248 100644
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@@ -1,5 +1,5 @@
-DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
DIST VirtualBox-4.3.32.tar.bz2 98168101 SHA256 dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 SHA512 856b36cd90647cdceb7e182d066e9e1489d2bae0b71ce8b2f6324cd2d9854806eaea0fe0aad2d4e8b84bd836c688e13258ae69e094320572729b7d886c8d35f0 WHIRLPOOL 441041947dcd190d73a9cc5007bc0001b6eeb36ba958f4a09fca775670faff690423095d334e258fc0d6dcbef01d74a085505c8549397ced5dbe75ca96724144
DIST VirtualBox-4.3.34.tar.bz2 98166680 SHA256 076507e924d3c5ae05c5e80a720b897da4a57a636a506a7d369b28f08b11d6c1 SHA512 1eeca08990d426155550d8920c159e41320bfedb53561b1752bd6816fa588588672ad364e73baf9b7b45e8352ae8feb1c649ba1748253da47586b55fe89e8fe3 WHIRLPOOL 1249e1d61aec38d439d1060457a1a0d0294a65d78dfa426026f3abe1882c429c628ea58f556bdeaf1a88d3cdd3b9095f1e4c6f1fae2176f39f8da5bb3d091809
-DIST VirtualBox-5.0.12.tar.bz2 111001547 SHA256 de0362b1d404d1ca0298db1984acb6f0f1c6210313aeb744fea345ad9201e86e SHA512 eef01d1a5121905d2fbfcd48081f18db06433187bfbfea6a006b3adea11cad8c8351025fd19fa115c132231592330b17bfeba033a3a168f3064176a3f7586d7a WHIRLPOOL bd73e67c83a524cb021ff92c4c3d655f6a1019e2d48f3ec97aee937543ca9da6f7ba2a1e70a6b75092dce3c8db8f3c7887300104fafa23432b94bc832c5e5447
+DIST VirtualBox-4.3.36.tar.bz2 98421624 SHA256 af0776df6d03b2709cb76a69f055487bf12bdb3b4163e2a82959860300283046 SHA512 179fd8c7d3562fd6c3c6815ef56a3dbda3fcbb841171f911a923ded06e627fb2e6e33f66124303b448a05c364343ec35e2fb264f462a48e52d66277dfd77bcfc WHIRLPOOL 0419c2baac6f07d729a35a54be872d7949cb6fa99a5ce0f2317df32f27e20e42f045811697e40255f240ec84b08a3a1f36a563841a341a528c37c9e63fda2e6d
DIST VirtualBox-5.0.14.tar.bz2 111033626 SHA256 69abac7255b2251a18fd73c0b7c200d5f8ce72a59fa019b53a5cdbf7f2843002 SHA512 5547da58b50c9cf5d096f81c005134e1f56c4fb55d4d40a6fbd1efe1fe1fbeebc0747f0903933da9238a24c63eeed2c6c15bfc5cae5ce6e3e2eb4a18511d6258 WHIRLPOOL 785e0fa7a0652825b977562a1febbd95463ce49a9257a004827725597e0fbd59f9bdf75cc31f5b04e0f04be3d0d68e90148c06dd5d03875063312f8a3cd5bc86
+DIST VirtualBox-5.0.16.tar.bz2 111062984 SHA256 f5a44d33a1db911f445b2eb2d22d9293a96a535cba488b5a235577ef868fa63c SHA512 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074 WHIRLPOOL ea709057c588f28820790c2b193decba9ee0c57e0f82aa4361ca87aef661315182e18b5ee29558e47ed92f6037eb91befa5390680661a7b9f2248c7819b4a85c
diff --git a/app-emulation/virtualbox-guest-additions/files/vboxguest-4.1.0-log-use-c99.patch b/app-emulation/virtualbox-guest-additions/files/vboxguest-4.1.0-log-use-c99.patch
index f3a738fa15a1..8f66a0033cc4 100644
--- a/app-emulation/virtualbox-guest-additions/files/vboxguest-4.1.0-log-use-c99.patch
+++ b/app-emulation/virtualbox-guest-additions/files/vboxguest-4.1.0-log-use-c99.patch
@@ -1,7 +1,7 @@
# https://bugs.gentoo.org/298988
---- vboxguest/Makefile
-+++ vboxguest/Makefile
+--- a/vboxguest/Makefile
++++ b/vboxguest/Makefile
@@ -104,7 +104,7 @@
MOD_DEFS = -DVBOX -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_GUEST \
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.32.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.32.ebuild
index 13636342a107..529792d3a551 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.32.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.32.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="X"
RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.28.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.36.ebuild
index 529792d3a551..b57f9624344d 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.28.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.3.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="X"
RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV}
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.12.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.16.ebuild
index a1d8560671d8..2bf21c9da0f0 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.12.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.16.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils linux-mod systemd user toolchain-funcs
@@ -73,7 +73,7 @@ src_unpack() {
src_prepare() {
# PaX fixes (see bug #298988)
pushd "${WORKDIR}" &>/dev/null || die
- epatch "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+ eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
popd &>/dev/null || die
# Disable things unused or splitted into separate ebuilds
@@ -87,6 +87,8 @@ src_prepare() {
"${WORKDIR}/${mdir}/${vboxheader}"
done
done
+
+ eapply_user
}
src_configure() {
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index f0c334a9e781..1224d014b832 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,5 +1,5 @@
-DIST vbox-kernel-module-src-4.3.28.tar.xz 539876 SHA256 fb052997ec4992b0ee102475051b5d7bd8485e17405c6b3dcc94e1fa4a53b761 SHA512 637149f8595cb023e75116f83237bb4cef1b05627f58d475fa952ac86a85aa3cbab5f0cec723d730979f831999c920f35248e5f8db8f6987fb4c15c4a29bd517 WHIRLPOOL ab1ed07ee148a1ef352c0fda3f09865405be4146b987a5dffcb753d7512a00aa88c2ba1f7184b56d694c88320b350c6ececd3bec5636dd1586fc14a6be8a874d
DIST vbox-kernel-module-src-4.3.32.tar.xz 546132 SHA256 4f0cf8a2d0f6714a5825551fa6ad38b85a70aac3a9949771bdcd85916ed12dae SHA512 7289dc1dd3a7e8812a57d3d1411c99ac25ddb33991e06e49a6212b030c6b6c2f08075c471f474c539b26be8a221934261af8f67a1aa4572f2e9cdb7433623a57 WHIRLPOOL 771c655bb5a7179d798330e438a3799d79cd1711844e491badaf7b6e0cb25fe2017a753675b0700b6ee2d8251bcc603f84a703cbe73b5bfcb46859b781d7c2d9
DIST vbox-kernel-module-src-4.3.34.tar.xz 543584 SHA256 ab9ab4c0c9e315ee447813a056b83b264e7baea073195c347903f9e7014dd0c8 SHA512 44eaf10a7063d0761c98e02ec8b6dda2c20de9cd188b8beedd9546dd348e976440ade034779a6adcaaf385fd34b4600f254dc5a987d580db4eb81da5c0b57509 WHIRLPOOL 3279d351493af02ab8ea3e66f14b3ab7e2073f3478b0cfd757424c825f512d739a65dc8d6d074f57d4639e61a6205ede63aa0483340d72ba938e823cf28e0ede
-DIST vbox-kernel-module-src-5.0.12.tar.xz 593196 SHA256 c24f56bbd04ccfb34af94d7d89c921e23d470b5b5720c2b819811c93226a072c SHA512 d6d474db87d854f2932639e564f0f6bb12d8852d5bbf8e19408aff0c53280116a3c0177b83f61b1c034edaa7404e9ba6584f762ad3b9003846016c8f873a9715 WHIRLPOOL 19d555eb05dfc4fae67595cdb8f4db38710ec66fca95216ce7783ef46c15a04d9347c82403877c1ddb01f16b6b02c2f9196879905a1d40ac81ca5db965472d47
+DIST vbox-kernel-module-src-4.3.36.tar.xz 543536 SHA256 3e341313097d092fe57284f149a54d94d6667d05c738d39da763b530cbc5fa9c SHA512 63198fd03f3ec3d7305c1f06694d2e69d0f6a10d0faeb7205c3cfc2690c2d1379f70124cff25e8365df5becc3d7356f7dfe667eac522ff2074a1ed1776509517 WHIRLPOOL 3948d2f8aecb0054c68164cdd4a16ca7c0e177e9357730933c75e8cf32e7fe4945e853228d042395b5ec94b82ea15fe27499958b76ea4cbed29bc0dba751f717
DIST vbox-kernel-module-src-5.0.14.tar.xz 593192 SHA256 15934e23601195e4f6d63c9f01a8f996bf9d278c572efe21bdabd223011da32a SHA512 0745b56974b751f812aac24a6bddabbbb1d8253ca80e3f221435c4162846280dbff616c5391ee9fce977fe6c4cbb4af8694c589931b058f0ca9306622ad448e2 WHIRLPOOL dc00622a7bcd284683cc123235ac4b2a9c05ec5512726f8de914a36aa676c60968fc7f9ffae2dad9601de6f1494443455368785536eea71207efc9d28d5dc6ac
+DIST vbox-kernel-module-src-5.0.16.tar.xz 593944 SHA256 8905e174069a6caf0200808fda6726704a947ab56fc48c3b6ebbf8831dde4123 SHA512 5311f6cfd917c04bcb51182ad414c0930fb85a73a90d81156f08640cdb4e4d442ed46a10b62b5d07ed81aa1ad65430d5186e95cc64293502c9b84937a6470bb4 WHIRLPOOL daf741cd8465ce65ae0e3f304b7c49d55be828da5fc285ac3a2b8e6fc7e68865b184b738a79fa7fbf1e106d647200a40224902ef7041e4dd5ab2c9ef054e4199
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.32.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.32.ebuild
index 24c6a3a8537c..279fcef823a8 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.32.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.32.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="pax_kernel"
RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.36.ebuild
index 279fcef823a8..a90623b999c1 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.3.28.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.3.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="pax_kernel"
RDEPEND="!=app-emulation/virtualbox-9999"
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.12.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.16.ebuild
index 4bf941558d0d..0cdee85050c4 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.12.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.16.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
# XXX: the tarball here is just the kernel modules split out of the binary
# package that comes from virtualbox-bin
-EAPI=5
+EAPI=6
inherit eutils linux-mod user
@@ -43,6 +43,8 @@ src_prepare() {
if use pax_kernel && kernel_is -ge 3 0 0 ; then
epatch "${FILESDIR}"/${PN}-4.1.4-pax-const.patch
fi
+
+ default
}
src_install() {
diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest
index 6cc1e6a8061b..0c9f363f8fde 100644
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@@ -1,7 +1,7 @@
-DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
DIST VirtualBox-4.3.32.tar.bz2 98168101 SHA256 dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 SHA512 856b36cd90647cdceb7e182d066e9e1489d2bae0b71ce8b2f6324cd2d9854806eaea0fe0aad2d4e8b84bd836c688e13258ae69e094320572729b7d886c8d35f0 WHIRLPOOL 441041947dcd190d73a9cc5007bc0001b6eeb36ba958f4a09fca775670faff690423095d334e258fc0d6dcbef01d74a085505c8549397ced5dbe75ca96724144
DIST VirtualBox-4.3.34.tar.bz2 98166680 SHA256 076507e924d3c5ae05c5e80a720b897da4a57a636a506a7d369b28f08b11d6c1 SHA512 1eeca08990d426155550d8920c159e41320bfedb53561b1752bd6816fa588588672ad364e73baf9b7b45e8352ae8feb1c649ba1748253da47586b55fe89e8fe3 WHIRLPOOL 1249e1d61aec38d439d1060457a1a0d0294a65d78dfa426026f3abe1882c429c628ea58f556bdeaf1a88d3cdd3b9095f1e4c6f1fae2176f39f8da5bb3d091809
-DIST VirtualBox-5.0.12.tar.bz2 111001547 SHA256 de0362b1d404d1ca0298db1984acb6f0f1c6210313aeb744fea345ad9201e86e SHA512 eef01d1a5121905d2fbfcd48081f18db06433187bfbfea6a006b3adea11cad8c8351025fd19fa115c132231592330b17bfeba033a3a168f3064176a3f7586d7a WHIRLPOOL bd73e67c83a524cb021ff92c4c3d655f6a1019e2d48f3ec97aee937543ca9da6f7ba2a1e70a6b75092dce3c8db8f3c7887300104fafa23432b94bc832c5e5447
+DIST VirtualBox-4.3.36.tar.bz2 98421624 SHA256 af0776df6d03b2709cb76a69f055487bf12bdb3b4163e2a82959860300283046 SHA512 179fd8c7d3562fd6c3c6815ef56a3dbda3fcbb841171f911a923ded06e627fb2e6e33f66124303b448a05c364343ec35e2fb264f462a48e52d66277dfd77bcfc WHIRLPOOL 0419c2baac6f07d729a35a54be872d7949cb6fa99a5ce0f2317df32f27e20e42f045811697e40255f240ec84b08a3a1f36a563841a341a528c37c9e63fda2e6d
DIST VirtualBox-5.0.14.tar.bz2 111033626 SHA256 69abac7255b2251a18fd73c0b7c200d5f8ce72a59fa019b53a5cdbf7f2843002 SHA512 5547da58b50c9cf5d096f81c005134e1f56c4fb55d4d40a6fbd1efe1fe1fbeebc0747f0903933da9238a24c63eeed2c6c15bfc5cae5ce6e3e2eb4a18511d6258 WHIRLPOOL 785e0fa7a0652825b977562a1febbd95463ce49a9257a004827725597e0fbd59f9bdf75cc31f5b04e0f04be3d0d68e90148c06dd5d03875063312f8a3cd5bc86
+DIST VirtualBox-5.0.16.tar.bz2 111062984 SHA256 f5a44d33a1db911f445b2eb2d22d9293a96a535cba488b5a235577ef868fa63c SHA512 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074 WHIRLPOOL ea709057c588f28820790c2b193decba9ee0c57e0f82aa4361ca87aef661315182e18b5ee29558e47ed92f6037eb91befa5390680661a7b9f2248c7819b4a85c
DIST virtualbox-4.3.16-patches-01.tar.xz 4288 SHA256 270c4f01b2c13c4133987b3acc073dfbf78840212cf09f083dbf8fc80407ce6f SHA512 595f88c4b388b4807347c15c1750ec73aceba1c82ad993e9a05c7b78dfece7b679aff0338b3a48e2ccee7911fb5ed0dba803052332a270230078551f747052bc WHIRLPOOL 2157ee3fb9beed906cff28647c869e37d62551ad8c93801c0f0ec6893675f11786aa6d92acf11c348d30aa58b6e03a3faa879c664dddac6e5b8525035986c9ca
DIST virtualbox-5.0.2-patches-01.tar.xz 4556 SHA256 8fcfa7972b0942f3e65bda73a35a6feb234aad770016fb4caafba105757d7ada SHA512 14ce8f0b17e593b2de676e0beaab688f29606aaea330151038fbb9259d3f5e4c22f254d1fa6cc45f968d81cf9f7d71deb9a7a32f565d07c1d9fa615431472ca9 WHIRLPOOL be73fd5576732f70f6ebb33a9d604d46a8fabdbdb0e187af3435f75412e21f62c0774130a9a6315e6b87ecf96d02398ffce828b3ab8f584716ed9a12e06d7cde
diff --git a/app-emulation/virtualbox/virtualbox-4.3.32.ebuild b/app-emulation/virtualbox/virtualbox-4.3.32.ebuild
index d9527e4a98e2..0d7f1033cea5 100644
--- a/app-emulation/virtualbox/virtualbox-4.3.32.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.3.32.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.virtualbox.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+additions alsa doc extensions headless java libressl pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
RDEPEND="!app-emulation/virtualbox-bin
diff --git a/app-emulation/virtualbox/virtualbox-4.3.28.ebuild b/app-emulation/virtualbox/virtualbox-4.3.36.ebuild
index f493f13b9c24..f1f5859077ba 100644
--- a/app-emulation/virtualbox/virtualbox-4.3.28.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.3.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,15 +19,16 @@ HOMEPAGE="http://www.virtualbox.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+additions alsa doc extensions headless java pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
+KEYWORDS="~amd64 ~x86"
+IUSE="+additions alsa doc extensions headless java libressl pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
RDEPEND="!app-emulation/virtualbox-bin
~app-emulation/virtualbox-modules-${PV}
dev-libs/libIDL
>=dev-libs/libxslt-1.1.19
net-misc/curl
- dev-libs/openssl:0=
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:= )
dev-libs/libxml2
media-libs/libpng:0=
media-libs/libvpx:0=
@@ -48,7 +49,7 @@ RDEPEND="!app-emulation/virtualbox-bin
media-libs/libsdl:0[X,video]
)
- java? ( || ( virtual/jre:1.7 virtual/jre:1.6 ) )
+ java? ( >=virtual/jre-1.6:= )
udev? ( >=virtual/udev-171 )
vnc? ( >=net-libs/libvncserver-0.9.9 )"
DEPEND="${RDEPEND}
@@ -66,7 +67,7 @@ DEPEND="${RDEPEND}
dev-texlive/texlive-fontsrecommended
dev-texlive/texlive-fontsextra
)
- java? ( || ( virtual/jdk:1.7 virtual/jdk:1.6 ) )
+ java? ( >=virtual/jre-1.6:= )
virtual/pkgconfig
alsa? ( >=media-libs/alsa-lib-1.0.13 )
!headless? ( x11-libs/libXinerama )
@@ -290,16 +291,14 @@ src_install() {
# VBoxSVC and VBoxManage need to be pax-marked (bug #403453)
# VBoxXPCOMIPCD (bug #524202)
for each in VBox{Manage,SVC,XPCOMIPCD} ; do
- pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each} || die
+ pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
done
if ! use headless ; then
- for each in VBox{SDL,Headless} ; do
- doins ${each}
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
- fperms 4750 /usr/$(get_libdir)/${PN}/${each}
- pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/${each}
- done
+ doins VBoxSDL
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxSDL
+ fperms 4750 /usr/$(get_libdir)/${PN}/VBoxSDL
+ pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSDL
if use opengl && use qt4 ; then
doins VBoxTestOGL
@@ -314,8 +313,7 @@ src_install() {
doins VirtualBox
fowners root:vboxusers /usr/$(get_libdir)/${PN}/VirtualBox
fperms 4750 /usr/$(get_libdir)/${PN}/VirtualBox
- pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox \
- || die
+ pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VirtualBox
dosym /usr/$(get_libdir)/${PN}/VBox /usr/bin/VirtualBox
@@ -327,14 +325,15 @@ src_install() {
newicon -s ${size} ${PN}-${size}px.png ${PN}.png
done
newicon ${PN}-48px.png ${PN}.png
+ doicon -s scalable ${PN}.svg
popd &>/dev/null || die
- else
- doins VBoxHeadless
- fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
- fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
- pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless || die
fi
+ doins VBoxHeadless
+ fowners root:vboxusers /usr/$(get_libdir)/${PN}/VBoxHeadless
+ fperms 4750 /usr/$(get_libdir)/${PN}/VBoxHeadless
+ pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxHeadless
+
insinto /usr/$(get_libdir)/${PN}
# Install EFI Firmware files (bug #320757)
pushd "${S}"/src/VBox/Devices/EFI/FirmwareBin &>/dev/null || die
diff --git a/app-emulation/virtualbox/virtualbox-5.0.12.ebuild b/app-emulation/virtualbox/virtualbox-5.0.16.ebuild
index 6a55b8560100..4c09818cfd57 100644
--- a/app-emulation/virtualbox/virtualbox-5.0.12.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.0.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 3592040b6f8f..c8957fd2469f 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -43,12 +43,14 @@ DIST wine-1.7.55.tar.bz2 22814631 SHA256 a148f6c9cb45a75ef1a15e60a7db9c22fce985e
DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512 1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea WHIRLPOOL 3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a
DIST wine-1.7.9.tar.bz2 21323337 SHA256 79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512 29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9bffffaadd2d85b904b55d99687a1c83d0 WHIRLPOOL 333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a
DIST wine-1.8.tar.bz2 22843418 SHA256 f33b45c18112b2071fbf9edee0e8c575407f9e2a9855ca4ee918ed33efa7c6f4 SHA512 34308e82e04dee714fdbd10f29cd6cf6326e5e6e9134f7076e58b09988211065b8c6584881b7e5dcbc9b3906a819ab8a72b612b060cb9aa50b5b67f03bdab089 WHIRLPOOL 335a48f1b34cd1038d62290e52c3189b842d4077b7cf0bcb9d003595992360dc36eac1c592d31db44598de68010f3934daa1f4bcd0a2ca74aa130a39a74f7ce3
+DIST wine-1.9.4.tar.bz2 22974777 SHA256 75c1eab6b980870b367a73db6e57eb0dc9242c2be8546f94084577a0ed0bbbb8 SHA512 e7b35290ec8f451163a08e841c559698a6b7264b320058e38ac788bdde66042efbb88511b30fa38383844425eaf0b6f4ed4b8412feb843ed405cb510a4a9000c WHIRLPOOL 875e11e9163df8c3473aa7b79deb5c6783a2068e678c4008cacf730d81c2f141490264a10f4345ceadd7aba100d3fc71bdfda7858f89d966d339cc2772cd8190
DIST wine-gentoo-2013.06.24.tar.bz2 85442 SHA256 bfbf6b25e98f717320de2ede467e3628fbc749d936b8449f8477c9dc6f41e04b SHA512 b6819889314f6a6ea16c1332f4b177c43623116763969c31b23b61754cd304dd085f5d3eafbe847159331eb97dddd9b4c10699430129ea4a71da418c1fe175f0 WHIRLPOOL 227e0ac6569736d4ad5813cef49f775dae956f4fc9255de95753d5d3cba1bf6cf3db31d23d3702bb54d2e60c5a6f779b602f0efb2096e4c827c924565b273d00
DIST wine-gentoo-2015.03.07.tar.bz2 85419 SHA256 f13f93dc49bbc33a294c4d511b6e01aec2d38bff77a1e44d07668291add1ab04 SHA512 bae1d2d5575d340d01f44008104f0e5ec0c4a4982995dec37d501594cd21d07a2b4ad4465c4273646d5bf6521996b4b82471097864be75342abe3e7d478a56bd WHIRLPOOL 0f254dd692e87a1f71dd19f6c1c8c59b8a91b994e75912a2e6e3ba5e875b85119fe497a331a95c2ce33bbf5f064143d23ee00275da92c494227de0807c9abb06
DIST wine-mono-0.0.8.msi 46967296 SHA256 3dfc23bbc29015e4e538dab8b83cb825d3248a0e5cf3b3318503ee7331115402 SHA512 d3009f2301b0a006136e880025a736f24612faa7a954956896124ec7282d35b678f02658e8be12b1c02ee217e594a2c728a9258c36ccb346b186a4781951adbd WHIRLPOOL 1d4b2e88ebab1f603326a238cc908982c7e135a33340087e8645572838d2b6034764e9fe787bb890792dea4c0531d26f9a6a811a7c200edb99ab82f975179389
DIST wine-mono-4.5.2.msi 52502528 SHA256 d9124edb41ba4418af10eba519dafb25ab4338c567d25ce0eb4ce1e1b4d7eaad SHA512 73c907f63b73836d5afd0753197358aaea43a74a47800f929ef0627112298256f1fa46d1b9ff297b117468d953cdeab21fb5962db13c5debbcb71004462df609 WHIRLPOOL 18d3544c6753c5a01917bfc1b694f31ce45213108527f13317ec0bb8b2d2339ce41800534967e067cd15cd186ef9e186a5d3252275e443dfa1a6ae3641d4d17c
DIST wine-mono-4.5.4.msi 53706752 SHA256 20bced7fee01f25279edf07670c5033d25c2c9834a839e7a20410ce1c611d6f2 SHA512 307fab2ac50c4eaa5c3fb8446ceb2df0d95c0a9d7c1e6289ef1ec5cc660fa8fcb26025c9723ce2bc01afcaf7e9c4dd9939d1beba877f4f95f6f80d92d8187221 WHIRLPOOL ccd1fed03158dd309d2a1f88558e5ad0e2e43de5ba61ab82702132bd0cdf75db75dcc1a61b5cb2775fdf0ad51464f34d2b3629538b1737cbedb410b859ef092a
DIST wine-mono-4.5.6.msi 53705216 SHA256 ac681f737f83742d786706529eb85f4bc8d6bdddd8dcdfa9e2e336b71973bc25 SHA512 4d8df04c1d0da09d1abe423dd271e5dd14a193d607fb54e214d2e340827f7c33829342d1580b6907d7cf466e70993d743c6e1ca9a026d4b6225dd7c1fc8b1386 WHIRLPOOL 9a68e502da0be6768e92d88f2ccace607300f3a331e0f9e1b6d60e9c6c2d4eb635b902f03e13aad73461dd5f0c2691c7b41958356ebb7f445e8def4282c675d3
+DIST wine-mono-4.6.0.msi 45690368 SHA256 635c6bc88bad8d6bf8c6016a589627142ae56ac2e7368192102a16fdbaa29cc3 SHA512 d2ab7a7b98d18132cc28ffd52352fcc6cdb16b1750a658e9ec961044e808e4e8e1605732f1e87bbb6a275f57fdb94aebaab3760f679472358c7df608b0fa3262 WHIRLPOOL f8f6e83be5bd4eb7bde6e6c0d1f17bd4d4c887c52fa2018f20e51a30ca7ec0a9550884423298bc571587fe3c203f921057d91c3c78c12ebf9e911996bdd7e77d
DIST wine-staging-1.7.18-1.tar.gz 874958 SHA256 127b1754928297883ab5423c0814c59afa8a60444603b5c3b74ae726e41442e6 SHA512 ac7e59914436cfd58fe1e5edc94956f8470bbf3f517f8e1017ca3d201b872aca6a277bb3074527b614db8123663cadf4d10faeeb048d011d7e81fdfe5c582819 WHIRLPOOL ac1913deddc127c55d90d9f7c5249f2866757fb86295bf61fed8641a39751dbfbf57d3c6234086f8cff9c5b1ec8c45effeef40f5973e9aa8550412134809938a
DIST wine-staging-1.7.20.tar.gz 887293 SHA256 ac55daab4c6062e7c3f7eadd4ea632ddc01702c1abf859bc4928bb9691cc7d22 SHA512 2f5bd5b3bfe85c0dd0d611fc2512f5f4ecac11d639eb578a7319c01a426b8cf788031fd299ecb5b5ff2c0bb7fa72dcfb1541bb9c987913068843a5b712099fc1 WHIRLPOOL 9c19e8e371e121009bed38ffe0e8789e35a4b9629a39aace1b44b8f830bf1e30c0cbca1c3eae45960373bedde39a912b4e1178b7af942c92263c6e4f278148d0
DIST wine-staging-1.7.21.tar.gz 883814 SHA256 d107eba41706adf039befe5a584e45225e7ebc502a11257227c378581ec22b96 SHA512 770ed2d46f5975de4a728314c3c38834c20f8c49bc5fa7eee36c870b9708404c157f6e1ac4b9ec9e5799ed3b14f825c0653d30a17d332f6b805c6255da0ddf28 WHIRLPOOL 898db4f1a3606e5645a7a1132e0b83264fa5d7c00f94a14fce067702ec3accb397db93fa0c0449df7962800c44e00825fa1cac55b76b5abe42670ad412d67e21
@@ -77,6 +79,7 @@ DIST wine-staging-1.7.53.tar.gz 9638222 SHA256 438f41165987a57635694dba2f67cc435
DIST wine-staging-1.7.54.tar.gz 9647030 SHA256 b244ab05326e0a4c149beba0684afc100d44dca8e6ff606bcfee883b21b27303 SHA512 f6e58be01ba10121d6904cb238b2d91dd79cb7d14d623c00a897e655adb88332bea125cedf3fad85e680c76aacfbab16dd5035c322278155defd3b493054aa23 WHIRLPOOL 4c053ad96e67f4e82c93d3cfa9b6f885c4c3fe693946dd0e2a30cef556aac55f9dcafb5c56ced0f714f8ea9448cb4e22f144ea7f3561cfdb5bbff1b049d34f07
DIST wine-staging-1.7.55.tar.gz 9604441 SHA256 856b630fe95250e3d2dfc80588529e42e92e37f2e974ce8d3da37b39bf5cc3c3 SHA512 a6fbfa01b6d6efc75f79235aea86091c32ddf91ca300c73325c8347949c627f53ceb0fe085d6c212602797b0496d36c0a79f08eae4644a17774e95906332032d WHIRLPOOL ad232568c9df5d436a79a3557c82e231eed121356d8db1f5a3c0e7249b6c2760d87bb433ff30d6db53ce190b2d49401aa387b06f0c3f74925aefea7b1d73f112
DIST wine-staging-1.8.tar.gz 9632566 SHA256 c66f3dd6a760d516affe7467c4fb2d15ea8e2f0c72bcda1982219948dcdff11b SHA512 7b030b217ed0b37b8037d782406f75fcdb681c81371eafcab87175c0e6ac8b50fc58fe364e933e79eff168c1755412276fae3f914b7c36a6937aea1f6e35b022 WHIRLPOOL 8cff5d1d4c23405b820dbf9e7f73f7bba785e04ec2d9087b0977bb7aa1e6b84c2e6c3ac2f9cc72ba3c16f2b9c8c3607ea02ef1cd52d428a2b441333a424d9a21
+DIST wine-staging-1.9.4.tar.gz 9719676 SHA256 1b3c6bb3e21e549fb8657cd9a2117946b7e78140b400c614dd41b041b6dc2674 SHA512 2c81b9f0315ed4f68d1874482805c9b6d3f2f9611f6dd1477ad0632d17f66e7f5e75720e5c7cef3a873876541c9d7d212fa8803a57cbec415aca32793a734634 WHIRLPOOL 0a66f53327976dd63532b9350d64461df3dcb0ea2fdc63d3498eac94d92387cf4bd53054c693c4a902f7fbba8ad0f2fdf59682e8622f3920a9a426344c656f54
DIST wine_gecko-2.21-x86.msi 20871680 SHA256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8 SHA512 f4ca9ca5b876dc39e906991e58c6da8ef4103782f83ba781ff27556c0ebdab7fe10c14f0551e900442a5d57a2c619da6e5ed6ed42323edcdd55ce9789c4c83ac WHIRLPOOL d1db97175b047652499c97c968b71c08c5b44774423f22ae626f89b4dde3d03b46295e5caae228f1f8614209e943e8246854b478eef3abb186e8de4c341b0a0d
DIST wine_gecko-2.21-x86_64.msi 21646336 SHA256 bc370bdc899f66d98f31c4d410a6952aa82c0c9c0a0ec27f2a11243c9b412c3f SHA512 2a48a7697beba4e45816a9eff09e181de353d8c93e02a70108fa77d27136cd5cd75b21c42caa7702a09f86544669ae2bbfc6975b1fc0d7fcb20150a4bc4ea514 WHIRLPOOL 2fce9b9a190a52c173551d47428dd8b8dc54d5878682733e0006a3f06f216cd9f47a88ada49f92fa5697ece8b2942a88f937bd2722b4cb85d2c35c19bda29b85
DIST wine_gecko-2.24-x86.msi 22373888 SHA256 6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c SHA512 f158d28ca09bc900a2680892e7ac10770e06050a9251e1ec3a953fee0bf9b1c326e166f92fb88a4648297b6587c91a5ef5af35f267bb2ba5f679da4c8fdb6898 WHIRLPOOL bbe7a2572d89dc5e0347ba11b2014bac79fc4427d7551655313a46b147a79c1607b7f46596877c459ddaa0e202337fb3d217429ddd6a4df49ee33b373a788487
@@ -87,6 +90,8 @@ DIST wine_gecko-2.36-x86.msi 29718016 SHA256 afa457ce8f9885225b6e549dd6f154713ce
DIST wine_gecko-2.36-x86_64.msi 31222784 SHA256 701b84004bf584a2dae7c1296121172c933321cb795c3817b64435fd3364ed44 SHA512 814b13268beeac4d0ace4ab62dbc29ccd92fc13a135499b8ea5a14355992d576268e1e401b28906e8379a826159c5bb051ad274a1e64dd0d5424d495f8e10e10 WHIRLPOOL dbd0e275bdca2ff7a1930daa62d23fd438a90f71b0fed1096b34b8d00a3f51cb91468ce61acaa9361a57deb9f3cfe70a21d16fc23de95cb4e0f7f957d4727010
DIST wine_gecko-2.40-x86.msi 31741440 SHA256 1a29d17435a52b7663cea6f30a0771f74097962b07031947719bb7b46057d302 SHA512 2f203852afede3f6b0899a54ad6eaa27c972a84df51de1632cb21af0c322e369a13150a5f19f68d7c4fcb0610b65e9244658e622c7e6b14c93ae6b7372bb184f WHIRLPOOL 461358782c8aa21be5bf934bdb7b7397717add883036a773dad20d2ba5169a5229c211781c60fb4df46057b476765c6541340f5764a5a7362daf357ab60877b6
DIST wine_gecko-2.40-x86_64.msi 33056768 SHA256 c3e28988e7d92221596fc4c569d10eb4dd2ca64b9f4970bf77e791f5dd8c9230 SHA512 af171193f221f2cd51f6dc3382a9b1c658ef2553213be32f201c05f7122eb6883838be97c3ec66177b1e3922df64c409745c3223acb01910680a5476c3f01478 WHIRLPOOL d11234b593f4190ae8fa99bec8363c0047f6de08b186752b9f49764519ee9f4aafd017a16c0496581a0f4791e1109273846cec0314d9e320423d51723cd2083a
+DIST wine_gecko-2.44-x86.msi 34832896 SHA256 77a64ad17571b3a00386a88b9b1b1ea4b7e759061675568bee0ec238fb456d39 SHA512 6c3b6ccbab0081d8ab188a9a031050ca8fd7ef8f1de0efa3a57569d6166397f91bf13037402e3437cc8cfc4fc25e7c2f8be32f66500306d567055e89aae0797d WHIRLPOOL 59c269a6d6e3ba829bd24cf81eba991f91bb0c1995a1841b7e548593f544088959093ba29eb83b53f38f77e71780d8288f0b12a212862af1374f954d61f24999
+DIST wine_gecko-2.44-x86_64.msi 36273152 SHA256 628e5a0d3b7406cbd2f031139be06e2ef695081fc77ee18dc06748e649ff6661 SHA512 71dcbd28ff048fc587ed796f2f09815f624774742abc192d9aa1104485f5d8cd93b2308fb72506f82d0ea5032dd6c7ed2af4ac95121e7b2367e7a6dd77cb042f WHIRLPOOL a327f2b5a8f47498967b80e06336918006b71b4e1b90a96943faa6f05e481273203259ab6f8a3b45ba85249344c76c100880ad88dd346a94ee45327fffb2f3a1
DIST winepulse-patches-1.7.10.tar.bz2 49205 SHA256 7330b4552b572244bbe99c16005d725eaf382995c986add170474381b90df468 SHA512 ef3a5477bc5803bfba609dc3299a7c07833958628d1aff01d100da57c0d270344ee326649206708c50c2a12b025f987a4e0f1dee9126e52e2778b256c45ba567 WHIRLPOOL b40088d8665f3cc57b4936774ac6dc2e6b005d75aa7c7385248ce35e5cf6e168ae212771f771b68dbf91fc5034b7ba54f907e93283cc2eddaa18e825d9b734a9
DIST winepulse-patches-1.7.12.tar.bz2 49171 SHA256 6c5b3f46ea1c4615c49ee0f6f65936cf650cce6640f0feb4236c707064a9d392 SHA512 ec41f6024d6e2325f14f8caa15bbe38c8dca6c69beb5343063365f58dd8b7edbbc4d24ad176de72cf0e37acae03eb9769b68fcbd40a672680e06156f4a59b12c WHIRLPOOL de8a33ee784606e76a60166e3e29a1fb748ce4b3af1db136558888bd09bb0a044e4a1a9a61ce3de59d55f93c98575ac8d77c3ff17de4d69cda3b8fbd8f6c33c5
DIST winepulse-patches-1.7.20.tar.bz2 52583 SHA256 95d0febb72baa73d5faeb82de774b49eaa9e38aa74448ea313c62f6eb1f4faf3 SHA512 9d7108fd2076d9a19dff5e72a25aa57f0946e6d17cfcc07422cce3fca34dfe04521d09cbfe611701781e10ad1f0d00562cba974214a4d189b16f6ded96ef61bf WHIRLPOOL 815d1cbf43b64a7a1a3aae965c6521ee3c6147458913f13236ccec7848340663d8372280f53eed381f3f68969bb06b272c30c605c290e31a678fc8d01575a766
diff --git a/app-emulation/wine/files/wine-1.9.5-multilib-portage.patch b/app-emulation/wine/files/wine-1.9.5-multilib-portage.patch
new file mode 100644
index 000000000000..216686533d61
--- /dev/null
+++ b/app-emulation/wine/files/wine-1.9.5-multilib-portage.patch
@@ -0,0 +1,22 @@
+--- configure.ac.orig 2016-03-05 20:53:50.574628728 -0500
++++ configure.ac 2016-03-05 20:57:54.945617833 -0500
+@@ -141,6 +141,9 @@
+ then
+ CC="$CC -m32"
+ CXX="$CXX -m32"
++ CFLAGS="$CFLAGS -m32"
++ LDFLAGS="$LDFLAGS -m32"
++ CXXFLAGS="$CXXFLAGS -m32"
+ AC_MSG_CHECKING([whether $CC works])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM()],AC_MSG_RESULT([yes]),
+ [AC_MSG_RESULT([no])
+@@ -160,6 +163,9 @@
+ fi
+ CC="$CC -m64"
+ CXX="$CXX -m64"
++ CFLAGS="$CFLAGS -m64"
++ LDFLAGS="$LDFLAGS -m64"
++ CXXFLAGS="$CXXFLAGS -m64"
+ host_cpu="x86_64"
+ notice_platform="64-bit "
+ AC_SUBST(TARGETFLAGS,"-m64")
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index 6efa58c54b8d..16fa7a695f4d 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -16,7 +16,7 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
<flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
<flag name="gecko">Add support for the Gecko engine when using iexplore</flag>
<flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;
- For versions less than wine-1.9.2, uses experimental patch which may break some apps</flag>
+ For versions before wine-1.9.2, uses experimental patch which may break some apps</flag>
<flag name="mono">Add support for .NET using Wine's Mono add-on</flag>
<flag name="netapi">Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag>
<flag name="opencl">Enable OpenCL support</flag>
@@ -25,7 +25,7 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
<flag name="perl">Install helpers written in perl (winedump/winemaker)</flag>
<flag name="pipelight">Apply Wine-Staging patches for Pipelight/Silverlight support</flag>
<flag name="prelink">Run prelink on DLLs during build;
- For versions less than wine-1.7.55 or hardened, do not disable if you do not know what this means as it can break things at runtime</flag>
+ For versions before wine-1.7.55 or hardened, do not disable if you do not know what this means as it can break things at runtime</flag>
<flag name="realtime">Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag>
<flag name="run-exes">Use Wine to open and run .EXE and .MSI files</flag>
<flag name="s3tc">Pull in <pkg>media-libs/libtxc_dxtn</pkg> for DXTn texture compression, needed for many games</flag>
@@ -33,7 +33,7 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
http://wiki.winehq.org/NtlmAuthSetupGuide and
http://wiki.winehq.org/NtlmSigningAndSealing</flag>
<flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet
- For versions less than wine-1.8, this patchset is unofficial.</flag>
+ For versions before wine-1.8, this patchset is unofficial.</flag>
</use>
<upstream>
<remote-id type="github">wine-compholio/wine-staging</remote-id>
diff --git a/app-emulation/wine/wine-1.9.4.ebuild b/app-emulation/wine/wine-1.9.4.ebuild
new file mode 100644
index 000000000000..6388a5b6d1cb
--- /dev/null
+++ b/app-emulation/wine/wine-1.9.4.ebuild
@@ -0,0 +1,426 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1
+PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
+PLOCALE_BACKUP="en"
+
+inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx versionator
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git http://source.winehq.org/git/wine.git"
+ EGIT_BRANCH="master"
+ inherit git-r3
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MAJOR_V=$(get_version_component_range 1-2)
+ SRC_URI="https://dl.winehq.org/wine/source/${MAJOR_V}/${P}.tar.bz2"
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+fi
+
+GV="2.44"
+MV="4.5.6"
+STAGING_P="wine-staging-${PV}"
+STAGING_DIR="${WORKDIR}/${STAGING_P}"
+WINE_GENTOO="wine-gentoo-2015.03.07"
+DESCRIPTION="Free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ gecko? (
+ abi_x86_32? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86.msi )
+ abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+ )
+ mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
+ https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
+
+if [[ ${PV} == "9999" ]] ; then
+ STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
+else
+ SRC_URI="${SRC_URI}
+ staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
+REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
+ test? ( abi_x86_32 )
+ elibc_glibc? ( threads )
+ mono? ( abi_x86_32 )
+ pipelight? ( staging )
+ s3tc? ( staging )
+ vaapi? ( staging )
+ osmesa? ( opengl )" #286560
+
+# FIXME: the test suite is unsuitable for us; many tests require net access
+# or fail due to Xvfb's opengl limitations.
+RESTRICT="test"
+
+COMMON_DEPEND="
+ truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
+ capi? ( net-dialup/capi4k-utils )
+ ncurses? ( >=sys-libs/ncurses-5.2:0=[${MULTILIB_USEDEP}] )
+ udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+ fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
+ gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
+ openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
+ gstreamer? (
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
+ )
+ X? (
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-libs/libXi[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ )
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
+ cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
+ opengl? (
+ virtual/glu[${MULTILIB_USEDEP}]
+ virtual/opengl[${MULTILIB_USEDEP}]
+ )
+ gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
+ lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] )
+ mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] )
+ netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] )
+ nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+ odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] )
+ osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] )
+ pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] )
+ pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+ staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+ xml? (
+ dev-libs/libxml2[${MULTILIB_USEDEP}]
+ dev-libs/libxslt[${MULTILIB_USEDEP}]
+ )
+ scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
+ ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
+ v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
+ vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] )
+ xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] )
+ abi_x86_32? (
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-baselibs-20140508-r14
+ !app-emulation/emul-linux-x86-db[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-db-20140508-r3
+ !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-medialibs-20140508-r6
+ !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-opengl-20140508-r1
+ !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-sdl-20140508-r1
+ !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-soundlibs-20140508
+ !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)]
+ !<app-emulation/emul-linux-x86-xlibs-20140508
+ )"
+
+RDEPEND="${COMMON_DEPEND}
+ dos? ( games-emulation/dosbox )
+ perl? ( dev-lang/perl dev-perl/XML-Simple )
+ s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
+ samba? ( >=net-fs/samba-3.0.25 )
+ selinux? ( sec-policy/selinux-wine )
+ udisks? ( sys-fs/udisks:2 )
+ pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
+
+# tools/make_requests requires perl
+DEPEND="${COMMON_DEPEND}
+ staging? ( dev-lang/perl dev-perl/XML-Simple )
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ xinerama? ( x11-proto/xineramaproto )
+ prelink? ( sys-devel/prelink )
+ >=sys-kernel/linux-headers-2.6
+ virtual/pkgconfig
+ virtual/yacc
+ sys-devel/flex"
+
+# These use a non-standard "Wine" category, which is provided by
+# /etc/xdg/applications-merged/wine.menu
+QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
+usr/share/applications/wine-notepad.desktop
+usr/share/applications/wine-uninstaller.desktop
+usr/share/applications/wine-winecfg.desktop"
+
+wine_build_environment_check() {
+ [[ ${MERGE_TYPE} = "binary" ]] && return 0
+
+ # bug #549768
+ if use abi_x86_64 && [[ $(gcc-major-version) = 5 && $(gcc-minor-version) -le 2 ]]; then
+ einfo "Checking for gcc-5 ms_abi compiler bug ..."
+ $(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o "${T}"/pr66838 || die
+ # Run in subshell to prevent "Aborted" message
+ if ! ( "${T}"/pr66838 || false ) >/dev/null 2>&1; then
+ eerror "64-bit wine cannot be built with gcc-5.1 or initial patchset of 5.2.0"
+ eerror "due to compiler bugs; please re-emerge the latest gcc-5.2.x ebuild,"
+ eerror "or use gcc-config to select a different compiler version."
+ eerror "See https://bugs.gentoo.org/549768"
+ eerror
+ return 1
+ fi
+ fi
+
+ if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
+ eerror "You need gcc-4.4+ to build 64-bit wine"
+ eerror
+ return 1
+ fi
+
+ if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
+ eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
+ eerror "See https://bugs.gentoo.org/487864 for more details."
+ eerror
+ return 1
+ fi
+}
+
+pkg_pretend() {
+ wine_build_environment_check || die
+}
+
+pkg_setup() {
+ wine_build_environment_check || die
+}
+
+src_unpack() {
+ if [[ ${PV} == "9999" ]] ; then
+ git-r3_src_unpack
+ if use staging; then
+ local WINE_COMMIT=${EGIT_VERSION}
+
+ EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
+ unset ${PN}_LIVE_REPO;
+ unset EGIT_COMMIT;
+
+ EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+
+ local STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) || die
+
+ if [[ "${WINE_COMMIT}" != "${STAGING_COMMIT}" ]]; then
+ einfo "The current Staging patchset is not guaranteed to apply on this WINE commit."
+ einfo "If src_prepare fails, try emerging with the env var EGIT_COMMIT."
+ einfo "Example: EGIT_COMMIT=${STAGING_COMMIT} emerge -1 wine"
+ fi
+ fi
+ else
+ unpack ${P}.tar.bz2
+ use staging && unpack "${STAGING_P}.tar.gz"
+ fi
+
+ unpack "${WINE_GENTOO}.tar.bz2"
+
+ l10n_find_plocales_changes "${S}/po" "" ".po"
+}
+
+src_prepare() {
+ local md5="$(md5sum server/protocol.def)"
+ local PATCHES=(
+ "${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
+ "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+ "${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
+ "${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
+ )
+ if use staging; then
+ ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
+ ewarn "Wine bugzilla should explicitly state that staging was used."
+
+ local STAGING_EXCLUDE=""
+ use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+
+ # Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
+ ebegin "Running Wine-Staging patch installer"
+ (
+ set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
+ cd "${STAGING_DIR}/patches"
+ source "${STAGING_DIR}/patches/patchinstall.sh"
+ )
+ eend $?
+ fi
+ autotools-utils_src_prepare
+
+ # Modification of the server protocol requires regenerating the server requests
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ if ! use run-exes; then
+ sed -i '/^MimeType/d' loader/wine.desktop || die #117785
+ fi
+
+ # hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
+ cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
+
+ l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
+}
+
+src_configure() {
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --sysconfdir=/etc/wine
+ $(use_with alsa)
+ $(use_with capi)
+ $(use_with lcms cms)
+ $(use_with cups)
+ $(use_with ncurses curses)
+ $(use_with udisks dbus)
+ $(use_with fontconfig)
+ $(use_with ssl gnutls)
+ $(use_enable gecko mshtml)
+ $(use_with gphoto2 gphoto)
+ $(use_with gsm)
+ $(use_with gstreamer)
+ --without-hal
+ $(use_with jpeg)
+ $(use_with ldap)
+ $(use_enable mono mscoree)
+ $(use_with mp3 mpg123)
+ $(use_with netapi)
+ $(use_with nls gettext)
+ $(use_with openal)
+ $(use_with opencl)
+ $(use_with opengl)
+ $(use_with osmesa)
+ $(use_with oss)
+ $(use_with pcap)
+ $(use_with png)
+ $(use_with pulseaudio pulse)
+ $(use_with threads pthread)
+ $(use_with scanner sane)
+ $(use_enable test tests)
+ $(use_with truetype freetype)
+ $(use_with v4l)
+ $(use_with X x)
+ $(use_with xcomposite)
+ $(use_with xinerama)
+ $(use_with xml)
+ $(use_with xml xslt)
+ )
+
+ use staging && myconf+=(
+ --with-xattr
+ $(use_with vaapi va)
+ )
+
+ local PKG_CONFIG AR RANLIB
+ # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
+ # set AR and RANLIB to make QA scripts happy; #483342
+ tc-export PKG_CONFIG AR RANLIB
+
+ if use amd64; then
+ if [[ ${ABI} == amd64 ]]; then
+ myconf+=( --enable-win64 )
+ else
+ myconf+=( --disable-win64 )
+ fi
+
+ # Note: using --with-wine64 results in problems with multilib.eclass
+ # CC/LD hackery. We're using separate tools instead.
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+ emake depend
+}
+
+multilib_src_test() {
+ # FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
+ if [[ ${ABI} == x86 ]]; then
+ if [[ $(id -u) == 0 ]]; then
+ ewarn "Skipping tests since they cannot be run under the root user."
+ ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
+ return
+ fi
+
+ WINEPREFIX="${T}/.wine-${ABI}" \
+ Xemake test
+ fi
+}
+
+multilib_src_install_all() {
+ local DOCS=( ANNOUNCE AUTHORS README )
+ local l
+ add_locale_docs() {
+ local locale_doc="documentation/README.$1"
+ [[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
+ }
+ l10n_for_each_locale_do add_locale_docs
+
+ einstalldocs
+ prune_libtool_files --all
+
+ emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
+ if use gecko ; then
+ insinto /usr/share/wine/gecko
+ use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+ use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ fi
+ if use mono ; then
+ insinto /usr/share/wine/mono
+ doins "${DISTDIR}"/wine-mono-${MV}.msi
+ fi
+ if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
+ rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+ fi
+
+ use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+ use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+ if use abi_x86_64 && ! use abi_x86_32; then
+ dosym /usr/bin/wine{64,} # 404331
+ dosym /usr/bin/wine{64,}-preloader
+ fi
+
+ # respect LINGUAS when installing man pages, #469418
+ for l in de fr pl; do
+ use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
+ done
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+
+ if ! use gecko; then
+ ewarn "Without Wine Gecko, wine prefixes will not have a default"
+ ewarn "implementation of iexplore. Many older windows applications"
+ ewarn "rely upon the existence of an iexplore implementation, so"
+ ewarn "you will likely need to install an external one, like via winetricks"
+ fi
+ if ! use mono; then
+ ewarn "Without Wine Mono, wine prefixes will not have a default"
+ ewarn "implementation of .NET. Many windows applications rely upon"
+ ewarn "the existence of a .NET implementation, so you will likely need"
+ ewarn "to install an external one, like via winetricks"
+ fi
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index b44030bba0e6..2c75d7b61190 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -22,12 +22,11 @@ else
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
fi
-GV="2.40"
-MV="4.5.6"
+GV="2.44"
+MV="4.6.0"
STAGING_P="wine-staging-${PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}"
WINE_GENTOO="wine-gentoo-2015.03.07"
-GST_P="wine-1.7.55-gstreamer-v5"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/"
SRC_URI="${SRC_URI}
@@ -36,7 +35,6 @@ SRC_URI="${SRC_URI}
abi_x86_64? ( https://dl.winehq.org/wine/wine-gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
)
mono? ( https://dl.winehq.org/wine/wine-mono/${MV}/wine-mono-${MV}.msi )
- gstreamer? ( https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${GST_P}.patch.bz2 )
https://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
if [[ ${PV} == "9999" ]] ; then
@@ -57,7 +55,6 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
s3tc? ( staging )
vaapi? ( staging )
osmesa? ( opengl )" #286560
- #?? ( gstreamer staging ) #Should be fixed by pre/post patchset
# FIXME: the test suite is unsuitable for us; many tests require net access
# or fail due to Xvfb's opengl limitations.
@@ -72,8 +69,8 @@ COMMON_DEPEND="
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
openal? ( media-libs/openal:=[${MULTILIB_USEDEP}] )
gstreamer? (
- media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}]
+ media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
+ media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}]
)
X? (
x11-libs/libXcursor[${MULTILIB_USEDEP}]
@@ -226,7 +223,6 @@ src_unpack() {
fi
unpack "${WINE_GENTOO}.tar.bz2"
- use gstreamer && unpack "${GST_P}.patch.bz2"
l10n_find_plocales_changes "${S}/po" "" ".po"
}
@@ -235,30 +231,10 @@ src_prepare() {
local md5="$(md5sum server/protocol.def)"
local PATCHES=(
"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
- "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+ "${FILESDIR}"/${PN}-1.9.5-multilib-portage.patch #395615
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
)
- if use gstreamer; then
- # See http://bugs.winehq.org/show_bug.cgi?id=30557
- ewarn "Applying experimental patch to fix GStreamer support. Note that"
- ewarn "this patch has been reported to cause crashes in certain games."
-
- # Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
- # during shutdown" patch and "Added patch to implement shared memory
- # wineserver communication for various user32 functions" prevents the
- # gstreamer patch from applying cleanly.
- # So undo the staging patch, apply gstreamer, then re-apply rebased staging
- # patch on top.
- if use staging; then
- PATCHES+=(
- "${FILESDIR}/${PN}-1.7.55-gstreamer-v5-staging-pre.patch"
- "${WORKDIR}/${GST_P}.patch"
- "${FILESDIR}/${PN}-1.7.55-gstreamer-v5-staging-post.patch" )
- else
- PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
- fi
- fi
if use staging; then
ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
ewarn "Wine bugzilla should explicitly state that staging was used."
diff --git a/app-misc/bijiben/bijiben-3.18.2.ebuild b/app-misc/bijiben/bijiben-3.18.2.ebuild
index d271a20a0b6e..f892b725b94e 100644
--- a/app-misc/bijiben/bijiben-3.18.2.ebuild
+++ b/app-misc/bijiben/bijiben-3.18.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Bijiben"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="zeitgeist"
RDEPEND="
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index a1246cb73bab..139282533f57 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,2 +1 @@
-DIST ckb-0.2.3.tar.gz 520320 SHA256 ee5ef3470444d422451a3e84b164723f54d697be8a6f86e31d7a6554c7cf0dc4 SHA512 7fd369b61c66f169445f88202fcb5a1cc73e12448ccb1da0d1849c39f0c779e0835039ede0eb1dd458d73a0660b1d526d97f629c5a716393eb54596bdbe637e4 WHIRLPOOL 45305b3846a17bf88d8051f62a2ab89639ab23fcf41decd90b3a935f4357028f8585911a39fdd076c7cc5f4c0bbb0b8247c17636553ebb83c9d5c322d919145d
DIST ckb-0.2.4.tar.gz 522149 SHA256 7c2c5cbf84cbde52b4310012e92278a05d53e7e56fc81ea04306df2131f39bc9 SHA512 fe55c8dc28728cc68baa754ed7e0f1296bcb1828bdbc9bc35ef7863b2a49e03e4533c919384494b88122559a88b3dd7c1040927c1ccdb90871d08f36b98e07f4 WHIRLPOOL c70a1d917b65106f611a0d2608efe24f81a38c13141049fa9d71c819bd078121b5f9db8f0b0cf25ddccfb2e2172f500ce05f8d5488abd3c8203d88f3727dbe8c
diff --git a/app-misc/ckb/ckb-0.2.3.ebuild b/app-misc/ckb/ckb-0.2.3.ebuild
deleted file mode 100644
index a17723e11dbf..000000000000
--- a/app-misc/ckb/ckb-0.2.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit qmake-utils systemd
-
-DESCRIPTION="Corsair K65/K70/K95 Driver"
-HOMEPAGE="https://github.com/ccMSC/ckb"
-SRC_URI="https://github.com/ccMSC/ckb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-libs/quazip[qt5]
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md BUILD.md DAEMON.md )
-
-src_prepare() {
- sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die
- sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip/" src/ckb/ckb.pro || die
-}
-
-src_configure() {
- eqmake5
-}
-
-src_install() {
- dobin bin/ckb bin/ckb-daemon
- dodir /usr/bin/ckb-animations
- exeinto /usr/bin/ckb-animations
- doexe bin/ckb-animations/*
-
- newinitd "${FILESDIR}"/ckb.initd ckb-daemon
- domenu usr/ckb.desktop
- doicon usr/ckb.png
- systemd_dounit service/systemd/ckb-daemon.service
-}
diff --git a/app-misc/dateutils/Manifest b/app-misc/dateutils/Manifest
index a9541e22549a..82ac7371998e 100644
--- a/app-misc/dateutils/Manifest
+++ b/app-misc/dateutils/Manifest
@@ -1,2 +1,3 @@
DIST dateutils-0.3.3.tar.xz 593700 SHA256 3eb0b1dbf4519c86bc890a12c78cc85eae2cc10c20ff894a90ed55140efeee7a SHA512 7041b415edd457b378db36f06782038c3b7b4663cb12dcd5c6555401169e953721a6c24b54fe6db67ba514ecd17fd6007bd503ba364012edcad99a0199f3a78c WHIRLPOOL f84cee24ade044f9fa8b284cc484711e86a3dcd91df840759817f28c516267a7008b4262c750d41ecbf27e87c476c641bd836b541288ba222b93d58ef1a1ae8e
DIST dateutils-0.3.4.tar.xz 593016 SHA256 1fe71d6f05705565612a61de848071bfb39fb604695c8052e8d7959c5f34a714 SHA512 3d4097bc42b5a05da8f7b242f820b2a85fc865c08f37d9087f590d739e7aef8e00a9b079b41756333b3fd13d8a4969e63f68b664bba0a45e10a0c7042c1276ba WHIRLPOOL 30caa00f018c92af29f23fe6c7c57fb5878106f900ae26dace3834d07be0613c7a260992c7aab76f2745100580098858dacce083ccfa45a8379470720b977e7b
+DIST dateutils-0.3.5.tar.xz 593112 SHA256 cff341d3e6394627d98cb9643b9ca1235b839037ede58983c927df4f27ee31a7 SHA512 e0d732ce42551906da0c6635ac9e17aa4b12cb199e63f32355a33ded36afa2a37e05853c23716982daf6078be8b8dafb0d7c49a228876cbbafc4541c037e067a WHIRLPOOL 4d50e485362813dc77f18c43c3071d69654ab31372852da35af612a465a0cf108a7ad7c5ba3d0a021923a02622acf6502f47668d7226498064ed6855f21de26b
diff --git a/app-misc/dateutils/dateutils-0.3.5.ebuild b/app-misc/dateutils/dateutils-0.3.5.ebuild
new file mode 100644
index 000000000000..09742ac0a609
--- /dev/null
+++ b/app-misc/dateutils/dateutils-0.3.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="command line date and time utilities"
+HOMEPAGE="https://hroptatyr.github.com/dateutils/"
+SRC_URI="https://bitbucket.org/hroptatyr/${PN}/downloads/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/xz-utils
+ sys-libs/timezone-data"
+
+# bug 429810
+RDEPEND="!sys-infiniband/dapl"
+
+src_configure() {
+ econf \
+ --docdir=/usr/share/doc/${PF}
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}"
+}
+
+src_test() {
+ # parallel tests failure
+ emake CFLAGS="${CFLAGS}" -j1 check
+}
diff --git a/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild b/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild
index 220b0dcb250b..e5c52a70c5c6 100644
--- a/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild
+++ b/app-misc/emelfm2/emelfm2-0.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://emelfm2.net/rel/${P}.tar.bz2"
LICENSE="GPL-3 LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="acl ansi gimp gtk3 kernel_linux nls policykit spell udisks"
EMELFM2_LINGUAS=( de fr ja pl ru zh_CN )
diff --git a/app-misc/geoclue/geoclue-2.4.1.ebuild b/app-misc/geoclue/geoclue-2.4.1.ebuild
index 9926a5269c7d..3138114cac3e 100644
--- a/app-misc/geoclue/geoclue-2.4.1.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz
LICENSE="LGPL-2"
SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE="+introspection +modemmanager zeroconf"
RDEPEND="
diff --git a/app-misc/gnote/gnote-3.18.1.ebuild b/app-misc/gnote/gnote-3.18.1.ebuild
index 052aa7deb0ca..7aa6fe38129f 100644
--- a/app-misc/gnote/gnote-3.18.1.ebuild
+++ b/app-misc/gnote/gnote-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gnote"
LICENSE="GPL-3+ FDL-1.1"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug X"
# Automagic glib-2.32 dep
diff --git a/app-misc/note/note-1.3.3-r1.ebuild b/app-misc/note/note-1.3.3-r1.ebuild
index 33575e76e8e7..d419bf67051b 100644
--- a/app-misc/note/note-1.3.3-r1.ebuild
+++ b/app-misc/note/note-1.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,7 +19,7 @@ DEPEND="dev-perl/TermReadKey
dev-perl/Term-ReadLine-Perl
virtual/perl-Storable
dev-perl/Config-General
- crypt? ( dev-perl/crypt-cbc
+ crypt? ( dev-perl/Crypt-CBC
dev-perl/Crypt-Blowfish
dev-perl/Crypt-DES )
mysql? ( virtual/mysql
diff --git a/app-misc/rlwrap/Manifest b/app-misc/rlwrap/Manifest
index 7613889c4192..8fff41371cc4 100644
--- a/app-misc/rlwrap/Manifest
+++ b/app-misc/rlwrap/Manifest
@@ -1,3 +1 @@
-DIST rlwrap-0.37.tar.gz 251438 SHA256 8403a2c184a33ee293a30637afd1362e7dbe0ee642c33b54b2fca68162498bbd SHA512 39edeaed5d36636ea3fa7993808a485ce5c6f303621c64f4a758b29b4fb0bb9ca0bfc60317bd8efa95c7e138db7ff0cb8fdb712a7d1582ea1c732e143efdd9c2 WHIRLPOOL 874950e10c990a3789f806aa0d9a48dc0b03d23da445c75248d1df319a080ae3bcd076a563121e4f5c3230cd6f66352552778d593e5545c84580ce6ae31c0268
-DIST rlwrap-0.41.tar.gz 259472 SHA256 34497647b68df4ee031acf4ef80c09c79fe02b9027e8988a64e13f9ebc17c20a SHA512 1a2949b5a1009da8bbc6bf4bb4a7a829fc0c2c37dacdb102ce4c102b636762a4dd5224f293e419159b691ef78419de1e322a42b41694cd4fbf384e21759e34d9 WHIRLPOOL e5a7d201b775e8891396e3b025563554bf4c0b62d73008bdc23cc456e9a0fc770a8a713171a0e119ff1579815004b1e3ca1a4f42ec0cb0eb0d25e1be38d463f1
DIST rlwrap-0.42.tar.gz 279608 SHA256 5a70d8469db9d0a6630628f2d5d2972ad16c092400b7fbbdf699693ec0f87e44 SHA512 991885e75aabf0d43581d59f7c78f7f64c3f32072de08ff5796cba75c0716548d2186cbe2d739f3e772871e3586d036f069db73b2ee8a30b2f7985088d0f68df WHIRLPOOL a4ff4ac599f87695c15060dcacb2d10b5d8ff21512f38b7374e096ef71ae17f7e977ecb9e3004c231d8d8c5b37e2ddbab724fedb3439f507a5a483373f4af14b
diff --git a/app-misc/rlwrap/rlwrap-0.37.ebuild b/app-misc/rlwrap/rlwrap-0.37.ebuild
deleted file mode 100644
index ea180cc3ea73..000000000000
--- a/app-misc/rlwrap/rlwrap-0.37.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-DESCRIPTION="GNU readline wrapper"
-HOMEPAGE="http://utopia.knoware.nl/~hlub/uck/rlwrap/"
-SRC_URI="http://utopia.knoware.nl/~hlub/uck/rlwrap/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug"
-
-RDEPEND="sys-libs/readline"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- econf \
- $(use_enable debug)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS BUGS ChangeLog NEWS README # PLEA TODO
-}
diff --git a/app-misc/rlwrap/rlwrap-0.41.ebuild b/app-misc/rlwrap/rlwrap-0.41.ebuild
deleted file mode 100644
index 61c9a2eb106b..000000000000
--- a/app-misc/rlwrap/rlwrap-0.41.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
-
-DESCRIPTION="GNU readline wrapper"
-HOMEPAGE="http://utopia.knoware.nl/~hlub/uck/rlwrap/"
-SRC_URI="http://utopia.knoware.nl/~hlub/uck/rlwrap/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug"
-
-RDEPEND="sys-libs/readline"
-DEPEND="${RDEPEND}"
-
-src_configure() {
- econf \
- $(use_enable debug)
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS BUGS ChangeLog NEWS README # PLEA TODO
-}
diff --git a/app-misc/rlwrap/rlwrap-0.42.ebuild b/app-misc/rlwrap/rlwrap-0.42.ebuild
index a42f734d8375..285b678ae486 100644
--- a/app-misc/rlwrap/rlwrap-0.42.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="amd64 ~mips ppc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="debug"
-RDEPEND="sys-libs/readline"
+RDEPEND="sys-libs/readline:0"
DEPEND="${RDEPEND}"
src_configure() {
diff --git a/app-misc/task/Manifest b/app-misc/task/Manifest
index 596027a5cdfa..0c0d0a298d6f 100644
--- a/app-misc/task/Manifest
+++ b/app-misc/task/Manifest
@@ -1,2 +1,3 @@
DIST task-2.4.4.tar.gz 2352265 SHA256 7ff406414e0be480f91981831507ac255297aab33d8246f98dbfd2b1b2df8e3b SHA512 23565dc21bb5a05af5fe44235756ac5ecbd3b7cd94b2edc2ed0b0bd4efc5a12739cc8e3474174878595188ba726428b865dee3a79f0ad2550d5a0bc25415b103 WHIRLPOOL f071926d77a228289e2fb6a9e5c53e9db9e2d278879bf6249b04b0e7f7afe5f4195f9ea3fb42ac4aac318d0f53eda378ac24c73321d99a83c0f22295ad1dcaf4
DIST task-2.5.0.tar.gz 900285 SHA256 4d8e67415a6993108c11b8eeef99b76a991af11b22874adbb7ae367e09334636 SHA512 911ed33553c71d0578dda20774ff1c5762700957ed637ed849ef51c4cd00a53feabc18c477dbc4b618371d9ddc8fec71795f96d8474acbec8a91be8bb1ff1bfd WHIRLPOOL e17995f173c6935f46ab476517e16157771a52bb930a6287e3f17b68ebae19db380da0643ae7a1fe6ce549ccb11d8ebe71ed45b5b650eef4343902b70459e1e6
+DIST task-2.5.1.tar.gz 903428 SHA256 d87bcee58106eb8a79b850e9abc153d98b79e00d50eade0d63917154984f2a15 SHA512 ec17e5cefff55ecd2c1cb717801c02683d94030906c8d86450c3c79c0bc5a18d82559a5e9e26a91411a1025a241b78ddbc1de51cafc1a2dd531e8229e5e61c10 WHIRLPOOL e4502a4f545eb5c044943758e3b4710db34c9011ccb58b95e70486c09593620a91cf547100025182867b69c87099cd8614b6bc28e21d5e0c0b88216f6df419ac
diff --git a/app-misc/task/task-2.5.1.ebuild b/app-misc/task/task-2.5.1.ebuild
new file mode 100644
index 000000000000..5f3af4a8d86e
--- /dev/null
+++ b/app-misc/task/task-2.5.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils cmake-utils bash-completion-r1
+
+DESCRIPTION="Taskwarrior is a command-line todo list manager"
+HOMEPAGE="http://taskwarrior.org/"
+SRC_URI="http://taskwarrior.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+IUSE="gnutls vim-syntax zsh-completion"
+
+DEPEND="sys-libs/readline:0
+ gnutls? ( net-libs/gnutls )
+ elibc_glibc? ( sys-apps/util-linux )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ # don't automatically install scripts
+ sed -i '/scripts/d' CMakeLists.txt || die
+}
+
+src_configure() {
+ mycmakeargs=(
+ $(cmake-utils_use_use gnutls GNUTLS)
+ -DTASK_DOCDIR=share/doc/${PF}
+ -DTASK_RCDIR=share/${PN}/rc
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ newbashcomp scripts/bash/task.sh task
+
+ if use vim-syntax ; then
+ rm scripts/vim/README
+ insinto /usr/share/vim/vimfiles
+ doins -r scripts/vim/*
+ fi
+
+ if use zsh-completion ; then
+ insinto /usr/share/zsh/site-functions
+ doins scripts/zsh/*
+ fi
+
+ exeinto /usr/share/${PN}/scripts
+ doexe scripts/add-ons/*
+}
diff --git a/app-misc/tracker/tracker-1.6.1.ebuild b/app-misc/tracker/tracker-1.6.1.ebuild
index 3009e3d07b42..83cb066ce3a6 100644
--- a/app-misc/tracker/tracker-1.6.1.ebuild
+++ b/app-misc/tracker/tracker-1.6.1.ebuild
@@ -18,7 +18,7 @@ IUSE="cue eds elibc_glibc exif ffmpeg firefox-bookmarks flac gif gsf
gstreamer gtk iptc +iso +jpeg libav +miner-fs mp3 nautilus networkmanager
pdf playlist rss stemmer test thunderbird +tiff upnp-av upower +vorbis +xml xmp xps"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
REQUIRED_USE="
?? ( gstreamer ffmpeg )
diff --git a/app-misc/vifm/vifm-0.8.1a.ebuild b/app-misc/vifm/vifm-0.8.1a.ebuild
index bec2322fba88..44f060045075 100644
--- a/app-misc/vifm/vifm-0.8.1a.ebuild
+++ b/app-misc/vifm/vifm-0.8.1a.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~s390 ~x86"
IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
DEPEND="
- >=sys-libs/ncurses-5.9-r99:5
+ >=sys-libs/ncurses-5.9-r3:0
magic? ( sys-apps/file )
gtk? ( x11-libs/gtk+:2 )
X? ( x11-libs/libX11 )
diff --git a/app-misc/vifm/vifm-0.8.ebuild b/app-misc/vifm/vifm-0.8.ebuild
index 7e3c38ab7fec..90748458bf26 100644
--- a/app-misc/vifm/vifm-0.8.ebuild
+++ b/app-misc/vifm/vifm-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ppc ~s390 x86"
IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
DEPEND="
- >=sys-libs/ncurses-5.7-r7
+ >=sys-libs/ncurses-5.7-r7:0
magic? ( sys-apps/file )
gtk? ( x11-libs/gtk+:2 )
X? ( x11-libs/libX11 )
diff --git a/app-misc/vit/files/vit-allow-nonsudo-install.patch b/app-misc/vit/files/vit-allow-nonsudo-install.patch
new file mode 100644
index 000000000000..0f5626cce379
--- /dev/null
+++ b/app-misc/vit/files/vit-allow-nonsudo-install.patch
@@ -0,0 +1,36 @@
+diff --git a/Makefile.in b/Makefile.in
+index 87abf5b..66d6acd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -7,6 +7,8 @@ VERSION=@VERSION@
+ TASK=@TASK@
+ PERL=@PERL@
+ CLEAR=@CLEAR@
++SUDO=@SUDO@
++SUDO=sudo
+
+ .PHONY : install
+
+@@ -28,14 +30,14 @@ build:
+ chmod 755 vit
+
+ install:
+- sudo mkdir -p @prefix@/bin
+- sudo cp vit @prefix@/bin/vit
+- sudo mkdir -p @prefix@/man/man1
+- sudo cp vit.1 @prefix@/man/man1/
+- sudo mkdir -p @prefix@/man/man5
+- sudo cp vitrc.5 @prefix@/man/man5/
+- sudo mkdir -p @prefix@/etc/
+- sudo cp commands @prefix@/etc/vit-commands
++ $(SUDO) mkdir -p $(DESTDIR)@prefix@/bin
++ $(SUDO) cp vit $(DESTDIR)@prefix@/bin/vit
++ $(SUDO) mkdir -p $(DESTDIR)@prefix@/man/man1
++ $(SUDO) cp vit.1 $(DESTDIR)@prefix@/man/man1/
++ $(SUDO) mkdir -p $(DESTDIR)@prefix@/man/man5
++ $(SUDO) cp vitrc.5 $(DESTDIR)@prefix@/man/man5/
++ $(SUDO) mkdir -p $(DESTDIR)@prefix@/etc/
++ $(SUDO) cp commands $(DESTDIR)@prefix@/etc/vit-commands
+
+ autoconf:
+ @make -f .makefile autoconf
diff --git a/app-misc/vit/files/vit-fix-man-installs.patch b/app-misc/vit/files/vit-fix-man-installs.patch
new file mode 100644
index 000000000000..9d13fbb287a0
--- /dev/null
+++ b/app-misc/vit/files/vit-fix-man-installs.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile.in b/Makefile.in
+index 66d6acd..c167ae4 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -32,10 +32,10 @@ build:
+ install:
+ $(SUDO) mkdir -p $(DESTDIR)@prefix@/bin
+ $(SUDO) cp vit $(DESTDIR)@prefix@/bin/vit
+- $(SUDO) mkdir -p $(DESTDIR)@prefix@/man/man1
+- $(SUDO) cp vit.1 $(DESTDIR)@prefix@/man/man1/
+- $(SUDO) mkdir -p $(DESTDIR)@prefix@/man/man5
+- $(SUDO) cp vitrc.5 $(DESTDIR)@prefix@/man/man5/
++ $(SUDO) mkdir -p $(DESTDIR)@prefix@/share/man/man1
++ $(SUDO) cp vit.1 $(DESTDIR)@prefix@/share/man/man1/
++ $(SUDO) mkdir -p $(DESTDIR)@prefix@/share/man/man5
++ $(SUDO) cp vitrc.5 $(DESTDIR)@prefix@/share/man/man5/
+ $(SUDO) mkdir -p $(DESTDIR)@prefix@/etc/
+ $(SUDO) cp commands $(DESTDIR)@prefix@/etc/vit-commands
+
diff --git a/app-misc/vit/metadata.xml b/app-misc/vit/metadata.xml
new file mode 100644
index 000000000000..9a9dbc1812a8
--- /dev/null
+++ b/app-misc/vit/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription lang="en">
+ A perl/Curses front end for Taskwarrior (<pkg>app-misc/task</pkg>) that
+ provides a fullscreen terminal window with modes and commands
+ modeled after the vi editor.
+</longdescription>
+</pkgmetadata>
diff --git a/app-misc/vit/vit-1.2.ebuild b/app-misc/vit/vit-1.2.ebuild
new file mode 100644
index 000000000000..2078d35f3dc4
--- /dev/null
+++ b/app-misc/vit/vit-1.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils git-r3
+
+DESCRIPTION="Perl/Curses front-end for Taskwarrior (app-misc/task)"
+HOMEPAGE="http://tasktools.org/projects/vit.html"
+
+EGIT_REPO_URI="https://git.tasktools.org/scm/ex/vit.git"
+if [[ ${PV} = 9999* ]]; then
+ KEYWORDS=""
+else
+ EGIT_COMMIT=v${PV}
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ dev-perl/Curses"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-allow-nonsudo-install.patch \
+ "${FILESDIR}"/${PN}-fix-man-installs.patch
+}
+
+src_install() {
+ emake DESTDIR="${D}" SUDO="" install
+ dodoc AUTHORS README CHANGES
+ doman vit.1 vitrc.5
+
+ rm -rf "${ED}"/usr/man
+}
diff --git a/app-misc/vit/vit-9999.ebuild b/app-misc/vit/vit-9999.ebuild
new file mode 100644
index 000000000000..2078d35f3dc4
--- /dev/null
+++ b/app-misc/vit/vit-9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils git-r3
+
+DESCRIPTION="Perl/Curses front-end for Taskwarrior (app-misc/task)"
+HOMEPAGE="http://tasktools.org/projects/vit.html"
+
+EGIT_REPO_URI="https://git.tasktools.org/scm/ex/vit.git"
+if [[ ${PV} = 9999* ]]; then
+ KEYWORDS=""
+else
+ EGIT_COMMIT=v${PV}
+ KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ dev-perl/Curses"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-allow-nonsudo-install.patch \
+ "${FILESDIR}"/${PN}-fix-man-installs.patch
+}
+
+src_install() {
+ emake DESTDIR="${D}" SUDO="" install
+ dodoc AUTHORS README CHANGES
+ doman vit.1 vitrc.5
+
+ rm -rf "${ED}"/usr/man
+}
diff --git a/app-office/gnucash/gnucash-2.6.11.ebuild b/app-office/gnucash/gnucash-2.6.11.ebuild
index 604bd46404c6..ecba963e0281 100644
--- a/app-office/gnucash/gnucash-2.6.11.ebuild
+++ b/app-office/gnucash/gnucash-2.6.11.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="chipcard debug +doc gnome-keyring hbci mysql ofx postgres python quotes sqlite"
# FIXME: rdepend on dev-libs/qof when upstream fix their mess (see configure.ac)
diff --git a/app-office/gnumeric/gnumeric-1.12.27.ebuild b/app-office/gnumeric/gnumeric-1.12.27.ebuild
index a5297b4d1894..89bc94fb9096 100644
--- a/app-office/gnumeric/gnumeric-1.12.27.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.27.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnumeric.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="+introspection libgda perl python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-office/pinpoint/pinpoint-0.1.8.ebuild b/app-office/pinpoint/pinpoint-0.1.8.ebuild
index eb203e508a61..fea449a051ee 100644
--- a/app-office/pinpoint/pinpoint-0.1.8.ebuild
+++ b/app-office/pinpoint/pinpoint-0.1.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Pinpoint"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+gstreamer +pdf"
# rsvg is used for svg-in-pdf -- clubbing it under pdf for now
diff --git a/app-office/upwork/Manifest b/app-office/upwork/Manifest
index 51dae940a2fd..ed07190e6c4d 100644
--- a/app-office/upwork/Manifest
+++ b/app-office/upwork/Manifest
@@ -1,3 +1,5 @@
+DIST upwork-4.0.144.0_i386.rpm 29416397 SHA256 d36d60d376090c2ac0513daa351e0eb0dac02018990c92275a9fd44d9dde0934 SHA512 d6d1a64c720cab26527324c75ba5b8f996f4e892334dc68c2a63ba356d764dec8f83303f65417a6445c90f43ed675beeb0fcbc197edf0590a49163586fd5a816 WHIRLPOOL d377c5f804fee57105c478d535a6671a7b27ab27f3e2fee6f2d7fbb638875a8b063aa4a0d8360546fb048f3cf2fc350c91df6bc1910111157f8983913e3587c8
+DIST upwork-4.0.144.0_x86_64.rpm 33391158 SHA256 fb46bdc802a11d504321ac0b3177de89884a073b51e3d783871a18bf79f959fa SHA512 fd029061bba8c1a089c388641cb54f5d27e220fd0a4811e1a2c23155858ade7276b062ec6fc3af02b1753ca3969fc8acb1a345aed76c301913242efb2da7df9f WHIRLPOOL ea365d7b36a6adbfc6e16b6f1d4d6b52919d6cdf49c6eb8787604413809be1304902b105729839ca959039e17d6d53e9d694c9992097f570d42eb13021d05044
DIST upwork-4.0.53.0_i386.rpm 29330489 SHA256 8fe161e3bda15ee7b8c372dfb3fabe4324fcfa4e925d0e8c14e71a8a8b90a858 SHA512 28e186f6b95dedfe4175ace94522e6ce19aedb90c44ea72f33e8ae15e358e190423dc20b4704f70196904f11dbc7d29ddb776f27a29cb2f09fa8f74d6593317f WHIRLPOOL 1d32e53d35afe42ae79e0c4e927dfdc2d8a7c89e0140186a0ffeb23f71fd705622783c421db1340b71f5f097ed28f9696d831568b90f2ec0cc403b879662ca93
DIST upwork-4.0.53.0_x86_64.rpm 33297576 SHA256 cb206dd72795ef6465dac4cd777cb3495880c3941194a6d2e16c988bd5495f26 SHA512 aada2c85d9f310d7bf085986ffdcb925461ba948d314e6616fb3f570670391b8a0102e9b03aa0c46659c6654e36284c51ddabc488b5013812b6bb3a76d96aaf4 WHIRLPOOL 6b18f72b65c00f4e538793d4e52436543a4a2501c49656c6bf416adeed12380cda6e88e95c6466ee79179130a173f891f242e843e4c472480628673f351f71dd
DIST upwork-4.0.70.0_i386.rpm 29349208 SHA256 b7d1490d3ebb170a2173b016a33c5263d3bc82845ba39dc3daa65295f9c03792 SHA512 cbece7f71e67bcb0742955e59f2682ab184af1bd28fab8682c6bd984beda086a20f8f3e4b8d3c3c40f1b244cc6f9f199662349ef7472e64bee05cd443ff033f3 WHIRLPOOL edad445cc1b3401c4d93357f1baf046541e61000b5ce127d109949170fd60a99090e4cbba911a4e089cd354e2433f3376121211c587344ce6f2a79ed02bae9ba
diff --git a/app-office/upwork/upwork-4.0.144.0.ebuild b/app-office/upwork/upwork-4.0.144.0.ebuild
new file mode 100644
index 000000000000..b368c854893a
--- /dev/null
+++ b/app-office/upwork/upwork-4.0.144.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit rpm eutils pax-utils
+
+# Binary only distribution
+QA_PREBUILT="*"
+
+DESCRIPTION="Project collaboration and tracking software for upwork.com"
+HOMEPAGE="https://www.upwork.com/"
+SRC_URI="amd64? ( http://updates.team.odesk.com/binaries/v4_0_144_0_mj9j7zmoj9asg5f0/upwork_x86_64.rpm -> ${P}_x86_64.rpm )
+ x86? ( http://updates.team.odesk.com/binaries/v4_0_144_0_mj9j7zmoj9asg5f0/upwork_i386.rpm -> ${P}_i386.rpm )
+"
+LICENSE="ODESK"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S=${WORKDIR}
+
+RDEPEND="
+ dev-libs/libgcrypt:11
+ media-libs/alsa-lib
+ sys-libs/libcap
+ virtual/udev
+ x11-libs/gtk+:2
+ x11-libs/gtkglext
+"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-desktop.patch"
+}
+
+src_install() {
+ # Wrapper to the real executable
+ dobin usr/bin/upwork
+
+ insinto /usr/share
+ pax-mark m usr/share/upwork/upwork
+ doins -r usr/share/upwork
+ dosym /usr/lib/libudev.so /usr/share/upwork/libudev.so.0
+
+ # Make this executable because it's the real executable
+ fperms 0755 /usr/share/upwork/upwork
+
+ domenu usr/share/applications/upwork.desktop
+ doicon usr/share/pixmaps/upwork.png
+}
diff --git a/app-portage/conf-update/conf-update-1.0.3-r1.ebuild b/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
index 996c6c8f05ba..a32f4de6cf42 100644
--- a/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
+++ b/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="colordiff libressl"
RDEPEND=">=dev-libs/glib-2.6
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index 1cf13f987eb6..a8b015a53c57 100644
--- a/app-portage/grs/Manifest
+++ b/app-portage/grs/Manifest
@@ -1,3 +1,2 @@
-DIST grs-0.3.tar.gz 34173 SHA256 445af2f267df936b4a06fdcb17e2a28dafd6eed8d52a8ff69ada622cedd8699d SHA512 710ea986ab55eabed5b774e850854ee36e600d378dd17a2d62cce67132695ecadea01b15ffaed750bb33a6f31e49989952425b7602808f65574ac506da1773fa WHIRLPOOL f5632d5562d6cb66b8111c35c5d5b57e0710d01d679d9c802182d18e2ddee0af7fe058a1275ca45c097fefdb1419943c638fdfe93110639cf299fd1c0df5b83d
DIST grs-0.4.tar.gz 34212 SHA256 a069b51258fa9dbe8158ebe7339967c588360037a405bb9600ca69f3f18bb0d2 SHA512 e24879aabf7d9d029f584693dcb5e6578d5e14ab9e2588143883b7a27174184a2e2c30d08bf140a1bb45b7ab80c10e73f5ccf96de0bea8185d326ce0ce83fa11 WHIRLPOOL 4a6389efeec00a71f457a5d1087758ebd590aa4546a1c36e37de33a0aae34c7e42cd591795ad3b4a232c5e85511f4d42173fdcb6dbbc7fbb55a89490632e0f30
DIST grs-0.5.tar.gz 34213 SHA256 8442d68d680665fcf3700add714503929d04cd435ebd487529a2555518bc8825 SHA512 85cb78d898c266fe4f1a5298d3add20fb127d43469cd00d32400bebf0c7350c07b581f9e8714a32db62c57f5a92fca0cbe66f0e2812dab86f57d9e8c66aaab7f WHIRLPOOL e99c2278a71f8285028699c7e961f27f94bf52189a2de3ea38d07514101fdc45be4b6261c5ea35429afd5acf9e06c4bd7a910df72c82b877e7d324cdb27c7d47
diff --git a/app-portage/grs/grs-0.3.ebuild b/app-portage/grs/grs-0.3.ebuild
deleted file mode 100644
index 9fdc78aaf555..000000000000
--- a/app-portage/grs/grs-0.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_4 )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="git://anongit.gentoo.org/proj/grss.git"
- inherit git-2
-else
- SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="amd64"
-fi
-
-DESCRIPTION="Suite to build Gentoo Reference Systems"
-HOMEPAGE="https://dev.gentoo.org/~blueness/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
- app-arch/tar[xattr]
- app-crypt/md5deep
- dev-libs/libcgroup
- dev-vcs/git
- net-misc/rsync
- sys-apps/portage
- sys-fs/squashfs-tools
- virtual/cdrtools
- || (
- sys-kernel/genkernel
- sys-kernel/genkernel-next
- )"
-
-src_install() {
- distutils-r1_src_install
- echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
- doenvd "${T}"/20grs
-}
diff --git a/app-portage/grs/grs-0.5.ebuild b/app-portage/grs/grs-0.5.ebuild
index 901f63a735d6..f3676da12498 100644
--- a/app-portage/grs/grs-0.5.ebuild
+++ b/app-portage/grs/grs-0.5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-2
else
SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
fi
DESCRIPTION="Suite to build Gentoo Reference Systems"
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index ea863478ddf1..84d60a92df79 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -1,2 +1,3 @@
DIST mksh-R52.tgz 383814 SHA256 45c2f5cdd2c63a6a831ffae65cea0afd021eabb983537aa21ff893ee38b3768f SHA512 83b478baa401dc6116c363043d9d6629028bbcdf19448db939738c5b98f8e4f7da92932296c2ee813b317151d31a1b6cd55d27f062f79e587e22991b018a0285 WHIRLPOOL 524524b950d5f7f21a2660235f955c45e645bcebf1e6120e71c183a0d50da5974840d7f70a18ab6d0766ad5345f62cd657f2fbcc1cd2d33976943f3bb28c243a
DIST mksh-R52b.tgz 385085 SHA256 93231332a1df0a9c8d4a0d54a519d8b485989a52f7400f0e6451366a0c74b81f SHA512 d204f0d0e221a8592dc0efdb31b909ce522792708937ab1f3ec0a4b1098f2d5171c06cda029a9f7e63eb087a1acf53210f4701cee5564868c15c6294e6fe322f WHIRLPOOL 687eba233332ad7d4de53a57e53a5f851558190ea69daca21ea820a85fbeca00da8fa92e9d8a4dd833498d9adb80482c3394913a61251e9fe2a3cc9e962e74e4
+DIST mksh-R52c.tgz 386254 SHA256 c6341acea725103f782c14e994d6e12dabaee69e60fe1bc78603a41258d43ba6 SHA512 f2434f2e165da290cc3f5d78846fb4774115a6e35ef3299d0343b1797b3773921d614396b0da78f8e9a451d6029df9abff503575c5cdcb232e18df7731d18da0 WHIRLPOOL 86ed90260285180fc097296ea5ba90015222fc2733570dfd9a056a867dba9661e2083e863632bca3f771699dec60ca65b1e1dc8821b492269bcc095b8bad2f9e
diff --git a/app-shells/mksh/mksh-52c.ebuild b/app-shells/mksh/mksh-52c.ebuild
new file mode 100644
index 000000000000..e2df980dbb41
--- /dev/null
+++ b/app-shells/mksh/mksh-52c.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="MirBSD KSH Shell"
+HOMEPAGE="http://mirbsd.de/mksh"
+SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static"
+DEPEND="static? ( dev-libs/klibc )"
+RDEPEND=""
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+ tc-export CC
+ # we want to build static with klibc
+ if use static ; then
+ unset CC
+ export CC="/usr/bin/klcc"
+ export LDSTATIC="-static"
+ fi
+ export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
+ # we can't assume lto existing/enabled, so we add a fallback
+ sh Build.sh -r -c lto || sh Build.sh -r || die
+}
+
+src_install() {
+ exeinto /bin
+ doexe mksh
+ doman mksh.1
+ dodoc dot.mkshrc
+}
+
+src_test() {
+ ./test.sh || die
+}
+
+pkg_postinst() {
+ ebegin "Updating /etc/shells"
+ ( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
+ mv -f "${T}"/shells "${ROOT}"etc/shells
+ eend $?
+}
diff --git a/app-shells/posh/posh-0.12.6.ebuild b/app-shells/posh/posh-0.12.6.ebuild
index 511eff566c91..9f585a6c0052 100644
--- a/app-shells/posh/posh-0.12.6.ebuild
+++ b/app-shells/posh/posh-0.12.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/p/posh/${P/-/_}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
DEPEND="app-arch/xz-utils"
diff --git a/app-text/atril/atril-1.8.1.ebuild b/app-text/atril/atril-1.8.1.ebuild
index 28070b388e7b..84cccece8c6b 100644
--- a/app-text/atril/atril-1.8.1.ebuild
+++ b/app-text/atril/atril-1.8.1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://mate-desktop.org"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="caja dbus debug djvu dvi +introspection gnome-keyring +postscript t1lib tiff xps"
diff --git a/app-text/bdf2psf/bdf2psf-1.104.ebuild b/app-text/bdf2psf/bdf2psf-1.104.ebuild
index f967e957f37a..3523d106a70e 100644
--- a/app-text/bdf2psf/bdf2psf-1.104.ebuild
+++ b/app-text/bdf2psf/bdf2psf-1.104.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE=""
DEPEND=""
diff --git a/app-text/evince/evince-3.18.2.ebuild b/app-text/evince/evince-3.18.2.ebuild
index ba71b19c255f..91a75daf508c 100644
--- a/app-text/evince/evince-3.18.2.ebuild
+++ b/app-text/evince/evince-3.18.2.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
SLOT="0/evd3.4-evv3.3"
IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
# not mature enough
diff --git a/app-text/gspell/gspell-0.1.2.ebuild b/app-text/gspell/gspell-0.1.2.ebuild
index 64742fbd1d90..4714220dedbf 100644
--- a/app-text/gspell/gspell-0.1.2.ebuild
+++ b/app-text/gspell/gspell-0.1.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+introspection vala"
REQUIRED_IUSE="vala? ( introspection )"
diff --git a/app-text/gtkspell/gtkspell-3.0.7.ebuild b/app-text/gtkspell/gtkspell-3.0.7.ebuild
index 2529821d065e..31e19aa5b21e 100644
--- a/app-text/gtkspell/gtkspell-3.0.7.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
LICENSE="GPL-2+"
SLOT="3/0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
IUSE="+introspection vala"
RDEPEND="
diff --git a/app-text/iso-codes/iso-codes-3.65.ebuild b/app-text/iso-codes/iso-codes-3.65.ebuild
index 22f4a6b83881..609caaacca24 100644
--- a/app-text/iso-codes/iso-codes-3.65.ebuild
+++ b/app-text/iso-codes/iso-codes-3.65.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/app-text/pdfminer/pdfminer-20140328-r1.ebuild b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
new file mode 100644
index 000000000000..9f0c142226e6
--- /dev/null
+++ b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python tool for extracting information from PDF documents"
+HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.python.org/pypi/pdfminer/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+python_compile_all(){
+ use examples && emake -C samples all
+}
+
+python_test() {
+ emake test
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/. )
+ use examples && local EXAMPLES=( samples/. )
+ distutils-r1_python_install_all
+}
diff --git a/app-text/q-text-as-data/Manifest b/app-text/q-text-as-data/Manifest
new file mode 100644
index 000000000000..8f2b6c63b89b
--- /dev/null
+++ b/app-text/q-text-as-data/Manifest
@@ -0,0 +1 @@
+DIST q-1.5.0.tar.gz 58746 SHA256 69bde3fb75aa1d42ba306576b135b8a72121a995e6d865cc8c18db289c602c4b SHA512 d21dd16a31629e36f0dee72ebc574283c7937821cb2da7ccaacb8484a35b53193dad05fe9857d1498434a0c1083514ea5b9e5d8a636bcd51d4c5924cb7bb1b55 WHIRLPOOL 264ecbd3a064ba37fc581fea1f9c7b3e6a7f8985c6dcc1c6856193036e202ba3483b90502640f042a25b418eaecc881bc3246855812ffbf55126789b6e79a44f
diff --git a/dev-java/bytecode/metadata.xml b/app-text/q-text-as-data/metadata.xml
index 952a4b9b605c..79d462e85571 100644
--- a/dev-java/bytecode/metadata.xml
+++ b/app-text/q-text-as-data/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
+<maintainer type="person">
+ <email>robbat2@gentoo.org</email>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild b/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild
new file mode 100644
index 000000000000..aa6fcbb4de0f
--- /dev/null
+++ b/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+# Does not yet support py3
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+DESCRIPTION="q: Text as Data is a CLI tool that allows direct execution of SQL-like queries on text"
+HOMEPAGE="http://harelba.github.io/q/"
+MY_P="q-${PV}"
+SRC_URI="https://github.com/harelba/q/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# No dependencies other than python >= 2.5
+# http://harelba.github.io/q/requirements.html
+RDEPEND="${PYTHON_DEPS}"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+q_install() {
+ python_newexe bin/q q-text-as-data
+}
+
+src_install() {
+ python_foreach_impl q_install
+ newdoc bin/.qrc dot-qrc
+ dodoc doc/*
+}
+
+pkg_postinst() {
+ einfo "On Gentoo, the 'q' binary is most often provided by app-portage/portage-utils;"
+ einfo "Thus, this tool is install as 'q-text-as-data' rather than 'q'."
+}
diff --git a/app-text/ronn/ronn-0.7.3-r3.ebuild b/app-text/ronn/ronn-0.7.3-r3.ebuild
index 26dd948bc1d0..a15e5a3c35bd 100644
--- a/app-text/ronn/ronn-0.7.3-r3.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
inherit ruby-fakegem
-DESCRIPTION="Converts simple, human readable textfiles to roff for terminal display, and to HTML"
+DESCRIPTION="Converts simple, human readable textfiles to roff for terminal display, and HTML"
HOMEPAGE="https://github.com/rtomayko/ronn/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE=""
diff --git a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
index dbc535b5a348..088793047b68 100644
--- a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/dev-cpp/atkmm/atkmm-2.24.2.ebuild b/dev-cpp/atkmm/atkmm-2.24.2.ebuild
index 5b0311da2590..fa9422055237 100644
--- a/dev-cpp/atkmm/atkmm-2.24.2.ebuild
+++ b/dev-cpp/atkmm/atkmm-2.24.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc"
COMMON_DEPEND="
diff --git a/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild b/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
index eeb2476e7d83..08341e254cee 100644
--- a/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
+++ b/dev-cpp/cairomm/cairomm-1.12.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://cairographics.org/cairomm"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="aqua doc +svg X"
RDEPEND="
diff --git a/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild b/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
index 13d0755d25f3..2dd826ce9f2b 100644
--- a/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
+++ b/dev-cpp/gconfmm/gconfmm-2.28.3-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE="doc"
RDEPEND="
diff --git a/dev-cpp/glibmm/glibmm-2.46.3.ebuild b/dev-cpp/glibmm/glibmm-2.46.3.ebuild
index 2a1607a08532..8cb54a977543 100644
--- a/dev-cpp/glibmm/glibmm-2.46.3.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.46.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc debug examples test"
RDEPEND="
diff --git a/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0-r1.ebuild b/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0-r1.ebuild
index 3732877093e9..b5ffb1479e2e 100644
--- a/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0-r1.ebuild
+++ b/dev-cpp/gnome-vfsmm/gnome-vfsmm-2.26.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1"
SLOT="1.1"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE="doc examples"
# glibmm dep is because build fails with older versions...
diff --git a/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild b/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild
index e800ea91b8a2..03008b979622 100644
--- a/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild
+++ b/dev-cpp/gtkglextmm/gtkglextmm-1.2.0-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="C++ bindings for gtkglext"
HOMEPAGE="https://projects.gnome.org/gtkglext/"
SRC_URI="mirror://sourceforge/gtkglext/${P}.tar.bz2"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="doc"
SLOT="1.0"
LICENSE="GPL-2 LGPL-2.1"
diff --git a/dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild b/dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild
index bd2c9af819fb..7a09de76966b 100644
--- a/dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-2.24.4-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2.4"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc examples test"
COMMON_DEPEND="
diff --git a/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild b/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild
index 42d8488883f6..9c3a6cbaf08d 100644
--- a/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild
+++ b/dev-cpp/gtkmm/gtkmm-3.18.0-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="3.0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="aqua doc examples test wayland X"
REQUIRED_USE="|| ( aqua wayland X )"
diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild
index a05188b9bd89..a788361a33cc 100644
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild
+++ b/dev-cpp/gtksourceviewmm/gtksourceviewmm-2.10.3-r1.ebuild
@@ -11,7 +11,7 @@ inherit flag-o-matic gnome2
DESCRIPTION="C++ bindings for gtksourceview"
HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="doc"
SLOT="2.0"
LICENSE="LGPL-2.1"
diff --git a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild
index c598ac4ee496..f1ef3134d117 100644
--- a/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild
+++ b/dev-cpp/gtksourceviewmm/gtksourceviewmm-3.18.0.ebuild
@@ -10,7 +10,7 @@ inherit gnome2
DESCRIPTION="C++ bindings for gtksourceview"
HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="doc"
SLOT="3.0"
LICENSE="LGPL-2.1"
diff --git a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
index 48e7ffcec8f9..76c099ca3bf2 100644
--- a/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
+++ b/dev-cpp/libglademm/libglademm-2.6.7-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="2.4"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE="doc examples"
RDEPEND="
diff --git a/dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild b/dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild
index 0dd40e4c0586..3a48c785d628 100644
--- a/dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild
+++ b/dev-cpp/libgnomemm/libgnomemm-2.30.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1"
SLOT="2.6"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND="
diff --git a/dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r2.ebuild b/dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r2.ebuild
index 55a444152de5..898ad7a382e1 100644
--- a/dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r2.ebuild
+++ b/dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1"
SLOT="2.6"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND="
diff --git a/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild b/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild
index 64c1d3452c29..2263dff53a18 100644
--- a/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild
+++ b/dev-cpp/libxmlpp/libxmlpp-2.40.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://libxmlplusplus.sourceforge.net/"
LICENSE="LGPL-2.1"
SLOT="2.6"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="doc"
RDEPEND="
diff --git a/dev-cpp/mm-common/mm-common-0.9.10.ebuild b/dev-cpp/mm-common/mm-common-0.9.10.ebuild
index 15139f67b02b..74dac2e44b84 100644
--- a/dev-cpp/mm-common/mm-common-0.9.10.ebuild
+++ b/dev-cpp/mm-common/mm-common-0.9.10.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
IUSE=""
RDEPEND=""
diff --git a/dev-cpp/pangomm/pangomm-2.38.1.ebuild b/dev-cpp/pangomm/pangomm-2.38.1.ebuild
index bb8158bf5980..1b20c7b8cbcb 100644
--- a/dev-cpp/pangomm/pangomm-2.38.1.ebuild
+++ b/dev-cpp/pangomm/pangomm-2.38.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="1.4"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc"
COMMON_DEPEND="
diff --git a/dev-db/barman/Manifest b/dev-db/barman/Manifest
index c8f502f3fc7c..c115425e25ea 100644
--- a/dev-db/barman/Manifest
+++ b/dev-db/barman/Manifest
@@ -2,3 +2,4 @@ DIST barman-1.4.0.tar.gz 120590 SHA256 d18c331bd6d8931bd60dab272bc9d512eb494bfdd
DIST barman-1.4.1.tar.gz 122048 SHA256 38a649ab1cea811e2db9410d87c08423beb3135f88b1160913bcb9f16a10b1df SHA512 3f6d55ceee55efc95d526848292f68c80bbee4081fc26714b0da52990e3a05030ae2f89561a4c4c71c273bb1c07f009dc0bbbbebbc5cde87831b514e918ad531 WHIRLPOOL 8f42844f5d9514b0d8c14ff2ad03f1e8e3994e0e394e7e7a761b0a95ed6a8c9a4eea791a82a14b346cbcf3354aaa8f56547290eddc75ea0f57e775a55db70499
DIST barman-1.5.0.tar.gz 128132 SHA256 21188b11f64dd13e70236456ca7ad43fc21ccb1956e093ced7f8f810b13d972a SHA512 7b9501277868b141f3813a545fe5463a1f7cddb0d4aaeb6c13a21aa969ced4a0a53a38ecb6e091b84c0174dae0593235cb8b586bdd244b30776273030cdfc1e8 WHIRLPOOL 5d5630370c5c30f79228e4007ff0608d2c6c44eee4e6d2f7dca2518c432bae24ddb5f6f32680b4759277d4b5e572140906f658f4d2db2d2fd82e1fea965675fe
DIST barman-1.5.1.tar.gz 132842 SHA256 69127c298f91f696241df0e15f9327d53b050cbbeea6ba5dec039aea76d432de SHA512 bc99c3b970c82f24b49e44eb4672e1201237e3a7e575d45dff5186fb472d98e59a7a18b74b7218ef05b05c606d2f53e1723f1482681624dd386caff79161926c WHIRLPOOL aa7eb221264d590b2afa344dfc7344de7ce913c638eb41d021bf96ae30b0a6c37b4b462e9ac059b02595722eda8f21e990c9e6f1152ac8f789ef06490890bcea
+DIST barman-1.6.0.tar.gz 157048 SHA256 771957451fafef93f64d7ce08f43530b86f52fb31451ecc180a40856c707bc76 SHA512 2f214fd85b19a098e5e16f32f781c6af1ab18d369b40afbbda118b4e7663beec8cdb44482171f7195a17c48949cc0f6fdec0eafda1b33add159e4e6144ddda4a WHIRLPOOL 7a343747de1d0848eae821e7fce3205d2b47e02570955956387716f2cdab45affc75749faa1044dedab72c5436ec1d77433f54acbc5ffbaf7dd0908a59703d5a
diff --git a/dev-db/barman/barman-1.6.0.ebuild b/dev-db/barman/barman-1.6.0.ebuild
new file mode 100644
index 000000000000..d312a7ea25b1
--- /dev/null
+++ b/dev-db/barman/barman-1.6.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+EAPI=5
+
+PYTHON_COMPAT=( python2_7)
+
+inherit distutils-r1
+
+DESCRIPTION="Administration tool for disaster recovery of PostgreSQL servers"
+
+HOMEPAGE="http://www.pgbarman.org"
+SRC_URI="http://downloads.sourceforge.net/project/pgbarman/${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+RDEPEND="dev-python/argh[${PYTHON_USEDEP}]
+ >=dev-python/psycopg-2[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ dev-python/argcomplete[${PYTHON_USEDEP}]
+ net-misc/rsync
+ dev-db/postgresql[server]"
+DEPEND=""
diff --git a/dev-db/mariadb/mariadb-10.1.12.ebuild b/dev-db/mariadb/mariadb-10.1.12.ebuild
index 24997ffd40dc..198a9b271a07 100644
--- a/dev-db/mariadb/mariadb-10.1.12.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.12.ebuild
@@ -79,6 +79,8 @@ src_configure(){
local MYSQL_CMAKE_NATIVE_DEFINES=(
-DWITH_JEMALLOC=$(usex jemalloc system)
-DWITH_PCRE=system
+ )
+ local MYSQL_CMAKE_EXTRA_DEFINES=(
-DPLUGIN_AUTH_GSSAPI_CLIENT=$(usex kerberos YES NO)
)
if use server ; then
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 3940f5759f43..24f5c373d8eb 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -6,6 +6,7 @@ DIST sqlite-autoconf-3090200.tar.gz 2284431 SHA256 064c0abe9c9177534d4c770bca7a5
DIST sqlite-autoconf-3100000.tar.gz 2331542 SHA256 43cc292d70711fa7580250c8a1cd7c64813a4a0a479dbd502cce5f10b5d91042 SHA512 0d34f511f386e841b60ca6354715e7196c2c3d47e0ae13f09b9ae8d0f95118104b2bd8e13697c4c97b994269c2b2e112841ab74e82a2a64c50243d8ec8d8f46e WHIRLPOOL 090ee131929573a71f3049ee9accf3e8df21dd9d6834e499baf0988cad6bd64f433ef5f05cdb0ba0a15254ced47d94591c913be5e15d0de76e4a41f391393d94
DIST sqlite-autoconf-3100200.tar.gz 2332013 SHA256 a2b3b4bd1291ea7d6c8252f7edff36a4362f2f0e5d5370444ba6cbe313ae2971 SHA512 fa4e3757d76c9f0cf167481346c0844f41a3a7ea0e8fde186be7ebcc14f9b45b770386110e23860c6dcaaf1819aa12725fde7507271a0a8b59610dcc458c552f WHIRLPOOL 5bc1f324bb9fb7baa70a12e6e1519ccae7f2beef51ec48312df4a1a8890406bfbd4a9c0ee0b5a186619624763c65238fa34b88bb478c76e7a39b23c4a96eb66a
DIST sqlite-autoconf-3110000.tar.gz 2359347 SHA256 508d4dcbcf7a7181e95c717a1dc4ae3c0880b3d593be0c4b40abb6c3a0e201fb SHA512 208bb41e9b2a67ba5efdefe5393161996b7741a153647bd28b680a41a7d3c23f6c916bf6eede5325f507697fa92571c4982522ba9396a58e7a675564dec73865 WHIRLPOOL 9096de033729f27ccbdea0753b27a5170b1c1d7c6b016d00ad27c1a4b29dc8eabf15a1b8afcf97682f33b064552db3ceac5eb9d9612c8fd17d3602d3a592eb3d
+DIST sqlite-autoconf-3110100.tar.gz 2359545 SHA256 533ff1d0271c2e666f01591271cef01a31648563affa0c95e80ef735077d4377 SHA512 c3efd2693e6a9526a2901d9879982a421e81e7e979aef65a160e71b255339344079a1943395480d5c37a1acc6243a8d45f45fa688f7e996774da38a3a99e71a1 WHIRLPOOL b8062e2030dffd8b44cc0eba32c93312b8ae20064004c460321a4251806037fe62ec5ef83499e491cb248786b9302f0495de0c0624128d0063cbff71b77b8864
DIST sqlite-doc-3081001.zip 5060040 SHA256 0b6c186a2da8b7d7397eb3942e97fd85b88734beb300702ace0dca4a3db729a6 SHA512 76caf476c98d8a0f5da55c4608bfc31235289e3ab2286089195fab86da6b5d98b2d5eb0fe7b81e3aff8f04939c9bcbfded6be22f0eeb21103478bf519e9ff78b WHIRLPOOL 5edd1d06babf19d54e326f6262d45851d43a0907adad66b130c93cf63efbfadcad6dbc98330bd4d2f80d1d528cd9088ada0727475b42005de6bcdbc4914e5d7c
DIST sqlite-doc-3081002.zip 5068441 SHA256 e355ec10989829d485d2df08f076f6c3f598f7fc1d45d307b4fd70d5e609e6c4 SHA512 c222b250de6c8e182da1b534f459600a81b300c87578f9484b7d6f1fbbfaad9e8be70c306d0200b163850f48c974c55ce25782fefd55672ef72f03dc0b5f8d19 WHIRLPOOL 148bbce9bc3ffb1f9101e45936ce060aa49dbc88647effabf5418fa95ccdb91a4971d171d940de3307a2d59144e73250c43f8d8d79927ac36a1e02784f143061
DIST sqlite-doc-3081101.zip 5108061 SHA256 89e3fc4bce7463885da3b03602b4260fe07240f9ea674ba4ac7ce2ee4987357f SHA512 8a39e05b1647f4769126234b9759552138f3e3874bc008686ef2f9136833ddc30b3b0696222a736d604e8910a436acedc4954e46894f4adc085eb5f2b6ab9280 WHIRLPOOL f47308753f8df2c497e1bf3cd941b862d69d4f6bbabb2f0606d144966cbb186c5e1513022a5adc122939180fc6cfaa7c83a9537481cce455a83b7bf68deec9cd
@@ -14,6 +15,7 @@ DIST sqlite-doc-3090200.zip 5295693 SHA256 4b9ecb9d2b0424ca2a288184ee36fa16a1103
DIST sqlite-doc-3100000.zip 5350213 SHA256 40af646d8c2109e5a15b1787e53524ed16c8e0d1705dda5f005b6186f18c2f2a SHA512 b04846e180d71c0bd3f76399f68df352ba663939a141fb1368f0099cfefb22e290ce1f5cf69eeb63a9136097c463ff9446670629f5b0662e5a230691c36e20c8 WHIRLPOOL 36802a6cb26b4f53945fcd79e5f665c0b9607ce8207fd647ac2735fb30fdba0419c0ecdfc946f74bd237fe646857bbb01a93c1e5135bd6aa13827c691d69c888
DIST sqlite-doc-3100200.zip 5374707 SHA256 21637344807efb9b6c6f615fd98b72620d074c720660940182888a4dbc2af982 SHA512 188f7b982066ba6680b13966b2d6f2c466fb99bef0c5c8ee0ca1a18a6760e5a26eef43ef985f2c9031e4299c27dc91a444f113549353c3209c5b50b97015aabb WHIRLPOOL f614a00fe9cc12e97f5c1bff6af008c3eeca5aa761656b0af3a1b790bee697f8316da2b57c457eb4c252463834b51a89911b9117c7d4508d4eba85eb73780a6b
DIST sqlite-doc-3110000.zip 5382519 SHA256 4a942d89d5bf0aa70c0a01267a52961632b27512c293eb6452f6efe909dcec50 SHA512 1c9a17c1461bae78d34a89a7c2bc7e7108d95ece40c909835fc08a7f332823a152a7a357f83755d66307336ce116d9539ef67be44c5e11ec742721ac819fd708 WHIRLPOOL 742df247b6930062cf0904d03a9e543c1affc8f592f8675a99a95acf34501cc14b47ca9eb7ee8062f83960cfdb62b2a05656989e2438d45fe70c90c2c5ce518a
+DIST sqlite-doc-3110100.zip 5386958 SHA256 3f127c51c7936d13de96255b00a6be3862693ff025f61a1d3d17d3d57ee295d0 SHA512 b8fe71a852ce2fa3d7da27c09e3a1e8d019a9c55eb7e5516425754148f8d8a6cc88571d006768d5fd5b2c72aa513544bfc0ce4208f376099f8f08b7fee480d06 WHIRLPOOL 8cf7b3495ff184622dbf2842931d6b77061dc166c9d66e6bb6e400525c59ccc5b689b22cea45dad0fa7a7117692a1c16fea46aa4789084ce8c4de3655e973812
DIST sqlite-src-3081001.zip 7648823 SHA256 def6e2401c8da91b489de19d1a1734f722b4e629148ab804776d27b49ba49e7b SHA512 7604ac35eddd4aca53c02b0ab7ae7682856aec2eb4e6a9627da041ea19d464bb6080a70d84070a94abf77eb14ae616a0a8c5fe2f2a6c19fc899d1b21535d3e1a WHIRLPOOL c44e4f446d12af1f4df49e171276d853381784e979d3521cafbfdd5b5359c792586d298f3573bbda8a260b9008a4b7fcdc4ce0382fdda18574287018a2cb4f4c
DIST sqlite-src-3081002.zip 7648737 SHA256 fda379bc4590761838d02ac8008433b7c3eae6e120e45d639d24b09d0004b42d SHA512 99661c709ffe8d5776c3ed2c1a64c70f541b68f0c7745e3e769528273966f71eeb29e8911d42ede9420f179b7fcbda63c4d0980a9d7bc05e937d0a6deb7b814f WHIRLPOOL 4e13138a5f92f5c5fe65c8b670097b57ea778244a37a5bcabf75f86f4ac3f0bc17860f3e55833adc9adcc335b6aece396c685421b58ccb0ddca66f37edfda7fc
DIST sqlite-src-3081101.zip 9057103 SHA256 261ad454663f66fda6101b278bb7b3931cf01884deefbf4ea6b152f83a624662 SHA512 e84048a4a7f9c51219698b59d45c0c533ffe46ba6a20b96ca40f8066fd3825f80f963283d61dc22b2eb5bbca35db3ed4a6e13b1ab3c8b70b0af83469d2760f16 WHIRLPOOL c1add1e5a269546883e58c1666b8acdc58b16b6ad37ea546c99c8ece3348196d5ba33effb17fc773f4d49b1ee45583de7fec3fbe2f6d48e95fdfe4a802c6a824
@@ -22,3 +24,4 @@ DIST sqlite-src-3090200.zip 9284007 SHA256 d0899e14797ded1e3cfdd7280c8fb485a07c6
DIST sqlite-src-3100000.zip 9222423 SHA256 7dd893f5569f0aa2fdd4f463f1f4ee670cff3f493d880d5e365c72fcdd777566 SHA512 70f09a41e516a8152e5e3b08e4e2e2e54dbe2976c89c4dfca08efbf2124dd3f73ef1d3b49742e03ea92fb99061c1ac67e0d7ad6d327c194faec0f48a1550264e WHIRLPOOL 7ffa03e617c7d53eeccacb178f4fece689e4bf7bbdee07ab532e93fa018a977a9604ae967ca6aa325606ee69ed77a4c2e7fbb24fe1800dc94b91f84f18f6a446
DIST sqlite-src-3100200.zip 9223036 SHA256 a45e1574e77951116cef6ad7eb79a683385a3a33fc78037e3cfcfd9243c4fb86 SHA512 08bd94f6fc282ab9e30e602c5eb27e0611bd7d9841f1135b037b9a3b09055f88a0351ce4973753fbd186ac912cdb2cf2e62835c67c35f9146697147bd7b7713d WHIRLPOOL 2a3de53f7eb944edb31602c121c2be518d1ce28d8b21933ac262fac7f48e803b9267ea0abbc7b578b44bc1104d65c4610a862c821f9797806fb674a7ab32729c
DIST sqlite-src-3110000.zip 9293025 SHA256 ac670e151222f5deee88d7883d8d509a874fe0e5df288659ada011ca8b435db0 SHA512 c83c1449e4f39f3aa22522a0ae8afa875259a7e1db7af129a7d185246567337435093d1f3a21a5038bbc97e35bb582b240ecffbe24d9fd6b60012016b9ebeecc WHIRLPOOL bcee84e44827a2a051b7d7b99e6e636373d656cf682eb12dae33bb884f4596f5223007a0e4f13993edb8da13551acb2d0957e6c53260d1ff056ac44c3fecb7d8
+DIST sqlite-src-3110100.zip 9294249 SHA256 ade6aa93fd1d52dec0d8712f9ba4df59ecc6ec442f32ef28631c3b9341aadf97 SHA512 350c3019922a6adc1b7372f5e27c810a08f4bf576ea4e07d46bc59e1939a919d1bda1a29581f4df258f577202d79253292f719ca56ba30d1e7a1a2d801b65a48 WHIRLPOOL 3f7cc7baa7c59930e2e676d859478a68fddd392ccc4747630aa68c3909eb0b633d6031e9a998c1a741054594935dd52b3143ce05b574ff1b14f20f6ededc0a6e
diff --git a/dev-db/sqlite/sqlite-3.11.1.ebuild b/dev-db/sqlite/sqlite-3.11.1.ebuild
new file mode 100644
index 000000000000..58280164a2dc
--- /dev/null
+++ b/dev-db/sqlite/sqlite-3.11.1.ebuild
@@ -0,0 +1,239 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic multilib multilib-minimal toolchain-funcs versionator
+
+SRC_PV="$(printf "%u%02u%02u%02u" $(get_version_components))"
+DOC_PV="${SRC_PV}"
+# DOC_PV="$(printf "%u%02u%02u00" $(get_version_components $(get_version_component_range 1-3)))"
+
+DESCRIPTION="A SQL Database Engine in a C Library"
+HOMEPAGE="https://sqlite.org/"
+SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip )
+ tcl? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+ test? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+ tools? ( https://sqlite.org/2016/${PN}-src-${SRC_PV}.zip )
+ !tcl? ( !test? ( !tools? ( https://sqlite.org/2016/${PN}-autoconf-${SRC_PV}.tar.gz ) ) )"
+
+LICENSE="public-domain"
+SLOT="3"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
+
+RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
+ readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+ tcl? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )
+ tools? ( dev-lang/tcl:0=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ doc? ( app-arch/unzip )
+ tcl? ( app-arch/unzip )
+ test? (
+ app-arch/unzip
+ dev-lang/tcl:0[${MULTILIB_USEDEP}]
+ )
+ tools? ( app-arch/unzip )"
+
+full_tarball() {
+ use tcl || use test || use tools
+}
+
+pkg_setup() {
+ if full_tarball; then
+ S="${WORKDIR}/${PN}-src-${SRC_PV}"
+ else
+ S="${WORKDIR}/${PN}-autoconf-${SRC_PV}"
+ fi
+}
+
+src_prepare() {
+ if full_tarball; then
+ epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-build.patch"
+ epatch "${FILESDIR}/${PN}-3.11.0-full_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch"
+
+ # Fix shell1-5.0 test.
+ # https://mailinglists.sqlite.org/cgi-bin/mailman/private/sqlite-dev/2015-May/002575.html
+ sed -e "/if {\$i==0x0D /s/\$i==0x0D /&|| (\$i>=0xE0 \&\& \$i<=0xEF) /" -i test/shell1.test
+ else
+ epatch "${FILESDIR}/${PN}-3.11.0-nonfull_tarball-build.patch"
+ epatch "${FILESDIR}/${PN}-3.11.0-nonfull_tarball-SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER.patch"
+ fi
+
+ eautoreconf
+
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local CPPFLAGS="${CPPFLAGS}" options=()
+
+ options+=(
+ --enable-$(full_tarball && echo load-extension || echo dynamic-extensions)
+ --enable-threadsafe
+ )
+ if ! full_tarball; then
+ options+=(--disable-static-shell)
+ fi
+
+ # Support detection of misuse of SQLite API.
+ # https://sqlite.org/compile.html#enable_api_armor
+ append-cppflags -DSQLITE_ENABLE_API_ARMOR
+
+ # Support column metadata functions.
+ # https://sqlite.org/c3ref/column_database_name.html
+ append-cppflags -DSQLITE_ENABLE_COLUMN_METADATA
+
+ # Support dbstat virtual table.
+ # https://sqlite.org/dbstat.html
+ append-cppflags -DSQLITE_ENABLE_DBSTAT_VTAB
+
+ # Support Full-Text Search versions 3, 4 and 5.
+ # https://sqlite.org/fts3.html
+ # https://sqlite.org/fts5.html
+ append-cppflags -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4
+ options+=(--enable-fts5)
+
+ # Support hidden columns.
+ append-cppflags -DSQLITE_ENABLE_HIDDEN_COLUMNS
+
+ # Support JSON1 extension.
+ # https://sqlite.org/json1.html
+ append-cppflags -DSQLITE_ENABLE_JSON1
+
+ # Support Resumable Bulk Update extension.
+ # https://sqlite.org/rbu.html
+ append-cppflags -DSQLITE_ENABLE_RBU
+
+ # Support R*Trees.
+ # https://sqlite.org/rtree.html
+ append-cppflags -DSQLITE_ENABLE_RTREE
+
+ # Support scan status functions.
+ # https://sqlite.org/c3ref/stmt_scanstatus.html
+ # https://sqlite.org/c3ref/stmt_scanstatus_reset.html
+ append-cppflags -DSQLITE_ENABLE_STMT_SCANSTATUS
+
+ # Support unlock notification.
+ # https://sqlite.org/unlock_notify.html
+ append-cppflags -DSQLITE_ENABLE_UNLOCK_NOTIFY
+
+ # Support soundex() function.
+ # https://sqlite.org/lang_corefunc.html#soundex
+ append-cppflags -DSQLITE_SOUNDEX
+
+ # debug USE flag.
+ if full_tarball; then
+ options+=($(use_enable debug))
+ else
+ if use debug; then
+ append-cppflags -DSQLITE_DEBUG
+ else
+ append-cppflags -DNDEBUG
+ fi
+ fi
+
+ # icu USE flag.
+ if use icu; then
+ # Support ICU extension.
+ # https://sqlite.org/compile.html#enable_icu
+ append-cppflags -DSQLITE_ENABLE_ICU
+ if full_tarball; then
+ sed -e "s/^TLIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+ else
+ sed -e "s/^LIBS = @LIBS@/& -licui18n -licuuc/" -i Makefile.in || die "sed failed"
+ fi
+ fi
+
+ # readline USE flag.
+ options+=(
+ --disable-editline
+ $(use_enable readline)
+ )
+ if full_tarball && use readline; then
+ options+=(--with-readline-inc="-I${EPREFIX}/usr/include/readline")
+ fi
+
+ # secure-delete USE flag.
+ if use secure-delete; then
+ # Enable secure_delete pragma by default.
+ # https://sqlite.org/pragma.html#pragma_secure_delete
+ append-cppflags -DSQLITE_SECURE_DELETE
+ fi
+
+ # static-libs USE flag.
+ options+=($(use_enable static-libs static))
+
+ # tcl, test, tools USE flags.
+ if full_tarball; then
+ options+=(--enable-tcl)
+ fi
+
+ if [[ "${CHOST}" == *-mint* ]]; then
+ append-cppflags -DSQLITE_OMIT_WAL
+ fi
+
+ # Use pread(), pread64(), pwrite(), pwrite64() functions for better performance if they are available.
+ if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread_pwrite_test" <<< $'#include <unistd.h>\nint main()\n{\n pread(0, NULL, 0, 0);\n pwrite(0, NULL, 0, 0);\n return 0;\n}' &> /dev/null; then
+ append-cppflags -DUSE_PREAD
+ fi
+ if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n pread64(0, NULL, 0, 0);\n pwrite64(0, NULL, 0, 0);\n return 0;\n}' &> /dev/null; then
+ append-cppflags -DUSE_PREAD64
+ elif $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -D_LARGEFILE64_SOURCE -Werror=implicit-function-declaration -x c - -o "${T}/pread64_pwrite64_test" <<< $'#include <unistd.h>\nint main()\n{\n pread64(0, NULL, 0, 0);\n pwrite64(0, NULL, 0, 0);\n return 0;\n}' &> /dev/null; then
+ append-cppflags -DUSE_PREAD64 -D_LARGEFILE64_SOURCE
+ fi
+
+ econf "${options[@]}"
+}
+
+multilib_src_compile() {
+ emake HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}"
+
+ if use tools && multilib_is_native_abi; then
+ emake rbu showdb showjournal showstat4 showwal sqldiff sqlite3_analyzer
+ fi
+}
+
+multilib_src_test() {
+ if [[ "${EUID}" -eq 0 ]]; then
+ ewarn "Skipping tests due to root permissions"
+ return
+ fi
+
+ emake HAVE_TCL="$(usex tcl 1 "")" $(use debug && echo fulltest || echo test)
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" HAVE_TCL="$(usex tcl 1 "")" TCLLIBDIR="${EPREFIX}/usr/$(get_libdir)/${P}" install
+
+ if use tools && multilib_is_native_abi; then
+ install_tool() {
+ if [[ -f ".libs/${1}" ]]; then
+ newbin ".libs/${1}" "${2}"
+ else
+ newbin "${1}" "${2}"
+ fi
+ }
+
+ install_tool rbu sqlite3-rbu
+ install_tool showdb sqlite3-show-db
+ install_tool showjournal sqlite3-show-journal
+ install_tool showstat4 sqlite3-show-stat4
+ install_tool showwal sqlite3-show-wal
+ install_tool sqldiff sqlite3-diff
+ install_tool sqlite3_analyzer sqlite3-analyzer
+
+ unset -f install_tool
+ fi
+}
+
+multilib_src_install_all() {
+ prune_libtool_files
+
+ doman sqlite3.1
+
+ if use doc; then
+ dohtml -A ico,odf,odg,pdf,svg -r "${WORKDIR}/${PN}-doc-${DOC_PV}/"
+ fi
+}
diff --git a/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild b/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild
index 9cf26f8d6da8..019322032c16 100644
--- a/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild
+++ b/dev-dotnet/zeitgeist-sharp/zeitgeist-sharp-0.8.0.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
doc? ( https://launchpad.net/zeitgeist-sharp/${DIR_PV}/${DIR_PV2}/+download/${PN}-docs-${DIR_PV2}.tar.gz )"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
LICENSE="GPL-3"
IUSE="doc"
diff --git a/dev-games/wfmath/wfmath-1.0.2.ebuild b/dev-games/wfmath/wfmath-1.0.2.ebuild
index 53fe04e1472e..a7ef53ac45c1 100644
--- a/dev-games/wfmath/wfmath-1.0.2.ebuild
+++ b/dev-games/wfmath/wfmath-1.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc static-libs"
RDEPEND=""
diff --git a/dev-go/cli/Manifest b/dev-go/cli/Manifest
new file mode 100644
index 000000000000..8aba04d3cd4b
--- /dev/null
+++ b/dev-go/cli/Manifest
@@ -0,0 +1 @@
+DIST cli-20160227.tar.gz 22096 SHA256 cd6332ad737e8fde546398eab54e2e17a698c1999ae5d0f5d48418d7150b2158 SHA512 56a0101f128bead8e7f9ae9c26960a30a8156290497c68e2c6f3156172110245a197f46e3008aadf2b0da598a34b48d8602ff80ad8b3a6eba1cf934ff98e301a WHIRLPOOL a5923c19e1f64d557effe6adfbb08ee3c5837715622ed00ef61f2417719d0135f3e21e7e7c0917933a59892b1031e05721fc7088ebc61d49e0a6565cfa3de921
diff --git a/dev-go/cli/cli-20160227.ebuild b/dev-go/cli/cli-20160227.ebuild
new file mode 100644
index 000000000000..37ae9080496c
--- /dev/null
+++ b/dev-go/cli/cli-20160227.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/codegangsta/cli/..."
+EGIT_COMMIT="a2943485b110df8842045ae0600047f88a3a56a1"
+ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A small package for building command line apps in Go"
+HOMEPAGE="https://github.com/codegangsta/cli"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="MIT"
+SLOT="0/${PVR}"
+IUSE=""
diff --git a/dev-go/cli/metadata.xml b/dev-go/cli/metadata.xml
new file mode 100644
index 000000000000..a6160401d85b
--- /dev/null
+++ b/dev-go/cli/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mrueg@gentoo.org</email>
+ <name>Manuel Rüger</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">codegangsta/cli</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-haskell/cgi/metadata.xml b/dev-haskell/cgi/metadata.xml
index e596d3b2119e..a5b813d56cdc 100644
--- a/dev-haskell/cgi/metadata.xml
+++ b/dev-haskell/cgi/metadata.xml
@@ -11,8 +11,6 @@
<use>
<flag name="extensible-exceptions-in-base">Required to be
enabled for &gt;=dev-lang/ghc-7.</flag>
- </use>
- <use>
<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
</use>
<upstream>
diff --git a/dev-haskell/hslua/metadata.xml b/dev-haskell/hslua/metadata.xml
index 2127026f06d6..e1447dd132e6 100644
--- a/dev-haskell/hslua/metadata.xml
+++ b/dev-haskell/hslua/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
+ <flag name="apicheck">Compile Lua with -DLUA_USE_APICHECK..</flag>
<flag name="system-lua">Use the system-wide lua instead of the bundled copy.</flag>
</use>
<longdescription>
@@ -15,8 +16,4 @@
The package is standalone: full Lua interpreter version 5.1.4
is distributed in this package as well.
</longdescription>
- <use>
- <flag name="system-lua">Use the system-wide lua instead of the bundled copy.</flag>
- <flag name="apicheck">Compile Lua with -DLUA_USE_APICHECK..</flag>
- </use>
</pkgmetadata>
diff --git a/dev-haskell/uuagc/metadata.xml b/dev-haskell/uuagc/metadata.xml
index 3ac2a79e5f64..14528f8d181e 100644
--- a/dev-haskell/uuagc/metadata.xml
+++ b/dev-haskell/uuagc/metadata.xml
@@ -7,11 +7,9 @@
</maintainer>
<use>
<flag name="bootstrap_external">Use an external uuagc executable for bootstrapping.</flag>
+ <flag name="with-loag">Use <pkg>dev-haskell/minisat</pkg> external SAT-solver to schedule all Linear Ordered AGs.</flag>
</use>
<longdescription>
Generates Haskell files from an attribute grammar specification
</longdescription>
- <use>
- <flag name="with-loag">Use <pkg>dev-haskell/minisat</pkg> external SAT-solver to schedule all Linear Ordered AGs.</flag>
- </use>
</pkgmetadata>
diff --git a/dev-java/bytecode/Manifest b/dev-java/bytecode/Manifest
deleted file mode 100644
index 96e648decfba..000000000000
--- a/dev-java/bytecode/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST bytecode-20081007.tar.bz2 29112 SHA256 fbcbecc957675128d1ae5d34288ecab8d8086cc2949b503ac1800b64e2ed556a SHA512 92462eec8c1f18bd3075c4cdb1bbb791bf4254f8d5808898f977089a0f188a062b907412178a10d04f261fa8b0fd33f97c4e8a641899f4bb4f5e9cc2aa1dd0b0 WHIRLPOOL 815c531bd058feef6a4c180183bf9220e599fff3a180782b565d56ecb13d6d994e6114483e4f36f81650f5e61a993137a3324f04b8390c60796007d3878cf58b
diff --git a/dev-java/bytecode/bytecode-20081007.ebuild b/dev-java/bytecode/bytecode-20081007.ebuild
deleted file mode 100644
index e5ae8125d30d..000000000000
--- a/dev-java/bytecode/bytecode-20081007.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=2
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Biojava bytecode manipulation library"
-HOMEPAGE="http://biojava.org"
-SRC_URI="https://dev.gentoo.org/~serkan/distfiles/${P}.tar.bz2"
-# svn export svn://code.open-bio.org/biojava/bytecode/trunk -r {20081007}
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4"
-
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-EANT_BUILD_TARGET="package"
-EANT_DOC_TARGET="javadocs"
-
-src_prepare() {
- mkdir {tests,demos,resources} || die
-}
-
-src_install() {
- java-pkg_dojar ant-build/${PN}.jar
- use doc && java-pkg_dojavadoc ant-build/docs
- use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/fastutil/Manifest b/dev-java/fastutil/Manifest
index 6752fc2ed132..5e2af3f8685d 100644
--- a/dev-java/fastutil/Manifest
+++ b/dev-java/fastutil/Manifest
@@ -1,2 +1,3 @@
DIST fastutil-5.1.3-src.tar.gz 238461 SHA256 fe95b3f66306003bdda1de018120150790205760065d7e31aa8c207c25c3a188 SHA512 67f7ac65afbfd9e5adc415ea65a3b2f334752008e994c7e1ecac334b06a98edad73da549245e39c79709df683f4384c1d0c76f7e8a8cdd428407d547ce0eea47 WHIRLPOOL 2533487909428345f35eebb845f33267f6cd81140206e721eeca1f3f7f94926dc2af9b03dcbdde35799a089ad174e5dd6a052251820558a907579e223ec3b01a
DIST fastutil-6.5.4-src.tar.gz 376688 SHA256 bc2cc6abb168856c43b9c5f6b468b1cfba4657efd0623a7d7e7800a9e01d966e SHA512 3b75d423ce9e4bb883f1baa910ed59b9ad2fc1ddf52da970f7d40eef6e0044618ce6aeaaa9daf873a256a966cd5bf850004feec21a8e7abf05cc6ac7eb6dd3fb WHIRLPOOL 5ec84a84c9be5dbfb53d69a557b0b26c0658b06b9234da4ed1614afff8ceafbcf3fe38a6b775fdc91202ad0301e2aebb70566dcd8cbae81c3828b7f18be5146d
+DIST fastutil-7.0.10.zip 518168 SHA256 0176bc09948db672e312b077420868aed7ded693666f77cec2d62b9c3226c26d SHA512 9345f509243bf91123b4232b95915ae4d6071b5da17948cf62e993e77e9ed947637f02937ccd98edbfd874db7f98c1858357e21721feb338d97041a7bcc3e558 WHIRLPOOL 7d209e130dc6c5dcffd2f32a7f77b18d2bfbd679fe18c7e7017db3c0006a5775398a8e1563c0a1b69b4a7f8f8f5ac430804b8ce7903fe836d371817111c07bde
diff --git a/dev-java/fastutil/fastutil-7.0.10.ebuild b/dev-java/fastutil/fastutil-7.0.10.ebuild
new file mode 100644
index 000000000000..e20bd2449a7d
--- /dev/null
+++ b/dev-java/fastutil/fastutil-7.0.10.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Provides faster type-specific maps, sets and lists with a small memory footprint"
+HOMEPAGE="https://github.com/vigna/fastutil"
+SRC_URI="https://github.com/vigna/fastutil/archive/${PV}.zip -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+src_compile() {
+ emake sources
+
+ # bug 162650 and #175578
+ java-pkg_init-compiler_
+
+ [[ ${GENTOO_COMPILER} != "javac" ]] && export ANT_OPTS="-Xmx512m"
+ java-pkg-2_src_compile
+}
+
+src_install() {
+ java-pkg_newjar "${P}.jar"
+
+ dodoc CHANGES README.md
+
+ use doc && java-pkg_dojavadoc docs
+ use source && java-pkg_dosrc src/it
+}
diff --git a/dev-java/gnu-regexp/Manifest b/dev-java/gnu-regexp/Manifest
index 0442419f54a0..e9f261aedfdc 100644
--- a/dev-java/gnu-regexp/Manifest
+++ b/dev-java/gnu-regexp/Manifest
@@ -1 +1,2 @@
+DIST gnu-regexp-1.1.4.tar.gz 164741 SHA256 493d9cbcb2cc08580be255f21543f3fe638a1eb93f605180583c91e1c5622080 SHA512 4397ecd2a485f67213ee74e1c942a1bfd1af5f261f964546cb3c7bc32fe88702a557d717f07d2a4d7d1db2d684ddc4191c120b35b44d1a68a126f7b81d8b0331 WHIRLPOOL 38b14b8dff8d214280f35893ad0c16ec6e8ec74e7ecd6d1d5df44bb3b88ef557589cf0d7011730bfd3fa40cb1c2861dc6655b73910aee4fc976a87da8e0e8de6
DIST gnu.regexp-1.1.4.tar.gz 164741 SHA256 493d9cbcb2cc08580be255f21543f3fe638a1eb93f605180583c91e1c5622080 SHA512 4397ecd2a485f67213ee74e1c942a1bfd1af5f261f964546cb3c7bc32fe88702a557d717f07d2a4d7d1db2d684ddc4191c120b35b44d1a68a126f7b81d8b0331 WHIRLPOOL 38b14b8dff8d214280f35893ad0c16ec6e8ec74e7ecd6d1d5df44bb3b88ef557589cf0d7011730bfd3fa40cb1c2861dc6655b73910aee4fc976a87da8e0e8de6
diff --git a/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild
new file mode 100644
index 000000000000..7abb153c8a78
--- /dev/null
+++ b/dev-java/gnu-regexp/gnu-regexp-1.1.4-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="gnu.regexp-${PV}"
+
+DESCRIPTION="GNU regular expression package for Java"
+HOMEPAGE="http://savannah.gnu.org/projects/gnu-regexp"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE=""
+
+CDEPEND="dev-java/java-getopt:1"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+ source? ( app-arch/zip )"
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_SRC_DIR="src"
+
+JAVA_GENTOO_CLASSPATH="java-getopt-1"
+
+java_prepare() {
+ java-pkg_clean
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+ java-pkg_addres "${PN}.jar" src -name "*.properties"
+}
diff --git a/dev-java/ibm-jdk-bin/Manifest b/dev-java/ibm-jdk-bin/Manifest
index c265cc1cfe01..25b115796d2d 100644
--- a/dev-java/ibm-jdk-bin/Manifest
+++ b/dev-java/ibm-jdk-bin/Manifest
@@ -2,10 +2,6 @@ DIST ibm-java-javacomm-6.0-9.0-linux-i386.tgz 336897 SHA256 2a04826238b0e2a24b61
DIST ibm-java-javacomm-6.0-9.0-linux-ppc.tgz 343028 SHA256 5618541e0cdb38607856eb47aa1878a3db4165c2ba0d59a87ada875c9b300da0 SHA512 da7b1709a2595810ea8def039ca88ff28fbf189a825a9229b174a22085d30a26c057ddb9f532940d413f7ecc49f1b201e46003a6842d085afa8038c6b6b89aaf WHIRLPOOL 1682cf4483e8d16287e2526a3f04936a820e47a8257382b6fd943fcc969c6a7ce0ab1204d07a5d45b5a9414d09f0df9d13645695b2e7aa3815944b628897da1c
DIST ibm-java-javacomm-6.0-9.0-linux-ppc64.tgz 342371 SHA256 27feede3959306f264185876440f55d5807782dc31d519600004f4868c644c4a SHA512 9d6cd92d2da22330e48177776b1a6a7455299890acbc0c36e830f3ea839d988bf0723dc07391c92e0716eba9b840da7091236a6c2042e28299ff87b973876376 WHIRLPOOL 5b5415b2c57c3364a85db6445cccc37ed7e9c27de9e370be0e093749aee4278075fc1942213b566650d2b1692fe4ae9b2279d34d9000c386ae3a55c8bbb800cb
DIST ibm-java-javacomm-6.0-9.0-linux-x86_64.tgz 339256 SHA256 10265a692a5056fe8d12c3d082f20ec113596e28bf98eb43d5a17a9a90176c8c SHA512 efb462a833e86697d79b7076e68b4812021cef3736875998aa6971cd23b64909faef7fdff43650337ba60daeeb29c6049fb4ef09666c1242b22963835ed4e043 WHIRLPOOL 963b9f717bba9a23ba14c6f2543ba4e1c8395e19b71759127503a9f0d0998cb0d4046f97102c23a348d273cb3ad8ab319260fbfe3beee556d31cda905f6abf4e
-DIST ibm-java-sdk-6.0-9.1-linux-i386.tgz 94205111 SHA256 7dc15aaa2d660ed938fc0fb71bfbe8ef25345726be90c99060cd10ed995d56bc SHA512 6c06670aaf43a9f5236781ce5cf6c3de39e6868c2d79258a49700a196043f6611e763b5edac47c1f7f00b65c529418da3bcc33f8a0722ad42179560958378e0e WHIRLPOOL 353f3dcca2fb6c25799505430b3fb72420a03c919e196408884a6517c0732fac48c2ac772c00362117cd15c6a09869e3088c04f35adf7da71286837fc25e757d
-DIST ibm-java-sdk-6.0-9.1-linux-ppc.tgz 96510114 SHA256 eb4c8603ecaa045a649ce3aef55e340ea984fb314a20cc692c5b244ffbf6ed9e SHA512 e24c83e79aa2100a7c0a6a5ab1c456c6b73d083254a375555880aa448da3a5023d21b13552d112a0d427eba1f2f84c3b9957794fcaf3a38d156d7c84516cc771 WHIRLPOOL 904b1ea7678dfc35c2580183b1b7a67fd6f863be5560b7b45529a757ba6b4e729f9256a0c93c0936a05c986efda2d60331f001fcb5ac27ed702a6e594afe3ec9
-DIST ibm-java-sdk-6.0-9.1-linux-ppc64.tgz 99300890 SHA256 2d9f324d934a3f7f38457d6808621510fa2c8b27c6781778d2a90476f35a00d1 SHA512 98b764e6aafe60ee3dc8cf57d38f7808f66d5ccd77f788665bee70fe72a52bd6c78449d9e0b6b86a97e2da46703e648a7a3f9208559a5ceee39530b1d75de3f1 WHIRLPOOL 02ccd6577a993c2f2a136e00f66035642858e6f101bc4b2a9020b42f5e3a2fa58fe784545e5546b5ee28693770cb64b731fc5f51b8e1a4f598993393858bfbe5
-DIST ibm-java-sdk-6.0-9.1-linux-x86_64.tgz 95717823 SHA256 36df08cefcbb690d37301fb8d6d6ecd19c6a32d5b0efff13e771cb6e6f6e302d SHA512 eeb799c662aba737bb881d98ae9ae2892952a873369ddf6971a8783879243c8d2efc2115eb6f717e8e7e401010404333a2c680441d62f80ef2852d9f694af00a WHIRLPOOL 1f1fded7e3835bf286190e7cea37e48a57177fab428037c4266675c6534d1fe43e36123d91b5bbd224a36e0b39811003ec222e652fc3113dc02d6b62d77f037d
DIST ibm-java-sdk-6.0-9.2-linux-i386.tgz 94285404 SHA256 cc835013d9b82f4f188bc6036bb9850d7f848c513f73b321539e4eb8cc5a7e71 SHA512 68862a26e147813b92f071b25e1591f32837789a502859e3045d0b14189fa60766739f587ffce3d1841925ef0305acd5346754d8cb3bb642cda5d43a1785c3ab WHIRLPOOL 780df88cf68853457d5445705cc0404a1d6b5b86e41e9aea74fbb62284e67e7aa9f1d88a2923f1992ba79fa17b3891f9c3eb13f72827bf9d599ca762812d267f
DIST ibm-java-sdk-6.0-9.2-linux-ppc.tgz 96591020 SHA256 738bc53ec28ca823d01218ad5a6d665b3b2d5638225c1dc6fad5b6780b953c5b SHA512 ce538243c359607886183625005b912b3b7613e561ebe5d17a7ec03c01768cc6aa5dc065e28ccc82f6e3d0276b1be85a20c6f008fa90d337fade609163532d41 WHIRLPOOL cc9fddb0414f05545526843a8967497f1f7152306cd5a2e6cfdb97fcfc7e4a63b3a93f24446e1dd9729234e996c3469b2ada7a765ee414467a323f37866cc174
DIST ibm-java-sdk-6.0-9.2-linux-ppc64.tgz 99395016 SHA256 2c831e79a5e8f87e716e216edb29825c9f3e4d4e473ec6cb3b71bdf88ae8ef0d SHA512 5af2dd4b4258c413f4d2c59a991e7f05371a26ee186af681580e55d62e082b9dc89cce6e089a108e1ce8b80f5b62b99f35fecaea7c9bb55315067048e2299b70 WHIRLPOOL 2a17f1ff64d18bd8a34225bbde8b0b93bfce8bcb338f4bdc1b49f44eabdc23644ba41f0217b5a5f88af7c1e28906e2cc5e36951cb02c6fea1d11686a5164ebe9
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p1.ebuild
deleted file mode 100644
index b67dbdaeaf36..000000000000
--- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.9_p1.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit java-vm-2 versionator eutils
-
-JDK_RELEASE=$(get_version_component_range 2-3)
-JAVACOMM_RELEASE=$(get_version_component_range 3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
-
-# versions ending with _pX translate to .X in distfile and fpX in SRC_URI
-if [[ $(get_version_component_count) == 5 ]]; then
- FP_VERSION="$(get_version_component_range 5)"
- FP_VERSION="${FP_VERSION#p}"
- FP_WEB="-FP${FP_VERSION}"
- FP_LINK="fp${FP_VERSION}"
- TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.${FP_VERSION}"
-else
- FP_WEB=""
- FP_LINK=""
- TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-fi
-
-#JAVACOMM_PV="3.${JAVACOMM_RELEASE}-${SERVICE_RELEASE}.0"
-# looks like they don't bump javacomm in service releases anymore
-JAVACOMM_PV_ORIG="3.${JAVACOMM_RELEASE}-0.0"
-JAVACOMM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-
-JDK_DIST_PREFIX="ibm-java-sdk-${TGZ_PV}-linux"
-JAVACOMM_DIST_PREFIX="ibm-java-javacomm-${JAVACOMM_PV}-linux"
-JAVACOMM_DIST_PREFIX_ORIG="ibm-java-javacomm-${JAVACOMM_PV_ORIG}-linux"
-
-X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz"
-X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz"
-X86_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-i386.tgz"
-
-AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz"
-AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.tgz"
-AMD64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-x86_64.tgz"
-
-PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.tgz"
-PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.tgz"
-PPC_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc.tgz"
-
-PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.tgz"
-PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.tgz"
-PPC64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc64.tgz"
-
-if use x86; then
- JDK_DIST=${X86_JDK_DIST}
- JAVACOMM_DIST=${X86_JAVACOMM_DIST}
- JAVACOMM_DIST_ORIG=${X86_JAVACOMM_DIST_ORIG}
- S="${WORKDIR}/ibm-java-i386-60"
- LINK_ARCH="intel"
-elif use amd64; then
- JDK_DIST=${AMD64_JDK_DIST}
- JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
- JAVACOMM_DIST_ORIG=${AMD64_JAVACOMM_DIST_ORIG}
- S="${WORKDIR}/ibm-java-x86_64-60"
- LINK_ARCH="amd64"
-elif use ppc; then
- JDK_DIST=${PPC_JDK_DIST}
- JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
- JAVACOMM_DIST_ORIG=${PPC_JAVACOMM_DIST_ORIG}
- S="${WORKDIR}/ibm-java-ppc-60"
- LINK_ARCH="ipseries32"
-elif use ppc64; then
- JDK_DIST=${PPC64_JDK_DIST}
- JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
- JAVACOMM_DIST_ORIG=${PPC64_JAVACOMM_DIST_ORIG}
- S="${WORKDIR}/ibm-java-ppc64-60"
- LINK_ARCH="ipseries64"
-fi
-
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}${FP_LINK}&S_TACT=105AGX05&S_CMP=JDK"
-
-SLOT="1.6"
-DESCRIPTION="IBM Java SE Development Kit"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
-DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-# bug #125178
-ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-
-SRC_URI="
- x86? ( ${X86_JDK_DIST} )
- amd64? ( ${AMD64_JDK_DIST} )
- ppc? ( ${PPC_JDK_DIST} )
- ppc64? ( ${PPC64_JDK_DIST} )
- javacomm? (
- x86? ( ${X86_JAVACOMM_DIST} )
- amd64? ( ${AMD64_JAVACOMM_DIST} )
- ppc? ( ${PPC_JAVACOMM_DIST} )
- ppc64? ( ${PPC64_JAVACOMM_DIST} )
- )"
-LICENSE="IBM-J1.6"
-KEYWORDS="-* amd64 ppc64 x86"
-RESTRICT="fetch"
-IUSE="X alsa doc examples javacomm nsplugin odbc selinux"
-
-RDEPEND="
- ppc? ( =virtual/libstdc++-3.3 )
- ppc64? ( =virtual/libstdc++-3.3 )
- X? (
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXp
- x11-libs/libXtst
- x11-libs/libX11
- x11-libs/libXt
- )
- alsa? ( media-libs/alsa-lib )
- doc? ( =dev-java/java-sdk-docs-1.6.0* )
- odbc? ( dev-db/unixODBC )
- selinux? ( sec-policy/selinux-java )"
-
-DEPEND="selinux? ( sec-policy/selinux-java )"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libj9jvmti24.so
-opt/${P}/jre/lib/i386/libj9vm24.so
-opt/${P}/jre/lib/i386/libjclscar_24.so
-opt/${P}/jre/lib/i386/motif21/libmawt.so
-opt/${P}/jre/lib/i386/libj9thr24.so
-opt/${P}/jre/lib/i386/libj9jit24.so
-opt/${P}/jre/lib/i386/libj9dbg24.so
-opt/${P}/jre/lib/i386/libj9gc24.so"
-
-QA_EXECSTACK_x86="opt/${P}/jre/bin/classic/libjvm.so
-opt/${P}/jre/lib/i386/j9vm/libjvm.so
-opt/${P}/jre/lib/i386/libj9jvmti24.so
-opt/${P}/jre/lib/i386/libj9hookable24.so
-opt/${P}/jre/lib/i386/libj9vm24.so
-opt/${P}/jre/lib/i386/libjclscar_24.so
-opt/${P}/jre/lib/i386/libj9thr24.so
-opt/${P}/jre/lib/i386/libj9dmp24.so
-opt/${P}/jre/lib/i386/libj9prt24.so
-opt/${P}/jre/lib/i386/libj9jit24.so
-opt/${P}/jre/lib/i386/libiverel24.so
-opt/${P}/jre/lib/i386/libj9trc24.so
-opt/${P}/jre/lib/i386/libj9dbg24.so
-opt/${P}/jre/lib/i386/libj9shr24.so
-opt/${P}/jre/lib/i386/libj9gc24.so
-opt/${P}/jre/lib/i386/libj9bcv24.so
-opt/${P}/jre/lib/i386/classic/libjvm.so"
-
-QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/default/libjvm.so
-opt/${P}/jre/lib/amd64/default/libj9jvmti24.so
-opt/${P}/jre/lib/amd64/default/libj9hookable24.so
-opt/${P}/jre/lib/amd64/default/libj9vm24.so
-opt/${P}/jre/lib/amd64/default/libjclscar_24.so
-opt/${P}/jre/lib/amd64/default/libj9jpi24.so
-opt/${P}/jre/lib/amd64/default/libj9thr24.so
-opt/${P}/jre/lib/amd64/default/libj9dmp24.so
-opt/${P}/jre/lib/amd64/default/libj9prt24.so
-opt/${P}/jre/lib/amd64/default/libj9jit24.so
-opt/${P}/jre/lib/amd64/default/libiverel24.so
-opt/${P}/jre/lib/amd64/default/libj9trc24.so
-opt/${P}/jre/lib/amd64/default/libj9dbg24.so
-opt/${P}/jre/lib/amd64/default/libj9shr24.so
-opt/${P}/jre/lib/amd64/default/libj9gc24.so
-opt/${P}/jre/lib/amd64/default/libj9bcv24.so
-opt/${P}/jre/lib/amd64/default/libj9ute24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libjvm.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9jvmti24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9hookable24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9vm24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libjclscar_24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9jpi24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9thr24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9dmp24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9prt24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9jit24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libiverel24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9trc24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9dbg24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9shr24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9gc24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9bcv24.so
-opt/${P}/jre/lib/amd64/compressedrefs/libj9ute24.so"
-
-pkg_nofetch() {
- einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
- einfo "Please visit: ${DOWNLOADPAGE}"
-
- einfo "Under Java SE 6, download SR${SERVICE_RELEASE}${FP_WEB} for your arch:"
- einfo "${JDK_DIST}"
- if use javacomm ; then
- einfo "Also download ${JAVACOMM_DIST_ORIG}"
- ewarn "and save it as ${JAVACOMM_DIST}"
- ewarn "Renaming is needed because javacomm changes content without changing filename."
- fi
-
- einfo "You can also use a direct link to your arch download page:"
- einfo "${DIRECT_DOWNLOAD}"
- einfo "Place the file(s) in: ${DISTDIR}"
- einfo "Then restart emerge: 'emerge --resume'"
-
- einfo "Note: if SR${SERVICE_RELEASE}${FP_WEB} is not available at ${DOWNLOADPAGE}"
- einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
- einfo "isn't updated, but the files should still available through the"
- einfo "direct link to arch download page. If it doesn't work, file a bug."
-}
-
-src_unpack() {
- unpack ${JDK_DIST}
- if use javacomm; then
- mkdir "${WORKDIR}/javacomm/" || die
- cd "${WORKDIR}/javacomm/"
- unpack ${JAVACOMM_DIST}
- fi
- cd "${S}"
-
- # bug #126105
- epatch "${FILESDIR}/${PN}-jawt.h.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
- # Copy all the files to the designated directory
- dodir /opt/${P}
- cp -pR "${S}"/{bin,jre,lib,include,src.zip} "${D}/opt/${P}/" || die
-
- if use examples; then
- cp -pPR "${S}"/demo "${D}"/opt/${P}/ || die
- fi
- if use javacomm; then
- chmod -x "${WORKDIR}"/javacomm/*/jar/*.jar "${WORKDIR}"/javacomm/*/lib/*.properties || die
- cp -pR "${WORKDIR}"/javacomm/*/jar/*.jar "${D}"/opt/${P}/jre/lib/ext/ || die
- cp -pR "${WORKDIR}"/javacomm/*/lib/*.properties "${D}"/opt/${P}/jre/lib/ || die
- cp -pR "${WORKDIR}"/javacomm/*/lib/*.so "${D}"/opt/${P}/jre/lib/$(get_system_arch)/ || die
- if use examples; then
- cp -pPR "${WORKDIR}"/javacomm/*/examples "${D}"/opt/${P}/ || die
- fi
- fi
-
- if use x86 || use ppc; then
- if use nsplugin; then
- local plugin="/opt/${P}/jre/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
- install_mozilla_plugin "${plugin}"
- fi
- fi
-
- local desktop_in="${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop"
- if [[ -f "${desktop_in}" ]]; then
- local desktop_out="${T}/ibm_jdk-${SLOT}.desktop"
- # install control panel for Gnome/KDE
- # The jre also installs these so make sure that they do not have the same
- # Name
- sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JDK ${SLOT}/" \
- -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
- -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
- "${desktop_in}" > \
- "${desktop_out}" || die
-
- domenu "${desktop_out}" || die
- fi
-
- dohtml -a html,htm,HTML -r docs || die
- dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die
-
- set_java_env
-
- # a workaround to fix the BOOTCLASSPATH in our env file
- # this is not optimal, using -Xcompressedrefs would probably make it
- # expect the compressedrefs version...
- if use amd64; then
- sed -i -e "s|vm.jar|amd64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
- fi
- if use ppc64; then
- sed -i -e "s|vm.jar|ppc64/default/jclSC160/vm.jar|g" "${D}${JAVA_VM_CONFIG_DIR}/${VMHANDLE}" || die "sed failed"
- fi
-
- java-vm_revdep-mask
-
- # bug #321695
- dodir /etc/sandbox.d
- echo 'SANDBOX_PREDICT="/proc/self/coredump_filter"' > "${D}/etc/sandbox.d/20${VMHANDLE}"
-}
diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
index c4e4b529d403..19c0b2438990 100644
--- a/dev-java/ibm-jre-bin/Manifest
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -1,7 +1,3 @@
-DIST ibm-java-jre-6.0-9.1-linux-i386.tgz 64347993 SHA256 6e2db98b14b192d82ce40e0930b3369c736f843d2bcda3a6f542ef6faf4c3da3 SHA512 11f7b73064b955f6938218d6d5908d75c66b3d6e761519d2d38e65af93925d77fa87853d20027546d97068fe59539fa832f8a2938d5545cd668cf51eff4e4727 WHIRLPOOL 27e9a2336f544950174c73e22468c908aad9d4816f2324b56c0bc824971fcd1dd89d787c1caa82f031671bd18e13878a73e99f06bf293d907408674d8b571f7c
-DIST ibm-java-jre-6.0-9.1-linux-ppc.tgz 66562449 SHA256 83b96b1689f0f473fa8aa55bcd98f44ba77470d05fcfcb81a097e74af435290d SHA512 41fc926bcc9e0bad76bd777f6bc7810261859f19d61a7d2ac0c85f841a1a36c8158ee0f3628423c1c9f5829e0998e965107cc50f5af6ea9ac7667090818a05d3 WHIRLPOOL acf0d9dc1eb71a4aca33d4d186a352e50b0909cc6330e60816ba56e116c74e8901b67f164b4dbdb9953fda4231020e22c9ce275a22a29a3851dc09df0091c0ae
-DIST ibm-java-jre-6.0-9.1-linux-ppc64.tgz 74578727 SHA256 12e46290968e595389ddaa3053e20a718674b699b796012e997c4737e484c579 SHA512 3cf01e9ef7580f24502e9380bfcd936d29eca1ea000c364a58678ac06871512f3876d44d4cdd0358575c642e278199dcccd6803adec83a32ba96b807c7fda8af WHIRLPOOL 1fe795237ab5a14c0dd86e9ab80551fec25f631f00ea42c3edb053181dd7ddde4156a2818a0f345e06dec478e0e0edb4acf800d69ce2be4e71955df722aab965
-DIST ibm-java-jre-6.0-9.1-linux-x86_64.tgz 70722323 SHA256 c36e65860c1599d51d9b481b3acbf9b9c195d6ddc364480dc9877b37821641ba SHA512 7a3b21f2f7c82faf0a4b0ef42cc009b159039412cefa074d0c3f26da80efff4566661df7cbdf17bfd07081f738052c2db4daa6b9a8166be28c7de4c83860a7c5 WHIRLPOOL 049e702251f10d99f31f6339a7191e78ccb4850ba7eb544ee09c3b7240ce68d00fd0ba098d578f134b50431e611f08a58390d0a5bb150ec97534b6caa8291f56
DIST ibm-java-jre-6.0-9.2-linux-i386.tgz 64421824 SHA256 87ce2252d6d88b13acb847a49d272c9798ea6267a10fbc82ea0e881c5c8e8206 SHA512 b44ac90452b40f86b4ad5263b41478dd8f3563160bda321af674802aebcd686a8b8f602464482097e1e68ca0a4ab3ab478c6439b68f705471f6b0cd912cc3e6a WHIRLPOOL 1b0da0e42e74508a6def1f4ec7963c8209b9ea1638359e5fc5c46471dfb45719e866f12a3008340197f47359c686edca5253cf32a2e362daaa1e3840c679093f
DIST ibm-java-jre-6.0-9.2-linux-ppc.tgz 66640675 SHA256 04237722187f4cd44845a0bf2764c7358f3df9a8b8468fbe629ff1f168864ceb SHA512 992057cb9c0867d0a8df6bc34ae03e1dfcc9fef0d965ce1c9588380c93b625cea8152051321f0b0951a2904f84b1ccaf7f2b3109b58a45f34c175e1e92911f54 WHIRLPOOL 67edc11fe548e427d9afe4ae4aef2312b3130acac4f7ea863c512b69b3e9e238235619b5b0f93f2f453f4ac4d15b79cee7c312a5bdcd473d79bbefee264b9f43
DIST ibm-java-jre-6.0-9.2-linux-ppc64.tgz 74698445 SHA256 30ef8dd7ce43e328dc5252b0457f78e021faaa433f20fe350d04f9546186fbca SHA512 ea2012a751f73cfa3ff13268ab2729b602680e8f4ce914b0be67a0185ba77ec748c128e38ae72500a75d16239fd6c6a862f802bf562970f44f634277cb373900 WHIRLPOOL 554c9aca0fce7383b90750b603ac2596b6b9364bf90427eae7905a3ae58e52ab325a50efe1a9a082b12845da3de33eedd78c0544e6a1a588001620d9e1a412b0
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p1.ebuild
deleted file mode 100644
index 9bdb54b860fc..000000000000
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.9_p1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit java-vm-2 versionator eutils
-
-JDK_RELEASE=$(get_version_component_range 2-3)
-SERVICE_RELEASE=$(get_version_component_range 4)
-SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
-
-# versions ending with _pX translate to .X in distfile and fpX in SRC_URI
-if [[ $(get_version_component_count) == 5 ]]; then
- FP_VERSION="$(get_version_component_range 5)"
- FP_VERSION="${FP_VERSION#p}"
- FP_WEB="-FP${FP_VERSION}"
- FP_LINK="fp${FP_VERSION}"
- TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.${FP_VERSION}"
-else
- FP_WEB=""
- FP_LINK=""
- TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
-fi
-
-JRE_DIST_PREFIX="ibm-java-jre-${TGZ_PV}-linux"
-
-X86_JRE_DIST="${JRE_DIST_PREFIX}-i386.tgz"
-AMD64_JRE_DIST="${JRE_DIST_PREFIX}-x86_64.tgz"
-PPC_JRE_DIST="${JRE_DIST_PREFIX}-ppc.tgz"
-PPC64_JRE_DIST="${JRE_DIST_PREFIX}-ppc64.tgz"
-
-if use x86; then
- JRE_DIST=${X86_JRE_DIST}
- S="${WORKDIR}/ibm-java-i386-60"
- LINK_ARCH="intel"
-elif use amd64; then
- JRE_DIST=${AMD64_JRE_DIST}
- S="${WORKDIR}/ibm-java-x86_64-60"
- LINK_ARCH="amd64"
-elif use ppc; then
- JRE_DIST=${PPC_JRE_DIST}
- S="${WORKDIR}/ibm-java-ppc-60"
- LINK_ARCH="ipseries32"
-elif use ppc64; then
- JRE_DIST=${PPC64_JRE_DIST}
- S="${WORKDIR}/ibm-java-ppc64-60"
- LINK_ARCH="ipseries64"
-fi
-
-DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}${FP_LINK}&S_TACT=105AGX05&S_CMP=JDK"
-
-SLOT="1.6"
-DESCRIPTION="IBM Java SE Runtime Environment"
-HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
-DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
-# bug #125178
-ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
-
-SRC_URI="x86? ( ${X86_JRE_DIST} )
- amd64? ( ${AMD64_JRE_DIST} )
- ppc? ( ${PPC_JRE_DIST} )
- ppc64? ( ${PPC64_JRE_DIST} )"
-LICENSE="IBM-J1.6"
-KEYWORDS="-* amd64 ppc64 x86"
-RESTRICT="fetch"
-IUSE="X alsa nsplugin odbc selinux"
-
-RDEPEND="
- X? (
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXi
- x11-libs/libXp
- x11-libs/libXtst
- x11-libs/libX11
- x11-libs/libXt
- )
- alsa? ( media-libs/alsa-lib )
- odbc? ( dev-db/unixODBC )
- selinux? ( sec-policy/selinux-java )"
-DEPEND="selinux? ( sec-policy/selinux-java )"
-
-QA_TEXTRELS_x86="opt/${P}/lib/i386/libj9jvmti24.so
-opt/${P}/lib/i386/libj9vm24.so
-opt/${P}/lib/i386/libjclscar_24.so
-opt/${P}/lib/i386/motif21/libmawt.so
-opt/${P}/lib/i386/libj9thr24.so
-opt/${P}/lib/i386/libj9jit24.so
-opt/${P}/lib/i386/libj9dbg24.so
-opt/${P}/lib/i386/libj9gc24.so"
-
-QA_EXECSTACK_x86="opt/${P}/bin/classic/libjvm.so
-opt/${P}/lib/i386/j9vm/libjvm.so
-opt/${P}/lib/i386/libj9jvmti24.so
-opt/${P}/lib/i386/libj9hookable24.so
-opt/${P}/lib/i386/libj9vm24.so
-opt/${P}/lib/i386/libjclscar_24.so
-opt/${P}/lib/i386/libj9thr24.so
-opt/${P}/lib/i386/libj9dmp24.so
-opt/${P}/lib/i386/libj9prt24.so
-opt/${P}/lib/i386/libj9jit24.so
-opt/${P}/lib/i386/libiverel24.so
-opt/${P}/lib/i386/libj9trc24.so
-opt/${P}/lib/i386/libj9dbg24.so
-opt/${P}/lib/i386/libj9shr24.so
-opt/${P}/lib/i386/libj9gc24.so
-opt/${P}/lib/i386/libj9bcv24.so
-opt/${P}/lib/i386/classic/libjvm.so"
-
-QA_EXECSTACK_amd64="opt/${P}/lib/amd64/default/libjvm.so
-opt/${P}/lib/amd64/default/libj9jvmti24.so
-opt/${P}/lib/amd64/default/libj9hookable24.so
-opt/${P}/lib/amd64/default/libj9vm24.so
-opt/${P}/lib/amd64/default/libjclscar_24.so
-opt/${P}/lib/amd64/default/libj9jpi24.so
-opt/${P}/lib/amd64/default/libj9thr24.so
-opt/${P}/lib/amd64/default/libj9dmp24.so
-opt/${P}/lib/amd64/default/libj9prt24.so
-opt/${P}/lib/amd64/default/libj9jit24.so
-opt/${P}/lib/amd64/default/libiverel24.so
-opt/${P}/lib/amd64/default/libj9trc24.so
-opt/${P}/lib/amd64/default/libj9dbg24.so
-opt/${P}/lib/amd64/default/libj9shr24.so
-opt/${P}/lib/amd64/default/libj9gc24.so
-opt/${P}/lib/amd64/default/libj9bcv24.so
-opt/${P}/lib/amd64/default/libj9ute24.so
-opt/${P}/lib/amd64/compressedrefs/libjvm.so
-opt/${P}/lib/amd64/compressedrefs/libj9jvmti24.so
-opt/${P}/lib/amd64/compressedrefs/libj9hookable24.so
-opt/${P}/lib/amd64/compressedrefs/libj9vm24.so
-opt/${P}/lib/amd64/compressedrefs/libjclscar_24.so
-opt/${P}/lib/amd64/compressedrefs/libj9jpi24.so
-opt/${P}/lib/amd64/compressedrefs/libj9thr24.so
-opt/${P}/lib/amd64/compressedrefs/libj9dmp24.so
-opt/${P}/lib/amd64/compressedrefs/libj9prt24.so
-opt/${P}/lib/amd64/compressedrefs/libj9jit24.so
-opt/${P}/lib/amd64/compressedrefs/libiverel24.so
-opt/${P}/lib/amd64/compressedrefs/libj9trc24.so
-opt/${P}/lib/amd64/compressedrefs/libj9dbg24.so
-opt/${P}/lib/amd64/compressedrefs/libj9shr24.so
-opt/${P}/lib/amd64/compressedrefs/libj9gc24.so
-opt/${P}/lib/amd64/compressedrefs/libj9bcv24.so
-opt/${P}/lib/amd64/compressedrefs/libj9ute24.so"
-
-pkg_nofetch() {
- elog "Due to license restrictions, we cannot redistribute or fetch the distfiles"
- elog "Please visit: ${DOWNLOADPAGE}"
-
- elog "Under Java SE 6, download SR${SERVICE_RELEASE}${FP_WEB} for your arch:"
- elog "${JRE_DIST}"
-
- elog "You can use direct link to your arch download page:"
- elog "${DIRECT_DOWNLOAD}"
- elog "Place the file(s) in: ${DISTDIR}"
- elog "Then restart emerge: 'emerge --resume'"
-
- elog "Note: if SR${SERVICE_RELEASE}${FP_WEB} is not available at ${DOWNLOADPAGE}"
- elog "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
- elog "isn't updated, but the files should still available through the"
- elog "direct link to arch download page. If it doesn't work, file a bug."
-}
-
-src_compile() { :; }
-
-src_install() {
- # Copy all the files to the designated directory
- dodir /opt/${P}
- cp -pR "${S}"/jre/* "${D}/opt/${P}/"
-
- if use x86 || use ppc; then
- if use nsplugin; then
- local plugin="/opt/${P}/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
- install_mozilla_plugin "${plugin}"
- fi
- fi
-
- local desktop_in="${D}/opt/${P}/plugin/desktop/sun_java.desktop"
- if [[ -f "${desktop_in}" ]]; then
- local desktop_out="${T}/ibm_jre-${SLOT}.desktop"
- # install control panel for Gnome/KDE
- # The jdk also installs these so make sure that they do not have the same
- # Name
- sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JRE ${SLOT}/" \
- -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
- -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
- "${desktop_in}" > \
- "${desktop_out}" || die
-
- domenu "${desktop_out}" || die
- fi
-
- dohtml -a html,htm,HTML -r docs || die
- dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die
-
- set_java_env
- java-vm_revdep-mask
-}
diff --git a/dev-java/jal/jal-20031117-r4.ebuild b/dev-java/jal/jal-20031117-r4.ebuild
index 22351b25bb22..da0915a5c12e 100644
--- a/dev-java/jal/jal-20031117-r4.ebuild
+++ b/dev-java/jal/jal-20031117-r4.ebuild
@@ -25,7 +25,8 @@ RDEPEND="
DEPEND="
${CDEPEND}
- >=virtual/jdk-1.6"
+ >=virtual/jdk-1.6
+ source? ( app-arch/zip )"
S="${WORKDIR}/${P}"
diff --git a/dev-java/jlfgr/jlfgr-1.0-r2.ebuild b/dev-java/jlfgr/jlfgr-1.0-r2.ebuild
new file mode 100644
index 000000000000..b346291a0256
--- /dev/null
+++ b/dev-java/jlfgr/jlfgr-1.0-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit versionator java-pkg-2
+
+MY_PV=$(replace_all_version_separators '_')
+
+DESCRIPTION="Java(TM) Look and Feel Graphics Repository"
+HOMEPAGE="http://java.sun.com/developer/techDocs/hi/repository/"
+SRC_URI="mirror://gentoo/jlfgr-${MY_PV}.zip"
+
+LICENSE="sun-jlfgr"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.6"
+
+DEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+# Empty src_compile() to prevent message about not found build.xml
+src_compile() { :; }
+
+src_install() {
+ java-pkg_newjar "jlfgr-${MY_PV}.jar" "${PN}.jar"
+}
diff --git a/dev-java/jrexx/jrexx-1.1.1-r2.ebuild b/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
index 454ef3b70e80..d6859966ab93 100644
--- a/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
+++ b/dev-java/jrexx/jrexx-1.1.1-r2.ebuild
@@ -17,8 +17,9 @@ KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64
RDEPEND="
>=virtual/jre-1.6"
+
DEPEND="
- app-arch/unzip
- >=virtual/jdk-1.6"
+ >=virtual/jdk-1.6
+ source? ( app-arch/zip )"
JAVA_ENCODING="ISO-8859-1"
diff --git a/dev-java/jtreemap/Manifest b/dev-java/jtreemap/Manifest
index 785749b29535..d51fe8cec483 100644
--- a/dev-java/jtreemap/Manifest
+++ b/dev-java/jtreemap/Manifest
@@ -1 +1,2 @@
DIST jtreemap-1.1.0-src.zip 7358161 SHA256 c6e27ec233e0da4e9ca7dc8b9a07ad60e99aad4cf9973c0fc4f37d0e58a158a3 SHA512 61c6b5e22cc839d6cfe8368bbd51db94b3667c8f4064645c3d70f5e6c93b029dd495b64b602570f59559dd99723516a197dcd1d915799411dc7f7c516bfce84c WHIRLPOOL e82944d0317b7ad3848552ebfe474d1bd8b58d13ce59a36f7339c15b8d23ab1ebade829072b79b46606f340c4b664038d1156732d57791cbd191c51d136d7ef2
+DIST jtreemap-1.1.0.zip 7358161 SHA256 c6e27ec233e0da4e9ca7dc8b9a07ad60e99aad4cf9973c0fc4f37d0e58a158a3 SHA512 61c6b5e22cc839d6cfe8368bbd51db94b3667c8f4064645c3d70f5e6c93b029dd495b64b602570f59559dd99723516a197dcd1d915799411dc7f7c516bfce84c WHIRLPOOL e82944d0317b7ad3848552ebfe474d1bd8b58d13ce59a36f7339c15b8d23ab1ebade829072b79b46606f340c4b664038d1156732d57791cbd191c51d136d7ef2
diff --git a/dev-java/jtreemap/jtreemap-1.1.0-r1.ebuild b/dev-java/jtreemap/jtreemap-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..a3c0c8f2f75a
--- /dev/null
+++ b/dev-java/jtreemap/jtreemap-1.1.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java, open-source library for treemapping"
+HOMEPAGE="http://jtreemap.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip -> ${P}.zip"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ >=virtual/jre-1.6"
+
+DEPEND="
+ >=virtual/jdk-1.6
+ source? ( app-arch/zip )"
+
+S="${WORKDIR}/${PN}-site-${PV}/JTreeMap"
+
+JAVA_SRC_DIR="src/main"
+
+JAVA_ENCODING="ISO-8859-1"
+
+java_prepare() {
+ pushd .. > /dev/null || die
+ java-pkg_clean
+ popd > /dev/null || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ java-pkg_dolauncher ${PN}-demo --main net.sf.jtreemap.swing.example.JTreeMapExample
+}
diff --git a/dev-java/juel/juel-2.1.0-r2.ebuild b/dev-java/juel/juel-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..57d90d418406
--- /dev/null
+++ b/dev-java/juel/juel-2.1.0-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Implementation of the Unified Expression Language (EL) - JSR-245"
+HOMEPAGE="http://juel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE=""
+
+RDEPEND="
+ >=virtual/jre-1.6"
+
+DEPEND="
+ >=virtual/jdk-1.6
+ source? ( app-arch/unzip )"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src/api src/impl"
+
+java_prepare() {
+ java-pkg_clean
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ use examples && java-pkg_doexamples src/samples/*
+}
diff --git a/dev-java/junitperf/junitperf-1.9.1-r2.ebuild b/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
new file mode 100644
index 000000000000..cecefcea96d0
--- /dev/null
+++ b/dev-java/junitperf/junitperf-1.9.1-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc test source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Simple framework to write repeatable tests"
+SRC_URI="http://www.clarkware.com/software/${P}.zip"
+HOMEPAGE="http://www.clarkware.com/software/JUnitPerf.html"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+
+IUSE=""
+
+CDEPEND="dev-java/junit:4"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
+ test? ( dev-java/ant-junit:0 )
+ source? ( app-arch/zip )
+ >=virtual/jdk-1.6"
+
+java_prepare() {
+ java-pkg_clean
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+EANT_GENTOO_CLASSPATH="junit-4"
+EANT_DOC_TARGET="doc"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}"
+EANT_TEST_TARGET="test"
+
+src_test() {
+ ANT_TASKS="ant-junit" java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_dojar "lib/${PN}.jar"
+ dodoc README
+ use doc && java-pkg_dojavadoc docs/api
+ use source && java-pkg_dosrc src/app/*
+}
diff --git a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
index 2109d3e16446..59e5acda511a 100644
--- a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
+++ b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
>=virtual/jre-1.6"
DEPEND="
- app-arch/unzip
+ source? ( app-arch/zip )
>=virtual/jdk-1.6"
S="${WORKDIR}/${P}"
diff --git a/dev-java/rundoc/Manifest b/dev-java/rundoc/Manifest
index 2b1daada14cb..e324f36db484 100644
--- a/dev-java/rundoc/Manifest
+++ b/dev-java/rundoc/Manifest
@@ -1 +1,2 @@
DIST rundoc-0.11-src.tar.gz 26109 SHA256 e123a38260df24f7641c3c0b5164be810ba6770d14d546d60b09a55e86333bc1 SHA512 e27f4f6ecbb4a78bc8ed245829e0ab7d727166890bfd4f55d544d4073f20691681bcb223e5cd353f786e79fc446bee24f10d955ed9844a44dd610b7eb7b773d4 WHIRLPOOL 5edd6a1b8b2865b60e82b3bd41640591919079f85283581343c1069c934edc0236a5e9a73683401618e6862abd892aaf9c0094711a04e7c8d8e2ac552ca2acb7
+DIST rundoc-0.11.zip 47013 SHA256 54cfc962032578d07ffc0a057f1659a8f8585b6da8935288475842f1bed1d647 SHA512 d16aef5455ac2c6bbae16e4a12df798eca88e9c15225af8dc28edfa0b88b73ca6119ca22c6c4319665fef1203b986f1401029318fb094fe30fe985497fb1c269 WHIRLPOOL 993146a53478d151689a01c2ffedcc81b2ec8649b5914804999c8d621f10b1a5f8d80634e861b214e065b90ab84b4a8a617ce76844a5b5896035f12f4a698c68
diff --git a/dev-java/rundoc/rundoc-0.11-r1.ebuild b/dev-java/rundoc/rundoc-0.11-r1.ebuild
new file mode 100644
index 000000000000..542052ea842b
--- /dev/null
+++ b/dev-java/rundoc/rundoc-0.11-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="an Apache ANT optional task that extracts snippets of code from text files"
+HOMEPAGE="http://www.martiansoftware.com/lab/snip.html"
+SRC_URI="http://www.martiansoftware.com/lab/${PN}/${P}-src.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="dev-java/ant-core:0"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+ source? ( app-arch/zip )"
+
+JAVA_GENTOO_CLASSPATH="ant-core"
+
+java_prepare() {
+ java-pkg_clean
+}
diff --git a/dev-java/sablecc/Manifest b/dev-java/sablecc/Manifest
index c02d8b78422b..473158defdf3 100644
--- a/dev-java/sablecc/Manifest
+++ b/dev-java/sablecc/Manifest
@@ -1,2 +1 @@
-DIST sablecc-3.2.tar.gz 440484 SHA256 f6a9e9ff5d2f57fa2c99f08653bb8c034fbd2de9e34aaf31b412c1b656fef80c SHA512 d8682a1cfd8bbb77543733008a12c4581c6b75c4e20a320d4dfc26b179e03076adfe735d70cc0ed92435ee23f6f74717524c800724f16804dc4d0078606918bd WHIRLPOOL db8aafe6134176091c7e173ed513d1acd61bd82767eadab788ada43de09645d975d213dd10626ee482b02c44372095470975854e52b23f23800aee9459aba251
DIST sablecc-3.7.tar.gz 556985 SHA256 665e25207832246449dcd3e5d1fff4dec77b0db27378a3de528bca2ecbd680f0 SHA512 c53212ae10afc546796a46b8f1d731d3337c1fe184f12a285686b1f876b207a6cddcd789876d5c9d6b378583065bbb8ca7b5c3797d88b4eea3609ffe9a9c8f71 WHIRLPOOL bae77590d9a9afe017d0a797edfd1fe67b4fc099b4cc9bf654d57d3101d97f601cf4df849c28fbf0047ff888df2b285421fbc4556c942cb77da56ea07e7ab2ce
diff --git a/dev-java/sablecc/files/sablecc b/dev-java/sablecc/files/sablecc
deleted file mode 100644
index ec449013fa84..000000000000
--- a/dev-java/sablecc/files/sablecc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-${JAVA_HOME}/bin/java -jar /usr/share/sablecc/lib/sablecc.jar $*
diff --git a/dev-java/sablecc/sablecc-3.2.ebuild b/dev-java/sablecc/sablecc-3.2.ebuild
deleted file mode 100644
index 58313f0f78d2..000000000000
--- a/dev-java/sablecc/sablecc-3.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Java based compiler / parser generator"
-HOMEPAGE="http://www.sablecc.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4"
-
-src_unpack() {
- unpack ${A}
- rm -v "${S}"/lib/*.jar || die
-}
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-src_install() {
- java-pkg_dojar lib/*
-
- dobin "${FILESDIR}"/${PN}
-
- dodoc AUTHORS THANKS || die
- dohtml README.html || die
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-java/sablecc/sablecc-3.7.ebuild b/dev-java/sablecc/sablecc-3.7.ebuild
index 1d824f5d9ca6..123bcfdd5928 100644
--- a/dev-java/sablecc/sablecc-3.7.ebuild
+++ b/dev-java/sablecc/sablecc-3.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND=">=virtual/jre-1.5"
DEPEND=">=virtual/jdk-1.5"
diff --git a/dev-java/sax/Manifest b/dev-java/sax/Manifest
index 571265f2af09..2a2f621cfe93 100644
--- a/dev-java/sax/Manifest
+++ b/dev-java/sax/Manifest
@@ -1 +1,2 @@
+DIST sax-2.2.1.zip 372488 SHA256 f9221ba55b3b753cf900ef64dc588a1d6b2716f63440b0f1ab55fe9deb418272 SHA512 af05c14994894f0b6cd860c1d632a1148f43cef824081357c9e4b256e66e0f36ac3cba1838f03322182339f2642b4bf68f707407fba8ee6c2f95d5b8d1267648 WHIRLPOOL 5822d3aba16ccb8bde702f3817090d931c01b6bbb83fc4abf521d3a369599bc4a88707e37db6ef9abb074ddd0119b4b845d7d8c12e6eacd93f382f0acc01d9f2
DIST sax2r3.zip 372488 SHA256 f9221ba55b3b753cf900ef64dc588a1d6b2716f63440b0f1ab55fe9deb418272 SHA512 af05c14994894f0b6cd860c1d632a1148f43cef824081357c9e4b256e66e0f36ac3cba1838f03322182339f2642b4bf68f707407fba8ee6c2f95d5b8d1267648 WHIRLPOOL 5822d3aba16ccb8bde702f3817090d931c01b6bbb83fc4abf521d3a369599bc4a88707e37db6ef9abb074ddd0119b4b845d7d8c12e6eacd93f382f0acc01d9f2
diff --git a/dev-java/sax/sax-2.2.1-r3.ebuild b/dev-java/sax/sax-2.2.1-r3.ebuild
new file mode 100644
index 000000000000..2ac14e9e6464
--- /dev/null
+++ b/dev-java/sax/sax-2.2.1-r3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+MY_PN="sax2r3"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="SAX: Simple API for XML in Java"
+HOMEPAGE="http://sax.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip -> ${P}.zip"
+LICENSE="public-domain"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="
+ >=virtual/jre-1.6"
+
+DEPEND="
+ >=virtual/jdk-1.6
+ source? ( app-arch/zip )"
+
+S="${WORKDIR}/sax2r3"
+
+java_prepare() {
+ java-pkg_clean
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ dodoc ChangeLog CHANGES README
+}
diff --git a/dev-java/snip/Manifest b/dev-java/snip/Manifest
index 89d12fe59b4f..06412ff20d93 100644
--- a/dev-java/snip/Manifest
+++ b/dev-java/snip/Manifest
@@ -1 +1,2 @@
DIST snip-0.11-src.tar.gz 23270 SHA256 c8d0e299010e0582d69b3c0567b89190cfab8b123b4bc61920c721c1b82240e7 SHA512 b782559bd542e4d79fa19e351d2e04331f002d139ecc4ae957ceb282c2fc117261c4031fb612c65caead07552de59782d8a0e3c8733d79f1cd2ef0118e60eaa7 WHIRLPOOL 6d72867eb46659d31703c299973ecb2cb47e566afd910122c37819afacf5333db398812af41f82adfcda7c83000e8a021ba17f99d401b185f08758ee2a4b7ef5
+DIST snip-0.11.zip 56801 SHA256 c5fc7c7c006ce4821cf143d94da29d99e7b6c25db8d3295dc72702bf05f89f33 SHA512 43ded00e411247c69882494cec1ee5322a0be273982ee37b2501d143259686f6d5f52c99b430ebad96d799aa42bb240b4a5130cba0b3fc47d21c70513e97ba93 WHIRLPOOL 145927ae16a5b067c41ac78c8e388bbf884d0c0feb7a6f53e6cd410cf51ebb744acf40f5f15c16bfe9056614dd312fd662f6e4cca3d430246ea55d3f4837ad41
diff --git a/dev-java/snip/snip-0.11-r1.ebuild b/dev-java/snip/snip-0.11-r1.ebuild
new file mode 100644
index 000000000000..542052ea842b
--- /dev/null
+++ b/dev-java/snip/snip-0.11-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="an Apache ANT optional task that extracts snippets of code from text files"
+HOMEPAGE="http://www.martiansoftware.com/lab/snip.html"
+SRC_URI="http://www.martiansoftware.com/lab/${PN}/${P}-src.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+CDEPEND="dev-java/ant-core:0"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+ source? ( app-arch/zip )"
+
+JAVA_GENTOO_CLASSPATH="ant-core"
+
+java_prepare() {
+ java-pkg_clean
+}
diff --git a/dev-java/spice-jndikit/Manifest b/dev-java/spice-jndikit/Manifest
index e402a50d2ffc..87265ab79a38 100644
--- a/dev-java/spice-jndikit/Manifest
+++ b/dev-java/spice-jndikit/Manifest
@@ -1 +1,2 @@
DIST spice-jndikit-1.2-src.tar.gz 23084 SHA256 3001e72223786e25a132ce8c41ff5e1d9fd8826e98122d5b73517aefd908e11a SHA512 bdb508eac32c8dac05be45553a6877e214dce4135c9ae96b95764254df4c0e57f2a7be3905301b096f140014e04e4fe6b517b7757553de26d73a513f7ff06244 WHIRLPOOL 62206bd937c9a7d9660ebda84782edcd08e331e48e389135a7b708999166ab122ce318aeac14386bbd091407c24a0096c14b72f42a073413b21a2bc65086cc3b
+DIST spice-jndikit-1.4.zip 55185 SHA256 74bc8619ed53219c7498cb7ef180098fad8fdd0b9ab62ba201a903cc3438bdcc SHA512 798a1671cf79a9ecf7777a2b5b6caa0074dcca97cecb445c8dad9a44144cc71fed312f7a13d4b7e12f09eb23b0525b38bca62d67866db76f03ceb5a7a0501501 WHIRLPOOL b3d3236a37a037d8c6f51dc8940b9539f73d1803a5c935b0bd9a625afc443b54c9c737a96a49b08c123fe48800023f8d821b4345b374829c171e7136cf16f186
diff --git a/dev-java/spice-jndikit/spice-jndikit-1.4.ebuild b/dev-java/spice-jndikit/spice-jndikit-1.4.ebuild
new file mode 100644
index 000000000000..b98bae4ced7a
--- /dev/null
+++ b/dev-java/spice-jndikit/spice-jndikit-1.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="${PN##*-}"
+
+DESCRIPTION="JNDI Kit is a toolkit designed to help with the construction of JNDI providers"
+HOMEPAGE="https://github.com/realityforge/jndikit"
+SRC_URI="https://github.com/realityforge/${MY_PN}/archive/${PV}.zip -> ${P}.zip"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=virtual/jre-1.6"
+
+DEPEND="
+ >=virtual/jdk-1.6
+ source? ( app-arch/zip )"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+JAVA_SRC_DIR="src"
+
+java_prepare() {
+ rm -rf src/test || die
+}
+
+src_compile() {
+ java-pkg-simple_src_compile
+ pushd target/classes > /dev/null || die
+ rmic org.realityforge.spice.jndikit.rmi.server.RMINamingProviderImpl \
+ || die "rmic failed"
+ popd > /dev/null || die
+}
diff --git a/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild b/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild
index 53722762bdef..666827ae888a 100644
--- a/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild
+++ b/dev-java/ws-commons-util/ws-commons-util-1.0.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://ws.apache.org/commons/util/"
SRC_URI="mirror://apache/ws/commons/util/sources/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
diff --git a/dev-java/ws-commons-util/ws-commons-util-1.0.1.ebuild b/dev-java/ws-commons-util/ws-commons-util-1.0.1.ebuild
deleted file mode 100644
index a49340d72bfb..000000000000
--- a/dev-java/ws-commons-util/ws-commons-util-1.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="1"
-JAVA_PKG_IUSE="source test"
-inherit java-pkg-2
-
-DESCRIPTION="Utility classes that allow high performance XML processing based on SAX"
-HOMEPAGE="http://ws.apache.org/commons/util/"
-SRC_URI="mirror://apache/ws/commons/util/sources/${P}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4
- test? ( dev-java/junit:0 )"
-
-RDEPEND=">=virtual/jre-1.4"
-
-src_compile() {
- mkdir -p bin || die
- ejavac -d bin `find src/main -name "*.java" || die`
- `java-config -j` cvf "${PN}.jar" -C bin . || die
-}
-
-src_install() {
- java-pkg_dojar "${PN}.jar"
- use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
- local class files=`find src/test -name "*.java" || die`
- ejavac -cp bin:`java-pkg_getjars junit` -d bin ${files}
-
- for class in ${files} ; do
- class=${class#src/test/java/}
- class=${class%.java}
- ejunit -cp bin ${class//\//.}
- done
-}
diff --git a/dev-java/xml-xmlbeans/Manifest b/dev-java/xml-xmlbeans/Manifest
index 38726e036900..a3efb24c797c 100644
--- a/dev-java/xml-xmlbeans/Manifest
+++ b/dev-java/xml-xmlbeans/Manifest
@@ -1,2 +1 @@
-DIST xml-xmlbeans-20041217.tar.bz2 2436239 SHA256 c2a53c653c9f49e172e2c364fc8e111ad3d258f906bbd6b8c65ca0b3f0c57a68 SHA512 93f662a10a12948bace265a34a23e851c1210da8d8af5e699d0f51eb6d1959220eaee8f9072d1a33330217aec08321eac7bf91d8aaa160f56b751b0ab4408619 WHIRLPOOL 0fd5c098d5b1c2ca49d00b639f0a49c87f62f6c74bce1bdf4bcdfe3b77a833dbc9bd7ad99fc40ab2bfb5561ebfb253d0c74a13a03803ad8cfba9f2063e0016bb
DIST xmlbeans-2.6.0-src.zip 9005098 SHA256 3dff52b0854236adbbff9dc76722372415cd9a8f406f6133886a6c5228595390 SHA512 162dc3d283ebf9f7fae823a2ae8d835b708c2cbeed48349c85996e60b2b8dfe0e51b17bd37eb34327c6452b2c0fc7df8a4902816b145993e36ca614ceb43b2b7 WHIRLPOOL cd775fa268e56aa02d744be67012d807e1cebf978d453610b48a8ca865f8d1587f27ced161d622d5d6ae0badab80de80ee4b46b7bf3bb753f69242c20d1e03d5
diff --git a/dev-java/xml-xmlbeans/files/xml-xmlbeans-gentoo.patch b/dev-java/xml-xmlbeans/files/xml-xmlbeans-gentoo.patch
deleted file mode 100644
index 9f3a7656fd2f..000000000000
--- a/dev-java/xml-xmlbeans/files/xml-xmlbeans-gentoo.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-diff -uprN xml-xmlbeans-20041217.orig/v1/build.xml xml-xmlbeans-20041217/v1/build.xml
---- xml-xmlbeans-20041217.orig/v1/build.xml 2004-12-24 13:27:42.347587336 +0100
-+++ xml-xmlbeans-20041217/v1/build.xml 2004-12-24 13:35:28.859666720 +0100
-@@ -340,7 +340,7 @@
- srcdir="test/src/drt"
- destdir="build/private/classes/drt"
- classpathref="test.compile.path"
-- source="1.4"
-+ source="1.4" target="1.4"
- debug="on"/>
- </target>
-
-@@ -372,7 +372,7 @@
-
- <target name="soaptest.classes" depends="dirs, stsschema.jar">
- <mkdir dir="build/private/classes/soaptest"/>
-- <javac srcdir="test/src/soaptest" destdir="build/private/classes/soaptest" source="1.4" debug="on">
-+ <javac srcdir="test/src/soaptest" destdir="build/private/classes/soaptest" source="1.4" target="1.4" debug="on">
- <classpath>
- <pathelement location="external/lib/jdom.jar"/>
- <pathelement location="external/lib/junit.jar"/>
-@@ -395,7 +395,7 @@
- srcdir="test/src/erictest"
- destdir="build/private/classes/erictest"
- classpathref="test.compile.path"
-- source="1.4"
-+ source="1.4" target="1.4"
- debug="on"/>
- </target>
-
-@@ -411,7 +411,7 @@
- srcdir="test/src/random"
- destdir="build/private/classes/random"
- classpathref="test.compile.path"
-- source="1.4"
-+ source="1.4" target="1.4"
- debug="on"/>
- </target>
-
-@@ -423,7 +423,7 @@
-
- <target name="teststore.classes" depends="dirs">
- <mkdir dir="build/private/classes/teststore"/>
-- <javac srcdir="test/src/teststore" destdir="build/private/classes/teststore" source="1.4" debug="on">
-+ <javac srcdir="test/src/teststore" destdir="build/private/classes/teststore" source="1.4" target="1.4" debug="on">
- <classpath>
- <pathelement location="build/private/classes/simpletypes"/>
- <pathelement location="build/private/classes/xmlcomp"/>
-@@ -557,7 +557,7 @@
- <property name="docs.dir" value="build/docs"/>
- <delete dir="${docs.dir}"/>
- <mkdir dir="${docs.dir}"/>
-- <javadoc packagenames="*" sourcepath="src/xmlpublic" classpath="${javadoc.path}" destdir="${docs.dir}/reference" windowtitle="XMLBeans Documentation" source="1.4" stylesheetfile="docs/stylesheet.css">
-+ <javadoc packagenames="*" sourcepath="src/xmlpublic" classpath="${javadoc.path}" source="1.4" destdir="${docs.dir}/reference" windowtitle="XMLBeans Documentation" stylesheetfile="docs/stylesheet.css">
- <link href="http://xml.apache.org/xmlbeans/docs/reference/index.html"/>
- <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
- <link href="http://java.sun.com/j2ee/1.4/docs/api/"/>
-@@ -583,7 +583,7 @@
- srcdir="test/src/streamtest"
- destdir="build/private/classes/streamtest"
- classpathref="test.compile.path"
-- source="1.4"
-+ source="1.4" target="1.4"
- debug="on"/>
- </target>
-
-@@ -736,7 +736,7 @@
-
- <target name="xmlpublic.classes" depends="dirs, xmlinputstream.classes">
- <mkdir dir="build/classes/xmlpublic"/>
-- <javac srcdir="src/xmlpublic" destdir="build/classes/xmlpublic" source="1.4" debug="on">
-+ <javac srcdir="src/xmlpublic" destdir="build/classes/xmlpublic" source="1.4" target="1.4" debug="on">
- <classpath>
- <pathelement location="build/classes/xmlinputstream"/>
- </classpath>
-@@ -756,7 +756,7 @@
-
- <target name="typestore.classes" depends="dirs, xmlpublic.classes, common.classes, xmlinputstream.classes">
- <mkdir dir="build/classes/typestore"/>
-- <javac srcdir="src/typestore" destdir="build/classes/typestore" source="1.4" debug="on">
-+ <javac srcdir="src/typestore" destdir="build/classes/typestore" source="1.4" target="1.4" debug="on">
- <classpath>
- <pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/classes/xmlpublic"/>
-@@ -770,7 +770,7 @@
-
- <target name="common.classes" depends="dirs, xmlpublic.jar, xmlinputstream.classes">
- <mkdir dir="build/classes/common"/>
-- <javac srcdir="src/common" destdir="build/classes/common" source="1.4" debug="on">
-+ <javac srcdir="src/common" destdir="build/classes/common" source="1.4" target="1.4" debug="on">
- <classpath>
- <pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/lib/xmlpublic.jar"/>
-@@ -783,7 +783,7 @@
-
- <target name="typeimpl.classes" depends="dirs, repackage.classes, xmlpublic.classes, typestore.classes, xsdschema.classes, configschema.classes, toolschema.classes">
- <mkdir dir="build/classes/typeimpl"/>
-- <javac destdir="build/classes/typeimpl" source="1.4" debug="on">
-+ <javac destdir="build/classes/typeimpl" source="1.4" target="1.4" debug="on">
- <classpath>
- <pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/classes/common"/>
-@@ -816,7 +816,7 @@
-
- <target name="xmlcomp.classes" depends="dirs, repackage.classes, typeimpl.classes, xmlpublic.classes, typestore.classes">
- <mkdir dir="build/classes/xmlcomp"/>
-- <javac srcdir="src/xmlcomp" destdir="build/classes/xmlcomp" source="1.4" debug="on">
-+ <javac srcdir="src/xmlcomp" destdir="build/classes/xmlcomp" source="1.4" target="1.4" debug="on">
- <classpath>
- <pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/classes/xmlpublic"/>
-@@ -837,7 +837,7 @@
- <target name="xmlstore.classes"
- depends="dirs, common.classes, typestore.classes, xmlpublic.classes">
- <mkdir dir="build/classes/xmlstore"/>
-- <javac srcdir="src/xmlstore" destdir="build/classes/xmlstore" source="1.4" debug="on">
-+ <javac srcdir="src/xmlstore" destdir="build/classes/xmlstore" source="1.4" target="1.4" debug="on">
- <classpath id="xmlstore.compile.path">
- <pathelement location="build/classes/xmlinputstream"/>
- <pathelement location="build/classes/typestore"/>
-@@ -916,7 +916,7 @@
-
- <target name="xmlconfig.classes" depends="dirs, xmlpublic.jar, configschema.classes">
- <mkdir dir="build/classes/xmlconfig"/>
-- <javac srcdir="src/xmlconfig" destdir="build/classes/xmlconfig" source="1.4" debug="on">
-+ <javac srcdir="src/xmlconfig" destdir="build/classes/xmlconfig" source="1.4" target="1.4" debug="on">
- <classpath>
- <pathelement location="build/lib/xmlpublic.jar"/>
- <pathelement location="build/classes/configschema"/>
-@@ -1044,7 +1044,7 @@
-
- <target name="repackage.classes">
- <mkdir dir="build/classes/repackage"/>
-- <javac srcdir="src/repackage" destdir="build/classes/repackage" source="1.4" debug="on"/>
-+ <javac srcdir="src/repackage" destdir="build/classes/repackage" source="1.4" target="1.4" debug="on"/>
- </target>
-
- <target name="check.jaxen.jar">
-@@ -1068,7 +1068,7 @@
- srcdir="src/xpath"
- destdir="build/private/classes/xpath"
- classpathref="xpath.compile.path"
-- source="1.4"
-+ source="1.4" target="1.4"
- debug="on">
- <classpath id="xpath.compile.path">
- <pathelement location="build/lib/xmlpublic.jar"/>
-@@ -1090,7 +1090,7 @@
- srcdir="test/src/xpath"
- destdir="build/private/classes/testxpath"
- classpathref="testxpath.compile.path"
-- source="1.4"
-+ source="1.4" target="1.4"
- debug="on">
- <classpath id="testxpath.compile.path">
- <pathelement location="build/lib/xmlpublic.jar"/>
diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild
deleted file mode 100644
index 19c0e73f8b77..000000000000
--- a/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_P="${PN}-20041217"
-
-DESCRIPTION="An XML-Java binding tool"
-HOMEPAGE="http://xmlbeans.apache.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-COMMON_DEPEND="
- dev-java/jaxen:1.1
- dev-java/ant-core:0"
-RDEPEND="${COMMON_DEPEND}
- >=virtual/jre-1.4"
-DEPEND="${COMMON_DEPEND}
- >=virtual/jdk-1.4"
-
-S="${WORKDIR}/${MY_P}/v1"
-
-java_prepare() {
- epatch "${FILESDIR}/xml-xmlbeans-gentoo.patch"
- java-ant_rewrite-classpath build.xml
-
- cd "${S}"/external/lib
- #TODO: includes and old copy named oldxbean.jar
- #that probably should not be used
- #rm -v *.jar
-
- java-pkg_jar-from jaxen-1.1 jaxen.jar jaxen-1.1-beta-2.jar
- java-pkg_filter-compiler jikes
-}
-
-src_compile() {
- eant xbean.jar $(use_doc docs) \
- -Dgentoo.classpath=$(java-pkg_getjars ant-core)
-}
-
-# Tests always seem to fail #100895
-
-src_install() {
- java-pkg_dojar build/lib/xbean*.jar
-
- dodoc CHANGES.txt NOTICE.txt README.txt
- if use doc; then
- java-pkg_dojavadoc build/docs/reference
- java-pkg_dohtml -r docs
- fi
- use source && java-pkg_dosrc src/*
-}
diff --git a/dev-lang/python-exec/python-exec-2.0.2.ebuild b/dev-lang/python-exec/python-exec-2.0.2.ebuild
index 0448541db614..4f56c6a9600e 100644
--- a/dev-lang/python-exec/python-exec-2.0.2.ebuild
+++ b/dev-lang/python-exec/python-exec-2.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="!<dev-python/python-exec-10000"
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 013ac0604b5e..85ce577b4b6f 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -4,3 +4,4 @@ DIST swi-prolog-7.2.3-gentoo-patchset-1.tar.gz 1875 SHA256 c11e48122dc468f21e08d
DIST swipl-7.2.3.tar.gz 16192142 SHA256 43657d51b7c5887bc2d2bced50a9822b86a08a6841399b8e76ee877f51d646b5 SHA512 da27a6b171d3b471401f1a91e86a4dbe98973d8a1db8c72aa27e452311d08b893b01a1de8f9f4dafcdac460774b4ea980050256d37284546941e1bdf84f8cd7b WHIRLPOOL de695c8e0317921dcc13898f7a3c88d1012e3f87f633cd25766ca5cb6637b29ca81b9245d015614089291a7d9abd0d8c7109ccae1df9297d78301d241cb258b3
DIST swipl-7.3.16.tar.gz 16214414 SHA256 584dce14e7eea75189c9133bb4eda05d639d6a4562b8cfca738ece25f0c2479e SHA512 5df2bd845087bb3f26e65d06b7db341b14500c7fc69b5c62b3ddd20d146c4280ffc79d5490d18239c0e70dab85e4424d81423deead148d7d1af768ae6800b3b8 WHIRLPOOL d7f45266ac2d1c36d7cd27e0e98f3856697d397060802790b5984c221092a69553a7bbbb761aa482aaba4892542f12c7786965b3db5fa1860f9864a404f0810b
DIST swipl-7.3.17.tar.gz 16231043 SHA256 ec1cdbeee833c0aff59a3e7aa182581d3b44562064cbd0983176aaf0b265652a SHA512 dc32f5bed52f985b81b967b43d132f5a2f79cf15ee04aaf189eae2c5713a24f41a5bcb0ff75710218ddc3d4d125bcd50a8a1255fead6933a5f4ffff0cf538aa9 WHIRLPOOL 2eb10cc73ab911e58bb6b61a4933cee31bdaba4b6172744a2566f46a39559da6d5ac91a0269d70c4850aeec8b39c3e66c738708bace24d080dc4881ec52e9077
+DIST swipl-7.3.18.tar.gz 16283755 SHA256 639d524e83cb6da138b783e855305c1c94d9d4f0fa9047c72e81dbaab11c7ff0 SHA512 055c68ce920d7ff0a2136fd8b2364f444214a700d8cf18acfdb03c8a75fd13b5b51476ce7ea2d6394bf6e0c1b465ba2f4f2ff7ada272716ed28dbc1be94b1dbd WHIRLPOOL 8df22a558fc50f829d722cb7894f07971f8029992d30655d1642aa87f838155babadf07e9c94fa65668ec001783c80f0f2320c0a20b11cb6313f1c508bf550a8
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.18.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.18.ebuild
new file mode 100644
index 000000000000..f9a7b8b391ad
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.3.18.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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/devel/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java libressl 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:0 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ java? ( >=virtual/jdk-1.5:= )
+ uuid? ( dev-libs/ossp-uuid )
+ X? (
+ virtual/jpeg:0
+ 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
+ if [[ -d "${WORKDIR}"/${PV} ]] ; then
+ epatch "${WORKDIR}"/${PV}
+ fi
+
+ 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
+}
+
+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 berkdb bdb ) \
+ $(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
+ unset DISPLAY
+ cd "${S}/packages" || die
+ emake \
+ USE_PUBLIC_NETWORK_TESTS=false \
+ USE_ODBC_TESTS=false \
+ check
+ ./report-failed || die
+ 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/vala/vala-0.30.1.ebuild b/dev-lang/vala/vala-0.30.1.ebuild
index 7f1ba9e66c5e..03359e5bc1e3 100644
--- a/dev-lang/vala/vala-0.30.1.ebuild
+++ b/dev-lang/vala/vala-0.30.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1"
SLOT="0.30"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 633491e40d50..bce6b4449777 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -2,5 +2,5 @@ DIST yap-6.2.2-gentoo-patchset-2.tar.gz 5736 SHA256 a4c74594a1342ae748c6f00b2ddd
DIST yap-6.2.2.tar.gz 5496746 SHA256 c9b5feb1ac6488797e8c722053db239cc208f7f6f09135f1e6d5f5802f90878e SHA512 8b357f02cd631b7e4d6a44911d82d329b82a654b24637d448ba0e4393ab34918df685c453f4e8b8ebb3aba71034f653c4522478cfafbb24f157c083b623bfc5e WHIRLPOOL 7d266b06874aab2c5b56391ee0d03be025f7cf2ae5ab9a2ca2ef5989b6ef5229bde491919a1b77f3af362798af83bc47614fd3bd293c0d9f4b74d202adb86ea5
DIST yap-6.3.2-gentoo-patchset-6.tar.gz 4138 SHA256 a5691612842b89e8dc3f5755fe076f3203574da34256bcba78ce282451cfde27 SHA512 c2dc49c0e185e6b6d7bdae175d470926f7b072dad1e46d30e36e885ca4d0abc8a7908b3abc946b1d7c77006973f8ef9e7dc862ecc4ef756eff5d83a06674e5a7 WHIRLPOOL 7046a9d74d34e9f561f71b762f81ae208784eb6daccb4e0bfe7980729bd5094d34858f7d88b54c9d4589e6b835707a0150fd0a6c2b98d41d9238efbc1badb805
DIST yap-6.3.2.tar.gz 6447312 SHA256 876a31a05a8e50a32bda8597d3381953e3ed99f37f06e7075209a501b8e2d1ed SHA512 8fd93d4e448e92f5dfd4b0dd18e0ce988766d99b3bf7a72bce3931d551c873a11468764bef6bbb132a5518870f2bce0a00658536614db3cdc6586af27d56555d WHIRLPOOL f4507cb41735f40bf343b608a443f017e118c2b99da38e8a59e630b397c4812ce087ce097e85d5af9552191b5f77559609b22f446d05a3513fec08582ea43804
-DIST yap-6.3.3-gentoo-patchset-5.tar.gz 4453 SHA256 33fad353352f983ebbadf3aa0aa5ecb8c5008b45493fba2e18a53fc40d4d45ac SHA512 892da147530e434352e0f628142dccb1966ef1bde9302fbc56efa77b566cb32ce6c99514ab227cfc66147e8380c2de030bdb09f2da3d32364be4e3a6d381a1b1 WHIRLPOOL f943be58161d88e81061370fdf177101cebc2a7bab9d6349f45b06c638d00794e8d1511743d96260266eec26efc84148c982f9aef02bfbe93ee3f849da43679a
+DIST yap-6.3.3-gentoo-patchset-6.tar.gz 4557 SHA256 823f9e83786db362106f50d3dce8a22948156c656b599f3eac7dd4f94e402e24 SHA512 ff58a91a94fbe5f51c90e60511dae3f7bc3b1c864ec7137b1ca3bf4fe3c18acb4519803d7b4d443e74674774725f89b0647ca1a988f8603254896b8caada686b WHIRLPOOL 9abe58b52b01d3fbffccdad64b0259588515b108966ad29b3f111b17f53105d1bd7f9be679a89dda74692c51efa53f33c472cd670ee16b92f858816b2e2bebe6
DIST yap-6.3.3.tar.gz 7879301 SHA256 aee3b449b1669af07a8291ce6e7fb0a9b35e1343e2ab96fadb1a37552397fa78 SHA512 4ef45277ec84b6e072fa54afc7d6c18f11c3a0cdf477e35e35a0ce2181c9ff2e693f8735f63a1899373f6baf79ce0a972b37e1ae6ed8271bec60663f477bbe80 WHIRLPOOL 3b4095ff9ecbd532d2211e9158f6bd400248b43386027894c08754aadc14712a60325aeb950b361f14b2bc105053ff8a70b025e305fb79003a68f4226a39b724
diff --git a/dev-lang/yap/yap-6.3.3.ebuild b/dev-lang/yap/yap-6.3.3.ebuild
index 9a07faf52936..68d7151f1388 100644
--- a/dev-lang/yap/yap-6.3.3.ebuild
+++ b/dev-lang/yap/yap-6.3.3.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit eutils flag-o-matic java-pkg-opt-2 multilib
-PATCHSET_VER="5"
+PATCHSET_VER="6"
DESCRIPTION="YAP is a high-performance Prolog compiler"
HOMEPAGE="http://www.dcc.fc.up.pt/~vsc/Yap/"
diff --git a/dev-libs/appstream-glib/appstream-glib-0.5.9.ebuild b/dev-libs/appstream-glib/appstream-glib-0.5.9.ebuild
index 6bb20a3f2010..409b2ebefa19 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.5.9.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.5.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0/8" # soname version
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="+introspection nls"
# FIXME: yaml is optional with --enable-dep11 but not
diff --git a/dev-libs/atk/atk-2.18.0.ebuild b/dev-libs/atk/atk-2.18.0.ebuild
index b9466dfc0a45..552289364bc9 100644
--- a/dev-libs/atk/atk-2.18.0.ebuild
+++ b/dev-libs/atk/atk-2.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
LICENSE="LGPL-2+"
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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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 ~x86-winnt"
IUSE="+introspection nls test"
RDEPEND="
diff --git a/dev-libs/btparser/btparser-0.26.ebuild b/dev-libs/btparser/btparser-0.26.ebuild
index 82b6fa616b4c..9bbb3d2c0c95 100644
--- a/dev-libs/btparser/btparser-0.26.ebuild
+++ b/dev-libs/btparser/btparser-0.26.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0/2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="static-libs"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-libs/cdk/cdk-5.0.20141106.ebuild b/dev-libs/cdk/cdk-5.0.20141106.ebuild
index 209a4ee16794..75f303a86d1e 100644
--- a/dev-libs/cdk/cdk-5.0.20141106.ebuild
+++ b/dev-libs/cdk/cdk-5.0.20141106.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
LICENSE="BSD"
SLOT="0/6" # subslot = soname version
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="examples static-libs unicode"
DEPEND=">=sys-libs/ncurses-5.2[unicode?]"
diff --git a/dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild b/dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild
index aebcc03576eb..9005ccb27daf 100644
--- a/dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild
+++ b/dev-libs/ferrisloki/ferrisloki-3.0.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/witme/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
IUSE="static-libs stlport"
RDEPEND="stlport? ( >=dev-libs/STLport-5 )
diff --git a/dev-libs/folks/folks-0.11.2.ebuild b/dev-libs/folks/folks-0.11.2.ebuild
index 2f7627abb895..3ab83d5b37da 100644
--- a/dev-libs/folks/folks-0.11.2.ebuild
+++ b/dev-libs/folks/folks-0.11.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
LICENSE="LGPL-2.1+"
SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
# TODO: --enable-profiling
# Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
diff --git a/dev-libs/gdl/gdl-3.18.0.ebuild b/dev-libs/gdl/gdl-3.18.0.ebuild
index faf931fe8db2..8f15cd71a6a2 100644
--- a/dev-libs/gdl/gdl-3.18.0.ebuild
+++ b/dev-libs/gdl/gdl-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdl"
LICENSE="LGPL-2.1+"
SLOT="3/5" # subslot = libgdl-3 soname version
IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
RDEPEND="
dev-libs/glib:2
diff --git a/dev-libs/geoip/geoip-1.6.9.ebuild b/dev-libs/geoip/geoip-1.6.9.ebuild
index 445952bd2f0a..9fed8e2dcc20 100644
--- a/dev-libs/geoip/geoip-1.6.9.ebuild
+++ b/dev-libs/geoip/geoip-1.6.9.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/glib-2.46.2-r2.ebuild b/dev-libs/glib/glib-2.46.2-r2.ebuild
index 31a93e710bb2..e969b62d3aee 100644
--- a/dev-libs/glib/glib-2.46.2-r2.ebuild
+++ b/dev-libs/glib/glib-2.46.2-r2.ebuild
@@ -32,7 +32,7 @@ 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"
+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}
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.46.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.46.0.ebuild
index 53918df6d61f..edfd502477f8 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.46.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.46.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://live.gnome.org/GObjectIntrospection/"
LICENSE="HPND"
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 ~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=""
RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.46.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.46.0.ebuild
index dbd8a09d0138..50a6efde71ce 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.46.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.46.0.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
${PYTHON_REQUIRED_USE}
test? ( cairo )
"
-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"
# virtual/pkgconfig needed at runtime, bug #505408
# We force glib and goi to be in sync by this way as explained in bug #518424
diff --git a/dev-libs/gom/gom-0.3.2.ebuild b/dev-libs/gom/gom-0.3.2.ebuild
index 3ca9916d0644..1f9a77179e75 100644
--- a/dev-libs/gom/gom-0.3.2.ebuild
+++ b/dev-libs/gom/gom-0.3.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gom"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
IUSE="+introspection python"
REQUIRED_IUSE="python? ( ${PYTHON_REQUIRED_USE} introspection )"
diff --git a/dev-libs/libcroco/libcroco-0.6.11.ebuild b/dev-libs/libcroco/libcroco-0.6.11.ebuild
index 7c0bce98f758..ec307634c554 100644
--- a/dev-libs/libcroco/libcroco-0.6.11.ebuild
+++ b/dev-libs/libcroco/libcroco-0.6.11.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/libcroco/"
LICENSE="LGPL-2"
SLOT="0.6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.5.ebuild
index 1c0a9518da1a..fb27c0387ba3 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.5.5.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.5.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 MIT"
SLOT="0/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
diff --git a/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild
index 9c4e1246ad46..01d664684d16 100644
--- a/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild
+++ b/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild
@@ -19,7 +19,7 @@ REQUIRED_IUSE="
vala? ( introspection )
"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
# configure checks for gtk:3, but only uses it for demos which are not installed
RDEPEND="
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 2f80e0495d64..d60acf4c2fac 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,3 +1,2 @@
DIST libgit2-glib-0.22.8.tar.xz 429300 SHA256 05c9453b195f1af0df2a5d8bc71472c9fb26d14bb8fbb5b688ad1b8ef7a30959 SHA512 caa0076127cd846b31bc9d341ecb0a07b0a4e960b16387b241f1e322627d304636bf59c34a657675444a7a5be66ab645416be0be14cc0e841078f5ce2ac7c9fd WHIRLPOOL 831b57d9da81c5fb3e5ad06a6e7080b1570e2b215eb193a3704cb4b7caa2e361c3290e0b15ab3d27ecc4402756e9d1cd4e8db0da0ea4cd119eafefe32a987213
DIST libgit2-glib-0.23.10.tar.xz 450552 SHA256 398ea6ff5fb1eafa61f2908da5ff8722dc051a2081be6cbed76a2ab07ecab1af SHA512 bf85ca562bb1e00fb65d499d133daaa9deeb8abe37e1caa33148c469e91f43f685c222fe976985b4a5e9cef4ebaec9e92d90d5a87287f0c6012f798ed9755a07 WHIRLPOOL 91d55e52c507a80d28f110f7feb183dd046db4389732ff4a68996156ef2a04e956c71ef485c36c9b8f945208f699bed883d5c914eb8e53db1301c7e9b59eb1f1
-DIST libgit2-glib-0.23.8.tar.xz 449096 SHA256 50853d1fbdabcdf67c14d3295a973c1c6f625b7d298459e494135a31984f140b SHA512 19624d7d83aef35e2d98002d75ce5dcc0fa2067ea29972b8f221758ae33c635150e46e511d748b7f4ca90de1ffdb3d5f20b22fd7b2f243ef9529295a4275dde9 WHIRLPOOL 4d630e143a50cd1bd7baa09cc8887bb144a03f71e739c924ae1c57cb1898e1666cff6be868bf2b4489cd009ec6e2fa52b4440a26d49168debaf27cdf133a44f7
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.23.10.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.23.10-r1.ebuild
index 070feb8239f7..917f24f5fd2a 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-0.23.10.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.23.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,13 +14,14 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="python ssh +vala"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="
>=dev-libs/libgit2-0.23.0:=
+ <dev-libs/libgit2-0.24
>=dev-libs/glib-2.44.0:2
>=dev-libs/gobject-introspection-0.10.1:=
python? (
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.23.8.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.23.8.ebuild
deleted file mode 100644
index d5f0661decb1..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.23.8.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
-GCONF_DEBUG="no"
-PYTHON_COMPAT=( python{3_3,3_4,3_5} )
-VALA_MIN_API_VERSION="0.22"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils gnome2 python-r1 vala
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="python ssh +vala"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-libs/libgit2-0.23.0:=
- >=dev-libs/glib-2.44.0:2
- >=dev-libs/gobject-introspection-0.10.1:=
- python? (
- ${PYTHON_DEPS}
- dev-python/pygobject:3[${PYTHON_USEDEP}] )
- ssh? ( dev-libs/libgit2[ssh] )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.11
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- $(use_enable python) \
- $(use_enable ssh) \
- $(use_enable vala)
-}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index d6d659414827..a2ae93bc4ad7 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -4,3 +4,4 @@ DIST libgit2-0.22.3.tar.gz 3594098 SHA256 511fe60e7c12c3525b4e0489861e5c1fe0e331
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
DIST libgit2-0.23.4.tar.gz 4065303 SHA256 c7f5e2d7381dbc4d7e878013d14f9993ae8a41bd23f032718e39ffba57894029 SHA512 f2f6244dfee4dab2dc5ef9607808404467a1f6baa684aa4e24b7116e7e7f63f396eef3282c1bcffbef47f19824731c2887deadbe3b2dad8a075b0639e5965d9e WHIRLPOOL 7346fd24616ba68929f02d686229a2f91caf2bf44ff88aadbb663ffb776dc6a5a222f0a9d7145ac9ef08ebcd321671e5c3d0175eca77230955bfaa2ca375ca6a
+DIST libgit2-0.24.0.tar.gz 4169652 SHA256 1c6693f943bee3f634b9094376f93e7e03b9ca77354a33f4e903fdcb2ee8b2b0 SHA512 f41e8f9d4b03b392fb7f3a8a7e2ee806760d4c43fdc4270ef59d42c9d57f1f93681216ff4cfdfc6512b212bf7a37a4fe0fe9c44a04742fb3e2aef54c016136ba WHIRLPOOL 98117ab066a51a39042b0862ac3df872d72e1214518a8d5733bc0a92f2cad3eb18ced56f715075276aba527f824eae58f643a8b12115134da9122b7d902652ae
diff --git a/dev-libs/libgit2/libgit2-0.23.4.ebuild b/dev-libs/libgit2/libgit2-0.23.4.ebuild
index 746b9b921ac6..788147484001 100644
--- a/dev-libs/libgit2/libgit2-0.23.4.ebuild
+++ b/dev-libs/libgit2/libgit2-0.23.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~x86 ~ppc-macos"
+ KEYWORDS="amd64 ~arm x86 ~ppc-macos"
fi
DESCRIPTION="A linkable library for Git"
diff --git a/dev-libs/libgit2/libgit2-0.24.0.ebuild b/dev-libs/libgit2/libgit2-0.24.0.ebuild
new file mode 100644
index 000000000000..6cc323b47e61
--- /dev/null
+++ b/dev-libs/libgit2/libgit2-0.24.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2016 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 ~arm ~x86 ~ppc-macos"
+fi
+
+DESCRIPTION="A linkable library for Git"
+HOMEPAGE="https://libgit2.github.com/"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0/24"
+IUSE="examples gssapi libressl ssh test threads trace"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ 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
+ egit_clean examples
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/dev-libs/libgusb/libgusb-0.2.8.ebuild b/dev-libs/libgusb/libgusb-0.2.8.ebuild
index 82d647026274..5dabc76bccb3 100644
--- a/dev-libs/libgusb/libgusb-0.2.8.ebuild
+++ b/dev-libs/libgusb/libgusb-0.2.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
IUSE="+introspection static-libs vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/dev-libs/libgweather/libgweather-3.18.1.ebuild b/dev-libs/libgweather/libgweather-3.18.1.ebuild
index fc6178069628..dc911850301b 100644
--- a/dev-libs/libgweather/libgweather-3.18.1.ebuild
+++ b/dev-libs/libgweather/libgweather-3.18.1.ebuild
@@ -16,7 +16,7 @@ SLOT="2/3-6" # subslot = 3-(libgweather-3 soname suffix)
IUSE="glade +introspection vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
COMMON_DEPEND="
>=x11-libs/gtk+-3.13.5:3[introspection?]
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 76709ac00d14..a8e99bef8a5c 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -3,3 +3,4 @@ DIST libinput-1.0.1.tar.xz 800244 SHA256 482fb35119b457ba65a8bebaa47e4f6b4dbd77e
DIST libinput-1.1.0.tar.xz 802348 SHA256 673186ea2a0d2b695afaa9758834f9217b175774d9ae222e1b43ff63c663f582 SHA512 7f014eabed120c00fcd2d8748aed44a8ca31fd30bdda8b289ca63f7d1bebb9c49f1d508707fb0c4a5c7c4a37b58548efdff0e9b7761475f18e1cf787a80520e6 WHIRLPOOL 028518c20cfc6daa442dd92d04183a6575b95b1f4792a646ce42c09a7bc75e5bb469ca88b8cad89919c0814e00aa65178cc49c9dca6e9aad4ce997a94f9ba645
DIST libinput-1.1.5.tar.xz 806960 SHA256 5e08c45dbb8bf32490cc6cd626da098564d646d161a07cba2e3adbd9745c0622 SHA512 031663c46b556048224aab018eb8ea76e34aace77508e52e6ef382a452585fafd4c91b427c0892aab3c624c0cfedc15c388922ae7166248e5da65575ff900c31 WHIRLPOOL 760cc1cf0c6657efbdadadd2f50e188d86465e1aa3f287275323d6fad9156b684de0d3b6dbf6e3fd5213018770726087ee282833f25ba5ef67918c0284b885a1
DIST libinput-1.2.0.tar.xz 866284 SHA256 1754b917fe675507ea80445b4f2e91d76cb6a6935508fe37234807affb316e2c SHA512 ab5b534ac5db7d4142e41c61e1f8fbc7f4c9cf89567fa27196fa9300f57db7328d61af25c93126905ad06061e1b2def0abe70654ac3710b6476379f84343cce8 WHIRLPOOL 2f74bcd3ae694db9f52c450c6b96d24fd320da2002e900cf69a3ce2d9c33b00213097c0330867f32b175b5fe80d06099c3bdc461a2001f4eee4f2481ab1e32fc
+DIST libinput-1.2.1.tar.xz 863660 SHA256 e2db8c5357f8859b33c58e583601f50509f085ae9340a58790bcf44f1480c1c3 SHA512 6dceed081bb0c5374d39be7ce14ccbeb7734c50a648a155ca9d57f7dabde80a35a5b3b4eb15f37ce5c475725a13624d4c7f9ab1147f71af2576fdb746310509c WHIRLPOOL 7748530169b95765f5d8a07191c8e3f8e165d5d778f6f9da8ea4dc10164501e9be4166eecb534b69153cb11d48354663739effbd324107596f496c5d38c6b632
diff --git a/dev-libs/libinput/libinput-1.1.5.ebuild b/dev-libs/libinput/libinput-1.1.5.ebuild
index c2225a060262..1cec4cb49bb2 100644
--- a/dev-libs/libinput/libinput-1.1.5.ebuild
+++ b/dev-libs/libinput/libinput-1.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0/10"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
IUSE="test"
# Tests require write access to udev rules directory which is a no-no for live system.
# Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libinput/libinput-1.2.1.ebuild b/dev-libs/libinput/libinput-1.2.1.ebuild
new file mode 100644
index 000000000000..3107c89aa9c5
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.2.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="input_devices_wacom test"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+ input_devices_wacom? ( >=dev-libs/libwacom-0.12 )
+ >=dev-libs/libevdev-0.4
+ >=sys-libs/mtdev-1.1
+ virtual/libudev
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+# test? (
+# >=dev-libs/check-0.9.10
+# dev-util/valgrind
+# sys-libs/libunwind )
+
+src_prepare() {
+ # Doc handling in kinda strange but everything
+ # is available in the tarball already.
+ sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \
+ -i Makefile.am Makefile.in || die
+}
+
+src_configure() {
+ # gui can be built but will not be installed
+ # building documentation silently fails with graphviz syntax errors
+ econf \
+ --disable-documentation \
+ --disable-event-gui \
+ $(use_enable input_devices_wacom libwacom) \
+ $(use_enable test tests) \
+ --with-udev-dir="$(get_udevdir)"
+}
+
+src_install() {
+ emake install DESTDIR="${D}"
+ dodoc -r doc/html
+ prune_libtool_files
+}
diff --git a/dev-libs/libpeas/libpeas-1.16.0.ebuild b/dev-libs/libpeas/libpeas-1.16.0.ebuild
index 04128cdd531b..6e1567c50caf 100644
--- a/dev-libs/libpeas/libpeas-1.16.0.ebuild
+++ b/dev-libs/libpeas/libpeas-1.16.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://developer.gnome.org/libpeas/stable/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="+gtk glade jit lua +python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ?? ( $(python_gen_useflags 'python3*') ) )"
diff --git a/dev-libs/libsigc++/libsigc++-2.6.2.ebuild b/dev-libs/libsigc++/libsigc++-2.6.2.ebuild
index d889754b3e4a..2844e36263dd 100644
--- a/dev-libs/libsigc++/libsigc++-2.6.2.ebuild
+++ b/dev-libs/libsigc++/libsigc++-2.6.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://libsigc.sourceforge.net/"
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-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 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs test"
RDEPEND=""
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
new file mode 100644
index 000000000000..cca3f246345a
--- /dev/null
+++ b/dev-libs/libtomcrypt/Manifest
@@ -0,0 +1 @@
+DIST crypt-1.17.tar.bz2 1599215 SHA256 e33b47d77a495091c8703175a25c8228aff043140b2554c08a3c3cd71f79d116 SHA512 9335df5ae0a2c8e33e8f03ced0cfb0a8d1ac4bccd007b74818228c3b8b232446b4425356f304a08320b75542a537a46b305b92c3011dee76dfd636497bf57af2 WHIRLPOOL 71f61a270635f5487016efbdffb5867aa880319f5ad3646f41510307925fb1f1d82d29072f8362be1a2c3b71336922cf23aec4ad1d0c7a077d5ff6e920117337
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.17.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.17.ebuild
new file mode 100644
index 000000000000..6764cc71dab9
--- /dev/null
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.17.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+RESTRICT="test"
+
+DESCRIPTION="Modular and portable cryptographic toolkit"
+HOMEPAGE="http://www.libtom.org/"
+
+SRC_URI="https://github.com/libtom/libtomcrypt/releases/download/${PV}/crypt-${PV}.tar.bz2"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+ # avoid PDF regen
+ emake NODOCS=1 DESTDIR="${D}" install
+ cp doc/crypt.pdf "${D}/usr/share/doc/libtomcrypt/pdf"
+}
diff --git a/dev-libs/libtomcrypt/metadata.xml b/dev-libs/libtomcrypt/metadata.xml
new file mode 100644
index 000000000000..a7029b1a1086
--- /dev/null
+++ b/dev-libs/libtomcrypt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/dev-libs/libtomfloat/metadata.xml b/dev-libs/libtomfloat/metadata.xml
index 6f49eba8f496..a7029b1a1086 100644
--- a/dev-libs/libtomfloat/metadata.xml
+++ b/dev-libs/libtomfloat/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-libs/libtommath/libtommath-1.0.ebuild b/dev-libs/libtommath/libtommath-1.0.ebuild
index 84b55329e834..98b3e2027e2b 100644
--- a/dev-libs/libtommath/libtommath-1.0.ebuild
+++ b/dev-libs/libtommath/libtommath-1.0.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit autotools eutils multilib toolchain-funcs
DESCRIPTION="highly optimized and portable routines for integer based number theoretic applications"
-HOMEPAGE="https://github.com/libtom/libtommath"
+HOMEPAGE="http://www.libtom.org/"
SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}.tar.xz"
LICENSE="WTFPL-2"
diff --git a/dev-libs/libtommath/metadata.xml b/dev-libs/libtommath/metadata.xml
index cd1becb2efd0..ff7228943422 100644
--- a/dev-libs/libtommath/metadata.xml
+++ b/dev-libs/libtommath/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
<longdescription>
LibTomMath is a free open source portable number theoretic multiple-precision
integer library written entirely in C. (phew!). The library is designed to
diff --git a/dev-libs/libtompoly/libtompoly-0.04.ebuild b/dev-libs/libtompoly/libtompoly-0.04.ebuild
index df09fb0a8018..0331db114a95 100644
--- a/dev-libs/libtompoly/libtompoly-0.04.ebuild
+++ b/dev-libs/libtompoly/libtompoly-0.04.ebuild
@@ -7,8 +7,8 @@ EAPI="4"
inherit toolchain-funcs multilib
DESCRIPTION="portable ISO C library for polynomial basis arithmetic"
-HOMEPAGE="http://poly.libtomcrypt.org/"
-SRC_URI="http://poly.libtomcrypt.org/files/ltp-${PV}.tar.bz2"
+HOMEPAGE="http://www.libtom.org/"
+SRC_URI="https://github.com/libtom/libtompoly/releases/download/${PV}/ltp-${PV}.tar.bz2"
LICENSE="WTFPL-2"
SLOT="0"
diff --git a/dev-libs/libtompoly/metadata.xml b/dev-libs/libtompoly/metadata.xml
index b4247c2472dd..29efcaf35b54 100644
--- a/dev-libs/libtompoly/metadata.xml
+++ b/dev-libs/libtompoly/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>patrick@gentoo.org</email>
+ <name>Patrick Lauer</name>
+ </maintainer>
<longdescription>
LibTomPoly has the following features.
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index f0901e3daf17..9384e498c939 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -1 +1,2 @@
DIST libvterm-0.0_pre20151022.tar.xz 61140 SHA256 6958aa321e0610baeb84691270e52c63c1320d94d8fd32bfc52c315a9d42a71f SHA512 d8179493bb6185a45e4565190d21dc08dc0d279945e898b2cc12cecca9c01b8d8a4ca24bb363861c1edfb009fab7ac2b2c4739393953efefda7616228ffd3bae WHIRLPOOL c586b9202adddce38f30190ac786870121cbad6e0562ca7ada9c7a6b956ab33f5ebf5c457cc1bc7e57af480abfb80cb1b02e204260e81975ecc11eb60f4a3427
+DIST libvterm-0.0_pre20160305.tar.xz 665672 SHA256 9d46d5674d32448b6923232acc507e2793289c25ad021eea2c60b1dc58202b3a SHA512 7e9a44ae679b8c7216f019c0c6b90f1b762f051f58fdb349cfa2a3b2df606940d891547fbc24f05ff32a33e4749242ce8ee2af214b7b3623b83a9f4b9fd53585 WHIRLPOOL a19e599253eefdad979c22e7753fbd8e7708220bd7c34f650819b66586af280eb3550ddeae5ff9d6c2294aad9938d83c342c6cdeb4c62606571999e63fa28bb2
diff --git a/dev-libs/libvterm/libvterm-0.0_pre20160305.ebuild b/dev-libs/libvterm/libvterm-0.0_pre20160305.ebuild
new file mode 100644
index 000000000000..4e5da7c1977f
--- /dev/null
+++ b/dev-libs/libvterm/libvterm-0.0_pre20160305.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils flag-o-matic multilib
+
+DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
+HOMEPAGE="http://www.leonerd.org.uk/code/libvterm/"
+SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-devel/libtool
+ virtual/pkgconfig"
+
+RDEPEND="!dev-libs/libvterm-neovim"
+
+src_compile() {
+ append-cflags -fPIC
+ emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+}
+
+src_install() {
+ emake PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ DESTDIR="${D}" install
+ prune_libtool_files
+
+ dodoc doc/*
+}
diff --git a/dev-libs/libxml2/libxml2-2.9.3.ebuild b/dev-libs/libxml2/libxml2-2.9.3.ebuild
index 34e9b7105a24..a1150960432a 100644
--- a/dev-libs/libxml2/libxml2-2.9.3.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="debug examples icu ipv6 lzma python readline static-libs test"
XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index ea8334d7711c..1b58f5184665 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -1,3 +1,3 @@
DIST mpfr-2.4.2.tar.bz2 1077886 SHA256 c7e75a08a8d49d2082e4caee1591a05d11b9d5627514e678f02d66a124bcf2ba SHA512 c004b3dbf86c04960e4a1f8db37a409a7cc4cb76135e76e98dcc5ad93aaa8deb62334ee13ff84447a7c12a5e8cb57f25c62ac908c24920f1fb1a38d79d4a4c5e WHIRLPOOL d08935d1c5cda48753ddbf98b3b0e87d911279d7fea24e6b210da7e2378f769f3b20babe96859601195d6a9811cf8297d239df53ad2cfa6d0a1bb7bb02ac6a29
-DIST mpfr-3.1.2.tar.xz 1074388 SHA256 399d0f47ef6608cc01d29ed1b99c7faff36d9994c45f36f41ba250147100453b SHA512 8d594206afb2637ed39ad564d42c8c4d02b042b95925f5c6ec891e5cb87f7155195559c7ff477256a088ecaaa3c2b0d35a9d11a74ed526a1080d49b2950e5587 WHIRLPOOL 1e391888d9cecc71617e99eb841cafac536e703b12d46a53fdcf773cc2654c98ca6bde2358f997c8b7bfd832bdb0c395b224df8a460a8fb5b4ad6f2c2e092b17
DIST mpfr-3.1.3.tar.xz 1112096 SHA256 6835a08bd992c8257641791e9a6a2b35b02336c8de26d0a8577953747e514a16 SHA512 79846fd82974269aa48152c2b6dbcb2321130dc4d0f0ba2eb94d56619b177add9b2077ebf88b4382c56db19c4215910e5a252f216715c1eee40baa299da42eb4 WHIRLPOOL fba9174551511ffa0fed80d906c5282c095697e79ab9b6fdeb915b9a81f15e20290b3ae6aa7c9ee9ef10fa9c0f973d8a75e1a169aae43f87a28ca433a93c57ce
+DIST mpfr-3.1.4.tar.xz 1122152 SHA256 761413b16d749c53e2bfd2b1dfaa3b027b0e793e404b90b5fbaeef60af6517f5 SHA512 4ef61708834efdea6b85258f46f1b25ce1c55b912f44b117d8c3d5e06d8f1177e50f627d9736f3289bd159c5bb10c80e09d1ad9f6f52c4ff43c3496034b04232 WHIRLPOOL 86021e6a60cad98ea42f8ab5bfe990a744ee21fbe89612e083dea43f7e981e84fcbc86de4a90e7a058c569b57b97359a29c9cf5252b960aa91f2247fb96c2743
diff --git a/dev-libs/mpfr/files/3.1.2/patch01 b/dev-libs/mpfr/files/3.1.2/patch01
deleted file mode 100644
index 731ea92f4395..000000000000
--- a/dev-libs/mpfr/files/3.1.2/patch01
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES 2013-09-26 10:52:52.000000000 +0000
-+++ mpfr-3.1.2-b/PATCHES 2013-09-26 10:52:52.000000000 +0000
-@@ -0,0 +1 @@
-+exp_2
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION 2013-03-13 15:37:28.000000000 +0000
-+++ mpfr-3.1.2-b/VERSION 2013-09-26 10:52:52.000000000 +0000
-@@ -1 +1 @@
--3.1.2
-+3.1.2-p1
-diff -Naurd mpfr-3.1.2-a/src/exp_2.c mpfr-3.1.2-b/src/exp_2.c
---- mpfr-3.1.2-a/src/exp_2.c 2013-03-13 15:37:28.000000000 +0000
-+++ mpfr-3.1.2-b/src/exp_2.c 2013-09-26 10:52:52.000000000 +0000
-@@ -204,7 +204,7 @@
- for (k = 0; k < K; k++)
- {
- mpz_mul (ss, ss, ss);
-- exps <<= 1;
-+ exps *= 2;
- exps += mpz_normalize (ss, ss, q);
- }
- mpfr_set_z (s, ss, MPFR_RNDN);
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h 2013-03-13 15:37:37.000000000 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h 2013-09-26 10:52:52.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2"
-+#define MPFR_VERSION_STRING "3.1.2-p1"
-
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c 2013-03-13 15:37:34.000000000 +0000
-+++ mpfr-3.1.2-b/src/version.c 2013-09-26 10:52:52.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "3.1.2";
-+ return "3.1.2-p1";
- }
diff --git a/dev-libs/mpfr/files/3.1.2/patch02 b/dev-libs/mpfr/files/3.1.2/patch02
deleted file mode 100644
index b229c18d093c..000000000000
--- a/dev-libs/mpfr/files/3.1.2/patch02
+++ /dev/null
@@ -1,605 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES 2013-09-26 10:56:55.000000000 +0000
-+++ mpfr-3.1.2-b/PATCHES 2013-09-26 10:56:55.000000000 +0000
-@@ -0,0 +1 @@
-+fits-smallneg
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION 2013-09-26 10:52:52.000000000 +0000
-+++ mpfr-3.1.2-b/VERSION 2013-09-26 10:56:55.000000000 +0000
-@@ -1 +1 @@
--3.1.2-p1
-+3.1.2-p2
-diff -Naurd mpfr-3.1.2-a/src/fits_u.h mpfr-3.1.2-b/src/fits_u.h
---- mpfr-3.1.2-a/src/fits_u.h 2013-03-13 15:37:35.000000000 +0000
-+++ mpfr-3.1.2-b/src/fits_u.h 2013-09-26 10:56:55.000000000 +0000
-@@ -32,17 +32,20 @@
- int res;
-
- if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f)))
-- /* Zero always fit */
-- return MPFR_IS_ZERO (f) ? 1 : 0;
-- else if (MPFR_IS_NEG (f))
-- /* Negative numbers don't fit */
-- return 0;
-- /* now it fits if
-- (a) f <= MAXIMUM
-- (b) round(f, prec(slong), rnd) <= MAXIMUM */
-+ return MPFR_IS_ZERO (f) ? 1 : 0; /* Zero always fits */
-
- e = MPFR_GET_EXP (f);
-
-+ if (MPFR_IS_NEG (f))
-+ return e >= 1 ? 0 /* f <= -1 does not fit */
-+ : rnd != MPFR_RNDN ? MPFR_IS_LIKE_RNDU (rnd, -1) /* directed mode */
-+ : e < 0 ? 1 /* f > -1/2 fits in MPFR_RNDN */
-+ : mpfr_powerof2_raw(f); /* -1/2 fits, -1 < f < -1/2 don't */
-+
-+ /* Now it fits if
-+ (a) f <= MAXIMUM
-+ (b) round(f, prec(slong), rnd) <= MAXIMUM */
-+
- /* first compute prec(MAXIMUM); fits in an int */
- for (s = MAXIMUM, prec = 0; s != 0; s /= 2, prec ++);
-
-diff -Naurd mpfr-3.1.2-a/src/fits_uintmax.c mpfr-3.1.2-b/src/fits_uintmax.c
---- mpfr-3.1.2-a/src/fits_uintmax.c 2013-03-13 15:37:33.000000000 +0000
-+++ mpfr-3.1.2-b/src/fits_uintmax.c 2013-09-26 10:56:55.000000000 +0000
-@@ -27,51 +27,19 @@
- #include "mpfr-intmax.h"
- #include "mpfr-impl.h"
-
--#ifdef _MPFR_H_HAVE_INTMAX_T
--
--/* We can't use fits_u.h <= mpfr_cmp_ui */
--int
--mpfr_fits_uintmax_p (mpfr_srcptr f, mpfr_rnd_t rnd)
--{
-- mpfr_exp_t e;
-- int prec;
-- uintmax_t s;
-- mpfr_t x;
-- int res;
--
-- if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f)))
-- /* Zero always fit */
-- return MPFR_IS_ZERO (f) ? 1 : 0;
-- else if (MPFR_IS_NEG (f))
-- /* Negative numbers don't fit */
-- return 0;
-- /* now it fits if
-- (a) f <= MAXIMUM
-- (b) round(f, prec(slong), rnd) <= MAXIMUM */
--
-- e = MPFR_GET_EXP (f);
--
-- /* first compute prec(MAXIMUM); fits in an int */
-- for (s = MPFR_UINTMAX_MAX, prec = 0; s != 0; s /= 2, prec ++);
--
-- /* MAXIMUM needs prec bits, i.e. MAXIMUM = 2^prec - 1 */
--
-- /* if e <= prec - 1, then f < 2^(prec-1) < MAXIMUM */
-- if (e <= prec - 1)
-- return 1;
-+/* Note: though mpfr-impl.h is included in fits_u.h, we also include it
-+ above so that it gets included even when _MPFR_H_HAVE_INTMAX_T is not
-+ defined; this is necessary to avoid an empty translation unit, which
-+ is forbidden by ISO C. Without this, a failing test can be reproduced
-+ by creating an invalid stdint.h somewhere in the default include path
-+ and by compiling MPFR with "gcc -ansi -pedantic-errors". */
-
-- /* if e >= prec + 1, then f >= 2^prec > MAXIMUM */
-- if (e >= prec + 1)
-- return 0;
-+#ifdef _MPFR_H_HAVE_INTMAX_T
-
-- MPFR_ASSERTD (e == prec);
-+#define FUNCTION mpfr_fits_uintmax_p
-+#define MAXIMUM MPFR_UINTMAX_MAX
-+#define TYPE uintmax_t
-
-- /* hard case: first round to prec bits, then check */
-- mpfr_init2 (x, prec);
-- mpfr_set (x, f, rnd);
-- res = MPFR_GET_EXP (x) == e;
-- mpfr_clear (x);
-- return res;
--}
-+#include "fits_u.h"
-
- #endif
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h 2013-09-26 10:52:52.000000000 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h 2013-09-26 10:56:55.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p1"
-+#define MPFR_VERSION_STRING "3.1.2-p2"
-
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c 2013-09-26 10:52:52.000000000 +0000
-+++ mpfr-3.1.2-b/src/version.c 2013-09-26 10:56:55.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "3.1.2-p1";
-+ return "3.1.2-p2";
- }
-diff -Naurd mpfr-3.1.2-a/tests/tfits.c mpfr-3.1.2-b/tests/tfits.c
---- mpfr-3.1.2-a/tests/tfits.c 2013-03-13 15:37:45.000000000 +0000
-+++ mpfr-3.1.2-b/tests/tfits.c 2013-09-26 10:56:55.000000000 +0000
-@@ -33,155 +33,176 @@
- #include "mpfr-intmax.h"
- #include "mpfr-test.h"
-
--#define ERROR1 { printf("Initial error for x="); mpfr_dump(x); exit(1); }
--#define ERROR2 { printf("Error for x="); mpfr_dump(x); exit(1); }
-+#define ERROR1(N) \
-+ do \
-+ { \
-+ printf("Error %d for rnd = %s and x = ", N, \
-+ mpfr_print_rnd_mode ((mpfr_rnd_t) r)); \
-+ mpfr_dump(x); \
-+ exit(1); \
-+ } \
-+ while (0)
-
- static void check_intmax (void);
-
- int
- main (void)
- {
-- mpfr_t x;
-+ mpfr_t x, y;
-+ int i, r;
-
- tests_start_mpfr ();
-
- mpfr_init2 (x, 256);
-+ mpfr_init2 (y, 8);
-
-- /* Check NAN */
-- mpfr_set_nan (x);
-- if (mpfr_fits_ulong_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_slong_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_uint_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_sint_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_ushort_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_sshort_p (x, MPFR_RNDN))
-- ERROR1;
-+ RND_LOOP (r)
-+ {
-
-- /* Check INF */
-- mpfr_set_inf (x, 1);
-- if (mpfr_fits_ulong_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_slong_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_uint_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_sint_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_ushort_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_sshort_p (x, MPFR_RNDN))
-- ERROR1;
-+ /* Check NAN */
-+ mpfr_set_nan (x);
-+ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (1);
-+ if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (2);
-+ if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (3);
-+ if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (4);
-+ if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (5);
-+ if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (6);
-
-- /* Check Zero */
-- MPFR_SET_ZERO (x);
-- if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_slong_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_uint_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_sint_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
-- ERROR2;
-+ /* Check INF */
-+ mpfr_set_inf (x, 1);
-+ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (7);
-+ if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (8);
-+ if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (9);
-+ if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (10);
-+ if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (11);
-+ if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (12);
-
-- /* Check small op */
-- mpfr_set_str1 (x, "1@-1");
-- if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_slong_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_uint_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_sint_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
-- ERROR2;
-+ /* Check Zero */
-+ MPFR_SET_ZERO (x);
-+ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (13);
-+ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (14);
-+ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (15);
-+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (16);
-+ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (17);
-+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (18);
-
-- /* Check 17 */
-- mpfr_set_ui (x, 17, MPFR_RNDN);
-- if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_slong_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_uint_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_sint_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
-- ERROR2;
-+ /* Check small positive op */
-+ mpfr_set_str1 (x, "1@-1");
-+ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (19);
-+ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (20);
-+ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (21);
-+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (22);
-+ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (23);
-+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (24);
-
-- /* Check all other values */
-- mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
-- mpfr_mul_2exp (x, x, 1, MPFR_RNDN);
-- if (mpfr_fits_ulong_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_slong_p (x, MPFR_RNDN))
-- ERROR1;
-- mpfr_mul_2exp (x, x, 40, MPFR_RNDN);
-- if (mpfr_fits_ulong_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_uint_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_sint_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_ushort_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_sshort_p (x, MPFR_RNDN))
-- ERROR1;
-+ /* Check 17 */
-+ mpfr_set_ui (x, 17, MPFR_RNDN);
-+ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (25);
-+ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (26);
-+ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (27);
-+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (28);
-+ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (29);
-+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (30);
-
-- mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
-- if (!mpfr_fits_ulong_p (x, MPFR_RNDN))
-- ERROR2;
-- mpfr_set_ui (x, LONG_MAX, MPFR_RNDN);
-- if (!mpfr_fits_slong_p (x, MPFR_RNDN))
-- ERROR2;
-- mpfr_set_ui (x, UINT_MAX, MPFR_RNDN);
-- if (!mpfr_fits_uint_p (x, MPFR_RNDN))
-- ERROR2;
-- mpfr_set_ui (x, INT_MAX, MPFR_RNDN);
-- if (!mpfr_fits_sint_p (x, MPFR_RNDN))
-- ERROR2;
-- mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN);
-- if (!mpfr_fits_ushort_p (x, MPFR_RNDN))
-- ERROR2;
-- mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN);
-- if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
-- ERROR2;
-+ /* Check all other values */
-+ mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
-+ mpfr_mul_2exp (x, x, 1, MPFR_RNDN);
-+ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (31);
-+ if (mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (32);
-+ mpfr_mul_2exp (x, x, 40, MPFR_RNDN);
-+ if (mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (33);
-+ if (mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (34);
-+ if (mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (35);
-+ if (mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (36);
-+ if (mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (37);
-
-- mpfr_set_si (x, 1, MPFR_RNDN);
-- if (!mpfr_fits_sint_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
-- ERROR2;
-+ mpfr_set_ui (x, ULONG_MAX, MPFR_RNDN);
-+ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (38);
-+ mpfr_set_ui (x, LONG_MAX, MPFR_RNDN);
-+ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (39);
-+ mpfr_set_ui (x, UINT_MAX, MPFR_RNDN);
-+ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (40);
-+ mpfr_set_ui (x, INT_MAX, MPFR_RNDN);
-+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (41);
-+ mpfr_set_ui (x, USHRT_MAX, MPFR_RNDN);
-+ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (42);
-+ mpfr_set_ui (x, SHRT_MAX, MPFR_RNDN);
-+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (43);
-
-- /* Check negative value */
-- mpfr_set_si (x, -1, MPFR_RNDN);
-- if (!mpfr_fits_sint_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_sshort_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_slong_p (x, MPFR_RNDN))
-- ERROR2;
-- if (mpfr_fits_uint_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_ushort_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_ulong_p (x, MPFR_RNDN))
-- ERROR1;
-+ mpfr_set_si (x, 1, MPFR_RNDN);
-+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (44);
-+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (45);
-+
-+ /* Check negative op */
-+ for (i = 1; i <= 4; i++)
-+ {
-+ int inv;
-+
-+ mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN);
-+ mpfr_rint (y, x, (mpfr_rnd_t) r);
-+ inv = MPFR_NOTZERO (y);
-+ if (!mpfr_fits_ulong_p (x, (mpfr_rnd_t) r) ^ inv)
-+ ERROR1 (46);
-+ if (!mpfr_fits_slong_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (47);
-+ if (!mpfr_fits_uint_p (x, (mpfr_rnd_t) r) ^ inv)
-+ ERROR1 (48);
-+ if (!mpfr_fits_sint_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (49);
-+ if (!mpfr_fits_ushort_p (x, (mpfr_rnd_t) r) ^ inv)
-+ ERROR1 (50);
-+ if (!mpfr_fits_sshort_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (51);
-+ }
-+ }
-
- mpfr_clear (x);
-+ mpfr_clear (y);
-
- check_intmax ();
-
-@@ -189,85 +210,98 @@
- return 0;
- }
-
--static void check_intmax (void)
-+static void
-+check_intmax (void)
- {
- #ifdef _MPFR_H_HAVE_INTMAX_T
-- mpfr_t x;
-+ mpfr_t x, y;
-+ int i, r;
-
-- mpfr_init2 (x, sizeof (uintmax_t)*CHAR_BIT);
-+ mpfr_init2 (x, sizeof (uintmax_t) * CHAR_BIT);
-+ mpfr_init2 (y, 8);
-
-- /* Check NAN */
-- mpfr_set_nan (x);
-- if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_intmax_p (x, MPFR_RNDN))
-- ERROR1;
-+ RND_LOOP (r)
-+ {
-+ /* Check NAN */
-+ mpfr_set_nan (x);
-+ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (52);
-+ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (53);
-
-- /* Check INF */
-- mpfr_set_inf (x, 1);
-- if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_intmax_p (x, MPFR_RNDN))
-- ERROR1;
-+ /* Check INF */
-+ mpfr_set_inf (x, 1);
-+ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (54);
-+ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (55);
-
-- /* Check Zero */
-- MPFR_SET_ZERO (x);
-- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
-- ERROR2;
-+ /* Check Zero */
-+ MPFR_SET_ZERO (x);
-+ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (56);
-+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (57);
-
-- /* Check small op */
-- mpfr_set_str1 (x, "1@-1");
-- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
-- ERROR2;
-+ /* Check positive small op */
-+ mpfr_set_str1 (x, "1@-1");
-+ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (58);
-+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (59);
-
-- /* Check 17 */
-- mpfr_set_ui (x, 17, MPFR_RNDN);
-- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
-- ERROR2;
-- if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
-- ERROR2;
-+ /* Check 17 */
-+ mpfr_set_ui (x, 17, MPFR_RNDN);
-+ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (60);
-+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (61);
-
-- /* Check hugest */
-- mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN);
-- if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
-- ERROR1;
-- if (mpfr_fits_intmax_p (x, MPFR_RNDN))
-- ERROR1;
-+ /* Check hugest */
-+ mpfr_set_ui_2exp (x, 42, sizeof (uintmax_t) * 32, MPFR_RNDN);
-+ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (62);
-+ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (63);
-
-- /* Check all other values */
-- mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
-- mpfr_add_ui (x, x, 1, MPFR_RNDN);
-- if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
-- ERROR1;
-- mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
-- if (!mpfr_fits_uintmax_p (x, MPFR_RNDN))
-- ERROR2;
-- mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
-- mpfr_add_ui (x, x, 1, MPFR_RNDN);
-- if (mpfr_fits_intmax_p (x, MPFR_RNDN))
-- ERROR1;
-- mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
-- if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
-- ERROR2;
-- mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN);
-- if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
-- ERROR2;
-- mpfr_sub_ui (x, x, 1, MPFR_RNDN);
-- if (mpfr_fits_intmax_p (x, MPFR_RNDN))
-- ERROR1;
-+ /* Check all other values */
-+ mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
-+ mpfr_add_ui (x, x, 1, MPFR_RNDN);
-+ if (mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (64);
-+ mpfr_set_uj (x, MPFR_UINTMAX_MAX, MPFR_RNDN);
-+ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (65);
-+ mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
-+ mpfr_add_ui (x, x, 1, MPFR_RNDN);
-+ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (66);
-+ mpfr_set_sj (x, MPFR_INTMAX_MAX, MPFR_RNDN);
-+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (67);
-+ mpfr_set_sj (x, MPFR_INTMAX_MIN, MPFR_RNDN);
-+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (68);
-+ mpfr_sub_ui (x, x, 1, MPFR_RNDN);
-+ if (mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (69);
-
-- /* Check negative value */
-- mpfr_set_si (x, -1, MPFR_RNDN);
-- if (!mpfr_fits_intmax_p (x, MPFR_RNDN))
-- ERROR2;
-- if (mpfr_fits_uintmax_p (x, MPFR_RNDN))
-- ERROR1;
-+ /* Check negative op */
-+ for (i = 1; i <= 4; i++)
-+ {
-+ int inv;
-+
-+ mpfr_set_si_2exp (x, -i, -2, MPFR_RNDN);
-+ mpfr_rint (y, x, (mpfr_rnd_t) r);
-+ inv = MPFR_NOTZERO (y);
-+ if (!mpfr_fits_uintmax_p (x, (mpfr_rnd_t) r) ^ inv)
-+ ERROR1 (70);
-+ if (!mpfr_fits_intmax_p (x, (mpfr_rnd_t) r))
-+ ERROR1 (71);
-+ }
-+ }
-
- mpfr_clear (x);
-+ mpfr_clear (y);
- #endif
- }
--
diff --git a/dev-libs/mpfr/files/3.1.2/patch03 b/dev-libs/mpfr/files/3.1.2/patch03
deleted file mode 100644
index 8e0cd8e04b7e..000000000000
--- a/dev-libs/mpfr/files/3.1.2/patch03
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES 2013-10-09 13:34:21.000000000 +0000
-+++ mpfr-3.1.2-b/PATCHES 2013-10-09 13:34:21.000000000 +0000
-@@ -0,0 +1 @@
-+clang-divby0
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION 2013-09-26 10:52:52.000000000 +0000
-+++ mpfr-3.1.2-b/VERSION 2013-10-09 13:34:21.000000000 +0000
-@@ -1 +1 @@
--3.1.2-p2
-+3.1.2-p3
-diff -Naurd mpfr-3.1.2-a/src/mpfr-impl.h mpfr-3.1.2-b/src/mpfr-impl.h
---- mpfr-3.1.2-a/src/mpfr-impl.h 2013-03-13 15:37:36.000000000 +0000
-+++ mpfr-3.1.2-b/src/mpfr-impl.h 2013-10-09 13:34:21.000000000 +0000
-@@ -468,8 +468,16 @@
- #define MPFR_LIMBS_PER_FLT ((IEEE_FLT_MANT_DIG-1)/GMP_NUMB_BITS+1)
-
- /* Visual C++ doesn't support +1.0/0.0, -1.0/0.0 and 0.0/0.0
-- at compile time. */
--#if defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)
-+ at compile time.
-+ Clang with -fsanitize=undefined is a bit similar due to a bug:
-+ http://llvm.org/bugs/show_bug.cgi?id=17381
-+ but even without its sanitizer, it may be better to use the
-+ double_zero version until IEEE 754 division by zero is properly
-+ supported:
-+ http://llvm.org/bugs/show_bug.cgi?id=17000
-+*/
-+#if (defined(_MSC_VER) && defined(_WIN32) && (_MSC_VER >= 1200)) || \
-+ defined(__clang__)
- static double double_zero = 0.0;
- # define DBL_NAN (double_zero/double_zero)
- # define DBL_POS_INF ((double) 1.0/double_zero)
-@@ -501,6 +509,8 @@
- (with Xcode 2.4.1, i.e. the latest one). */
- #define LVALUE(x) (&(x) == &(x) || &(x) != &(x))
- #define DOUBLE_ISINF(x) (LVALUE(x) && ((x) > DBL_MAX || (x) < -DBL_MAX))
-+/* The DOUBLE_ISNAN(x) macro is also valid on long double x
-+ (assuming that the compiler isn't too broken). */
- #ifdef MPFR_NANISNAN
- /* Avoid MIPSpro / IRIX64 / gcc -ffast-math (incorrect) optimizations.
- The + must not be replaced by a ||. With gcc -ffast-math, NaN is
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h 2013-09-26 10:52:52.000000000 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h 2013-10-09 13:34:21.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p2"
-+#define MPFR_VERSION_STRING "3.1.2-p3"
-
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c 2013-09-26 10:52:52.000000000 +0000
-+++ mpfr-3.1.2-b/src/version.c 2013-10-09 13:34:21.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "3.1.2-p2";
-+ return "3.1.2-p3";
- }
-diff -Naurd mpfr-3.1.2-a/tests/tget_flt.c mpfr-3.1.2-b/tests/tget_flt.c
---- mpfr-3.1.2-a/tests/tget_flt.c 2013-03-13 15:37:44.000000000 +0000
-+++ mpfr-3.1.2-b/tests/tget_flt.c 2013-10-09 13:34:21.000000000 +0000
-@@ -28,9 +28,17 @@
- main (void)
- {
- mpfr_t x, y;
-- float f, g, infp;
-+ float f, g;
- int i;
-+#if !defined(MPFR_ERRDIVZERO)
-+ float infp;
-+#endif
-+
-+ tests_start_mpfr ();
-
-+#if !defined(MPFR_ERRDIVZERO)
-+ /* The definition of DBL_POS_INF involves a division by 0. This makes
-+ "clang -O2 -fsanitize=undefined -fno-sanitize-recover" fail. */
- infp = (float) DBL_POS_INF;
- if (infp * 0.5 != infp)
- {
-@@ -38,8 +46,7 @@
- fprintf (stderr, "(this is probably a compiler bug, please report)\n");
- exit (1);
- }
--
-- tests_start_mpfr ();
-+#endif
-
- mpfr_init2 (x, 24);
- mpfr_init2 (y, 24);
-@@ -353,6 +360,7 @@
- printf ("expected %.8e, got %.8e\n", g, f);
- exit (1);
- }
-+#if !defined(MPFR_ERRDIVZERO)
- f = mpfr_get_flt (x, MPFR_RNDN); /* first round to 2^128 (even rule),
- thus we should get +Inf */
- g = infp;
-@@ -376,6 +384,7 @@
- printf ("expected %.8e, got %.8e\n", g, f);
- exit (1);
- }
-+#endif
-
- mpfr_clear (x);
- mpfr_clear (y);
-diff -Naurd mpfr-3.1.2-a/tests/tset_ld.c mpfr-3.1.2-b/tests/tset_ld.c
---- mpfr-3.1.2-a/tests/tset_ld.c 2013-03-13 15:37:44.000000000 +0000
-+++ mpfr-3.1.2-b/tests/tset_ld.c 2013-10-09 13:34:21.000000000 +0000
-@@ -47,8 +47,11 @@
- static int
- Isnan_ld (long double d)
- {
-- double e = (double) d;
-- if (DOUBLE_ISNAN (e))
-+ /* Do not convert d to double as this can give an overflow, which
-+ may confuse compilers without IEEE 754 support (such as clang
-+ -fsanitize=undefined), or trigger a trap if enabled.
-+ The DOUBLE_ISNAN macro should work fine on long double. */
-+ if (DOUBLE_ISNAN (d))
- return 1;
- LONGDOUBLE_NAN_ACTION (d, goto yes);
- return 0;
diff --git a/dev-libs/mpfr/files/3.1.2/patch04 b/dev-libs/mpfr/files/3.1.2/patch04
deleted file mode 100644
index 2451f36027e0..000000000000
--- a/dev-libs/mpfr/files/3.1.2/patch04
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES 2013-11-15 00:51:49.211333830 +0000
-+++ mpfr-3.1.2-b/PATCHES 2013-11-15 00:51:49.323334999 +0000
-@@ -0,0 +1 @@
-+printf-alt0
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION 2013-11-15 00:51:49.211333830 +0000
-+++ mpfr-3.1.2-b/VERSION 2013-11-15 00:51:49.323334999 +0000
-@@ -1 +1 @@
--3.1.2-p3
-+3.1.2-p4
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h 2013-11-15 00:51:49.211333830 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h 2013-11-15 00:51:49.323334999 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p3"
-+#define MPFR_VERSION_STRING "3.1.2-p4"
-
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/vasprintf.c mpfr-3.1.2-b/src/vasprintf.c
---- mpfr-3.1.2-a/src/vasprintf.c 2013-03-13 15:37:37.000000000 +0000
-+++ mpfr-3.1.2-b/src/vasprintf.c 2013-11-15 00:51:49.267334408 +0000
-@@ -1040,7 +1040,7 @@
- }
-
- /* Determine the different parts of the string representation of the regular
-- number P when SPEC.SPEC is 'e', 'E', 'g', or 'G'.
-+ number P when spec.spec is 'e', 'E', 'g', or 'G'.
- DEC_INFO contains the previously computed exponent and string or is NULL.
-
- return -1 if some field > INT_MAX */
-@@ -1167,7 +1167,7 @@
- }
-
- /* Determine the different parts of the string representation of the regular
-- number P when SPEC.SPEC is 'f', 'F', 'g', or 'G'.
-+ number P when spec.spec is 'f', 'F', 'g', or 'G'.
- DEC_INFO contains the previously computed exponent and string or is NULL.
-
- return -1 if some field of number_parts is greater than INT_MAX */
-@@ -1559,7 +1559,7 @@
- /* fractional part */
- {
- np->point = MPFR_DECIMAL_POINT;
-- np->fp_trailing_zeros = (spec.spec == 'g' && spec.spec == 'G') ?
-+ np->fp_trailing_zeros = (spec.spec == 'g' || spec.spec == 'G') ?
- spec.prec - 1 : spec.prec;
- }
- else if (spec.alt)
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c 2013-11-15 00:51:49.211333830 +0000
-+++ mpfr-3.1.2-b/src/version.c 2013-11-15 00:51:49.323334999 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "3.1.2-p3";
-+ return "3.1.2-p4";
- }
-diff -Naurd mpfr-3.1.2-a/tests/tsprintf.c mpfr-3.1.2-b/tests/tsprintf.c
---- mpfr-3.1.2-a/tests/tsprintf.c 2013-03-13 15:37:44.000000000 +0000
-+++ mpfr-3.1.2-b/tests/tsprintf.c 2013-11-15 00:51:49.267334408 +0000
-@@ -456,10 +456,16 @@
- check_sprintf ("1.999900 ", "%-#10.7RG", x);
- check_sprintf ("1.9999 ", "%-10.7RG", x);
- mpfr_set_ui (x, 1, MPFR_RNDN);
-+ check_sprintf ("1.", "%#.1Rg", x);
-+ check_sprintf ("1. ", "%-#5.1Rg", x);
-+ check_sprintf (" 1.0", "%#5.2Rg", x);
- check_sprintf ("1.00000000000000000000000000000", "%#.30Rg", x);
- check_sprintf ("1", "%.30Rg", x);
- mpfr_set_ui (x, 0, MPFR_RNDN);
-- check_sprintf ("0.000000000000000000000000000000", "%#.30Rg", x);
-+ check_sprintf ("0.", "%#.1Rg", x);
-+ check_sprintf ("0. ", "%-#5.1Rg", x);
-+ check_sprintf (" 0.0", "%#5.2Rg", x);
-+ check_sprintf ("0.00000000000000000000000000000", "%#.30Rg", x);
- check_sprintf ("0", "%.30Rg", x);
-
- /* following tests with precision 53 bits */
diff --git a/dev-libs/mpfr/files/3.1.2/patch05 b/dev-libs/mpfr/files/3.1.2/patch05
deleted file mode 100644
index 669b91d54dac..000000000000
--- a/dev-libs/mpfr/files/3.1.2/patch05
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES 2013-12-01 11:07:49.575329762 +0000
-+++ mpfr-3.1.2-b/PATCHES 2013-12-01 11:07:49.751331625 +0000
-@@ -0,0 +1 @@
-+custom_init_set
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION 2013-12-01 11:07:49.571329714 +0000
-+++ mpfr-3.1.2-b/VERSION 2013-12-01 11:07:49.747331585 +0000
-@@ -1 +1 @@
--3.1.2-p4
-+3.1.2-p5
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h 2013-12-01 11:07:49.571329714 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h 2013-12-01 11:07:49.747331585 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p4"
-+#define MPFR_VERSION_STRING "3.1.2-p5"
-
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-@@ -861,7 +861,7 @@
- _t = (mpfr_kind_t) _k; \
- _s = 1; \
- } else { \
-- _t = (mpfr_kind_t) -k; \
-+ _t = (mpfr_kind_t) - _k; \
- _s = -1; \
- } \
- _e = _t == MPFR_REGULAR_KIND ? (e) : \
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c 2013-12-01 11:07:49.575329762 +0000
-+++ mpfr-3.1.2-b/src/version.c 2013-12-01 11:07:49.747331585 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "3.1.2-p4";
-+ return "3.1.2-p5";
- }
diff --git a/dev-libs/mpfr/files/3.1.2/patch06 b/dev-libs/mpfr/files/3.1.2/patch06
deleted file mode 100644
index 50cd04d72491..000000000000
--- a/dev-libs/mpfr/files/3.1.2/patch06
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES 2014-04-15 21:56:49.609057464 +0000
-+++ mpfr-3.1.2-b/PATCHES 2014-04-15 21:56:49.697059857 +0000
-@@ -0,0 +1 @@
-+li2-return
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION 2014-04-15 21:56:49.609057464 +0000
-+++ mpfr-3.1.2-b/VERSION 2014-04-15 21:56:49.697059857 +0000
-@@ -1 +1 @@
--3.1.2-p5
-+3.1.2-p6
-diff -Naurd mpfr-3.1.2-a/src/li2.c mpfr-3.1.2-b/src/li2.c
---- mpfr-3.1.2-a/src/li2.c 2013-03-13 15:37:32.000000000 +0000
-+++ mpfr-3.1.2-b/src/li2.c 2014-04-15 21:56:49.653058661 +0000
-@@ -630,5 +630,5 @@
- return mpfr_check_range (y, inexact, rnd_mode);
- }
-
-- MPFR_ASSERTN (0); /* should never reach this point */
-+ MPFR_RET_NEVER_GO_HERE ();
- }
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h 2014-04-15 21:56:49.609057464 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h 2014-04-15 21:56:49.697059857 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p5"
-+#define MPFR_VERSION_STRING "3.1.2-p6"
-
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c 2014-04-15 21:56:49.609057464 +0000
-+++ mpfr-3.1.2-b/src/version.c 2014-04-15 21:56:49.697059857 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "3.1.2-p5";
-+ return "3.1.2-p6";
- }
diff --git a/dev-libs/mpfr/files/3.1.2/patch07 b/dev-libs/mpfr/files/3.1.2/patch07
deleted file mode 100644
index 378c3bf4fcf0..000000000000
--- a/dev-libs/mpfr/files/3.1.2/patch07
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES 2014-04-15 22:04:57.090286262 +0000
-+++ mpfr-3.1.2-b/PATCHES 2014-04-15 22:04:57.162288198 +0000
-@@ -0,0 +1 @@
-+exp3
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION 2014-04-15 22:04:57.086286154 +0000
-+++ mpfr-3.1.2-b/VERSION 2014-04-15 22:04:57.162288198 +0000
-@@ -1 +1 @@
--3.1.2-p6
-+3.1.2-p7
-diff -Naurd mpfr-3.1.2-a/src/exp3.c mpfr-3.1.2-b/src/exp3.c
---- mpfr-3.1.2-a/src/exp3.c 2013-03-13 15:37:34.000000000 +0000
-+++ mpfr-3.1.2-b/src/exp3.c 2014-04-15 22:04:57.126287230 +0000
-@@ -283,7 +283,7 @@
- }
- }
-
-- if (mpfr_can_round (shift_x > 0 ? t : tmp, realprec, MPFR_RNDD, MPFR_RNDZ,
-+ if (mpfr_can_round (shift_x > 0 ? t : tmp, realprec, MPFR_RNDN, MPFR_RNDZ,
- MPFR_PREC(y) + (rnd_mode == MPFR_RNDN)))
- {
- inexact = mpfr_set (y, shift_x > 0 ? t : tmp, rnd_mode);
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h 2014-04-15 22:04:57.086286154 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h 2014-04-15 22:04:57.162288198 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p6"
-+#define MPFR_VERSION_STRING "3.1.2-p7"
-
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c 2014-04-15 22:04:57.090286262 +0000
-+++ mpfr-3.1.2-b/src/version.c 2014-04-15 22:04:57.162288198 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "3.1.2-p6";
-+ return "3.1.2-p7";
- }
-diff -Naurd mpfr-3.1.2-a/tests/texp.c mpfr-3.1.2-b/tests/texp.c
---- mpfr-3.1.2-a/tests/texp.c 2013-03-13 15:37:44.000000000 +0000
-+++ mpfr-3.1.2-b/tests/texp.c 2014-04-15 22:04:57.126287230 +0000
-@@ -150,6 +150,22 @@
- exit (1);
- }
-
-+ mpfr_set_prec (x, 118);
-+ mpfr_set_str_binary (x, "0.1110010100011101010000111110011000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E-86");
-+ mpfr_set_prec (y, 118);
-+ mpfr_exp_2 (y, x, MPFR_RNDU);
-+ mpfr_exp_3 (x, x, MPFR_RNDU);
-+ if (mpfr_cmp (x, y))
-+ {
-+ printf ("mpfr_exp_2 and mpfr_exp_3 differ for prec=118\n");
-+ printf ("mpfr_exp_2 gives ");
-+ mpfr_out_str (stdout, 2, 0, y, MPFR_RNDN);
-+ printf ("\nmpfr_exp_3 gives ");
-+ mpfr_out_str (stdout, 2, 0, x, MPFR_RNDN);
-+ printf ("\n");
-+ exit (1);
-+ }
-+
- mpfr_clear (x);
- mpfr_clear (y);
- return 0;
diff --git a/dev-libs/mpfr/files/3.1.2/patch08 b/dev-libs/mpfr/files/3.1.2/patch08
deleted file mode 100644
index 2245c7c23ec4..000000000000
--- a/dev-libs/mpfr/files/3.1.2/patch08
+++ /dev/null
@@ -1,254 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES 2014-04-15 22:20:32.243481506 +0000
-+++ mpfr-3.1.2-b/PATCHES 2014-04-15 22:22:32.418722707 +0000
-@@ -0,0 +1 @@
-+gmp6-compat
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION 2014-04-15 22:20:20.755171478 +0000
-+++ mpfr-3.1.2-b/VERSION 2014-04-15 22:21:45.225450147 +0000
-@@ -1 +1 @@
--3.1.2-p7
-+3.1.2-p8
-diff -Naurd mpfr-3.1.2-a/configure mpfr-3.1.2-b/configure
---- mpfr-3.1.2-a/configure 2013-03-13 15:38:20.000000000 +0000
-+++ mpfr-3.1.2-b/configure 2014-04-15 22:21:38.821277476 +0000
-@@ -14545,26 +14545,30 @@
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
--if test "$use_gmp_build" = yes ; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for valid GMP_NUMB_BITS" >&5
--$as_echo_n "checking for valid GMP_NUMB_BITS... " >&6; }
-- if test "$cross_compiling" = yes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency" >&5
-+$as_echo_n "checking for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency... " >&6; }
-+if test "$cross_compiling" = yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't test" >&5
- $as_echo "can't test" >&6; }
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
-+#include <stdio.h>
- #include <limits.h>
- #include "gmp.h"
--#include "gmp-impl.h"
-
- int
- main ()
- {
-
-- return GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT
-- && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
-+ if (GMP_NUMB_BITS == sizeof(mp_limb_t) * CHAR_BIT)
-+ return 0;
-+ fprintf (stderr, "GMP_NUMB_BITS = %ld\n", (long) GMP_NUMB_BITS);
-+ fprintf (stderr, "sizeof(mp_limb_t) = %ld\n", (long) sizeof(mp_limb_t));
-+ fprintf (stderr, "sizeof(mp_limb_t) * CHAR_BIT = %ld != GMP_NUMB_BITS\n",
-+ (long) (sizeof(mp_limb_t) * CHAR_BIT));
-+ return 1;
-
- ;
- return 0;
-@@ -14577,14 +14581,14 @@
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-- as_fn_error $? "GMP_NUMB_BITS is incorrect.
--You probably need to change some of the GMP or MPFR compile options." "$LINENO" 5
-+ as_fn_error $? "GMP_NUMB_BITS and sizeof(mp_limb_t) are not consistent.
-+You probably need to change some of the GMP or MPFR compile options.
-+See 'config.log' for details (search for GMP_NUMB_BITS)." "$LINENO" 5
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
-
--fi
-
-
- if test "$dont_link_with_gmp" = yes ; then
-diff -Naurd mpfr-3.1.2-a/configure.ac mpfr-3.1.2-b/configure.ac
---- mpfr-3.1.2-a/configure.ac 2013-03-13 15:37:46.000000000 +0000
-+++ mpfr-3.1.2-b/configure.ac 2013-03-13 15:37:46.000000000 +0000
-@@ -435,23 +435,29 @@
- ])
- fi
-
--dnl Check for valid GMP_NUMB_BITS and BYTES_PER_MP_LIMB
-+dnl Check for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency.
-+dnl Problems may occur if gmp.h was generated with some ABI
-+dnl and is used with another ABI (or if nails are used).
- dnl This test doesn't need to link with libgmp (at least it shouldn't).
--if test "$use_gmp_build" = yes ; then
-- AC_MSG_CHECKING(for valid GMP_NUMB_BITS)
-- AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+AC_MSG_CHECKING(for GMP_NUMB_BITS and sizeof(mp_limb_t) consistency)
-+AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+#include <stdio.h>
- #include <limits.h>
- #include "gmp.h"
--#include "gmp-impl.h"
- ]], [[
-- return GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT
-- && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
-+ if (GMP_NUMB_BITS == sizeof(mp_limb_t) * CHAR_BIT)
-+ return 0;
-+ fprintf (stderr, "GMP_NUMB_BITS = %ld\n", (long) GMP_NUMB_BITS);
-+ fprintf (stderr, "sizeof(mp_limb_t) = %ld\n", (long) sizeof(mp_limb_t));
-+ fprintf (stderr, "sizeof(mp_limb_t) * CHAR_BIT = %ld != GMP_NUMB_BITS\n",
-+ (long) (sizeof(mp_limb_t) * CHAR_BIT));
-+ return 1;
- ]])], [AC_MSG_RESULT(yes)], [
- AC_MSG_RESULT(no)
-- AC_MSG_ERROR([GMP_NUMB_BITS is incorrect.
--You probably need to change some of the GMP or MPFR compile options.])],
-+ AC_MSG_ERROR([GMP_NUMB_BITS and sizeof(mp_limb_t) are not consistent.
-+You probably need to change some of the GMP or MPFR compile options.
-+See 'config.log' for details (search for GMP_NUMB_BITS).])],
- [AC_MSG_RESULT([can't test])])
--fi
-
-
- dnl We really need to link using libtool. But it is impossible with the current
-diff -Naurd mpfr-3.1.2-a/src/init2.c mpfr-3.1.2-b/src/init2.c
---- mpfr-3.1.2-a/src/init2.c 2013-03-13 15:37:32.000000000 +0000
-+++ mpfr-3.1.2-b/src/init2.c 2014-04-15 22:21:06.220398489 +0000
-@@ -30,11 +30,11 @@
-
- /* Check if we can represent the number of limbs
- * associated to the maximum of mpfr_prec_t*/
-- MPFR_ASSERTN( MP_SIZE_T_MAX >= (MPFR_PREC_MAX/BYTES_PER_MP_LIMB) );
-+ MPFR_ASSERTN( MP_SIZE_T_MAX >= (MPFR_PREC_MAX/MPFR_BYTES_PER_MP_LIMB) );
-
-- /* Check for correct GMP_NUMB_BITS and BYTES_PER_MP_LIMB */
-- MPFR_ASSERTN( GMP_NUMB_BITS == BYTES_PER_MP_LIMB * CHAR_BIT
-- && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB );
-+ /* Check for correct GMP_NUMB_BITS and MPFR_BYTES_PER_MP_LIMB */
-+ MPFR_ASSERTN( GMP_NUMB_BITS == MPFR_BYTES_PER_MP_LIMB * CHAR_BIT
-+ && sizeof(mp_limb_t) == MPFR_BYTES_PER_MP_LIMB );
-
- MPFR_ASSERTN (mp_bits_per_limb == GMP_NUMB_BITS);
-
-diff -Naurd mpfr-3.1.2-a/src/mpfr-gmp.h mpfr-3.1.2-b/src/mpfr-gmp.h
---- mpfr-3.1.2-a/src/mpfr-gmp.h 2013-03-13 15:37:32.000000000 +0000
-+++ mpfr-3.1.2-b/src/mpfr-gmp.h 2014-04-15 22:21:06.220398489 +0000
-@@ -72,7 +72,6 @@
- #endif
-
- /* Define some macros */
--#define BYTES_PER_MP_LIMB (GMP_NUMB_BITS/CHAR_BIT)
-
- #define MP_LIMB_T_MAX (~(mp_limb_t)0)
-
-@@ -96,19 +95,19 @@
- #define SHRT_HIGHBIT SHRT_MIN
-
- /* MP_LIMB macros */
--#define MPN_ZERO(dst, n) memset((dst), 0, (n)*BYTES_PER_MP_LIMB)
--#define MPN_COPY_DECR(dst,src,n) memmove((dst),(src),(n)*BYTES_PER_MP_LIMB)
--#define MPN_COPY_INCR(dst,src,n) memmove((dst),(src),(n)*BYTES_PER_MP_LIMB)
-+#define MPN_ZERO(dst, n) memset((dst), 0, (n)*MPFR_BYTES_PER_MP_LIMB)
-+#define MPN_COPY_DECR(dst,src,n) memmove((dst),(src),(n)*MPFR_BYTES_PER_MP_LIMB)
-+#define MPN_COPY_INCR(dst,src,n) memmove((dst),(src),(n)*MPFR_BYTES_PER_MP_LIMB)
- #define MPN_COPY(dst,src,n) \
- do \
- { \
- if ((dst) != (src)) \
- { \
- MPFR_ASSERTD ((char *) (dst) >= (char *) (src) + \
-- (n) * BYTES_PER_MP_LIMB || \
-+ (n) * MPFR_BYTES_PER_MP_LIMB || \
- (char *) (src) >= (char *) (dst) + \
-- (n) * BYTES_PER_MP_LIMB); \
-- memcpy ((dst), (src), (n) * BYTES_PER_MP_LIMB); \
-+ (n) * MPFR_BYTES_PER_MP_LIMB); \
-+ memcpy ((dst), (src), (n) * MPFR_BYTES_PER_MP_LIMB); \
- } \
- } \
- while (0)
-diff -Naurd mpfr-3.1.2-a/src/mpfr-impl.h mpfr-3.1.2-b/src/mpfr-impl.h
---- mpfr-3.1.2-a/src/mpfr-impl.h 2013-10-09 13:34:21.000000000 +0000
-+++ mpfr-3.1.2-b/src/mpfr-impl.h 2014-04-15 22:21:06.220398489 +0000
-@@ -191,7 +191,7 @@
- # endif
- #endif
-
--
-+#define MPFR_BYTES_PER_MP_LIMB (GMP_NUMB_BITS/CHAR_BIT)
-
- /******************************************************
- ******************** Check GMP ***********************
-@@ -930,7 +930,7 @@
- #define MPFR_SET_ALLOC_SIZE(x, n) \
- ( ((mp_size_t*) MPFR_MANT(x))[-1] = n)
- #define MPFR_MALLOC_SIZE(s) \
-- ( sizeof(mpfr_size_limb_t) + BYTES_PER_MP_LIMB * ((size_t) s) )
-+ ( sizeof(mpfr_size_limb_t) + MPFR_BYTES_PER_MP_LIMB * ((size_t) s) )
- #define MPFR_SET_MANT_PTR(x,p) \
- (MPFR_MANT(x) = (mp_limb_t*) ((mpfr_size_limb_t*) p + 1))
- #define MPFR_GET_REAL_PTR(x) \
-@@ -964,7 +964,7 @@
- #endif
-
- #define MPFR_TMP_LIMBS_ALLOC(N) \
-- ((mp_limb_t *) MPFR_TMP_ALLOC ((size_t) (N) * BYTES_PER_MP_LIMB))
-+ ((mp_limb_t *) MPFR_TMP_ALLOC ((size_t) (N) * MPFR_BYTES_PER_MP_LIMB))
-
- /* temporary allocate 1 limb at xp, and initialize mpfr variable x */
- /* The temporary var doesn't have any size field, but it doesn't matter
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h 2014-04-15 22:20:20.755171478 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h 2014-04-15 22:21:45.225450147 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p7"
-+#define MPFR_VERSION_STRING "3.1.2-p8"
-
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/mul.c mpfr-3.1.2-b/src/mul.c
---- mpfr-3.1.2-a/src/mul.c 2013-03-13 15:37:37.000000000 +0000
-+++ mpfr-3.1.2-b/src/mul.c 2014-04-15 22:21:06.224398597 +0000
-@@ -106,7 +106,7 @@
- MPFR_ASSERTD(tn <= k);
-
- /* Check for no size_t overflow*/
-- MPFR_ASSERTD((size_t) k <= ((size_t) -1) / BYTES_PER_MP_LIMB);
-+ MPFR_ASSERTD((size_t) k <= ((size_t) -1) / MPFR_BYTES_PER_MP_LIMB);
- MPFR_TMP_MARK(marker);
- tmp = MPFR_TMP_LIMBS_ALLOC (k);
-
-@@ -301,7 +301,7 @@
- MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */
-
- /* Check for no size_t overflow*/
-- MPFR_ASSERTD ((size_t) k <= ((size_t) -1) / BYTES_PER_MP_LIMB);
-+ MPFR_ASSERTD ((size_t) k <= ((size_t) -1) / MPFR_BYTES_PER_MP_LIMB);
- MPFR_TMP_MARK (marker);
- tmp = MPFR_TMP_LIMBS_ALLOC (k);
-
-diff -Naurd mpfr-3.1.2-a/src/stack_interface.c mpfr-3.1.2-b/src/stack_interface.c
---- mpfr-3.1.2-a/src/stack_interface.c 2013-03-13 15:37:32.000000000 +0000
-+++ mpfr-3.1.2-b/src/stack_interface.c 2014-04-15 22:21:06.220398489 +0000
-@@ -26,7 +26,7 @@
- size_t
- mpfr_custom_get_size (mpfr_prec_t prec)
- {
-- return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB;
-+ return MPFR_PREC2LIMBS (prec) * MPFR_BYTES_PER_MP_LIMB;
- }
-
- #undef mpfr_custom_init
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c 2014-04-15 22:20:20.755171478 +0000
-+++ mpfr-3.1.2-b/src/version.c 2014-04-15 22:21:45.225450147 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "3.1.2-p7";
-+ return "3.1.2-p8";
- }
diff --git a/dev-libs/mpfr/files/3.1.2/patch09 b/dev-libs/mpfr/files/3.1.2/patch09
deleted file mode 100644
index 6ff7c4ac92e7..000000000000
--- a/dev-libs/mpfr/files/3.1.2/patch09
+++ /dev/null
@@ -1,166 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES 2014-06-30 15:15:25.533266905 +0000
-+++ mpfr-3.1.2-b/PATCHES 2014-06-30 15:15:25.617269178 +0000
-@@ -0,0 +1 @@
-+div-overflow
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION 2014-06-30 15:15:25.529266797 +0000
-+++ mpfr-3.1.2-b/VERSION 2014-06-30 15:15:25.617269178 +0000
-@@ -1 +1 @@
--3.1.2-p8
-+3.1.2-p9
-diff -Naurd mpfr-3.1.2-a/src/div.c mpfr-3.1.2-b/src/div.c
---- mpfr-3.1.2-a/src/div.c 2013-03-13 15:37:33.000000000 +0000
-+++ mpfr-3.1.2-b/src/div.c 2014-06-30 15:15:25.585268312 +0000
-@@ -750,7 +750,9 @@
- truncate_check_qh:
- if (qh)
- {
-- qexp ++;
-+ if (MPFR_LIKELY (qexp < MPFR_EXP_MAX))
-+ qexp ++;
-+ /* else qexp is now incorrect, but one will still get an overflow */
- q0p[q0size - 1] = MPFR_LIMB_HIGHBIT;
- }
- goto truncate;
-@@ -765,7 +767,9 @@
- inex = 1; /* always here */
- if (mpn_add_1 (q0p, q0p, q0size, MPFR_LIMB_ONE << sh))
- {
-- qexp ++;
-+ if (MPFR_LIKELY (qexp < MPFR_EXP_MAX))
-+ qexp ++;
-+ /* else qexp is now incorrect, but one will still get an overflow */
- q0p[q0size - 1] = MPFR_LIMB_HIGHBIT;
- }
-
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h 2014-06-30 15:15:25.533266905 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h 2014-06-30 15:15:25.613269070 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p8"
-+#define MPFR_VERSION_STRING "3.1.2-p9"
-
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c 2014-06-30 15:15:25.533266905 +0000
-+++ mpfr-3.1.2-b/src/version.c 2014-06-30 15:15:25.613269070 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "3.1.2-p8";
-+ return "3.1.2-p9";
- }
-diff -Naurd mpfr-3.1.2-a/tests/tdiv.c mpfr-3.1.2-b/tests/tdiv.c
---- mpfr-3.1.2-a/tests/tdiv.c 2013-03-13 15:37:44.000000000 +0000
-+++ mpfr-3.1.2-b/tests/tdiv.c 2014-06-30 15:15:25.585268312 +0000
-@@ -1104,6 +1104,96 @@
- #define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), randlimb () % 100, RANDS)
- #include "tgeneric.c"
-
-+static void
-+test_extreme (void)
-+{
-+ mpfr_t x, y, z;
-+ mpfr_exp_t emin, emax;
-+ mpfr_prec_t p[4] = { 8, 32, 64, 256 };
-+ int xi, yi, zi, j, r;
-+ unsigned int flags, ex_flags;
-+
-+ emin = mpfr_get_emin ();
-+ emax = mpfr_get_emax ();
-+
-+ mpfr_set_emin (MPFR_EMIN_MIN);
-+ mpfr_set_emax (MPFR_EMAX_MAX);
-+
-+ for (xi = 0; xi < 4; xi++)
-+ {
-+ mpfr_init2 (x, p[xi]);
-+ mpfr_setmax (x, MPFR_EMAX_MAX);
-+ MPFR_ASSERTN (mpfr_check (x));
-+ for (yi = 0; yi < 4; yi++)
-+ {
-+ mpfr_init2 (y, p[yi]);
-+ mpfr_setmin (y, MPFR_EMIN_MIN);
-+ for (j = 0; j < 2; j++)
-+ {
-+ MPFR_ASSERTN (mpfr_check (y));
-+ for (zi = 0; zi < 4; zi++)
-+ {
-+ mpfr_init2 (z, p[zi]);
-+ RND_LOOP (r)
-+ {
-+ mpfr_clear_flags ();
-+ mpfr_div (z, x, y, (mpfr_rnd_t) r);
-+ flags = __gmpfr_flags;
-+ MPFR_ASSERTN (mpfr_check (z));
-+ ex_flags = MPFR_FLAGS_OVERFLOW | MPFR_FLAGS_INEXACT;
-+ if (flags != ex_flags)
-+ {
-+ printf ("Bad flags in test_extreme on z = a/b"
-+ " with %s and\n",
-+ mpfr_print_rnd_mode ((mpfr_rnd_t) r));
-+ printf ("a = ");
-+ mpfr_dump (x);
-+ printf ("b = ");
-+ mpfr_dump (y);
-+ printf ("Expected flags:");
-+ flags_out (ex_flags);
-+ printf ("Got flags: ");
-+ flags_out (flags);
-+ printf ("z = ");
-+ mpfr_dump (z);
-+ exit (1);
-+ }
-+ mpfr_clear_flags ();
-+ mpfr_div (z, y, x, (mpfr_rnd_t) r);
-+ flags = __gmpfr_flags;
-+ MPFR_ASSERTN (mpfr_check (z));
-+ ex_flags = MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT;
-+ if (flags != ex_flags)
-+ {
-+ printf ("Bad flags in test_extreme on z = a/b"
-+ " with %s and\n",
-+ mpfr_print_rnd_mode ((mpfr_rnd_t) r));
-+ printf ("a = ");
-+ mpfr_dump (y);
-+ printf ("b = ");
-+ mpfr_dump (x);
-+ printf ("Expected flags:");
-+ flags_out (ex_flags);
-+ printf ("Got flags: ");
-+ flags_out (flags);
-+ printf ("z = ");
-+ mpfr_dump (z);
-+ exit (1);
-+ }
-+ }
-+ mpfr_clear (z);
-+ } /* zi */
-+ mpfr_nextabove (y);
-+ } /* j */
-+ mpfr_clear (y);
-+ } /* yi */
-+ mpfr_clear (x);
-+ } /* xi */
-+
-+ set_emin (emin);
-+ set_emax (emax);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -1130,6 +1220,7 @@
- test_20070603 ();
- test_20070628 ();
- test_generic (2, 800, 50);
-+ test_extreme ();
-
- tests_end_mpfr ();
- return 0;
diff --git a/dev-libs/mpfr/files/3.1.2/patch10 b/dev-libs/mpfr/files/3.1.2/patch10
deleted file mode 100644
index 43848f7b1166..000000000000
--- a/dev-libs/mpfr/files/3.1.2/patch10
+++ /dev/null
@@ -1,138 +0,0 @@
-diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
---- mpfr-3.1.2-a/PATCHES 2014-06-30 15:17:53.337268149 +0000
-+++ mpfr-3.1.2-b/PATCHES 2014-06-30 15:17:53.417270314 +0000
-@@ -0,0 +1 @@
-+vasprintf
-diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
---- mpfr-3.1.2-a/VERSION 2014-06-30 15:17:53.337268149 +0000
-+++ mpfr-3.1.2-b/VERSION 2014-06-30 15:17:53.413270206 +0000
-@@ -1 +1 @@
--3.1.2-p9
-+3.1.2-p10
-diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
---- mpfr-3.1.2-a/src/mpfr.h 2014-06-30 15:17:53.337268149 +0000
-+++ mpfr-3.1.2-b/src/mpfr.h 2014-06-30 15:17:53.413270206 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "3.1.2-p9"
-+#define MPFR_VERSION_STRING "3.1.2-p10"
-
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.2-a/src/vasprintf.c mpfr-3.1.2-b/src/vasprintf.c
---- mpfr-3.1.2-a/src/vasprintf.c 2013-11-15 00:51:49.267334408 +0000
-+++ mpfr-3.1.2-b/src/vasprintf.c 2014-06-30 15:17:53.377269231 +0000
-@@ -884,14 +884,18 @@
- first digit, we want the exponent for radix two and the decimal
- point AFTER the first digit. */
- {
-- MPFR_ASSERTN (exp > MPFR_EMIN_MIN /4); /* possible overflow */
-+ /* An integer overflow is normally not possible since MPFR_EXP_MIN
-+ is twice as large as MPFR_EMIN_MIN. */
-+ MPFR_ASSERTN (exp > (MPFR_EXP_MIN + 3) / 4);
- exp = (exp - 1) * 4;
- }
- else
- /* EXP is the exponent for decimal point BEFORE the first digit, we
- want the exponent for decimal point AFTER the first digit. */
- {
-- MPFR_ASSERTN (exp > MPFR_EMIN_MIN); /* possible overflow */
-+ /* An integer overflow is normally not possible since MPFR_EXP_MIN
-+ is twice as large as MPFR_EMIN_MIN. */
-+ MPFR_ASSERTN (exp > MPFR_EXP_MIN);
- --exp;
- }
- }
-diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
---- mpfr-3.1.2-a/src/version.c 2014-06-30 15:17:53.337268149 +0000
-+++ mpfr-3.1.2-b/src/version.c 2014-06-30 15:17:53.413270206 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "3.1.2-p9";
-+ return "3.1.2-p10";
- }
-diff -Naurd mpfr-3.1.2-a/tests/tsprintf.c mpfr-3.1.2-b/tests/tsprintf.c
---- mpfr-3.1.2-a/tests/tsprintf.c 2013-11-15 00:51:49.267334408 +0000
-+++ mpfr-3.1.2-b/tests/tsprintf.c 2014-06-30 15:17:53.377269231 +0000
-@@ -1184,6 +1184,69 @@
- check_emax_aux (MPFR_EMAX_MAX);
- }
-
-+static void
-+check_emin_aux (mpfr_exp_t e)
-+{
-+ mpfr_t x;
-+ char *s1, s2[256];
-+ int i;
-+ mpfr_exp_t emin;
-+ mpz_t ee;
-+
-+ MPFR_ASSERTN (e >= LONG_MIN);
-+ emin = mpfr_get_emin ();
-+ set_emin (e);
-+
-+ mpfr_init2 (x, 16);
-+ mpz_init (ee);
-+
-+ mpfr_setmin (x, e);
-+ mpz_set_si (ee, e);
-+ mpz_sub_ui (ee, ee, 1);
-+
-+ i = mpfr_asprintf (&s1, "%Ra", x);
-+ MPFR_ASSERTN (i > 0);
-+
-+ gmp_snprintf (s2, 256, "0x1p%Zd", ee);
-+
-+ if (strcmp (s1, s2) != 0)
-+ {
-+ printf ("Error in check_emin_aux for emin = %ld\n", (long) e);
-+ printf ("Expected %s\n", s2);
-+ printf ("Got %s\n", s1);
-+ exit (1);
-+ }
-+
-+ mpfr_free_str (s1);
-+
-+ i = mpfr_asprintf (&s1, "%Rb", x);
-+ MPFR_ASSERTN (i > 0);
-+
-+ gmp_snprintf (s2, 256, "1p%Zd", ee);
-+
-+ if (strcmp (s1, s2) != 0)
-+ {
-+ printf ("Error in check_emin_aux for emin = %ld\n", (long) e);
-+ printf ("Expected %s\n", s2);
-+ printf ("Got %s\n", s1);
-+ exit (1);
-+ }
-+
-+ mpfr_free_str (s1);
-+
-+ mpfr_clear (x);
-+ mpz_clear (ee);
-+ set_emin (emin);
-+}
-+
-+static void
-+check_emin (void)
-+{
-+ check_emin_aux (-15);
-+ check_emin_aux (mpfr_get_emin ());
-+ check_emin_aux (MPFR_EMIN_MIN);
-+}
-+
- int
- main (int argc, char **argv)
- {
-@@ -1203,6 +1266,7 @@
- decimal ();
- mixed ();
- check_emax ();
-+ check_emin ();
-
- #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
- locale_da_DK ();
diff --git a/dev-libs/mpfr/mpfr-3.1.2_p10.ebuild b/dev-libs/mpfr/mpfr-3.1.4.ebuild
index 90b92c02107d..50325e06a101 100644
--- a/dev-libs/mpfr/mpfr-3.1.2_p10.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="4"
# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils libtool multilib multilib-minimal
+inherit eutils libtool multilib-minimal
MY_PV=${PV/_p*}
MY_P=${PN}-${MY_PV}
@@ -16,7 +16,7 @@ SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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="static-libs"
RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
@@ -52,11 +52,3 @@ multilib_src_install_all() {
dohtml *.html && rm COPYING* *.html || die
popd >/dev/null
}
-
-pkg_preinst() {
- preserve_old_lib /usr/$(get_libdir)/libmpfr$(get_libname 1)
-}
-
-pkg_postinst() {
- preserve_old_lib_notify /usr/$(get_libdir)/libmpfr$(get_libname 1)
-}
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index bb34f48b2fe7..78ef69175597 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -1,3 +1,4 @@
DIST ntl-5.5.2.tar.gz 707247 SHA256 ef7fe7c8b60ec6e05b2a279caad0081263f7fb68b7360120846644cde726ff56 SHA512 44892e00051ca743b1184c9ae30e62c8e2605edaa394358979ff990a535993a6f282d882871ca9ebb3c632971f806c41d9b8024c8fb2cc6fa0d22bc26c66db06 WHIRLPOOL 4587463c4b52be721a7feb164fab73341af97c6f451c0bb2fbf675503c8a5262a5d7615d628e97f082dde23ce49db0f0b314c625dae0526bb1abdfc88732896f
DIST ntl-6.1.0.tar.gz 715439 SHA256 e16c30ceef1d47e94b8a37a8c4a1fb58729b8f8449c648e2a96280a3eecf9b6f SHA512 8c013bd4a250c8e29d57864585492be1f392c84356959d8100d5c45b420e411e5cd677524e2d50bbe265dda4c364185395780ba5d8490f6ac46da73c6a9728de WHIRLPOOL cf2a48cfe33cb58d8bda35d4a18d57a20ae23f2ba53f0f757d1bacc58ffa0bfdfd38363db38996e2e4069f5e3f2ad6a3ae9a859437a93404308512652190c765
DIST ntl-9.3.0.tar.gz 888710 SHA256 8f31508a9176b3fc843f08468b1632017f2450677bfd5147ead5136e0f24b68f SHA512 dfb4ac7a66aaddcf5d0d0c9fcaff253b0196a9d9f727788127dd18e131528fe60dedf8bfb864503225fc5796987aec9c7019b74e0fc12cd12c20aa33a9cf9d7d WHIRLPOOL a1f7cf573d49a277f0b2f1d50d18e66ef83a54430c517fd5d3c75e800216b706e8b5ff10e6ed2dc02b6eb4f9290671b249c67f1937cced96ac987055aaa3ab99
+DIST ntl-9.6.4.tar.gz 915256 SHA256 c4a1f015a879b4a20f6b76a98eb6033a7936b0ff3b3f3ca6159d7e7b2afd89eb SHA512 ec8a4deb6996b31140edff978e07844ea8e30327491a6777d3982bffec01599b0cb5cc5dca297c8610ecb7ac9a4eae3407a59736fed840a2415a52a159370868 WHIRLPOOL 31ab69dc19b206868d1a9ac4f3d1cb52180980e751fe1431b738921b3816998797cf33a0ea9db8e1017e4face98efa897a4e42aa5be58365d1bc12e320a34354
diff --git a/dev-libs/ntl/files/ntl-9.6.4-sanitize-makefile.patch b/dev-libs/ntl/files/ntl-9.6.4-sanitize-makefile.patch
new file mode 100644
index 000000000000..ed2e533fe430
--- /dev/null
+++ b/dev-libs/ntl/files/ntl-9.6.4-sanitize-makefile.patch
@@ -0,0 +1,160 @@
+--- ntl-9.6.4/src/DoConfig
++++ ntl-9.6.4/src/DoConfig
+@@ -24,14 +24,16 @@
+
+ 'LDFLAGS' => '',
+ 'LDLIBS' => '-lm',
++'PICFLAG' => '-fPIC',
+ 'CPPFLAGS' => '',
+
+-'DEF_PREFIX' => '/usr/local',
++'DEF_PREFIX' => '/usr',
+
+ 'PREFIX' => '$(DEF_PREFIX)',
+ 'LIBDIR' => '$(PREFIX)/lib',
+ 'INCLUDEDIR' => '$(PREFIX)/include',
+ 'DOCDIR' => '$(PREFIX)/share/doc',
++'SHMAKE' => 'non-gld',
+
+ 'GMP_PREFIX' => '$(DEF_PREFIX)',
+ 'GMP_INCDIR' => '$(GMP_PREFIX)/include',
+--- ntl-9.6.4/src/mfile
++++ ntl-9.6.4/src/mfile
+@@ -113,6 +113,18 @@
+ # Set to off if you want to bypass the wizard; otherwise, set to on.
+
+
++###############################################################
++#
++# New addition for shared library building. With gcc you need to
++# choose the Position Indepent Code flag. You have a choice of
++# -fpic better code but in rare case not available (ppc)
++# -fPIC slightly slower code but guaranted to work anywhere.
++#
++###############################################################
++
++PICFLAG=@{PICFLAG}
++
++
+ #################################################################
+ #
+ # That's it! You can ignore everything else in this file!
+@@ -144,6 +156,8 @@
+
+ OBJ=$(O19)
+
++SHOBJ=$(subst .o,.lo,$(OBJ))
++
+ # library source files
+
+
+@@ -317,6 +331,7 @@
+
+ LINK = $(CXX) $(NTL_INCLUDE) $(CPPFLAGS) $(CXXAUTOFLAGS) $(CXXFLAGS) $(LDFLAGS)
+
++.SUFFIXES: .lo
+
+
+ # 'make all' does a complete make, including all setup.
+@@ -325,11 +340,11 @@
+ # again.
+
+ all:
+- make setup1
+- make setup2
+- make setup3
+- make setup4
+- make ntl.a
++ ${MAKE} setup1
++ ${MAKE} setup2
++ ${MAKE} setup3
++ ${MAKE} setup4
++ ${MAKE} ntl.a
+ touch all
+
+
+@@ -378,16 +393,28 @@
+ lip.o: lip.c g_lip_impl.h c_lip_impl.h
+ $(LCOMP) $(COMPILE) $(GMP_OPT_INCDIR) lip.c
+
++lip.lo: lip.c g_lip_impl.h c_lip_impl.h
++ $(LCOMP) $(COMPILE) $(PICFLAG) $(GMP_OPT_INCDIR) lip.c -o lip.lo
++
+ ctools.o: ctools.c
+ $(LCOMP) $(COMPILE) ctools.c
+
++ctools.lo: ctools.c
++ $(LCOMP) $(COMPILE) $(PICFLAG) ctools.c -o ctools.lo
++
+
+ GetTime.o: GetTime.c
+ $(LCOMP) $(COMPILE) GetTime.c
+
++GetTime.lo: GetTime.c
++ $(LCOMP) $(COMPILE) $(PICFLAG) GetTime.c -o GetTime.lo
++
+ GetPID.o: GetPID.c
+ $(LCOMP) $(COMPILE) GetPID.c
+
++GetPID.lo: GetPID.c
++ $(LCOMP) $(COMPILE) $(PICFLAG) GetPID.c -o GetPID.lo
++
+ CheckCompile: CheckCompile.c
+ $(LINK) -o CheckCompile CheckCompile.c $(LDLIBS)
+
+@@ -395,6 +422,9 @@
+ .c.o:
+ $(LCOMP) $(COMPILE) $(GF2X_OPT_INCDIR) $<
+
++.c.lo:
++ $(LCOMP) $(COMPILE) $(PICFLAG) $(GF2X_OPT_INCDIR) -o $@ $<
++
+ .c:
+ @{LSTAT} $(LINK) -o $@ $< ntl.a $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB) $(LDLIBS) #LSTAT
+ @{LSHAR} $(LIBTOOL) --tag=CXX --mode=link $(LINK) -o $@ $< libntl.la #LSHAR
+@@ -408,7 +438,7 @@
+
+ check:
+ sh RemoveProg $(PROGS)
+- make QuickTest
++ ${MAKE} QuickTest
+ ./QuickTest
+ sh RemoveProg QuickTest
+ sh TestScript
+@@ -465,20 +495,18 @@
+ #
+ #################################################################
+
+-clobber:
++clobber: clean
+ rm -f ntl.a mach_desc.h ../include/NTL/mach_desc.h GetTime.c GetPID.c
+ sh ResetFeatures '..'
+ rm -f ../include/NTL/gmp_aux.h
+- sh RemoveProg $(PROGS) MakeDesc $(AUXPROGS) gen_gmp_aux
+- rm -f *.o
+- rm -rf small
++ sh RemoveProg $(PROGS)
+ rm -f cfileout mfileout
+ rm -rf .libs *.lo libntl.la
+ rm -f all
+
+ clean:
+ sh RemoveProg $(PROGS) MakeDesc $(AUXPROGS) gen_gmp_aux
+- rm -f *.o
++ rm -f *.o *.lo
+ rm -rf small
+ @{LSHAR} - $(LIBTOOL) --mode=clean rm -f libntl.la *.lo #LSHAR
+
+@@ -570,5 +598,11 @@
+ $(LINK) -o DispSettings DispSettings.c $(LDLIBS)
+
+
+-
++sharedso: DIRNAME $(SHOBJ)
++ $(LINK) $(PICFLAG) -shared -Wl,-soname,lib`cat DIRNAME`.so -o lib`cat DIRNAME`.so $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
++ ln -s lib`cat DIRNAME`.so libntl.so
++
++shareddylib: DIRNAME $(SHOBJ)
++ $(LINK) $(PICFLAG) -dynamiclib -install_name $(LIBDIR)/lib`cat DIRNAME`.dylib -o lib`cat DIRNAME`.dylib $(SHOBJ) $(GMP_OPT_LIBDIR) $(GMP_OPT_LIB) $(GF2X_OPT_LIBDIR) $(GF2X_OPT_LIB)
++ ln -s lib`cat DIRNAME`.dylib libntl.dylib
+
diff --git a/dev-libs/ntl/ntl-9.6.4.ebuild b/dev-libs/ntl/ntl-9.6.4.ebuild
new file mode 100644
index 000000000000..3b67c4ef707e
--- /dev/null
+++ b/dev-libs/ntl/ntl-9.6.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="High-performance and portable Number Theory C++ library"
+HOMEPAGE="http://shoup.net/ntl/"
+SRC_URI="http://www.shoup.net/ntl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc static-libs test"
+
+RDEPEND="dev-libs/gmp:0=
+ >=dev-libs/gf2x-0.9"
+DEPEND="${RDEPEND}
+ dev-lang/perl"
+
+S="${WORKDIR}/${P}/src"
+PATCHES=(
+ "${FILESDIR}/${P}-sanitize-makefile.patch"
+ "${FILESDIR}/${PN}-9.2.0-singular.patch"
+)
+
+src_prepare() {
+ # fix parallel make
+ sed -i -e "s/make/make ${MAKEOPTS}/g" WizardAux || die
+ cd .. || die
+ default
+
+ replace-flags -O[3-9] -O2
+}
+
+src_configure() {
+ perl DoConfig \
+ PREFIX="${EPREFIX}"/usr \
+ CXXFLAGS="${CXXFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ CXX="$(tc-getCXX)" \
+ AR="$(tc-getAR)" \
+ RANLIB="$(tc-getRANLIB)" \
+ NTL_GMP_LIP=on NTL_GF2X_LIB=on NTL_LEGACY_SP_MULMOD=on \
+ || die "DoConfig failed"
+}
+
+src_compile() {
+ # split the targets to allow parallel make to run properly
+ emake setup1 setup2
+ emake setup3
+ sh Wizard on || die "Tuning wizard failed"
+ if use static-libs; then
+ emake ntl.a
+ fi
+ local trg=so
+ [[ ${CHOST} == *-darwin* ]] && trg=dylib
+ emake shared${trg}
+}
+
+src_install() {
+ if use static-libs; then
+ newlib.a ntl.a libntl.a
+ fi
+ dolib.so lib*$(get_libname)
+
+ cd .. || die
+ insinto /usr/include
+ doins -r include/NTL
+
+ dodoc README
+ if use doc ; then
+ dodoc doc/*.txt
+ docinto html
+ dodoc doc/*.html doc/*.gif
+ fi
+}
+
+src_test(){
+ # the current ebuild need static library to run tests
+ emake ntl.a
+
+ default
+}
diff --git a/dev-libs/openssl/openssl-1.0.2g-r2.ebuild b/dev-libs/openssl/openssl-1.0.2g-r2.ebuild
index 3928f2f24916..b4d874e8a5e6 100644
--- a/dev-libs/openssl/openssl-1.0.2g-r2.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2g-r2.ebuild
@@ -15,7 +15,7 @@ LICENSE="openssl"
# subslot set to 1.0.2g version as this is the first release without SSLv2
# support and thus breaks nearly every openssl consumer (see bug #575548)
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib"
RESTRICT="!bindist? ( bindist )"
diff --git a/dev-libs/qcustomplot/qcustomplot-1.3.2.ebuild b/dev-libs/qcustomplot/qcustomplot-1.3.2.ebuild
index adce5e166f05..5731c982ce5e 100644
--- a/dev-libs/qcustomplot/qcustomplot-1.3.2.ebuild
+++ b/dev-libs/qcustomplot/qcustomplot-1.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
SLOT="0"
LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
IUSE="qt5"
RDEPEND="
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild
index 890d4e4184a4..32160c25d769 100644
--- a/dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.10.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
LICENSE="LGPL-2+"
SLOT="0/18"
IUSE="archive crypt +introspection +quvi test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
RDEPEND="
>=dev-libs/glib-2.31:2
diff --git a/dev-libs/uchardet/metadata.xml b/dev-libs/uchardet/metadata.xml
index 3fc943d3aa94..97c636b9449b 100644
--- a/dev-libs/uchardet/metadata.xml
+++ b/dev-libs/uchardet/metadata.xml
@@ -4,7 +4,6 @@
<maintainer type="person">
<email>itumaykin+gentoo@gmail.com</email>
<name>Coacher</name>
- <description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
diff --git a/dev-libs/vala-common/vala-common-0.30.1.ebuild b/dev-libs/vala-common/vala-common-0.30.1.ebuild
index d5c3a73b303a..0f37f824ad8d 100644
--- a/dev-libs/vala-common/vala-common-0.30.1.ebuild
+++ b/dev-libs/vala-common/vala-common-0.30.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
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 ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE=""
# Previously ${PN} was part of dev-lang/vala
diff --git a/dev-ml/cppo/cppo-1.3.1.ebuild b/dev-ml/cppo/cppo-1.3.1-r1.ebuild
index 87d0447b1a92..064faf4bf4dc 100644
--- a/dev-ml/cppo/cppo-1.3.1.ebuild
+++ b/dev-ml/cppo/cppo-1.3.1-r1.ebuild
@@ -16,9 +16,9 @@ KEYWORDS="~amd64"
IUSE="examples"
-RDEPEND=">=dev-lang/ocaml-3.12:="
-DEPEND="${RDEPEND}
- dev-ml/ocamlbuild"
+RDEPEND=">=dev-lang/ocaml-3.12:=
+ dev-ml/ocamlbuild:="
+DEPEND="${RDEPEND}"
src_install() {
findlib_src_preinst
diff --git a/dev-ml/ocamlnet/Manifest b/dev-ml/ocamlnet/Manifest
index 2a1720da53a5..55e50495ccd4 100644
--- a/dev-ml/ocamlnet/Manifest
+++ b/dev-ml/ocamlnet/Manifest
@@ -1,2 +1,3 @@
DIST ocamlnet-3.7.7.tar.gz 3357674 SHA256 5b8e464a874018c5e48fc1edc752b83e014061f19316b5b14df8422d939e7609 SHA512 b500a92e6c5dc4d96ac26352923d78cb3a8b555deda038c41860aecbd20ee9ccbcfee949014c91f1266c937ae03fadd72c322e3cbe6456d23fd20b871114df6a WHIRLPOOL ceb4a9fc5d43fe89487589ae14c4bdf58d6c3d99d3a9ebc07fa722e894106899a2ae2aca91a47338d8004017fdd0d23632e187d96ec51479b43955daddbbb893
DIST ocamlnet-4.0.4.tar.gz 4336176 SHA256 becaa6c2b0c1ae6a3fb05139928442e5d4a685ea5033017060a86d70114e5f72 SHA512 f3bce94d43161e46bf0973bfbe0d9d5d7232136a24a27b987ae371a7aab129720df35bd0d6ef75126d587ee1fde56fe29d05bc44840724adf3be50ac250e7c85 WHIRLPOOL 34985fa9a49a60d6e671645a73533d6284b87205d63956265e631195ab117afdc6b41347e72f92d8cab711aef35db0c78a8989c955507dac66e8174ec6cb0242
+DIST ocamlnet-4.1.1.tar.gz 4561784 SHA256 61e5c280e96f7fd5a7d1e63391f60da6704e16f3816b45acaed17dd7042912fc SHA512 cd10f7fe622bed3208cc5ad66d65911c1c0992bdc6f4d1bc10d6e7ef197fe157226e6b8ca7857b91cd1c6d6103ac9c3d586d39f3cb32a9ccb9ab83e00bf4444d WHIRLPOOL c39fbb5e37c6eb71f8899f703913a9869e5f4995418195f68f7dbc53314c12d15ca941b35b00eff78ba9a088af079578db7a3e1ffee1467a027479e38c8bff2d
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.1.ebuild
new file mode 100644
index 000000000000..5fe2f7ad68f9
--- /dev/null
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.1.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 eutils findlib
+
+MY_P=${P/_beta/test}
+DESCRIPTION="Modules for OCaml application-level Internet protocols"
+HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+
+LICENSE="ZLIB GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
+RESTRICT="installsources"
+
+# the auth-dh compile flag has been disabled as well, since it depends on
+# ocaml-cryptgps, which is not available.
+
+RDEPEND=">=dev-ml/findlib-1.0
+ pcre? ( >=dev-ml/pcre-ocaml-5:= )
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ tk? ( || ( dev-ml/labltk:= <dev-lang/ocaml-4.02[tk] ) )
+ ssl? ( net-libs/gnutls:= )
+ gtk? ( >=dev-ml/lablgtk-2:= )
+ kerberos? ( virtual/krb5 )
+ zip? ( dev-ml/camlzip:= )
+ "
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+ocamlnet_use_with() {
+ if use $1; then
+ echo "-with-$2"
+ else
+ echo "-without-$2"
+ fi
+}
+
+ocamlnet_use_enable() {
+ if use $1; then
+ echo "-enable-$2"
+ else
+ echo "-disable-$2"
+ fi
+}
+
+src_configure() {
+ ./configure \
+ -bindir /usr/bin \
+ -datadir /usr/share/${PN} \
+ $(ocamlnet_use_enable ssl gnutls) \
+ $(ocamlnet_use_enable gtk gtk2) \
+ $(ocamlnet_use_enable kerberos gssapi) \
+ $(ocamlnet_use_enable pcre pcre) \
+ $(ocamlnet_use_enable tk tcl) \
+ $(ocamlnet_use_enable zip zip) \
+ $(ocamlnet_use_with httpd nethttpd) \
+ || die "Error : econf failed!"
+}
+
+src_compile() {
+ emake -j1 all
+ if use ocamlopt; then
+ emake -j1 opt
+ fi
+}
+
+src_install() {
+ export STRIP_MASK="*/bin/*"
+ findlib_src_install
+}
diff --git a/dev-ml/pxp/Manifest b/dev-ml/pxp/Manifest
index eff83f850bbd..a1a43279c326 100644
--- a/dev-ml/pxp/Manifest
+++ b/dev-ml/pxp/Manifest
@@ -1,2 +1,3 @@
DIST pxp-1.2.4.tar.gz 702365 SHA256 1cd3e946f19d800f412475adf56e6da87231f80be22d7ea71dd4eabf93876355 SHA512 1520dd732db17923c24d43c328e659db83ac00569e7d2153e5633dfbc3fad899db8e45523ea76915e5dd1cb71cda2500db3875deebdf47b375af5bd05ad383d6 WHIRLPOOL 26c54816a63b26cee4cbaa7c3c868f449c40291eff1a242ade45f5c08f89afd7ef8b12ff3da5b00608f8ede486d17b1fd1387f0042c42e79d08e76f43c97089f
DIST pxp-1.2.7.tar.gz 735710 SHA256 2b0aca564f71c87825436e31a82de2ca3b3e99ee81a83840a525b0be63d73025 SHA512 11b49edc8e93a867b39d99ed6117460b3ecc7f9368564c815125662897f3cfbd87876b68c794bfd73b28cb0d8a898500ccd8ce0e1fca205bbce8b9759fa684d3 WHIRLPOOL 728f708c5dc332179884a4c2b6a222c514e8153c3bdf67847361df323886d61e320672f7dc7bd695343a641b34c9742c94f3cd9065541622670cb8b3df22380d
+DIST pxp-1.2.8.tar.gz 619689 SHA256 701754f4460595434ea6db77c33e046d33e4a485e8d28c5d39ced56112c94452 SHA512 3292bfbda494066e454331a9cfc56b03f55afe8548bdf24fea09d9bc0a03c333c027f7b527983bd9b4d659458c95acf7e3fc251c72d26ab3502f52067c9f2549 WHIRLPOOL 5529a6ad818428b03664764704e62d200802dc26c8c344897f4b15b17945e4620fa4b878f0108b12f346000a7cc070b50d2ce82d945c6bcd34a0e5e811ec8c0a
diff --git a/dev-ml/pxp/pxp-1.2.8.ebuild b/dev-ml/pxp/pxp-1.2.8.ebuild
new file mode 100644
index 000000000000..1937ee73d8e9
--- /dev/null
+++ b/dev-ml/pxp/pxp-1.2.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit findlib eutils
+
+MY_P=${P/_beta/test}
+
+DESCRIPTION="validating XML parser library for O'Caml"
+HOMEPAGE="http://projects.camlcity.org/projects/pxp.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+SLOT="0/${PV}"
+DEPEND=">=dev-ml/pcre-ocaml-4.31:=
+ >=dev-ml/ulex-0.5:=
+ >=dev-ml/ocamlnet-0.98:=
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )"
+RDEPEND="${DEPEND}"
+
+IUSE="examples +ocamlopt"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ #the included configure does not support many standard switches and is quite picky
+ ./configure || die "configure failed"
+}
+
+src_compile() {
+ emake -j1 all
+ if use ocamlopt; then
+ emake -j1 opt
+ fi
+}
+
+src_install() {
+ findlib_src_install
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ cd doc
+ dodoc ABOUT-FINDLIB README SPEC design.txt
+}
diff --git a/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild b/dev-perl/Canary-Stability/Canary-Stability-2006.ebuild
index 8573b7de49e1..9ee85969eb3e 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/crypt-cbc/crypt-cbc-2.330.0-r1.ebuild b/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r1.ebuild
index 496c8d87fc6e..9d870725740c 100644
--- a/dev-perl/crypt-cbc/crypt-cbc-2.330.0-r1.ebuild
+++ b/dev-perl/Crypt-CBC/Crypt-CBC-2.330.0-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-MY_PN=Crypt-CBC
MODULE_AUTHOR=LDS
MODULE_VERSION=2.33
inherit perl-module
@@ -21,7 +20,7 @@ DEPEND="${RDEPEND}
test? (
dev-perl/Crypt-Blowfish
dev-perl/Crypt-DES
- dev-perl/crypt-idea
+ dev-perl/Crypt-IDEA
)"
# dev-perl/Crypt-Rijndael"
diff --git a/dev-perl/crypt-cbc/Manifest b/dev-perl/Crypt-CBC/Manifest
index 4d2f03d9f126..4d2f03d9f126 100644
--- a/dev-perl/crypt-cbc/Manifest
+++ b/dev-perl/Crypt-CBC/Manifest
diff --git a/dev-perl/crypt-cbc/metadata.xml b/dev-perl/Crypt-CBC/metadata.xml
index 9dac203ebd0e..9dac203ebd0e 100644
--- a/dev-perl/crypt-cbc/metadata.xml
+++ b/dev-perl/Crypt-CBC/metadata.xml
diff --git a/dev-perl/crypt-des-ede3/crypt-des-ede3-0.10.0-r1.ebuild b/dev-perl/Crypt-DES_EDE3/Crypt-DES_EDE3-0.10.0-r1.ebuild
index bbb7f64893ed..c9ace97d74bb 100644
--- a/dev-perl/crypt-des-ede3/crypt-des-ede3-0.10.0-r1.ebuild
+++ b/dev-perl/Crypt-DES_EDE3/Crypt-DES_EDE3-0.10.0-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-MY_PN=Crypt-DES_EDE3
MODULE_AUTHOR=BTROTT
MODULE_VERSION=0.01
inherit perl-module
diff --git a/dev-perl/crypt-des-ede3/Manifest b/dev-perl/Crypt-DES_EDE3/Manifest
index 528de40be2d6..528de40be2d6 100644
--- a/dev-perl/crypt-des-ede3/Manifest
+++ b/dev-perl/Crypt-DES_EDE3/Manifest
diff --git a/dev-perl/crypt-des-ede3/metadata.xml b/dev-perl/Crypt-DES_EDE3/metadata.xml
index c1a68cf81d5b..c1a68cf81d5b 100644
--- a/dev-perl/crypt-des-ede3/metadata.xml
+++ b/dev-perl/Crypt-DES_EDE3/metadata.xml
diff --git a/dev-perl/crypt-dh/crypt-dh-0.70.0-r1.ebuild b/dev-perl/Crypt-DH/Crypt-DH-0.70.0-r1.ebuild
index bc6c8b923d3c..fa8a43e45fd0 100644
--- a/dev-perl/crypt-dh/crypt-dh-0.70.0-r1.ebuild
+++ b/dev-perl/Crypt-DH/Crypt-DH-0.70.0-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-MY_PN=Crypt-DH
MODULE_AUTHOR=MITHALDU
MODULE_VERSION=0.07
inherit perl-module
@@ -19,6 +18,6 @@ RDEPEND="
dev-libs/gmp
dev-perl/Math-BigInt-GMP
>=virtual/perl-Math-BigInt-1.60
- dev-perl/crypt-random
+ dev-perl/Crypt-Random
"
DEPEND="${RDEPEND}"
diff --git a/dev-perl/crypt-dh/Manifest b/dev-perl/Crypt-DH/Manifest
index f2e47f248d7f..f2e47f248d7f 100644
--- a/dev-perl/crypt-dh/Manifest
+++ b/dev-perl/Crypt-DH/Manifest
diff --git a/dev-perl/crypt-dh/metadata.xml b/dev-perl/Crypt-DH/metadata.xml
index 0c52a1028474..0c52a1028474 100644
--- a/dev-perl/crypt-dh/metadata.xml
+++ b/dev-perl/Crypt-DH/metadata.xml
diff --git a/dev-perl/crypt-dsa/crypt-dsa-1.170.0.ebuild b/dev-perl/Crypt-DSA/Crypt-DSA-1.170.0.ebuild
index 57ddb7e9c7c7..ef9ee63d9df8 100644
--- a/dev-perl/crypt-dsa/crypt-dsa-1.170.0.ebuild
+++ b/dev-perl/Crypt-DSA/Crypt-DSA-1.170.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-MY_PN=Crypt-DSA
MODULE_AUTHOR=ADAMK
MODULE_VERSION=1.17
inherit perl-module
diff --git a/dev-perl/crypt-dsa/Manifest b/dev-perl/Crypt-DSA/Manifest
index 8b52deaa4e45..8b52deaa4e45 100644
--- a/dev-perl/crypt-dsa/Manifest
+++ b/dev-perl/Crypt-DSA/Manifest
diff --git a/dev-perl/crypt-dsa/files/crypt-dsa-1.16-dsaparam.patch b/dev-perl/Crypt-DSA/files/crypt-dsa-1.16-dsaparam.patch
index fe3dfbb6480d..fe3dfbb6480d 100644
--- a/dev-perl/crypt-dsa/files/crypt-dsa-1.16-dsaparam.patch
+++ b/dev-perl/Crypt-DSA/files/crypt-dsa-1.16-dsaparam.patch
diff --git a/dev-perl/crypt-dsa/metadata.xml b/dev-perl/Crypt-DSA/metadata.xml
index bb3e7a6e3099..bb3e7a6e3099 100644
--- a/dev-perl/crypt-dsa/metadata.xml
+++ b/dev-perl/Crypt-DSA/metadata.xml
diff --git a/dev-perl/crypt-idea/crypt-idea-1.100.0.ebuild b/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0.ebuild
index e99307423bfc..cab8b87c14be 100644
--- a/dev-perl/crypt-idea/crypt-idea-1.100.0.ebuild
+++ b/dev-perl/Crypt-IDEA/Crypt-IDEA-1.100.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-MY_PN=Crypt-IDEA
MODULE_AUTHOR=DPARIS
MODULE_VERSION=1.10
inherit perl-module
diff --git a/dev-perl/crypt-idea/Manifest b/dev-perl/Crypt-IDEA/Manifest
index 502bce096563..502bce096563 100644
--- a/dev-perl/crypt-idea/Manifest
+++ b/dev-perl/Crypt-IDEA/Manifest
diff --git a/dev-perl/crypt-idea/metadata.xml b/dev-perl/Crypt-IDEA/metadata.xml
index ac6d1bb41e94..ac6d1bb41e94 100644
--- a/dev-perl/crypt-idea/metadata.xml
+++ b/dev-perl/Crypt-IDEA/metadata.xml
diff --git a/dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.70.0.ebuild b/dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.70.0.ebuild
index cfabc93037fb..682631b00fdf 100644
--- a/dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.70.0.ebuild
+++ b/dev-perl/Crypt-OpenPGP/Crypt-OpenPGP-1.70.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -31,14 +31,14 @@ RDEPEND="
virtual/perl-IO-Compress
dev-perl/libwww-perl
dev-perl/URI
- dev-perl/crypt-dsa
- dev-perl/crypt-rsa
+ dev-perl/Crypt-DSA
+ dev-perl/Crypt-RSA
dev-perl/File-HomeDir
- dev-perl/crypt-idea
+ dev-perl/Crypt-IDEA
virtual/perl-Digest-MD5
- dev-perl/crypt-des-ede3
+ dev-perl/Crypt-DES_EDE3
dev-perl/Digest-SHA1
dev-perl/Crypt-Rijndael
diff --git a/dev-perl/crypt-primes/crypt-primes-0.500.0-r1.ebuild b/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r1.ebuild
index 3217657b0db9..884885083831 100644
--- a/dev-perl/crypt-primes/crypt-primes-0.500.0-r1.ebuild
+++ b/dev-perl/Crypt-Primes/Crypt-Primes-0.500.0-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-MY_PN=Crypt-Primes
MODULE_AUTHOR=VIPUL
MODULE_VERSION=0.50
inherit perl-module
@@ -16,7 +15,7 @@ KEYWORDS="alpha amd64 hppa ~mips ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-mac
IUSE=""
RDEPEND="dev-perl/math-pari
- dev-perl/crypt-random"
+ dev-perl/Crypt-Random"
DEPEND="${RDEPEND}"
SRC_TEST="do"
diff --git a/dev-perl/crypt-primes/Manifest b/dev-perl/Crypt-Primes/Manifest
index ee4e2259a373..ee4e2259a373 100644
--- a/dev-perl/crypt-primes/Manifest
+++ b/dev-perl/Crypt-Primes/Manifest
diff --git a/dev-perl/crypt-primes/metadata.xml b/dev-perl/Crypt-Primes/metadata.xml
index 6ded7a2966b1..6ded7a2966b1 100644
--- a/dev-perl/crypt-primes/metadata.xml
+++ b/dev-perl/Crypt-Primes/metadata.xml
diff --git a/dev-perl/crypt-rsa/crypt-rsa-1.990.0-r1.ebuild b/dev-perl/Crypt-RSA/Crypt-RSA-1.990.0-r1.ebuild
index fe23907e0a90..166a52e72047 100644
--- a/dev-perl/crypt-rsa/crypt-rsa-1.990.0-r1.ebuild
+++ b/dev-perl/Crypt-RSA/Crypt-RSA-1.990.0-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-MY_PN=Crypt-RSA
MODULE_AUTHOR=VIPUL
MODULE_VERSION=1.99
inherit perl-module
@@ -18,9 +17,9 @@ IUSE=""
DEPEND="dev-perl/class-loader
dev-perl/Crypt-Blowfish
dev-perl/convert-ascii-armour
- dev-perl/crypt-cbc
- dev-perl/crypt-primes
- dev-perl/crypt-random
+ dev-perl/Crypt-CBC
+ dev-perl/Crypt-Primes
+ dev-perl/Crypt-Random
dev-perl/data-buffer
dev-perl/digest-md2
virtual/perl-Digest-MD5
diff --git a/dev-perl/crypt-rsa/Manifest b/dev-perl/Crypt-RSA/Manifest
index 4758dd75271f..4758dd75271f 100644
--- a/dev-perl/crypt-rsa/Manifest
+++ b/dev-perl/Crypt-RSA/Manifest
diff --git a/dev-perl/crypt-rsa/metadata.xml b/dev-perl/Crypt-RSA/metadata.xml
index c4a40366d52f..c4a40366d52f 100644
--- a/dev-perl/crypt-rsa/metadata.xml
+++ b/dev-perl/Crypt-RSA/metadata.xml
diff --git a/dev-perl/crypt-random/crypt-random-1.250.0-r1.ebuild b/dev-perl/Crypt-Random/Crypt-Random-1.250.0-r1.ebuild
index 1440187cf91d..1fd9b46677fb 100644
--- a/dev-perl/crypt-random/crypt-random-1.250.0-r1.ebuild
+++ b/dev-perl/Crypt-Random/Crypt-Random-1.250.0-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-MY_PN=Crypt-Random
MODULE_AUTHOR=VIPUL
MODULE_VERSION=1.25
inherit perl-module
diff --git a/dev-perl/crypt-random/Manifest b/dev-perl/Crypt-Random/Manifest
index 6262c559ab76..6262c559ab76 100644
--- a/dev-perl/crypt-random/Manifest
+++ b/dev-perl/Crypt-Random/Manifest
diff --git a/dev-perl/crypt-random/metadata.xml b/dev-perl/Crypt-Random/metadata.xml
index 203918dd9316..203918dd9316 100644
--- a/dev-perl/crypt-random/metadata.xml
+++ b/dev-perl/Crypt-Random/metadata.xml
diff --git a/dev-perl/DBD-Pg/DBD-Pg-2.19.3-r1.ebuild b/dev-perl/DBD-Pg/DBD-Pg-2.19.3-r1.ebuild
deleted file mode 100644
index 3df33bce30ab..000000000000
--- a/dev-perl/DBD-Pg/DBD-Pg-2.19.3-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=TURNSTEP
-MODULE_VERSION=2.19.3
-inherit perl-module
-
-DESCRIPTION="The Perl DBD::Pg Module"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="virtual/perl-version
- >=dev-perl/DBI-1.52
- dev-db/postgresql:*"
-DEPEND="${RDEPEND}"
-
-# testcases require a local database with an
-# open password for the postgres user.
-SRC_TEST="skip"
-
-src_prepare() {
- postgres_include="$(readlink -f "${EPREFIX}"/usr/include/postgresql)"
- postgres_lib="${postgres_include//include/lib}"
- # Fall-through case is the non-split postgresql
- # The active cases instead get us the matching libdir for the includedir.
- for i in lib lib64 ; do
- if [ -d "${postgres_lib}/${i}" ]; then
- postgres_lib="${postgres_lib}/${i}"
- break
- fi
- done
-
- # env variables for compilation:
- export POSTGRES_INCLUDE="${postgres_include}"
- export POSTGRES_LIB="${postgres_lib}"
- perl-module_src_prepare
-}
diff --git a/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild b/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild
index 0b14a41033e3..2a7839615312 100644
--- a/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild
+++ b/dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="PostgreSQL database driver for the DBI module"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
RDEPEND="virtual/perl-version
diff --git a/dev-perl/DBD-Pg/Manifest b/dev-perl/DBD-Pg/Manifest
index c360fe2008cf..a37b53d9e995 100644
--- a/dev-perl/DBD-Pg/Manifest
+++ b/dev-perl/DBD-Pg/Manifest
@@ -1,3 +1,2 @@
-DIST DBD-Pg-2.19.3.tar.gz 237399 SHA256 37350d134b7fa88fb3b9432d92991e0a73f405bf5b3a4ee53430439280b8262a SHA512 e1183fda7abcd2ee05491fe269172e5fb09dba6cb329c6f6f1a5abb9dc9a98c414a0b67f3465b938b197bbe34e3ebc9ec6a4e810e1f9e2316753845ac5416fec WHIRLPOOL 427b1705a3d8e69032b2db5d7ad1d1c6de6353c44b5b6294352abfb28f100f2f572356a2402e285bfbb373384bff18fef7355c545ceb21fbffea07d5de75ec24
DIST DBD-Pg-3.4.2.tar.gz 253346 SHA256 7b76930cec143b90a068e1e64a3beb6f640c10b22d0a41f9a032516683892f24 SHA512 290f8e19d6920c1a514305a943ec4f63da14dd321e93a6e9cc4f6fce6737f308a3931135ec9ed0d4577f1ab97358106ca2def7ccb28a7c5c169a80ca5cda1d85 WHIRLPOOL a177efa5cd07c3064528329a9be72cd464671e55ac19ec564b75f8fe5e757c960a89d83d09a65e7e327bb88d9322465c0cdc320ddb33eb85a59bb29c9fe1dfbe
DIST DBD-Pg-3.5.3.tar.gz 256570 SHA256 7e98a9b975256a4733db1c0e974cad5ad5cb821489323e395ed97bd058e0a90e SHA512 7a564e5c86fa41719289f6e391f0cd39f01df7d088892fca11175c60fec8a3af884f9204ae834caac2024ff0d45dcc013e314ec0c09a07fe7ee76170ec3a634f WHIRLPOOL 6f4091284c2c91b8c2126e06a2727b65e672db91ce5f265841ef3c02b977f48712e84ad013980bbe4a2e127f5003906bf315d7b6a86787440a9cc6688aa14cd8
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.350.0-r1.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.350.0-r1.ebuild
deleted file mode 100644
index 230a1092e289..000000000000
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.350.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ADAMK
-MODULE_VERSION=1.35
-inherit perl-module
-
-DESCRIPTION="Self Contained RDBMS in a DBI Driver"
-
-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 ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND=">=dev-perl/DBI-1.57
- >=dev-db/sqlite-3.6.22[extensions(+)]
- !<dev-perl/DBD-SQLite-1"
-DEPEND="${RDEPEND}
- test? ( >=virtual/perl-Test-Simple-0.86 )"
-
-SRC_TEST="do"
-
-src_prepare() {
- perl-module_src_prepare
- sed -i 's/^if ( 0 )/if ( 1 )/' "${S}"/Makefile.PL || die
- # remove bundled sqlite (rt.cpan#61361)
- for i in sqlite3{.c,.h,ext.h} ; do
- rm ${i} || die
- sed -i -e "/^${i}\$/d" MANIFEST || die
- done
-
- myconf="SQLITE_LOCATION=${EPREFIX}/usr"
-}
diff --git a/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild
index 4e69ad9fc4ca..e15bdd865e6f 100644
--- a/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild
+++ b/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Self Contained RDBMS in a DBI Driver"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/DBD-SQLite/Manifest b/dev-perl/DBD-SQLite/Manifest
index 1802caf6fefe..06074312a06c 100644
--- a/dev-perl/DBD-SQLite/Manifest
+++ b/dev-perl/DBD-SQLite/Manifest
@@ -1,2 +1 @@
-DIST DBD-SQLite-1.35.tar.gz 1467375 SHA256 ff08d1ee50c057d03ab2901aa7896fda2226c30b85c0999f5858cd2a81b4bc7d SHA512 36ac23aa84c19aff170b5505f6d80c1a577176b2738030e3b161147b9b738fa76ab9a6a620c4ff4a2b9f6abd62520e9fd78111177e8bf347fca28ff8c97b31ca WHIRLPOOL e67e25bd8e8b70ba9bae603a0c0d608111871fdb126398cf8dd392df1544f4e7298ff7e605cc1a1f204efa4cbe679a4f178183ab1bd3cd370b4c1cd79a8c9d10
DIST DBD-SQLite-1.48.tar.gz 1769115 SHA256 b397230f5d4cdc9923f91c62da9e535234f3055c528ede75afd7d24698030ea6 SHA512 9c00decdb6730c0e4be3fdd01fef6ebad0452cbe1b5141c23fee7d0c5ca0089f3cd4e5d70d331e959ec50546bb10154a3c2db4bfd27993912d5c788cef0a81ee WHIRLPOOL 8313333ba47203d2eb1434266af250dcfe9e360d697155d82bb24b6f0c0abf650d3cc787e6b9c93144e790de16aa1c318032626f867977b8dfeee92be53c3b12
diff --git a/dev-perl/Date-Calc/Date-Calc-6.300.0-r1.ebuild b/dev-perl/Date-Calc/Date-Calc-6.300.0-r1.ebuild
deleted file mode 100644
index 103cce2379e0..000000000000
--- a/dev-perl/Date-Calc/Date-Calc-6.300.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=STBEY
-MODULE_VERSION=6.3
-inherit perl-module
-
-DESCRIPTION="Gregorian calendar date calculations"
-
-LICENSE="${LICENSE} LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=dev-perl/Bit-Vector-6.6
- >=dev-perl/Carp-Clan-5.3"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
-export OPTIMIZE="$CFLAGS"
-mydoc="ToDo"
diff --git a/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild b/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild
index b93d4a6ec3e3..6a7d7f713ab1 100644
--- a/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild
+++ b/dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Gregorian calendar date calculations"
LICENSE="${LICENSE} LGPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Date-Calc/Manifest b/dev-perl/Date-Calc/Manifest
index b270852fc0a5..e3fcc2fd6a87 100644
--- a/dev-perl/Date-Calc/Manifest
+++ b/dev-perl/Date-Calc/Manifest
@@ -1,2 +1 @@
-DIST Date-Calc-6.3.tar.gz 168967 SHA256 3eb66188af89abc65b71e9852808d5d6b4bea7a606c55f2ae52c229bfc5bdb93 SHA512 74d755e07c2c1601b3f9ae630a60142367a8b6aa11223da57334b05b363fe636f2d77eeb5cce273122e1f090bc917c8b833370451a7a402637f29305523c2385 WHIRLPOOL 86db06898a947f4ea4e30835b465ed079c5f54e7637c948205e0e1ed4a2fd957bab7b88b7086d597ad64892f7096136fb8d5ef6ea8702a085cc1e88e42dba57e
DIST Date-Calc-6.4.tar.gz 173828 SHA256 7ce137b2e797b7c0901f3adf1a05a19343356cd1f04676aa1c56a9f624f859ad SHA512 e2d0cb2b041afedb10033700e27075f01987abc763a59034a10a9fc0bb059706cc959f6d76fe1fc21ced4b547475f62a8c37ad38e8e49f7453d78b17082c0671 WHIRLPOOL adb18aa6e6f00b58f860830bd840add58516e28e326f165ff7f05e0ae1498e4d5f933654d7b3feb06f1babc27ff6130f7429019932af2c14df7a2577522f1dd6
diff --git a/dev-perl/Error/Error-0.170.240.ebuild b/dev-perl/Error/Error-0.170.240.ebuild
index 1fd3948cd634..a51f34ef2f64 100644
--- a/dev-perl/Error/Error-0.170.240.ebuild
+++ b/dev-perl/Error/Error-0.170.240.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ DESCRIPTION="Error/exception handling in an OO-ish way"
LICENSE+=" MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/File-Slurper/File-Slurper-0.0.800.ebuild b/dev-perl/File-Slurper/File-Slurper-0.0.800.ebuild
index c7fc79bea868..b8fce78fba8f 100644
--- a/dev-perl/File-Slurper/File-Slurper-0.0.800.ebuild
+++ b/dev-perl/File-Slurper/File-Slurper-0.0.800.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A simple, sane and efficient module to slurp a file"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.97.0.ebuild b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.97.0.ebuild
index c992f96c5648..ccbe8d072684 100644
--- a/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.97.0.ebuild
+++ b/dev-perl/Getopt-Long-Descriptive/Getopt-Long-Descriptive-0.97.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Getopt::Long with usage text"
SLOT="0"
-KEYWORDS="amd64 arm ~ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 arm ppc x86 ~ppc-aix ~ppc-macos ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild b/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild
index ae68e0774cc1..991673deadab 100644
--- a/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild
+++ b/dev-perl/HTML-Format/HTML-Format-2.140.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
DESCRIPTION="HTML Formatter"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/HTML-Strip/HTML-Strip-2.90.0.ebuild b/dev-perl/HTML-Strip/HTML-Strip-2.90.0.ebuild
index 40b34d1b95e8..2594701470be 100644
--- a/dev-perl/HTML-Strip/HTML-Strip-2.90.0.ebuild
+++ b/dev-perl/HTML-Strip/HTML-Strip-2.90.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Extension for stripping HTML markup from text"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/HTML-TableExtract/HTML-TableExtract-2.110.0-r1.ebuild b/dev-perl/HTML-TableExtract/HTML-TableExtract-2.110.0-r1.ebuild
deleted file mode 100644
index 4eb45d67fb5d..000000000000
--- a/dev-perl/HTML-TableExtract/HTML-TableExtract-2.110.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MSISK
-MODULE_VERSION=2.11
-inherit perl-module
-
-DESCRIPTION="The Perl Table-Extract Module"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 x86 ~x86-linux"
-IUSE=""
-
-RDEPEND=">=dev-perl/HTML-Element-Extended-1.16
- dev-perl/HTML-Parser"
-DEPEND="${RDEPEND}"
-
-mydoc="TODO"
diff --git a/dev-perl/HTML-TableExtract/HTML-TableExtract-2.130.0.ebuild b/dev-perl/HTML-TableExtract/HTML-TableExtract-2.130.0.ebuild
index 634e5c50b1bb..a189843d0284 100644
--- a/dev-perl/HTML-TableExtract/HTML-TableExtract-2.130.0.ebuild
+++ b/dev-perl/HTML-TableExtract/HTML-TableExtract-2.130.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="The Perl Table-Extract Module"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-linux"
+KEYWORDS="alpha amd64 ppc ppc64 x86 ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/dev-perl/HTML-TableExtract/Manifest b/dev-perl/HTML-TableExtract/Manifest
index 030e0e23a62e..9b2906f34899 100644
--- a/dev-perl/HTML-TableExtract/Manifest
+++ b/dev-perl/HTML-TableExtract/Manifest
@@ -1,2 +1 @@
-DIST HTML-TableExtract-2.11.tar.gz 27123 SHA256 1861d55a2aa1728ef56ea2d08d630b9a008456f1106994e4e49e76f56e4955ee SHA512 ffe77574ac213d9e210e48e221ef7a77922409285005b3a3a27cea82efd8e48756ed2398e3ac645b591395be4f28e868ed1c2d236d128f5159f733d78785e853 WHIRLPOOL 8d333603a4f3157660a3c1e0453a3db5233b6761abdbf1c3a9e5ae4342bfce61a18d7f3c2b8b9b3b4f1b6931c41c278fea63b5c3030d04568ef579b6709c038f
DIST HTML-TableExtract-2.13.tar.gz 36417 SHA256 0a7d81a265d2d46aeeb277a9d7cd5f5e2c8e3765959b641252c8e0a175ad5106 SHA512 7a35952c37d6c2997e50901208cce06af97b597574f91a14d3e7700bef42df398721a6b42fe14bd3ed3733d248e80c2c8f0029c6e2caab4bc66a84474bdddf7c WHIRLPOOL e36d84401024643977d3fe05f2f0ae69e8b10ca2d1e539fbb4508ace3d0f47dea90675e3fc6939f2c99e3d49ffbe8ff665db682828ccdc71af58d2e2ccd13c45
diff --git a/dev-perl/HTML-TableParser/HTML-TableParser-0.380.0-r1.ebuild b/dev-perl/HTML-TableParser/HTML-TableParser-0.380.0-r1.ebuild
deleted file mode 100644
index 330290c66518..000000000000
--- a/dev-perl/HTML-TableParser/HTML-TableParser-0.380.0-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DJERIUS
-MODULE_VERSION=0.38
-inherit perl-module
-
-DESCRIPTION="Extract data from an HTML table"
-
-LICENSE="GPL-3" # GPL-3+
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="dev-perl/HTML-Parser"
-DEPEND="test? ( ${RDEPEND}
- dev-perl/Test-Pod
- dev-perl/Test-Pod-Coverage )"
-
-SRC_TEST=do
diff --git a/dev-perl/HTML-TableParser/HTML-TableParser-0.400.0.ebuild b/dev-perl/HTML-TableParser/HTML-TableParser-0.400.0.ebuild
index 737da282bc32..77ed594eeafb 100644
--- a/dev-perl/HTML-TableParser/HTML-TableParser-0.400.0.ebuild
+++ b/dev-perl/HTML-TableParser/HTML-TableParser-0.400.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Extract data from an HTML table"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/HTML-TableParser/Manifest b/dev-perl/HTML-TableParser/Manifest
index 6068638c25ee..908b31603861 100644
--- a/dev-perl/HTML-TableParser/Manifest
+++ b/dev-perl/HTML-TableParser/Manifest
@@ -1,2 +1 @@
-DIST HTML-TableParser-0.38.tar.gz 73084 SHA256 8b18054261228e7c88ad0213e649cf95cdf493795f7e86d03c81264d50aa7bec SHA512 44c026acf52ab731fc6cdec24d073ac6375443d9c46a70599614de1cf017cb355e7a206cd7f9017a68ba7dbd79d87d7f41e49a9233c9bbf14002e4bc890ca99f WHIRLPOOL c2f5ae0a2ed69ac44a72b14e6d900acd4d5af71d987291634ccc410e5702191cc228ca40d3cbc657f87304bb82691367c52620c2e1c669a7dbf5a5fc5f29d68e
DIST HTML-TableParser-0.40.tar.gz 77006 SHA256 34e5782ef23c0d9c10c63ad3cc79f5e2769f6e169caf38792a0ed5457437ebbb SHA512 c394734acbec92cf3ab6886302d316879c69170a3382520a60739e71517b05abe0cce88306d8ae1f1702b60f73fa39bca89a56ad0dc55adb2b0804dfb8aaf015 WHIRLPOOL c9cbd9df0e19172e87f67a011828e63fe0ff036aa6e8dbee6673874c16f77aa8f31e86065dbd61b25acae123ad56eca41561d175759ae4dcd719d696acc11980
diff --git a/dev-perl/HTML-Template/HTML-Template-2.940.0.ebuild b/dev-perl/HTML-Template/HTML-Template-2.940.0.ebuild
deleted file mode 100644
index eee5ebeaceca..000000000000
--- a/dev-perl/HTML-Template/HTML-Template-2.940.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=WONKO
-MODULE_VERSION=2.94
-inherit perl-module
-
-DESCRIPTION="A Perl module to use HTML Templates"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/HTML-Template/HTML-Template-2.950.0.ebuild b/dev-perl/HTML-Template/HTML-Template-2.950.0.ebuild
index fefb9528f8a7..b796ae0204aa 100644
--- a/dev-perl/HTML-Template/HTML-Template-2.950.0.ebuild
+++ b/dev-perl/HTML-Template/HTML-Template-2.950.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A Perl module to use HTML Templates"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 x86 ~x86-fbsd"
IUSE="test"
DEPEND="test? ( dev-perl/CGI )"
diff --git a/dev-perl/HTML-Template/Manifest b/dev-perl/HTML-Template/Manifest
index 88eee882ef02..231a8f604f3d 100644
--- a/dev-perl/HTML-Template/Manifest
+++ b/dev-perl/HTML-Template/Manifest
@@ -1,2 +1 @@
-DIST HTML-Template-2.94.tar.gz 90862 SHA256 4e6e1615f7e186a6affdf70e16d2648d975d6419617874587a495e711cf5fa09 SHA512 7e141522ec9b932f89628dd1ede90f9c0f8336edb892898cf8f27b5dbcec5ae1c545b65ee770a938305aedc7b964c8cdf34fceb72716c50823ccfd90c95619fd WHIRLPOOL 92993b0e1f080a6862f4e36aacc7d7d17976e3f43e1f6778aff82140f36bf3c90eb95cab409d054be6b87866f940831d7348d4bacbd4e4709c658076dbe25543
DIST HTML-Template-2.95.tar.gz 91083 SHA256 78100adaea7a56ae65826220fcb0c18a188df25a27227f96175cf7169fbb501d SHA512 4b52856c7ac97a6c7985c73492aa5074f90b6b7f89dfb2434487a2cfeb9d521e55afe4e77c33285042e3d391fe6e9fc86a3f58bb6850d94f1331bb7be9809be7 WHIRLPOOL b9c8bf33788c22c5fc4ca96b6ceb1a3cba02cedf5d6eb4585bf6c22771e1f69c3507a27413600d1746b7a88f5677516f06b0c0ec06c9e364ef631528cb493359
diff --git a/dev-perl/HTTP-DAV/HTTP-DAV-0.470.0-r1.ebuild b/dev-perl/HTTP-DAV/HTTP-DAV-0.470.0-r1.ebuild
deleted file mode 100644
index c27e5af2a696..000000000000
--- a/dev-perl/HTTP-DAV/HTTP-DAV-0.470.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=COSIMO
-MODULE_VERSION=0.47
-inherit perl-module
-
-DESCRIPTION="A WebDAV client library for Perl5"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="
- dev-perl/libwww-perl
- dev-perl/URI
- dev-perl/XML-DOM
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/HTTP-DAV/HTTP-DAV-0.480.0.ebuild b/dev-perl/HTTP-DAV/HTTP-DAV-0.480.0.ebuild
index d627bc4175e8..d139382799a4 100644
--- a/dev-perl/HTTP-DAV/HTTP-DAV-0.480.0.ebuild
+++ b/dev-perl/HTTP-DAV/HTTP-DAV-0.480.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A WebDAV client library for Perl5"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/HTTP-DAV/Manifest b/dev-perl/HTTP-DAV/Manifest
index b544068b0ddd..4b635d8ebff1 100644
--- a/dev-perl/HTTP-DAV/Manifest
+++ b/dev-perl/HTTP-DAV/Manifest
@@ -1,2 +1 @@
-DIST HTTP-DAV-0.47.tar.gz 109648 SHA256 30db3e3b55be32052bf724e2c09acf1b1a11ebf6c701261ef3f5ffe4ed2ab42a SHA512 920d725d9986e5fb7fa5d7a93c9b5ec1af37a966d976826940c5ca59a64c363a0e53fa409ed546bc3306ab49c03f00dc089f474c18a4ce90a2c752a5e5a88894 WHIRLPOOL d367d20299472b1ca875123eb60bfda89ee6f540a61b5fe0109d8c753a452083cecadeb83e9ca4a08b5f0ae9ce524734c3a6abc73c106ce131af4a0ed294741b
DIST HTTP-DAV-0.48.tar.gz 105090 SHA256 06a902ec1d44209d44206ad3378e7fda378b088f243e2c49c17de69f1a1fdcba SHA512 2edf92791660b1996eb22b9ea68bd4e417c497afeebb56cb0a2ecf0cf72ea54b6fb8efd4d69dae1dcb946517f917593932a8040bd0ef5cfc83f7fdfd1fe3ccf8 WHIRLPOOL 191908faeb15be2c3eff1a0b0b6361da54846b9343c22e45ee9be7d33df74a5ac08f389b5b16e543576d4a7d082fb67fb80870f13c1d60ad57a19e4b8a397360
diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.110.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.110.0.ebuild
index 51c46e1e809d..5b7b215ba2cd 100644
--- a/dev-perl/HTTP-Message/HTTP-Message-6.110.0.ebuild
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.110.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Base class for Request/Response"
SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
# MIME::QuotedPrint -> MIME-Base64
diff --git a/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.440.0-r1.ebuild b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.440.0-r1.ebuild
deleted file mode 100644
index f4f25ccd9540..000000000000
--- a/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.440.0-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=JESSE
-MODULE_VERSION=0.44
-inherit perl-module eutils
-
-DESCRIPTION="Lightweight HTTP Server"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- test? (
- dev-perl/Test-Pod
- dev-perl/Test-Pod-Coverage
- )"
-
-SRC_TEST="do"
diff --git a/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.510.0.ebuild b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.510.0.ebuild
index 094d083b1360..f067a96b57ac 100644
--- a/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.510.0.ebuild
+++ b/dev-perl/HTTP-Server-Simple/HTTP-Server-Simple-0.510.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Lightweight HTTP Server"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/HTTP-Server-Simple/Manifest b/dev-perl/HTTP-Server-Simple/Manifest
index 807e509416c3..ad6235146161 100644
--- a/dev-perl/HTTP-Server-Simple/Manifest
+++ b/dev-perl/HTTP-Server-Simple/Manifest
@@ -1,2 +1 @@
-DIST HTTP-Server-Simple-0.44.tar.gz 33804 SHA256 cff4f882da63a9a71271e25d1dc9160e64e5dd1195ed0a63894609ada7bb7416 SHA512 d8a3abd636de5cbd1b169911d02bb207d071f3f4ec9056f7ae4892062ff57b61737e4dfd03db8629ae553368c97b40baa88d021f6e4f973900d94abcc780591e WHIRLPOOL c8d112eefddf60d69eb17b1779a8744507da9bb6e759247da6309ba12188dcdc76a99ab439b8079fd865d87f3c0b003550d62172b8e7fbde970c3ac5a9bda388
DIST HTTP-Server-Simple-0.51.tar.gz 35056 SHA256 b9dc5c9f12c16ca39a96f0ede1e27a18a5594274ff8f583000788a7fca136dfb SHA512 92cb45fc8b57237c064b780ccdfd3ca959daff73cb054590574053cc3dedc81e14627c2aee6d26da48f717f31925d099dd9d11b0e9cd0a98cb3b06221820fabd WHIRLPOOL 449677370d084430afa03e3abdcb42615a7be0a24d94c4b605b196f4b8789ac4642637550c2462e5df364cceaac7fc4f985cde9681e681385cec29f2cd6490cf
diff --git a/dev-perl/IO-AIO/IO-AIO-4.330.0.ebuild b/dev-perl/IO-AIO/IO-AIO-4.330.0.ebuild
index 8b9894245484..cbdb84de74be 100644
--- a/dev-perl/IO-AIO/IO-AIO-4.330.0.ebuild
+++ b/dev-perl/IO-AIO/IO-AIO-4.330.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Asynchronous Input/Output"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE=""
# Tests trigger stack overflow in sandbox code, see bug 553918
RESTRICT="test"
diff --git a/dev-perl/IO-HTML/IO-HTML-1.1.0.ebuild b/dev-perl/IO-HTML/IO-HTML-1.1.0.ebuild
index e46036c2a7f7..72261cae3c26 100644
--- a/dev-perl/IO-HTML/IO-HTML-1.1.0.ebuild
+++ b/dev-perl/IO-HTML/IO-HTML-1.1.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Open an HTML file with automatic charset detection"
SLOT="0"
-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/IO-Interface/IO-Interface-1.90.0.ebuild b/dev-perl/IO-Interface/IO-Interface-1.90.0.ebuild
index d75e45dc1c1b..364e947196d9 100644
--- a/dev-perl/IO-Interface/IO-Interface-1.90.0.ebuild
+++ b/dev-perl/IO-Interface/IO-Interface-1.90.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Perl extension for access to network card configuration information"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/IO-Multiplex/IO-Multiplex-1.130.0-r1.ebuild b/dev-perl/IO-Multiplex/IO-Multiplex-1.130.0-r1.ebuild
deleted file mode 100644
index bd0467db5531..000000000000
--- a/dev-perl/IO-Multiplex/IO-Multiplex-1.130.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=MARKOV
-MODULE_VERSION=1.13
-inherit perl-module
-
-DESCRIPTION="Manage IO on many file handles "
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0.ebuild b/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0.ebuild
index 3a0c912563a7..f0e1f74871ec 100644
--- a/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0.ebuild
+++ b/dev-perl/IO-Multiplex/IO-Multiplex-1.160.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Manage IO on many file handles "
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/IO-Multiplex/Manifest b/dev-perl/IO-Multiplex/Manifest
index b6547d112851..a1655eac5383 100644
--- a/dev-perl/IO-Multiplex/Manifest
+++ b/dev-perl/IO-Multiplex/Manifest
@@ -1,2 +1 @@
-DIST IO-Multiplex-1.13.tar.gz 16244 SHA256 2053c4617cc1f78cc82ec5dc9362091aaa17a68b203ea9bebdf27b46cbc55171 SHA512 ac98033161e65d76338e3acd312595426fab07df9ed8486ffdbc6cd166ea616cafe41fac2a36f5704eccf2a9f2f463e1cfe1ca2623d47f76f0c7d070faddef11 WHIRLPOOL d4364c27ffef1298b967d7308160104e8f48b86323afe24609f162e76a0a206c93417433e9feba4aefe1ad945d4d08901955da68e1a28ea482b3d1662149a451
DIST IO-Multiplex-1.16.tar.gz 15974 SHA256 74d22c44b5ad2e7190e2786e8a17d74bbf4cef89b4d1157ba33598b5a2720dad SHA512 695462be217a107f734e214d2f0a00800962abac24cf4e30272376f5effa25584bc458377feed16b5cc7bab5858c00e547dc97d02962e57b2b8fa6e55df20fa6 WHIRLPOOL 048fd8af6bfa9bf12c5a9281b45552539b397526592bf167f6e8dad6e7b4b94d64d19994ed389780a5a87f3ed124277495a68d5139ef15fe47ae23a2f7d233dc
diff --git a/dev-perl/IO-Pager/IO-Pager-0.310.0-r1.ebuild b/dev-perl/IO-Pager/IO-Pager-0.310.0-r1.ebuild
deleted file mode 100644
index f659e8e32961..000000000000
--- a/dev-perl/IO-Pager/IO-Pager-0.310.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_A_EXT=tgz
-MODULE_AUTHOR=JPIERCE
-MODULE_VERSION=0.31
-inherit perl-module
-
-DESCRIPTION="Select a pager, optionally pipe it output if destination is a TTY"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-SRC_TEST=do
-S=${WORKDIR}/${PN}-0.31
-
-src_prepare() {
- rm t.pl || die
- sed -i '/^t.pl/d' MANIFEST || die
- perl-module_src_prepare
-}
diff --git a/dev-perl/IO-Pager/IO-Pager-0.350.0.ebuild b/dev-perl/IO-Pager/IO-Pager-0.350.0.ebuild
index 51a756707cbc..08520828f262 100644
--- a/dev-perl/IO-Pager/IO-Pager-0.350.0.ebuild
+++ b/dev-perl/IO-Pager/IO-Pager-0.350.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
DESCRIPTION="Select a pager, optionally pipe it output if destination is a TTY"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE="test"
PERL_RM_FILES=(
"t.pl" # Useless test-only file gets installed to SITE otherwise
diff --git a/dev-perl/IO-Pager/Manifest b/dev-perl/IO-Pager/Manifest
index a0b4cae18b6b..8439e5dc885b 100644
--- a/dev-perl/IO-Pager/Manifest
+++ b/dev-perl/IO-Pager/Manifest
@@ -1,2 +1 @@
-DIST IO-Pager-0.31.tgz 15406 SHA256 e5a61ecae2e81f1349293e2246543da42e8ff61c23bf773e87db561f2e83b939 SHA512 c6e66fc59b951d041d19b3bb57c73860e601732e24c4d3e78e84f6532089b511fc11d071aef21c2f46344813479b592c5ead4438aec47dba487e94ae3452b6a3 WHIRLPOOL 8b798f54e4d730e442eee8016b49f21a2255d66dd0085e69bafe83560831b7eb3aa8e2081f33c8b04bb6c108890e98f702f204ca09733f17f5982bdec4377157
DIST IO-Pager-0.35.tgz 17298 SHA256 3aa529089be7a93014cd03ebf469271d6d333eae2d34e3bfd127826a38aa8d45 SHA512 adfb9e7d65941115f3d6376996c3c41682079a02346e1cddda0df2bfa93d46a0deeea42a0109697dd327e19ebf9ed869adc2827f0ea9acf28c69885afa6cd962 WHIRLPOOL 531ee9fc77d95bbe5df7c6ddddd52aed455446cc21ac3fbf419d971d01641bf19859e08560b5e7eb616ef87a528e565fae726d51e750be806900f02704ddbe74
diff --git a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.24.0.ebuild b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.24.0.ebuild
index 815be7afdc70..3645b8ee955a 100644
--- a/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.24.0.ebuild
+++ b/dev-perl/IO-Socket-SSL/IO-Socket-SSL-2.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Nearly transparent SSL encapsulation for IO::Socket::INET"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="idn"
RDEPEND="
diff --git a/dev-perl/IO-stringy/IO-stringy-2.110.0-r1.ebuild b/dev-perl/IO-stringy/IO-stringy-2.110.0-r1.ebuild
deleted file mode 100644
index 79e73912b9ab..000000000000
--- a/dev-perl/IO-stringy/IO-stringy-2.110.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DSKOLL
-MODULE_VERSION=2.110
-inherit perl-module
-
-DESCRIPTION="A Perl module for I/O on in-core objects like strings and arrays"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild b/dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild
index f13f74a76803..8e8b0b94220d 100644
--- a/dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild
+++ b/dev-perl/IO-stringy/IO-stringy-2.111.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A Perl module for I/O on in-core objects like strings and arrays"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/IO-stringy/Manifest b/dev-perl/IO-stringy/Manifest
index 80eea29e54e4..30140517c0e3 100644
--- a/dev-perl/IO-stringy/Manifest
+++ b/dev-perl/IO-stringy/Manifest
@@ -1,2 +1 @@
-DIST IO-stringy-2.110.tar.gz 40590 SHA256 7e3cf438b3938a2692cb502704c0bbfa2c5ec4a5071ab77906a2432126b004ee SHA512 54f274ac398023c3c245172052d781e72cdaa2d2edd425a25104098212fe2862da615f3512792daffcd22fd9b1cf7c0df12b85faad8241d8d7e600a319135d95 WHIRLPOOL ea08619aab39c9ac1c6f4ee8782d0999626188652979aef2ed58cbcaa05e8e07a083002411660d3c915acbbbc48816038a8673d51e1fc6349f39341660d1509c
DIST IO-stringy-2.111.tar.gz 41515 SHA256 8c67fd6608c3c4e74f7324f1404a856c331dbf48d9deda6aaa8296ea41bf199d SHA512 9da8fb03945bc4a59cea3b3b2e22b15d56b133470e581d1cb03920bda2b4953e3c9e4a25d095ed8a384efb5a4c58db437c92cca6a81d583791191f1a37691a4a WHIRLPOOL d09a15ceeeb40cddfd69facdcd2289eca5127fc7b4398518c9bb084dd0483428e42b79e87ad78ddbafd81fe2d6dec763ab67c4e52ddebd3b928a61bdbe39f337
diff --git a/dev-perl/IPC-Run/IPC-Run-0.920.0-r1.ebuild b/dev-perl/IPC-Run/IPC-Run-0.920.0-r1.ebuild
deleted file mode 100644
index 33ced8be6c42..000000000000
--- a/dev-perl/IPC-Run/IPC-Run-0.920.0-r1.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
-
-MODULE_AUTHOR=TODDR
-MODULE_VERSION=0.92
-inherit perl-module
-
-DESCRIPTION="system() and background procs w/ piping, redirs, ptys"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-perl/IO-Tty-1.08"
-DEPEND="${RDEPEND}
- test? ( dev-perl/Test-Pod
- dev-perl/Test-Pod-Coverage )"
-
-SRC_TEST=do
diff --git a/dev-perl/IPC-Run/IPC-Run-0.940.0.ebuild b/dev-perl/IPC-Run/IPC-Run-0.940.0.ebuild
index e966fd082f68..f191e79db0b2 100644
--- a/dev-perl/IPC-Run/IPC-Run-0.940.0.ebuild
+++ b/dev-perl/IPC-Run/IPC-Run-0.940.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="system() and background procs w/ piping, redirs, ptys"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/IPC-Run/Manifest b/dev-perl/IPC-Run/Manifest
index d1822618fe08..3b128dcc8524 100644
--- a/dev-perl/IPC-Run/Manifest
+++ b/dev-perl/IPC-Run/Manifest
@@ -1,2 +1 @@
-DIST IPC-Run-0.92.tar.gz 121532 SHA256 e186b46ddf1577d24f11eec1ba42285963c3f71ec7ecb1ce51d6e88c729d46d2 SHA512 b24d7352d93ffd77b1fce3e052de1ebe2f85732063871c10eb0ddd4fd0f312ce97e16fb530d174ce026e157b295d8d6e2db7868d14624f47e891402619557fc2 WHIRLPOOL 4fcc3e48698b1a536b78920096e8d4d4546a3cd2e15f46b90723cffa593c38b0a5db25c10e216d26ee4927a043017a6d737fdce36abdc7558e881fc23dc6e4b3
DIST IPC-Run-0.94.tar.gz 121394 SHA256 2eb336c91a2b7ea61f98e5b2282d91020d39a484f16041e2365ffd30f8a5605b SHA512 c42fb5e0a5085698bec3f970ba642c00ad947629bd30c1485ebd28e8e24db4273fa6439e0abeddbc602be66e4ebfcaaa7e8d3982ac8b82c3c6a8a431c170f721 WHIRLPOOL 3a89f0d4615dd155e001057ac22d82903e0a6110679e198168b425589df33fd36797e1e1be6c69c0609e2147ff5fcb60e272ad9f71def00c5bbab55098d1aaaf
diff --git a/dev-perl/Image-Info/Image-Info-1.360.0.ebuild b/dev-perl/Image-Info/Image-Info-1.360.0.ebuild
deleted file mode 100644
index 338422ae9726..000000000000
--- a/dev-perl/Image-Info/Image-Info-1.360.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SREZIC
-MODULE_VERSION=1.36
-inherit perl-module
-
-DESCRIPTION="The Perl Image-Info Module"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND=">=dev-perl/IO-String-1.01
- dev-perl/XML-LibXML
- dev-perl/XML-Simple"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Image-Info/Image-Info-1.380.0.ebuild b/dev-perl/Image-Info/Image-Info-1.380.0.ebuild
index 8abac59b8913..8b0b3a4dff63 100644
--- a/dev-perl/Image-Info/Image-Info-1.380.0.ebuild
+++ b/dev-perl/Image-Info/Image-Info-1.380.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="The Perl Image-Info Module"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE=""
DEPEND=">=dev-perl/IO-String-1.01
diff --git a/dev-perl/Image-Info/Manifest b/dev-perl/Image-Info/Manifest
index 8ee18eda64ad..74650dfda790 100644
--- a/dev-perl/Image-Info/Manifest
+++ b/dev-perl/Image-Info/Manifest
@@ -1,2 +1 @@
-DIST Image-Info-1.36.tar.gz 260867 SHA256 5f02738fa0e8885d5968ff299d194acdd419a7fbad1ec07ad7391cab012635e8 SHA512 e0e94be4d546fa630089180873db82f10065d53025409944855052bac63c5c56a813dd520de2206e07e468941b5d4857a836c6a8a1208af4f9c0dfd1a01eb8ef WHIRLPOOL 5ccd4ec321ec178d3e4356c8ea7cae1743b40c724fb20af990cdb1907406ea6b9c63e522fae19b2f346e849f790a9707ef5325c9a8c7bbf37b1023481cb5aa47
DIST Image-Info-1.38.tar.gz 262292 SHA256 b8a68b5661555feaf767956fe9ff14c917a63bedb3e30454d5598d992eb7e919 SHA512 99e8d99a12fc0761a5c425e4db585b8200520ce5c2963ba3b580a4ca35e51e5026536349f6ee55c97358bf64a4d577afbc98be1f86c3ec182d4a3123c96b42e6 WHIRLPOOL c5c99f3aba97be1b221f4268aaf814298054257de5b6311b7ed10ad09d2301efc950307aa518967fecbbda835d896e954f02950ec7a3d3b7275b0ef8dba878e1
diff --git a/dev-perl/Image-Size/Image-Size-3.232.0-r1.ebuild b/dev-perl/Image-Size/Image-Size-3.232.0-r1.ebuild
deleted file mode 100644
index e7f1021e1d44..000000000000
--- a/dev-perl/Image-Size/Image-Size-3.232.0-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=RJRAY
-MODULE_VERSION=3.232
-inherit perl-module
-
-DESCRIPTION="A library to extract height/width from images"
-
-LICENSE="|| ( Artistic-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
- virtual/perl-IO-Compress
- virtual/perl-File-Spec
-"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
-mydoc="ToDo"
diff --git a/dev-perl/Image-Size/Image-Size-3.300.0.ebuild b/dev-perl/Image-Size/Image-Size-3.300.0.ebuild
index 7b8b7003b362..a73cdceef5dc 100644
--- a/dev-perl/Image-Size/Image-Size-3.300.0.ebuild
+++ b/dev-perl/Image-Size/Image-Size-3.300.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A library to extract height/width from images"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Image-Size/Manifest b/dev-perl/Image-Size/Manifest
index 9bfccbde85dd..5451f7092ab2 100644
--- a/dev-perl/Image-Size/Manifest
+++ b/dev-perl/Image-Size/Manifest
@@ -1,2 +1 @@
-DIST Image-Size-3.232.tar.gz 222148 SHA256 acc34ef5270473ca925b2757bc9c379add8542280636dade2dc73f324231a0d7 SHA512 6d46c3e4e3e3b93cb141b1e4cd3ef04c91cd6b94437acd607f7654b73b2ac5fde0c3c211ec8df8e1c10fbe2b969c00c3702b3fee52d01ee03374c7ede3877087 WHIRLPOOL 3142332deb6b808543f02b4a0d590b53acbd69ba8a06b62e8866e678b173436f205cd27ac2dec4ee2488200a6c3586fa6f39c006ce6a40c6e95d09ea12064b25
DIST Image-Size-3.300.tar.gz 237954 SHA256 53c9b1f86531cde060ee63709d1fda73cabc0cf2d581d29b22b014781b9f026b SHA512 d0a94aaf6c6c2db653ed6314be0ec8fac27caa1d57eb02665fdfde57c9bbcf0fa4158cd12cf9a31fc9cf5afc7dd75ac358160804bc7c19a092e729d2871a7a64 WHIRLPOOL 6ed241dce819b4f3de66e8b14056567a5a126607a0786ca79775454719484c58ad46995fc8a147eef444d0623f4ddf9f16d96397bbf45273b8c1b97076275c35
diff --git a/dev-perl/Import-Into/Import-Into-1.2.0.ebuild b/dev-perl/Import-Into/Import-Into-1.2.0.ebuild
deleted file mode 100644
index 12c4e33b581f..000000000000
--- a/dev-perl/Import-Into/Import-Into-1.2.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=HAARG
-MODULE_VERSION=1.002000
-inherit perl-module
-
-DESCRIPTION="Import packages into other packages"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~ppc-aix ~x86-solaris"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/Import-Into/Import-Into-1.2.5.ebuild b/dev-perl/Import-Into/Import-Into-1.2.5.ebuild
index a57844cf8936..373c93875d4d 100644
--- a/dev-perl/Import-Into/Import-Into-1.2.5.ebuild
+++ b/dev-perl/Import-Into/Import-Into-1.2.5.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Import packages into other packages"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-aix ~x86-solaris"
+KEYWORDS="amd64 ~ppc x86 ~ppc-aix ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Import-Into/Manifest b/dev-perl/Import-Into/Manifest
index 270d3f40bfc3..1e24270fe515 100644
--- a/dev-perl/Import-Into/Manifest
+++ b/dev-perl/Import-Into/Manifest
@@ -1,2 +1 @@
-DIST Import-Into-1.002000.tar.gz 6483 SHA256 122277b33b42a1232681b457440309a031489bdb73a97d3c33b6bda9b1d8adbf SHA512 a36a59850adccd8cd2e25d4565627695c129a8e2a4097accb8afa90144c26f3f2e214679c35ac5ee269a672b352c9c9f1e1f49e35d17f08da257eef5e528bedd WHIRLPOOL 91571abc0e8f1dd4abb4020b8cb25d658bc68dd7c0771a1e6201259745b83bdd0ae4820d5a56ba3f1290b6f299926e99398221af7e323e435dd0077db57618d8
DIST Import-Into-1.002005.tar.gz 7748 SHA256 bd9e77a3fb662b40b43b18d3280cd352edf9fad8d94283e518181cc1ce9f0567 SHA512 d356307072da18bc40b25f11583018ed416cb87178f080982e14e98e53d42bc1e04aebda56d595e707c05065eaa6ad7a6b059920e8b5b8e1589bfd68e26900fb WHIRLPOOL f4180667c6c6ce5919bdebb13ea2820c427f470b0c77767723d265bea92315b65320f33bfd00927ef82603685fd6c0e7d8fff0bec18349e763f53f68d10335b1
diff --git a/dev-perl/Inline-Files/Inline-Files-0.680.0-r1.ebuild b/dev-perl/Inline-Files/Inline-Files-0.680.0-r1.ebuild
deleted file mode 100644
index 509eae1b38ca..000000000000
--- a/dev-perl/Inline-Files/Inline-Files-0.680.0-r1.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
-
-MY_PN=Inline-Files
-MODULE_AUTHOR=AMBS
-MODULE_SECTION=Inline
-MODULE_VERSION=0.68
-inherit perl-module
-
-DESCRIPTION="Multiple virtual files in a single file"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE=""
-
-SRC_TEST=do
diff --git a/dev-perl/Inline-Files/Inline-Files-0.690.0.ebuild b/dev-perl/Inline-Files/Inline-Files-0.690.0.ebuild
index cad6e5159e5e..fa7d1d3b46ca 100644
--- a/dev-perl/Inline-Files/Inline-Files-0.690.0.ebuild
+++ b/dev-perl/Inline-Files/Inline-Files-0.690.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Multiple virtual files in a single file"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ppc x86"
IUSE="test"
RDEPEND=""
diff --git a/dev-perl/Inline-Files/Manifest b/dev-perl/Inline-Files/Manifest
index 65808a7b23b7..995f7ad6e494 100644
--- a/dev-perl/Inline-Files/Manifest
+++ b/dev-perl/Inline-Files/Manifest
@@ -1,2 +1 @@
-DIST Inline-Files-0.68.tar.gz 14712 SHA256 f1117b239af9762e88118e6d42a1ecd2e4c2f3d013ce7b28ecc282b76c253e45 SHA512 438ec3dcb218a6196fa52d4b1fc652f644dcf70ddcc8cbc26eb401d68929ebaf2b78b743e7016cb100cca1838466313eb718b7e76f57df54f91df80f36129ef1 WHIRLPOOL c4b1ca557f369f4f27bde1469199eabbc0be55c0e549169a1e10f5e0dd94e280789c6bd8b95386c73dde338e3459e6c995756b1cbd81620dcb81dfa5bba85459
DIST Inline-Files-0.69.tar.gz 14804 SHA256 8f003605f2f4a3cb9929772ca78d66aa88c0d441c8f75c7d47d798b3128b685e SHA512 87b3d837a6d30eb344e7c80f866297558d3f1f8275d1e9fac0b9a1adfbee83f8452f686dcd39ce7c48bda50f1442b194822ee194da84464d076d2ac629ff289e WHIRLPOOL 8256786236207f6630fedd8108a175743b4ce312baceb4de49ea590a1170fe8c6f434620d735f561c2a653f256f8c5ec4ba6c698ad041ad7a039c17c9099c2c4
diff --git a/dev-perl/Inline/Inline-0.790.0.ebuild b/dev-perl/Inline/Inline-0.790.0.ebuild
deleted file mode 100644
index afb1fe74d2c2..000000000000
--- a/dev-perl/Inline/Inline-0.790.0.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
-
-MODULE_AUTHOR=INGY
-MODULE_VERSION=0.79
-inherit perl-module
-
-DESCRIPTION="Write Perl subroutines in other languages"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
- virtual/perl-Digest-MD5
- virtual/perl-File-Spec
-"
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-MakeMaker
- test? (
- >=virtual/perl-Test-Simple-0.880.0
- >=dev-perl/Test-Warn-0.230.0
- )
-"
-
-SRC_TEST=do
-
-src_test() {
- MAKEOPTS+=" -j1" perl-module_src_test # bug 384137
-}
diff --git a/dev-perl/Inline/Inline-0.800.0.ebuild b/dev-perl/Inline/Inline-0.800.0.ebuild
index 3e6cb3dfcbab..570118555798 100644
--- a/dev-perl/Inline/Inline-0.800.0.ebuild
+++ b/dev-perl/Inline/Inline-0.800.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Write Perl subroutines in other languages"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Inline/Manifest b/dev-perl/Inline/Manifest
index 192b48ae64a5..d88d58b83deb 100644
--- a/dev-perl/Inline/Manifest
+++ b/dev-perl/Inline/Manifest
@@ -1,3 +1,2 @@
DIST Inline-0.50.tar.gz 104632 SHA256 6263fa1145efe9e96bcd60d10f9eabd93313e00cb1e555abddda1e98b7c280d6 SHA512 58b2968d3602c0703cc191216ca3dd0ef877b833d5bf8848e4ad76fbbf06d5ab5e5953253334614d397fe961ba72446b639cac186709234fd26a99be37ba0c3c WHIRLPOOL b3c5e0ff14779111c727d6df868720527acd4727f71327be4478397edf947755c158c71b28e0ed6b0fc219e6f5bf5b5f2b4ce844c938c1bcd32571d72332f582
-DIST Inline-0.79.tar.gz 78224 SHA256 525214a46d9dd0267bb5815dfbbd78a2544157895676d38917fa5a9728cc7b94 SHA512 8a99fe9900a99950cd52d4a75c41bf7a522aa00468562baaa5d86a6e02724b6d4f8f3f08bf565b03693ffe16bbd5738e693dccf60b0451f044b6c468b95e37dc WHIRLPOOL b451f7b17ebef63e210cd0afcc7fb48d2b4f23747ecdc83ba23689e633bdcb3e9025ebcabc67bcf6714c5e87363d82b36f976b0c3e6bdcd9dbf29298633c3358
DIST Inline-0.80.tar.gz 78254 SHA256 7e2bd984b1ebd43e336b937896463f2c6cb682c956cbd2c311a464363d2ccef6 SHA512 e64f7752f32fd07c7c7a975429e04730f2987c9588f99b95502d4e5c87d458736a606c03943a68660940c3987cd632ad2f75ec3862342956c1754b1aca86e0bb WHIRLPOOL 1b16d389e793a99e5cb0d733852f97ab33ee177cc857fb56b0f5b76a113f8b12c982e816de35e7b6978baa752c81b26f15cac2874ab5ec3cdae2d0076b9f2880
diff --git a/dev-perl/Module-Signature/Module-Signature-0.770.0.ebuild b/dev-perl/Module-Signature/Module-Signature-0.770.0.ebuild
index 400f5dc625ea..4f808c207ce9 100644
--- a/dev-perl/Module-Signature/Module-Signature-0.770.0.ebuild
+++ b/dev-perl/Module-Signature/Module-Signature-0.770.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,7 +19,7 @@ RDEPEND="
virtual/perl-MIME-Base64
dev-perl/PAR-Dist
virtual/perl-IO-Compress
- dev-perl/crypt-cbc
+ dev-perl/Crypt-CBC
dev-perl/Crypt-DES
dev-perl/Crypt-Blowfish
dev-perl/Crypt-RIPEMD160
@@ -29,11 +29,11 @@ RDEPEND="
dev-perl/data-buffer
dev-perl/digest-md2
>=dev-perl/math-pari-2.010603
- dev-perl/crypt-random
- dev-perl/crypt-primes
- dev-perl/crypt-des-ede3
- dev-perl/crypt-dsa
- dev-perl/crypt-rsa
+ dev-perl/Crypt-Random
+ dev-perl/Crypt-Primes
+ dev-perl/Crypt-DES_EDE3
+ dev-perl/Crypt-DSA
+ dev-perl/Crypt-RSA
dev-perl/Convert-ASN1
dev-perl/convert-pem
dev-perl/Crypt-OpenPGP
diff --git a/dev-perl/Module-Signature/Module-Signature-0.790.0.ebuild b/dev-perl/Module-Signature/Module-Signature-0.790.0.ebuild
index 3f370c5ac031..c8b5950d73f4 100644
--- a/dev-perl/Module-Signature/Module-Signature-0.790.0.ebuild
+++ b/dev-perl/Module-Signature/Module-Signature-0.790.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -20,7 +20,7 @@ RDEPEND="
virtual/perl-MIME-Base64
dev-perl/PAR-Dist
virtual/perl-IO-Compress
- dev-perl/crypt-cbc
+ dev-perl/Crypt-CBC
dev-perl/Crypt-DES
dev-perl/Crypt-Blowfish
dev-perl/Crypt-RIPEMD160
@@ -30,11 +30,11 @@ RDEPEND="
dev-perl/data-buffer
dev-perl/digest-md2
>=dev-perl/math-pari-2.010603
- dev-perl/crypt-random
- dev-perl/crypt-primes
- dev-perl/crypt-des-ede3
- dev-perl/crypt-dsa
- dev-perl/crypt-rsa
+ dev-perl/Crypt-Random
+ dev-perl/Crypt-Primes
+ dev-perl/Crypt-DES_EDE3
+ dev-perl/Crypt-DSA
+ dev-perl/Crypt-RSA
dev-perl/Convert-ASN1
dev-perl/convert-pem
dev-perl/Crypt-OpenPGP
diff --git a/dev-perl/Net-OpenID-Consumer/Net-OpenID-Consumer-1.30.0-r1.ebuild b/dev-perl/Net-OpenID-Consumer/Net-OpenID-Consumer-1.30.0-r1.ebuild
index 7ec20e767796..1a42cc1d7edd 100644
--- a/dev-perl/Net-OpenID-Consumer/Net-OpenID-Consumer-1.30.0-r1.ebuild
+++ b/dev-perl/Net-OpenID-Consumer/Net-OpenID-Consumer-1.30.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-RDEPEND="dev-perl/crypt-dh
+RDEPEND="dev-perl/Crypt-DH
dev-perl/XML-Simple
dev-perl/Digest-SHA1
dev-perl/libwww-perl
diff --git a/dev-perl/Net-OpenSSH/Manifest b/dev-perl/Net-OpenSSH/Manifest
index 7d539079f9fc..c23057f12f88 100644
--- a/dev-perl/Net-OpenSSH/Manifest
+++ b/dev-perl/Net-OpenSSH/Manifest
@@ -1,2 +1,2 @@
-DIST Net-OpenSSH-0.59.tar.gz 55353 SHA256 0373c0a06f3254077d02b17eb82a67f7e1189f37024223264363a1b617d83a65 SHA512 093e34057028a44310acc332041af6252263a6bc52d9a2a39d0a1dfd5a4810a24ac6ab65baef38dadffe5976ba00530a8a43a20a1510b51e6c5516b4dd95fdba WHIRLPOOL 00133ab0ef4e01d02c37e48cd5c7d5b5aa3ff27d8eebdb0e9a53d8c7224f2eecca0d9609d252f39d7e7b7064fa6cc9db6b956c409555f14f81e91a0351798380
DIST Net-OpenSSH-0.60.tar.gz 55413 SHA256 c3034cfa8577d314364c9ff2d3ed8a5f5ec7b47d4c134818ab72cc6dce2a29af SHA512 6780ac0a73bdb923bb2915a535ae490a7c198f6667fc0885766fbb50835fc2c457bc8dea8fa2be7488c610621a1b9b1955d5712544e3f8948f54e97d012c6aaa WHIRLPOOL 813fe52d58e52eaba71175452a655e151f3b80ec6707a0308c575e7dfec0af118afa156ec266cc38e636b94ea02e40c322df236bfac8f826e7f221ae5b04e3ab
+DIST Net-OpenSSH-0.70.tar.gz 72604 SHA256 3fcb36a5a2fc296c1d0def54f3201cecffe7d81157ef5fa2bac9868875f63b95 SHA512 ce2e74fa68e79a1180c3b29ad32d1d75ff1223e0721a9c91b7bc29ab0dbe3a0ffea490223dcaaa2c3c0eaa43a859af572b1777ad36eea80fe240319af8f358e5 WHIRLPOOL 4eea21ca473770dacd7f995334c8790730488b572c85e0854b1d5695948a741beb6415a0dcd448fc183196312e04efce05849eff9d4f33bb3d41f5a7c5ac9f07
diff --git a/dev-perl/Net-OpenSSH/Net-OpenSSH-0.590.0.ebuild b/dev-perl/Net-OpenSSH/Net-OpenSSH-0.700.0.ebuild
index 989b3aba8991..ebd140ed6bd0 100644
--- a/dev-perl/Net-OpenSSH/Net-OpenSSH-0.590.0.ebuild
+++ b/dev-perl/Net-OpenSSH/Net-OpenSSH-0.700.0.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-MODULE_AUTHOR=SALVA
-MODULE_VERSION=0.59
+DIST_AUTHOR=SALVA
+DIST_VERSION=0.70
inherit perl-module
DESCRIPTION="Net::OpenSSH, Perl wrapper for OpenSSH secure shell client"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE="sftp"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal"
RDEPEND="
+ virtual/ssh
dev-perl/IO-Tty
- sftp? (
+ !minimal? (
+ dev-perl/Net-SSH-Any
dev-perl/Net-SFTP-Foreign
)
"
-DEPEND="${RDEPEND}"
-
-#SRC_TEST=do
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Net-SFTP-Foreign/Manifest b/dev-perl/Net-SFTP-Foreign/Manifest
index e43ab60cf169..a5aabfe62005 100644
--- a/dev-perl/Net-SFTP-Foreign/Manifest
+++ b/dev-perl/Net-SFTP-Foreign/Manifest
@@ -1 +1,2 @@
DIST Net-SFTP-Foreign-1.75.tar.gz 157458 SHA256 db962a0ac2f8dce469c99f8d4251f29e3ce05767c948541bde51ba109d39b0c2 SHA512 655d263e4c8cac422b2322459286145c641a0baa90b893f306c85c804bee4c2e14f97b492edf1af0221ad98cb053a9d1d18d7ef6fb629af92f9bf9f029121b0d WHIRLPOOL 2f3e0d00ff94a31a5ac87c417d59fb8a1eb383cd1f6195a647ca6388fce092f528982e4c9e27d68c598e137b3c6de6337c45dc95b1fa2e12a0aeae8121231d5e
+DIST Net-SFTP-Foreign-1.81.tar.gz 162752 SHA256 d1918f272f2d5b5d3f4d81bb9027788fddaa0e6507ebaf82938a0466accc1ed4 SHA512 b8d62ac3558f2ad1c53d2e0018f57e7fbc9b729eaad668a61d4a6d1bbc51be3648685bcd242980eff97c537b29d10925523b2e23e48130354cf516edee935a07 WHIRLPOOL 4023f765e51e07d0e8e57b6c3fb3aba8cf67bc0c2e124a4ca0a330687cee3fbcca67a4ead1db82c8f61cc62361b9fde96bbfee1a44c699d164cae688c76665cf
diff --git a/dev-perl/Net-SFTP-Foreign/Net-SFTP-Foreign-1.810.0.ebuild b/dev-perl/Net-SFTP-Foreign/Net-SFTP-Foreign-1.810.0.ebuild
new file mode 100644
index 000000000000..a68857c7f85d
--- /dev/null
+++ b/dev-perl/Net-SFTP-Foreign/Net-SFTP-Foreign-1.810.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=SALVA
+DIST_VERSION=1.81
+inherit perl-module
+
+DESCRIPTION="SSH File Transfer Protocol client"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="test examples"
+
+PATCHES=(
+ # https://rt.cpan.org/Ticket/Display.html?id=112709
+ "${FILESDIR}/${DIST_VERSION}-test-server-path.patch"
+)
+RDEPEND="
+ virtual/perl-Scalar-List-Utils
+ virtual/perl-Time-HiRes
+ virtual/ssh
+"
+DEPEND="
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ virtual/perl-Test-Simple
+ )
+"
+
+src_install() {
+ perl-module_src_install
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ insinto usr/share/doc/${PF}/examples
+ doins -r samples/*
+ fi
+}
diff --git a/dev-perl/Net-SFTP-Foreign/files/1.81-test-server-path.patch b/dev-perl/Net-SFTP-Foreign/files/1.81-test-server-path.patch
new file mode 100644
index 000000000000..243fd25ea079
--- /dev/null
+++ b/dev-perl/Net-SFTP-Foreign/files/1.81-test-server-path.patch
@@ -0,0 +1,11 @@
+diff -Naur Net-SFTP-Foreign-1.81/t/common.pm Net-SFTP-Foreign-1.81b/t/common.pm
+--- Net-SFTP-Foreign-1.81/t/common.pm 2015-10-06 11:27:30.000000000 +0000
++++ Net-SFTP-Foreign-1.81b/t/common.pm 2016-03-04 20:32:09.551563940 +0000
+@@ -62,6 +62,7 @@
+ File::Spec->catfile($up, 'sbin', $ssname),
+ File::Spec->catfile($up, 'lib', 'openssh', $ssname),
+ File::Spec->catfile($up, 'usr', 'lib', $ssname),
++ File::Spec->catfile($up, 'usr', 'lib64','misc', $ssname),
+ File::Spec->catfile($up, 'usr', 'libexec', $ssname),
+ File::Spec->catfile($up, 'usr', 'sbin', $ssname) ) {
+
diff --git a/dev-perl/Net-SMTPS/Manifest b/dev-perl/Net-SMTPS/Manifest
index 66f4ec154a6e..df7f4b8427f0 100644
--- a/dev-perl/Net-SMTPS/Manifest
+++ b/dev-perl/Net-SMTPS/Manifest
@@ -1 +1,2 @@
DIST Net-SMTPS-0.03.tar.gz 4569 SHA256 f8b2f1c2812df87e4a901388df760de913607481747e9a39e495582baeeb0a08 SHA512 375e12f78ba7b1b1f7596dc00fdc6e46496ffa2d0eb7c1eaed2951e59563d7d165a3295ab185cbc7db602ab22d2cef321fcc3a03e9de41deace4a2d2038dfc47 WHIRLPOOL fb76f83514ef12a63c4a1e4d9736b4652336a12b453852aaae1bae2bbda3aba88650efdaf4f682f1917f5b5c7d05a517801431e61b6629a3fc54eb4959dc9036
+DIST Net-SMTPS-0.04.tar.gz 4712 SHA256 54b5d8b73e2c4f1eb6ea0ea16a3a230884f83b8439634f3d90b49dc81ea8aea5 SHA512 69fcfb221a139a9d92f56d3917081a21de786095314efaa840e41dcd27bebd29d66f0f9c63cc2eb8adbaa1b701877b4ab9b9fe2790c335a13b256b742319054b WHIRLPOOL 45d29170be521c6468eb8c2bc6025cac08db4339fa68a768f586c0b290620dc508fc44cae21016ec7f5e7bb83fb3d9c1711505e61b2727f31e0c35202bc2d929
diff --git a/dev-perl/Net-SMTPS/Net-SMTPS-0.40.0.ebuild b/dev-perl/Net-SMTPS/Net-SMTPS-0.40.0.ebuild
new file mode 100644
index 000000000000..104bae71e132
--- /dev/null
+++ b/dev-perl/Net-SMTPS/Net-SMTPS-0.40.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=TOMO
+DIST_VERSION=0.04
+DIST_SECTION=src
+inherit perl-module
+
+DESCRIPTION="SSL/STARTTLS support for Net::SMTP"
+IUSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-perl/Authen-SASL-2.150.0
+ >=dev-perl/IO-Socket-SSL-1
+ >=virtual/perl-libnet-2"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Net-SSH-Any/Manifest b/dev-perl/Net-SSH-Any/Manifest
new file mode 100644
index 000000000000..764053db3ba9
--- /dev/null
+++ b/dev-perl/Net-SSH-Any/Manifest
@@ -0,0 +1 @@
+DIST Net-SSH-Any-0.04.tar.gz 14688 SHA256 feaff6cef661ef8963a80dfd868b369e799f43fefbeb0f2c7d5f3e66bc0db39e SHA512 40d7ffc9efcd252dcdf8b3af86146c2f56c0c316d9935e231c0d1ef8a64e8fe9a3153a7106bfca0b1cbdadaa10c8918b525455593fb2d07301247180d4226c49 WHIRLPOOL b6497976edbbcb35268fde6c73204c30d2744bbbd8af86048189f947e3d12beb7d11f247a7659c34dc288897c29e3ef031de49bbca7b5ea41338fabff40a95e2
diff --git a/dev-perl/Net-SSH-Any/Net-SSH-Any-0.40.0.ebuild b/dev-perl/Net-SSH-Any/Net-SSH-Any-0.40.0.ebuild
new file mode 100644
index 000000000000..6b111f41ac2e
--- /dev/null
+++ b/dev-perl/Net-SSH-Any/Net-SSH-Any-0.40.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=SALVA
+DIST_VERSION=0.04
+inherit perl-module
+
+DESCRIPTION="Use any SSH module"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test" # All tests require SSH server + Test::SSH at present
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Net-SSH-Any/metadata.xml b/dev-perl/Net-SSH-Any/metadata.xml
new file mode 100644
index 000000000000..4bb54e680ac3
--- /dev/null
+++ b/dev-perl/Net-SSH-Any/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="cpan">Net-SSH-Any</remote-id>
+ <remote-id type="cpan-module">Net::SSH::Any</remote-id>
+ <remote-id type="cpan-module">Net::SSH::Any::Backend::Net_OpenSSH</remote-id>
+ <remote-id type="cpan-module">Net::SSH::Any::Backend::Net_SSH2</remote-id>
+ <remote-id type="cpan-module">Net::SSH::Any::Constants</remote-id>
+ <remote-id type="cpan-module">Net::SSH::Any::Util</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-perl/Net-SSH2/Manifest b/dev-perl/Net-SSH2/Manifest
index 71d84627d0bc..bb4fb0e8de77 100644
--- a/dev-perl/Net-SSH2/Manifest
+++ b/dev-perl/Net-SSH2/Manifest
@@ -1 +1,2 @@
DIST Net-SSH2-0.55.tar.gz 123165 SHA256 492a23eba5e9951944087262a042136269c1434a678e0148ca3202e50259a43e SHA512 6ada62f1863c23d11bc09087e8336fcfdd3dfc3dec533d93151ab9d5cb41132601585809b7e5ed5ce03430dab6b063353d68600f9912ddb460f6ad661df31f51 WHIRLPOOL dd0ba4105bc7fca2f29e2803c887af19f5c4ede531ca14ffbbb6415c7d730d59619b897fd2833e0bc2348abec1c545a87138800048de0972538cce671406b8a1
+DIST Net-SSH2-0.58.tar.gz 124853 SHA256 1d1f5f4cdf267ded0cb17ace6def2204f1891fc1274e248e7332dcd48f6a189e SHA512 753e5037d08405f9c401631cd77f1df57e7ee14db44033df8ce0b82f02377bdf7fdecd32bb6f9e1cd80f3fed88adb37e3abdb0b1dbfa50d115ee9e31fd735380 WHIRLPOOL 272dea3d975229cda0a9ad2e44c91ce55ae05aafabbdef52a8e931b2d988baaf224153b9fbf5c248e38ec685eb2118bba85337197c015ae7b892f2c90ca76b11
diff --git a/dev-perl/Net-SSH2/Net-SSH2-0.580.0.ebuild b/dev-perl/Net-SSH2/Net-SSH2-0.580.0.ebuild
new file mode 100644
index 000000000000..3130f0311fb7
--- /dev/null
+++ b/dev-perl/Net-SSH2/Net-SSH2-0.580.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=SALVA
+DIST_VERSION=0.58
+inherit perl-module
+
+DESCRIPTION="Support for the SSH 2 protocol via libssh2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gcrypt libressl examples"
+
+RDEPEND="
+ sys-libs/zlib
+ net-libs/libssh2
+ !gcrypt? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ gcrypt? (
+ dev-libs/libgcrypt:0
+ )
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-Constant
+ >=virtual/perl-ExtUtils-MakeMaker-6.50
+"
+
+src_configure() {
+ use gcrypt && myconf=gcrypt
+ perl-module_src_configure
+}
+
+src_install() {
+ perl-module_src_install
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ insinto /usr/share/doc/${PF}/examples
+ doins example/*
+ fi
+}
diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 07e5a753d84f..cdc6c260dfa1 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -1 +1,2 @@
DIST Net-SSLeay-1.65.tar.gz 384413 SHA256 2fb1371120b85f018944d95736c107163f04ba56b6029c0709a2c3d6247b9c06 SHA512 e347ac7cc5ee22b9785953a5318d35fa3a2d5a21a2e726f49c74621d2dad9ea68373e208068dcd60d8a8d5ab027ae6e32fc0b671995d1645a14c2934eb5a884f WHIRLPOOL 15f38b5a026734f7a074b290979f3e346dfea125d02d8f63e7f5c163de7a4514456d3948ade61b74a53173e27aa221b9142736a98b9d6631c61f0239e6f0833b
+DIST Net-SSLeay-1.72.tar.gz 386011 SHA256 1baac39f0f12cee515d8bec633175bb5916ca542e5356e26420437bd6195d2f4 SHA512 33d8355af22bf76da21a6fc1f336970c6baf5a4595cd445a986bfd2de6ae4fac479d63a97d54c4cb2c9f3f1a7024c893ad0961be419adb6c51e0916829b53a88 WHIRLPOOL 13bceb86968209ae257d8144f4fc11ba9c39fe201cd9799b0135160c5b2ba17831ba35bc608739a2051a93516d4fa39738ec4d5737f2d824eb082fe25dd37a83
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.720.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.720.0.ebuild
new file mode 100644
index 000000000000..0c7633868b00
--- /dev/null
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.720.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=MIKEM
+DIST_VERSION=1.72
+inherit multilib perl-module
+
+DESCRIPTION="Perl extension for using OpenSSL"
+
+LICENSE="openssl"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libressl test minimal examples"
+
+RDEPEND="
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ virtual/perl-MIME-Base64
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? (
+ !minimal? (
+ dev-perl/Test-Exception
+ dev-perl/Test-Warn
+ dev-perl/Test-NoWarnings
+ )
+ virtual/perl-Test-Simple
+ )
+"
+export OPTIMIZE="$CFLAGS"
+export OPENSSL_PREFIX=${EPREFIX}/usr
+
+src_prepare() {
+ sed -i \
+ -e "/\$opts->{optimize} = '-O2 -g';/d" \
+ -e "s,\"\$prefix/lib\",\"\$prefix/$(get_libdir)\"," \
+ inc/Module/Install/PRIVATE/Net/SSLeay.pm || die
+
+ local my_test_control
+ my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
+
+ if use test; then
+ perl_rm_files 't/local/01_pod.t' 't/local/02_pod_coverage.t' 't/local/kwalitee.t'
+ fi
+ if use test && has network ${my_test_control} ; then
+ eapply "${FILESDIR}/${DIST_VERSION}-config-nettest-yes.patch"
+ else
+ eapply "${FILESDIR}/${DIST_VERSION}-config-nettest-no.patch"
+ fi
+
+ perl-module_src_prepare
+}
+src_install() {
+ perl-module_src_install
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/*
+ fi
+}
diff --git a/dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch b/dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch
new file mode 100644
index 000000000000..0090bfd83a01
--- /dev/null
+++ b/dev-perl/Net-SSLeay/files/1.72-config-nettest-no.patch
@@ -0,0 +1,20 @@
+diff -Naur Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
+--- Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2015-08-02 05:54:14.000000000 +0000
++++ Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2016-03-04 23:29:36.997983312 +0000
+@@ -47,15 +47,7 @@
+ LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})),
+ );
+
+- if ( $self->prompt(
+- "Do you want to run external tests?\n".
+- "These tests *will* *fail* if you do not have network connectivity.",
+- 'n',
+- ) =~ /^y/i ) {
+- $self->tests('t/*/*.t t/*/*/*.t');
+- } else {
+- $self->tests('t/local/*.t t/handle/local/*.t');
+- }
++ $self->tests('t/local/*.t t/handle/local/*.t');
+ }
+
+ sub ssleay_get_build_opts {
diff --git a/dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch b/dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch
new file mode 100644
index 000000000000..d79662593f40
--- /dev/null
+++ b/dev-perl/Net-SSLeay/files/1.72-config-nettest-yes.patch
@@ -0,0 +1,20 @@
+diff -Naur Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm
+--- Net-SSLeay-1.72/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2015-08-02 05:54:14.000000000 +0000
++++ Net-SSLeay-1.72b/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2016-03-04 23:28:49.543069218 +0000
+@@ -47,15 +47,7 @@
+ LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})),
+ );
+
+- if ( $self->prompt(
+- "Do you want to run external tests?\n".
+- "These tests *will* *fail* if you do not have network connectivity.",
+- 'n',
+- ) =~ /^y/i ) {
+- $self->tests('t/*/*.t t/*/*/*.t');
+- } else {
+- $self->tests('t/local/*.t t/handle/local/*.t');
+- }
++ $self->tests('t/*/*.t t/*/*/*.t');
+ }
+
+ sub ssleay_get_build_opts {
diff --git a/dev-perl/Net-Server-Mail/Manifest b/dev-perl/Net-Server-Mail/Manifest
index f29f1f2c3ab4..d1c22a73edfd 100644
--- a/dev-perl/Net-Server-Mail/Manifest
+++ b/dev-perl/Net-Server-Mail/Manifest
@@ -1 +1,2 @@
DIST Net-Server-Mail-0.21.tar.gz 25485 SHA256 ac677a49172799612323b5288e107724a261fa328435a9bb0f9947c4a5f2d58f SHA512 da24b7437964ae390e4e64cc1a95f7e465f9858e9977d45568c15b01c6bc509647afffd886d3559ec9cc09558f25eb812c4fba58fdcf20ca94dc107c18410de1 WHIRLPOOL 25d455da75af60bac94e4df70f3cb6651cd80f56f0107f787b376f1a538b304ac93cf5eba52e856a357a43edcd14934cf7ae47966ce2f6838e7e58961c4f6151
+DIST Net-Server-Mail-0.23.tar.gz 26204 SHA256 b76c7863ec20f3d21793a23360da03b8da8182842ab7402207e1c026f883dcd8 SHA512 db793f26dd20aee6393e7d369059af12b6eafa0568f284130473fb235c09b6a63843be12ec9a86102dbc31ad81f2c669fedba7c4858301fe85d71a4d686adc4e WHIRLPOOL ef82d922ba0f0c59a089017d21644058bd47c4d34d7c88195d62b43208a624feaddf00c2b68bcdc50bc72545421a7627bfd007b717a16149a9bfa378dfa7f783
diff --git a/dev-perl/Net-Server-Mail/Net-Server-Mail-0.230.0.ebuild b/dev-perl/Net-Server-Mail/Net-Server-Mail-0.230.0.ebuild
new file mode 100644
index 000000000000..3acf89ad432f
--- /dev/null
+++ b/dev-perl/Net-Server-Mail/Net-Server-Mail-0.230.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=GUIMARD
+DIST_VERSION=0.23
+inherit perl-module
+
+DESCRIPTION="Class to easily create a mail server"
+
+# Some files Artistic-2
+LICENSE="LGPL-2.1+ Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=dev-perl/IO-Socket-SSL-1.831.0
+ virtual/perl-libnet
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+ test? ( dev-perl/Test-Most )
+"
diff --git a/dev-perl/Net-Telnet/Manifest b/dev-perl/Net-Telnet/Manifest
index 1a979c816453..b9fe607b6995 100644
--- a/dev-perl/Net-Telnet/Manifest
+++ b/dev-perl/Net-Telnet/Manifest
@@ -1 +1,2 @@
DIST Net-Telnet-3.03.tar.gz 35641 SHA256 1604911947a283a8df2bde57a9adfe71e2717f6e0f915fcc73fc47a37130a16b SHA512 ef943616fb4f4272a658de27afa11b19b5010ab110451fc1661e22e60dbf4025a9cd86509a9742c980b46c8fb2f3e52c88e137295d2d35b76b18ff3fdf7d2331 WHIRLPOOL b76604564b8dacdb749fd47191b4f5b432bcaf91d3047ed63774a60167d9077a7e4593a180e5c7a50c2288adfe7da6daf79a1ec0a641a718c5a8326524c37072
+DIST Net-Telnet-3.04.tar.gz 40731 SHA256 e64d567a4e16295ecba949368e7a6b8b5ae2a16b3ad682121d9b007dc5d2a37a SHA512 1df68f55ad94d42e5e2be5e0669c2ecd0bc916f4ed929453ee2d136141ce413ff84b883d488c2f815c2c43132f7c3b36178177072fc5172c292e7bc39351dbdc WHIRLPOOL 3d2ec8669e485a603b2aa02768feb7adf500b75e14bf31c3de0087a3c3d88d846f6bfdf3098a133693945ae709363f8697c6c121b10eecdf771b2fad90bb3242
diff --git a/dev-perl/Net-Telnet/Net-Telnet-3.40.0.ebuild b/dev-perl/Net-Telnet/Net-Telnet-3.40.0.ebuild
new file mode 100644
index 000000000000..a91bfb15e692
--- /dev/null
+++ b/dev-perl/Net-Telnet/Net-Telnet-3.40.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=JROGERS
+DIST_VERSION=3.04
+inherit perl-module
+
+DESCRIPTION="interact with TELNET port or other TCP ports in Perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=virtual/perl-libnet-1.70.300"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Net-Twitter/Manifest b/dev-perl/Net-Twitter/Manifest
index aef0167bfa05..7a79fc8d4909 100644
--- a/dev-perl/Net-Twitter/Manifest
+++ b/dev-perl/Net-Twitter/Manifest
@@ -1,2 +1,2 @@
-DIST Net-Twitter-4.00006.tar.gz 126439 SHA256 cf1caaad7b6b5d5fa9abe98bbc2fb88625cdd9a9081ad60cc1e7ffb741b205e9 SHA512 746a4673a10758e9c3c250814d70834f8bd3517185b4790ce047e74a7acd81754eba13dceeada1feb3ca8d2d77a7343cdd24566f18f96e65e77e3e731fb60395 WHIRLPOOL 2dfb567df9e7fcf852d0333cefa725f1678a46bef7f17853c6a534d7a41882e6ff871466dd876da86629e430a12e974917ff10f7ad211ff4f4054dc794cca911
DIST Net-Twitter-4.01008.tar.gz 129953 SHA256 3c42d3bd61d0850e86e65d1b144fdf137034a6ba509b1a6fb18641381ff85a25 SHA512 7fe7c68f0c8926f398c120ed3ed15e2aba69ec123495eec1fe7b517da7f60f5d192e6f682ee5d36b70ccf0ea55824318b9d74e4add261c93083fcca080d83c65 WHIRLPOOL 5bdea6922ed726a045b5da2e7c6987913f4dcfaa0e81b575a2665a0deaf9d55a2bd7bf6f2940fca8269a5a7d6f186be9f5ee033c207e712fd263b6cdb4c993cb
+DIST Net-Twitter-4.01010.tar.gz 131104 SHA256 76cab0f00abaab9a7c36e391bc6cb930ee92b997a25c8c08fe59491e44a6330a SHA512 39933357e5f802859d7d12272453f9d253a5ef5279916f8d58da7e4d40070aa940b501073c967c330d9efac6bf6b18002d8e92b47214431b23694c2995008a24 WHIRLPOOL 1a612a4df115441c77b6ee5210ab5b93a7a07b6c682558438f23499a5a29dc156c5c5a217d899a80575ed5b1b500475db94485b2ef03fc247755f789c4f0b3f3
diff --git a/dev-perl/Net-Twitter/Net-Twitter-4.000.60-r1.ebuild b/dev-perl/Net-Twitter/Net-Twitter-4.000.60-r1.ebuild
deleted file mode 100644
index 90241a8514b5..000000000000
--- a/dev-perl/Net-Twitter/Net-Twitter-4.000.60-r1.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
-
-MODULE_AUTHOR=MMIMS
-MODULE_VERSION=4.00006
-inherit perl-module
-
-DESCRIPTION="A perl interface to the Twitter API"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
-IUSE=""
-
-RDEPEND=">=dev-perl/Moose-0.94
- dev-perl/Crypt-SSLeay
- dev-perl/Data-Visitor
- >=dev-perl/DateTime-0.51
- dev-perl/DateTime-Format-Strptime
- >=dev-perl/Devel-StackTrace-1.21
- dev-perl/Digest-HMAC
- virtual/perl-Digest-SHA
- virtual/perl-File-Spec
- dev-perl/HTML-Parser
- dev-perl/libwww-perl
- dev-perl/JSON
- virtual/perl-Scalar-List-Utils
- >=dev-perl/Try-Tiny-0.03
- dev-perl/MooseX-Aliases
- dev-perl/MooseX-Role-Parameterized
- >=dev-perl/Net-OAuth-0.25
- dev-perl/namespace-autoclean
- >=dev-perl/URI-1.40
- dev-perl/Carp-Clan"
-
-DEPEND="${RDEPEND}
- dev-perl/Module-Build"
-
-# online test
-SRC_TEST=skip
diff --git a/dev-perl/Net-Twitter/Net-Twitter-4.10.100.ebuild b/dev-perl/Net-Twitter/Net-Twitter-4.10.100.ebuild
new file mode 100644
index 000000000000..309ce3e66705
--- /dev/null
+++ b/dev-perl/Net-Twitter/Net-Twitter-4.10.100.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=MMIMS
+DIST_VERSION=4.01010
+inherit perl-module
+
+DESCRIPTION="A perl interface to the Twitter API"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+IUSE="test examples"
+
+RDEPEND="
+ dev-perl/Carp-Clan
+ dev-perl/Class-Load
+ dev-perl/Data-Visitor
+ >=dev-perl/DateTime-0.51
+ dev-perl/DateTime-Format-Strptime
+ >=dev-perl/Devel-StackTrace-1.21
+ virtual/perl-Digest-SHA
+ virtual/perl-Encode
+ dev-perl/HTML-Parser
+ dev-perl/HTTP-Message
+ >=dev-perl/IO-Socket-SSL-2.5.0
+ dev-perl/JSON
+ dev-perl/LWP-Protocol-https
+ virtual/perl-Scalar-List-Utils
+ >=dev-perl/Moose-0.940.0
+ dev-perl/MooseX-Role-Parameterized
+ dev-perl/Net-HTTP
+ !=dev-perl/Net-HTTP-6.40.0
+ !=dev-perl/Net-HTTP-6.50.0
+ virtual/perl-libnet
+ >=dev-perl/Net-OAuth-0.25
+ virtual/perl-Time-HiRes
+ >=dev-perl/Try-Tiny-0.30.0
+ >=dev-perl/URI-1.400.0
+ dev-perl/namespace-autoclean
+"
+
+DEPEND="${RDEPEND}
+ >=dev-perl/Module-Build-0.360.100
+ test? (
+ virtual/perl-Carp
+ virtual/perl-File-Spec
+ virtual/perl-File-Temp
+ >=dev-perl/libwww-perl-5.819.0
+ dev-perl/Test-Deep
+ dev-perl/Test-Fatal
+ >=virtual/perl-Test-Simple-0.980.0
+ dev-perl/Test-Warn
+ )
+"
+src_install() {
+ perl-module_src_install
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ insinto /usr/share/doc/${PF}/examples
+ doins -r examples/*
+ fi
+}
+src_test() {
+ perl_rm_files 't/99-pod_spelling.t' 't/release-pod-syntax.t' 't/release-pod-coverage.t'
+ perl-module_src_test
+}
diff --git a/dev-perl/Net-Twitter/metadata.xml b/dev-perl/Net-Twitter/metadata.xml
index d88eec3f1352..cb5b79147616 100644
--- a/dev-perl/Net-Twitter/metadata.xml
+++ b/dev-perl/Net-Twitter/metadata.xml
@@ -20,6 +20,7 @@
<remote-id type="cpan-module">Net::Twitter::Role::API::Search::Trends</remote-id>
<remote-id type="cpan-module">Net::Twitter::Role::API::TwitterVision</remote-id>
<remote-id type="cpan-module">Net::Twitter::Role::API::Upload</remote-id>
+ <remote-id type="cpan-module">Net::Twitter::Role::AppAuth</remote-id>
<remote-id type="cpan-module">Net::Twitter::Role::AutoCursor</remote-id>
<remote-id type="cpan-module">Net::Twitter::Role::InflateObjects</remote-id>
<remote-id type="cpan-module">Net::Twitter::Role::Legacy</remote-id>
diff --git a/dev-perl/Net-UPnP/Manifest b/dev-perl/Net-UPnP/Manifest
index 8802615ba406..fd975c7ea067 100644
--- a/dev-perl/Net-UPnP/Manifest
+++ b/dev-perl/Net-UPnP/Manifest
@@ -1 +1,2 @@
DIST Net-UPnP-1.4.2.tar.gz 18910 SHA256 10595ff3e716fd3d0aa609c1304777e3a4acbc1ead983222ba8b6888ac5042f8 SHA512 ab03922b665c9d6df0b8ed28899865cd0e6cdbada8313b951378fcd464c56883503f65ef5b69a72948da4fbc35c09e3aba3e68804ca6313a70c864f4ac8e3932 WHIRLPOOL aa64ec1bacd279cad9505bfd34d5364a6eb7c9a25109626ce12b118bed7eae02c007ee18c324413b1f0c4d1d192ef8d71edd8b33c8ff2d8e2a7df53e7632560e
+DIST Net-UPnP-1.4.3.tar.gz 19169 SHA256 cf323b34adb07c4cf79443bbebbafca11e213f1c7a50b5fac5e572909598821b SHA512 72c8733402a7fec1ca24523dbf4b9d7baf0c1bcae44a36bc8ba2193cb40396f6285584c6fc11a961003477a9abbf0a4e2da9e1876e341ddc52da7850540fff8f WHIRLPOOL 049373a56bbacebb3cc38c5e5cbe9b0d942f296af804a7108618faa88d7aa1e66250f058c5a09bd087e9f2a8a0af6f0f26e23856687dae6a531d5e39a2a53960
diff --git a/dev-perl/Net-UPnP/Net-UPnP-1.4.3.ebuild b/dev-perl/Net-UPnP/Net-UPnP-1.4.3.ebuild
new file mode 100644
index 000000000000..32a5b21146b7
--- /dev/null
+++ b/dev-perl/Net-UPnP/Net-UPnP-1.4.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_AUTHOR=SKONNO
+inherit perl-module
+
+DESCRIPTION="Perl extension for UPnP"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-solaris"
+# Package warrants IUSE examples
+IUSE="examples test"
+
+RDEPEND="virtual/perl-version"
+DEPEND="${RDEPEND}
+ dev-perl/Module-Build
+ test? ( virtual/perl-Test-Simple )
+"
+src_install() {
+ perl-module_src_install
+ if use examples; then
+ dodir usr/share/doc/${PF}/examples
+ docompress -x usr/share/doc/${PF}/examples
+ insinto usr/share/doc/${PF}/
+ doins -r examples/
+ fi
+}
diff --git a/dev-perl/Net-Whois-IP/Manifest b/dev-perl/Net-Whois-IP/Manifest
index 8ab473f961b3..ab5d79d5f31c 100644
--- a/dev-perl/Net-Whois-IP/Manifest
+++ b/dev-perl/Net-Whois-IP/Manifest
@@ -1 +1,2 @@
DIST Net-Whois-IP-1.10.tar.gz 25379 SHA256 f6fcf44ebc3ad683cfa711e80f3eddfc41a9473d9963d095c43e40d5c79862ad SHA512 0dd44a9329c30578163938cd75c1a660fbf2e03ae17adeeaf1b2d92b44af7ddd3ef53263a7e5702b7e591df27636c3445c72ec2b6cc48def4df15363e3bfe6a0 WHIRLPOOL 274fdb552e9386387cda7a02c4773fa619e3d008676a57e37db7ad6ec106453093d4c89537d06013dc03a80ede83db87c6c08ca993e4b5774d25ee1c2a310e55
+DIST Net-Whois-IP-1.19.tar.gz 25192 SHA256 f09bdfa0f1d2665b534826b5f3a8662349930eed2998efe4d8dbf98813147222 SHA512 80d1be9dc6c8e9da74df97524f1a804f6ab64f1e016509944b1ba970c2a508e46cd6d633c6cfc2e9fa5d3fc8240500f81cbc90a27bdeab26cb7b590ba97758ae WHIRLPOOL 29446110c561951b1b24e3482a371bcdea29a5ac7b1b15d0701f78bb2ffe797512213f872fce41f7c3babeef0b0f15f6db238c386f89b874f9dd04a689ccea95
diff --git a/dev-perl/Net-Whois-IP/Net-Whois-IP-1.190.0.ebuild b/dev-perl/Net-Whois-IP/Net-Whois-IP-1.190.0.ebuild
new file mode 100644
index 000000000000..9ba5233d27ad
--- /dev/null
+++ b/dev-perl/Net-Whois-IP/Net-Whois-IP-1.190.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DIST_VERSION=${PV%0.0}
+DIST_AUTHOR=BSCHMITZ
+inherit perl-module
+
+DESCRIPTION="Perl extension for looking up the whois information for ip addresses"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# All tests defined require networking
+# and all fail.
+# https://rt.cpan.org/Public/Bug/Display.html?id=110961
+RESTRICT="test"
+PERL_RM_FILES=(
+ "test.pl" # gets installed otherwise :(
+)
+RDEPEND="
+ dev-perl/Regexp-IPv6
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
+src_test() {
+ local my_test_control
+ my_test_control=${DIST_TEST_OVERRIDE:-${DIST_TEST:-do parallel}}
+ if ! has network ${my_test_control} ; then
+ perl_rm_files "t/test1.t" "t/testx.t"
+ fi
+ perl-module_src_test
+}
diff --git a/dev-perl/Pango/Pango-1.224.0-r1.ebuild b/dev-perl/Pango/Pango-1.224.0-r1.ebuild
index 60b8bba4b2ff..93bcdf5d38ed 100644
--- a/dev-perl/Pango/Pango-1.224.0-r1.ebuild
+++ b/dev-perl/Pango/Pango-1.224.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Layout and render international text"
LICENSE="LGPL-2.1+"
SLOT="0"
-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=""
RDEPEND="
diff --git a/dev-perl/convert-pem/convert-pem-0.80.0-r1.ebuild b/dev-perl/convert-pem/convert-pem-0.80.0-r1.ebuild
index 60f688704da2..cb8595d46477 100644
--- a/dev-perl/convert-pem/convert-pem-0.80.0-r1.ebuild
+++ b/dev-perl/convert-pem/convert-pem-0.80.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,7 +18,7 @@ IUSE=""
RDEPEND="
dev-perl/Class-ErrorHandler
dev-perl/Convert-ASN1
- dev-perl/crypt-des-ede3
+ dev-perl/Crypt-DES_EDE3
virtual/perl-Digest-MD5
virtual/perl-MIME-Base64
"
diff --git a/dev-perl/net-ssh-perl/net-ssh-perl-1.360.0-r1.ebuild b/dev-perl/net-ssh-perl/net-ssh-perl-1.360.0-r1.ebuild
index 4efa95104486..98773ef30e0d 100644
--- a/dev-perl/net-ssh-perl/net-ssh-perl-1.360.0-r1.ebuild
+++ b/dev-perl/net-ssh-perl/net-ssh-perl-1.360.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -22,15 +22,15 @@ DEPEND="
>=dev-perl/math-pari-2.001804
>=dev-perl/Digest-SHA1-2.10
dev-perl/Digest-HMAC
- dev-perl/crypt-dh
- >=dev-perl/crypt-dsa-0.11
+ dev-perl/Crypt-DH
+ >=dev-perl/Crypt-DSA-0.110.0
virtual/perl-MIME-Base64
>=dev-perl/convert-pem-0.05
dev-perl/Crypt-Blowfish
dev-perl/Crypt-DES
- dev-perl/crypt-idea
+ dev-perl/Crypt-IDEA
dev-perl/Crypt-OpenSSL-RSA
- dev-perl/crypt-rsa
+ dev-perl/Crypt-RSA
dev-perl/digest-bubblebabble"
RDEPEND="${DEPEND}"
diff --git a/dev-perl/tie-encryptedhash/tie-encryptedhash-1.240.0-r1.ebuild b/dev-perl/tie-encryptedhash/tie-encryptedhash-1.240.0-r1.ebuild
index cf3fd1f96001..36aba10c9a7a 100644
--- a/dev-perl/tie-encryptedhash/tie-encryptedhash-1.240.0-r1.ebuild
+++ b/dev-perl/tie-encryptedhash/tie-encryptedhash-1.240.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,7 @@ IUSE=""
RDEPEND="dev-perl/Crypt-Blowfish
dev-perl/Crypt-DES
- dev-perl/crypt-cbc"
+ dev-perl/Crypt-CBC"
DEPEND="${RDEPEND}"
SRC_TEST=do
diff --git a/dev-python/click/click-6.3.ebuild b/dev-python/click/click-6.3.ebuild
index d4e8418d4de4..62d8e2627a94 100644
--- a/dev-python/click/click-6.3.ebuild
+++ b/dev-python/click/click-6.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://click.pocoo.org/ https://pypi.python.org/pypi/click"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="doc examples test"
REQUIRED_USE="doc? ( || ( $(python_gen_useflags 'python2*') ) )"
diff --git a/dev-python/fonttools/fonttools-3.0.ebuild b/dev-python/fonttools/fonttools-3.0.ebuild
index 2c5409582d66..98725a89f3ba 100644
--- a/dev-python/fonttools/fonttools-3.0.ebuild
+++ b/dev-python/fonttools/fonttools-3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/behdad/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
IUSE=""
DEPEND=">=dev-python/numpy-1.0.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/gst-python/gst-python-1.6.2.ebuild b/dev-python/gst-python/gst-python-1.6.2.ebuild
index 81aee5dd3f23..2a6ba5cdb34b 100644
--- a/dev-python/gst-python/gst-python-1.6.2.ebuild
+++ b/dev-python/gst-python/gst-python-1.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
LICENSE="LGPL-2"
SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild b/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild
index cc59d1ba63b0..7e00c010c3be 100644
--- a/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-1.3.1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} = *9999* ]]; then
RDEPEND="app-emulation/libvirt:=[-python(-)]"
else
SRC_URI="http://libvirt.org/sources/python/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
RDEPEND="app-emulation/libvirt:0/${PV}"
fi
S="${WORKDIR}/${P%_rc*}"
diff --git a/dev-python/llvmlite/Manifest b/dev-python/llvmlite/Manifest
index dfb2680c200c..92cf6870f388 100644
--- a/dev-python/llvmlite/Manifest
+++ b/dev-python/llvmlite/Manifest
@@ -3,3 +3,4 @@ DIST llvmlite-0.2.2.tar.gz 75171 SHA256 5771189d07da7774446e1ac6c586d31ea4293ef1
DIST llvmlite-0.5.0.tar.gz 74434 SHA256 616b0f16366dd1eec197b7067f4618c6c5183db852e7f4203862c0343ebdd31c SHA512 aec69c841a8166896a6632a4204a53df1f19a42514c335a3dc21a9c7e7610c110a5d00b293d7013dfe497cc7c1e3ffbaedf0a80ee16970f5f33f0043bacd6aec WHIRLPOOL 737a53017e160a04f371e87abf24eb923f17b101d3b2394c276ae0d47787c617aa496428b268ee86301a2ed33a0a93b0b5d3fbc0fb293e295d38742d8a5b98e8
DIST llvmlite-0.6.0.tar.gz 74834 SHA256 0ed6bbf850578dc99c06be3060a1067ea4993474392137760d1c020f7188a236 SHA512 7db3f774d7cff903e4a5a476eee3efd1c6f107443433ab47543eae4e28918a385534225a23e0cd000cfab65b5ebeb0a5c38d6b963090ee0943c65fb61879fc7b WHIRLPOOL 3bed14fef8defac3f217b9ecdb5a2b4d1c68cd9e19078292cc792f375345a87b4daf63ee9c6429954d5156e7c73b5ea85b3bff54c60f78fbc982067411f2eb40
DIST llvmlite-0.8.0.tar.gz 80497 SHA256 a10d8d5e597c6a54ec418baddd31a51a0b7937a895d75b240d890aead946081c SHA512 d960dd2635d670b3ed2a79f81e5c3ada4fe0a03ac39e8f94a16a83fb62013ecbbce1a430ac48c8e6abd8fa34c37938d4ec7a0b949bd8c490f391c8dc29ce221c WHIRLPOOL 569cf60ae6b6efe63aa1af322d53cb983a4d29550557ba465ff26dbcc49bab598365cc592931cabca5f2e99b979ebb4f101d698a1c457a1ef1fa11eb89184c31
+DIST llvmlite-0.9.0.tar.gz 96549 SHA256 edf936f7c4ec7b2ad8da235a0a063e10bfab43a50395a1c8f8601a9a539ec809 SHA512 0cf3fb488d0830763066b73653b36b0ad167d4d5449159229fbbe5212c8925b49f43f79aa214c46d4f947a437597dda4cd99b76f04b1238242d1be8e4435f9f6 WHIRLPOOL 2c4d15d6fdc16ad095bdeb8b788d9d66c8f503a6f0d64783d5ce7b8b7a41cde50fbf9b05a26fc79e206431ec123bd245718dcdfa175001f2700d72dd2f683f17
diff --git a/dev-python/llvmlite/llvmlite-0.9.0.ebuild b/dev-python/llvmlite/llvmlite-0.9.0.ebuild
new file mode 100644
index 000000000000..19cdec73659e
--- /dev/null
+++ b/dev-python/llvmlite/llvmlite-0.9.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=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DISTUTILS_IN_SOURCE_BUILD="1"
+RESTRICT="test"
+
+DESCRIPTION="Python wrapper around the llvm C++ library"
+HOMEPAGE="https://pypi.python.org/pypi/llvmlite"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="
+ =sys-devel/llvm-3.7*:=[multitarget]
+ $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3)
+ "
+DEPEND="${RDEPEND}
+ dev-util/cmake"
+
+python_prepare_all() {
+ # dirty hack :\
+ sed -i -e 's/^LIBS/#LIBS/' ffi/Makefile.linux || die
+ sed -i -e 's/-flto$/-flto -fPIC/' ffi/Makefile.linux || die
+
+ # disable test using installed instance to read version info
+ sed -e 's:test_version:_&:' -i llvmlite/tests/test_binding.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ "${PYTHON}" -m "llvmlite.tests" || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
index 0ab7c3ef6fcb..3ff8221fdac6 100644
--- a/dev-python/numba/Manifest
+++ b/dev-python/numba/Manifest
@@ -3,3 +3,4 @@ DIST numba-0.19.2.tar.gz 871394 SHA256 10bdd84a3a8dfb9b195ad7d3b11c1f52693833820
DIST numba-0.20.0.tar.gz 895183 SHA256 62dd4eebbd8fef27a8a60b74de2f540b12223939e197877babb13bf06eba5d9f SHA512 d511ed382813471dd2b9f6d99ee7cae4b77375a3c003df44ec2954b0f16c32b0fec76b3c33df46c821f17a4d148afab6c4b2d43429548a5bc81efbebc4fb54e3 WHIRLPOOL 8345bed1965715aace541bfcde33f4a999241fac8f655d80d1bb67db5ae806924fec47e3895b2a61484474fef2d4362d15800aa5be8b1c8f1922eaeb06d432ce
DIST numba-0.22.1.tar.gz 1101843 SHA256 2b0c95cf9c4f6390b1ff0a238499ee4cc32b3695728293e1d888cd3c15803633 SHA512 0514a04e83f800ba4dba97e5b220fd5d530e923e91769881f9df320a0eedcfb1e652fc87a1cda2d80223e38a25f85387a1930259179996bab7b7a731b86864c0 WHIRLPOOL dd554a15ea3783bfe335ed08b538eed6ec7071986ef4ad63e76e51c3d06783b38dccd0fb5b01b720eab130dbb20d8a2fe8cefd4124a6f57aeb10e74c228fad16
DIST numba-0.23.1.tar.gz 1284771 SHA256 54359b8ef700a70f0d7a9b9aecb2c58867fd23479f556730d8b3422a132d5735 SHA512 833087ac4272d386eca0434855128773284f0f1f7cd85143088d2184781b070bf2922a7e2378ae90ba53382ffb5c547e9c2e34ec35a9423e1cf2ad9706d7c366 WHIRLPOOL 1cc91acb8acd9e14ace0be14c45e5e1abf5fc28440ad463240f8ed5b18708496b166ebb9134df32170551ac6f7e123d1dcb4897434320bb9471338c008b638ab
+DIST numba-0.24.0.tar.gz 1134646 SHA256 623fa32a9e0018dcbffb3e5ab29c87a12252e67eb1325be69abac9faaff2f8ed SHA512 ffad0fa1a92479aa7d41cbbfdace5bb8c2be49b99cf7da3ccacbc972b910e945bb763aaf1a1704c2af28c57d9384530c7303571653ff964d7470cb48704062bc WHIRLPOOL b280105aa8ccd74e689f7d1a837bd4e7833400fdb1f469810b8c01db37ada725698534cdf95aad34a5f85d1bd8b206c83fd02be1100924889487813269721ba9
diff --git a/dev-python/numba/numba-0.24.0.ebuild b/dev-python/numba/numba-0.24.0.ebuild
new file mode 100644
index 000000000000..a82a996dfcc7
--- /dev/null
+++ b/dev-python/numba/numba-0.24.0.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=( python{2_7,3_3,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
+HOMEPAGE="http://numba.pydata.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+ dev-python/llvmlite[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
+ virtual/python-funcsigs[${PYTHON_USEDEP}]"
+DEPEND="test? ( ${RDEPEND} )
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# test phase is pointless since it errors in circa 60% of 1984 tests
+RESTRICT="test"
+
+# Delete intersphinx & entry to set sphinxjp.themecore, which is absent from portage, from conf.py
+PATCHES=( "${FILESDIR}"/${PN}-0.19.2-docbuild.patch )
+
+python_prepare_all() {
+ # Re-set them of doc build to one provided by sphinx
+ if has_version ">=dev-python/sphinx-1.3.1"; then
+ sed -e 's:basicstrap:classic:' -i docs/source/conf.py || die
+ else
+ sed -e 's:basicstrap:default:' -i docs/source/conf.py || die
+ fi
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ if ! python_is_python3; then
+ local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ export CFLAGS
+ fi
+ distutils-r1_python_compile
+}
+
+python_compile_all() {
+ use doc && emake -C docs/ html
+}
+
+python_test() {
+ cd "${BUILD_DIR}"/lib* || die
+ ${PYTHON} -c "import numba; numba.test()" || die
+}
+
+python_install_all() {
+ # doc needs obsolete sphinxjp package
+# use doc && dodoc docs/Numba.pdf
+ use examples && local EXAMPLES=( examples/. )
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/peewee/peewee-2.7.4.ebuild b/dev-python/peewee/peewee-2.7.4.ebuild
index ecc09195f958..75265bae905f 100644
--- a/dev-python/peewee/peewee-2.7.4.ebuild
+++ b/dev-python/peewee/peewee-2.7.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc examples"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index f6145fbc2831..7ac6d1a4fd39 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1 +1,2 @@
DIST phonenumbers-7.2.3.tar.gz 4252048 SHA256 7a9735fc1083ddf161e4eb2800cab11abd98b06b4f384c405e4752d654f0aab3 SHA512 73d544c963e4cf33b8cd2d73ba9e4df0c3c77bc2718358ef686a549a5c11d326c4fd73dd11cea97d814732d41021c51e0675d483d133bd44be38eb65ff443689 WHIRLPOOL c455961517ef805f246e8c65ed95a868da9b1c05a20a0d33024cd9435d751c1410dbcde5fbc6520df8ac322785c4339a46db79410e430d61b8ecf852e782c41e
+DIST phonenumbers-7.2.6.tar.gz 4254183 SHA256 f8ff8b0734bc4421c61df8bf9079ad5d3294ebe4124641d059df929b07262e94 SHA512 d07cff95ae92a11bd18eea55cf9eef8d531c881442ad97dc5b5277c5604df071539d0140b0502a3baecf8c18c91a7478069f9397e9e38225cdccb7818ca3e191 WHIRLPOOL 6ec4d99dd7c65cc92a38f6a1056ff35fa16d412ed83a9e6ab89bc4324dff75ab968b63b534ddf522f3631b850f49b95f677c7197efaf1bac4e3119bcbad8d51f
diff --git a/dev-python/phonenumbers/phonenumbers-7.2.6.ebuild b/dev-python/phonenumbers/phonenumbers-7.2.6.ebuild
new file mode 100644
index 000000000000..e56e0fad2e7f
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-7.2.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="https://github.com/daviddrysdale/python-${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+S="${WORKDIR}/python-${PN}-release-${PV}"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ esetup.py test
+} \ No newline at end of file
diff --git a/dev-python/pyatspi/pyatspi-2.18.0.ebuild b/dev-python/pyatspi/pyatspi-2.18.0.ebuild
index 7e7fb8c5d16b..b81e6ebc2146 100644
--- a/dev-python/pyatspi/pyatspi-2.18.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.18.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
# Note: only some of the tests are GPL-licensed, everything else is LGPL
LICENSE="LGPL-2 GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="" # test
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pygobject/pygobject-3.18.2.ebuild b/dev-python/pygobject/pygobject-3.18.2.ebuild
index 1ed68961e5b3..8cb5b1a34f94 100644
--- a/dev-python/pygobject/pygobject-3.18.2.ebuild
+++ b/dev-python/pygobject/pygobject-3.18.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/PyGObject"
LICENSE="LGPL-2.1+"
SLOT="3"
-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 ~x64-solaris ~x86-solaris"
+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 ~x64-solaris ~x86-solaris"
IUSE="+cairo examples test +threads"
REQUIRED_USE="
diff --git a/dev-python/pygsl/pygsl-0.9.5-r1.ebuild b/dev-python/pygsl/pygsl-0.9.5-r1.ebuild
index 92102d21d45d..7242f4d10148 100644
--- a/dev-python/pygsl/pygsl-0.9.5-r1.ebuild
+++ b/dev-python/pygsl/pygsl-0.9.5-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples"
DEPEND="
diff --git a/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild b/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild
new file mode 100644
index 000000000000..2aadc71eb82a
--- /dev/null
+++ b/dev-python/pyminuit/pyminuit-1.2.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/jpivarski/pyminuit"
+SRC_URI="
+ https://pyminuit.googlecode.com/files/${P}.tgz
+ https://pyminuit.googlecode.com/files/Minuit-1_7_9-patch1.tar.gz
+ "
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"/${PN}
+
+src_configure() {
+ cd "${WORKDIR}"/Minuit-1_7_9 && econf --disable-static || die
+}
+src_compile() {
+ cd "${WORKDIR}"/Minuit-1_7_9 && emake
+ cd "${S}"
+ distutils-r1_src_compile
+}
+
+python_install_all() {
+ cd "${WORKDIR}"/Minuit-1_7_9 || die
+ default
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index e18ea7ac48a6..eb8f805b3a42 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1 +1,2 @@
DIST pytest-httpbin-0.2.0.tar.gz 9372 SHA256 67a6d8e7890630b334e1cb38548a7118cb15930e218ece5b7a8bc94a8696ceed SHA512 a8e80979de59578a7cf16fa6cc08386bac9357bc8b48e34fc2a24cea18d531e61bf3c2474f8fc1b230dcd31641cb4bc960bab05e4bdbab98637c2fbf08671bfd WHIRLPOOL b5b532a1cc9e4b06f67787ca7ada0614b5145245934bcd796586fe0d18d186529388f608b24222a1b9372393e38f0a81df75ab205eafe134bb3287a34b122fec
+DIST pytest-httpbin-0.2.3.tar.gz 9498 SHA256 c5b698dfa474ffc9caebcb35e34346b753eb226aea5c2e1b69fefedbcf161bf8 SHA512 f3c4eb67d1b02c27d8edb42622793fa3604e3f0bd5086e4986b8f0402a9fb8d7969a466be92fc6a7e301e829dbeb300183b40dccc9ec5da1d158cb4d08274f8b WHIRLPOOL c7b4c1d4955389d180474aae59ad1ab3d86e1f81f84fb00fecd562c38a2a27cc741562a4f78fe7691fe978533dd8fbfd2c1b5da1a205cb996eea9bdc090c0072
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.ebuild
new file mode 100644
index 000000000000..817a0644f4df
--- /dev/null
+++ b/dev-python/pytest-httpbin/pytest-httpbin-0.2.3.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="Easily test your HTTP library against a local copy of httpbin"
+HOMEPAGE="https://github.com/kevin1024/pytest-httpbin http://pypi.python.org/pypi/pytest-httpbin"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+ dev-python/decorator[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/httpbin[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )"
+
+# Not includd
+RESTRICT=test
+
+python_test() {
+ PYTEST_PLUGINS=pytest_httpbin \
+ py.test -v -s || die
+}
diff --git a/dev-python/python-caja/python-caja-1.8.1.ebuild b/dev-python/python-caja/python-caja-1.8.1.ebuild
index 03c37b123cfe..d1b55c470594 100644
--- a/dev-python/python-caja/python-caja-1.8.1.ebuild
+++ b/dev-python/python-caja/python-caja-1.8.1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.mate-desktop.org"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc"
diff --git a/dev-python/wtf-peewee/Manifest b/dev-python/wtf-peewee/Manifest
index 0e140a3ca737..d673446db421 100644
--- a/dev-python/wtf-peewee/Manifest
+++ b/dev-python/wtf-peewee/Manifest
@@ -1,2 +1,3 @@
DIST wtf-peewee-0.2.3.tar.gz 60654 SHA256 d64bab9c8b9b247f21534e87a94b988afd9655d7abaa14dc7d2af0bea3a3b9da SHA512 0a8e4a6586a4521d99c35b907935286c20b9106214a9826960073e710fc0a91c68402b9812d2b0119263786f8e48bdcacf999044ade9f3a27afa9bc7fd058926 WHIRLPOOL b44d3480d274f26ff84993c8941c473e6104bab8cd65bd8befb903dc9f2d6fad16299d6b4fc5f3b8af822dbc6aa9781dbe9ba43da6fb2f2dcf929578d3eac7ea
DIST wtf-peewee-0.2.4.tar.gz 60869 SHA256 e771daf99ec6ecab0771742f3bb104058cd5e0b72ad404c6d278b6eefc116349 SHA512 f63ecae4b39873124d11408a58732cc147a7b8a68b7f19be1f8ff67c4847b7daddd9f62c180a723af00176d2d13531fa30d076cf64ea618c260da522555ec7e7 WHIRLPOOL 0fcbc0c919e1df3af1f5d2787ebb8934c697e7dc6f65c9b264306d62a9b552e8969658c7cf6654f260b0e902b4aa3708aed694b36b4262cbf4e3e49aa2c9e43e
+DIST wtf-peewee-0.2.5.tar.gz 60905 SHA256 79bc345a1c543d78deaa0767f792c152abb34d9a90b98cbd65ac4cce8849d00b SHA512 10758f0617d28baee850d6a2f6041eaf16ac9accef3be51d8156bd0c387e6324708668c4c681f3a7fd7da309b6546e96e518d219905ac9148d51e59959bb9129 WHIRLPOOL 93c2518e6636536f9f57035468a76d3dd5477e8fdbed3bfbdbe652a91c6abbedd1835c7dd3031f49986786e408ac88d99710bcd40254cb3fe09e25a65e403c6b
diff --git a/dev-python/wtf-peewee/wtf-peewee-0.2.5.ebuild b/dev-python/wtf-peewee/wtf-peewee-0.2.5.ebuild
new file mode 100644
index 000000000000..53e3fca64dc3
--- /dev/null
+++ b/dev-python/wtf-peewee/wtf-peewee-0.2.5.ebuild
@@ -0,0 +1,36 @@
+# 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="Small python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND=">=dev-python/peewee-2.0.0[${PYTHON_USEDEP}]
+ dev-python/wtforms[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( "${RDEPEND}" )"
+
+python_prepare_all() {
+ # https://github.com/coleifer/peewee/issues/361
+ sed -e s':test_null_form_saving:_&:' -i "${PN/\-/}"/tests.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ "${PYTHON}" ./runtests.py || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( example/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-qt/assistant/assistant-5.5.1-r1.ebuild b/dev-qt/assistant/assistant-5.5.1-r1.ebuild
index 7505c992a44f..6a3d116c6049 100644
--- a/dev-qt/assistant/assistant-5.5.1-r1.ebuild
+++ b/dev-qt/assistant/assistant-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
fi
IUSE="webkit"
diff --git a/dev-qt/designer/designer-5.5.1-r1.ebuild b/dev-qt/designer/designer-5.5.1-r1.ebuild
index bb105094c82a..2b074b9224d9 100644
--- a/dev-qt/designer/designer-5.5.1-r1.ebuild
+++ b/dev-qt/designer/designer-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE="declarative webkit"
diff --git a/dev-qt/linguist-tools/linguist-tools-5.5.1-r1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.5.1-r1.ebuild
index 3132acf5ca07..96c3525aad56 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.5.1-r1.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Tools for working with Qt translation data files"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE="qml"
diff --git a/dev-qt/linguist/linguist-5.5.1-r1.ebuild b/dev-qt/linguist/linguist-5.5.1-r1.ebuild
index 5cf33cd753a2..7f3dd57080e0 100644
--- a/dev-qt/linguist/linguist-5.5.1-r1.ebuild
+++ b/dev-qt/linguist/linguist-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Graphical tool for translating Qt applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/pixeltool/pixeltool-5.5.1-r1.ebuild b/dev-qt/pixeltool/pixeltool-5.5.1-r1.ebuild
index 6b58bdd293b4..ae2913063d28 100644
--- a/dev-qt/pixeltool/pixeltool-5.5.1-r1.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Qt screen magnifier"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qdbus/qdbus-5.5.1-r1.ebuild b/dev-qt/qdbus/qdbus-5.5.1-r1.ebuild
index ebe5d79c1d0f..1780de08bb53 100644
--- a/dev-qt/qdbus/qdbus-5.5.1-r1.ebuild
+++ b/dev-qt/qdbus/qdbus-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Interface to Qt applications communicating over D-Bus"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.5.1-r1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.5.1-r1.ebuild
index 1e3cb4fcdd3b..63f090ab7d52 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.5.1-r1.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qdoc/qdoc-5.5.1.ebuild b/dev-qt/qdoc/qdoc-5.5.1.ebuild
index 71331d02f08c..b3fc694007e8 100644
--- a/dev-qt/qdoc/qdoc-5.5.1.ebuild
+++ b/dev-qt/qdoc/qdoc-5.5.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Qt documentation generator"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.5.1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.5.1.ebuild
index a42b6e8a0c1c..dfc3432db346 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.5.1.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.5.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtcore/qtcore-5.5.1-r1.ebuild b/dev-qt/qtcore/qtcore-5.5.1-r1.ebuild
index 9f424843a643..360227832604 100644
--- a/dev-qt/qtcore/qtcore-5.5.1-r1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE="icu systemd"
diff --git a/dev-qt/qtdbus/qtdbus-5.5.1.ebuild b/dev-qt/qtdbus/qtdbus-5.5.1.ebuild
index bc41adeb340b..edc9799a5056 100644
--- a/dev-qt/qtdbus/qtdbus-5.5.1.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.5.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="The D-Bus module for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.5.1-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.5.1-r1.ebuild
index 840bcfc3b072..f85756fc0c64 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.5.1-r1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="The QML and Quick modules for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE="gles2 +jit localstorage +widgets xml"
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1-r1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1-r1.ebuild
index 158ba6d99b6b..31729959044e 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1-r1.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build virtualx
DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtgui/qtgui-5.5.1-r1.ebuild b/dev-qt/qtgui/qtgui-5.5.1-r1.ebuild
index 2bf7dd15963a..86f919393f01 100644
--- a/dev-qt/qtgui/qtgui-5.5.1-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
# TODO: directfb, linuxfb, kms integration in eglfs
diff --git a/dev-qt/qthelp/qthelp-5.5.1-r1.ebuild b/dev-qt/qthelp/qthelp-5.5.1-r1.ebuild
index 5181181f4449..41452c71ad3d 100644
--- a/dev-qt/qthelp/qthelp-5.5.1-r1.ebuild
+++ b/dev-qt/qthelp/qthelp-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="The Help module for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtimageformats/qtimageformats-5.5.1-r1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.5.1-r1.ebuild
index d36e8f54fea4..d3f822c4b4c3 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.5.1-r1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Additional format plugins for the Qt image I/O system"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r2.ebuild
index cfdd747b1f05..ff8733b4994e 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r2.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.5.1-r2.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="The Multimedia module for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
fi
IUSE="alsa gles2 gstreamer gstreamer010 openal pulseaudio qml widgets"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.5.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.5.1.ebuild
index 5be50a57995a..3f3a164a38d6 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.5.1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.5.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Network abstraction library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE="bindist connman libproxy networkmanager +ssl"
diff --git a/dev-qt/qtopengl/qtopengl-5.5.1.ebuild b/dev-qt/qtopengl/qtopengl-5.5.1.ebuild
index d11b859cc87e..b4061eb3513a 100644
--- a/dev-qt/qtopengl/qtopengl-5.5.1.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.5.1.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE="gles2"
diff --git a/dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild b/dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild
index 51d6f5770a02..ef602e5a58e2 100644
--- a/dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Tool to query Qt path information"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtpositioning/qtpositioning-5.5.1-r1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.5.1-r1.ebuild
index 2eb27c697b6a..c5437aa22447 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.5.1-r1.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Physical position determination library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
fi
# TODO: src/plugins/position/gypsy
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.5.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.5.1.ebuild
index ec7526ad114f..f503158d3dd4 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.5.1.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.5.1.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
DESCRIPTION="Printing support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE="cups gles2"
diff --git a/dev-qt/qtquick1/qtquick1-5.5.1-r1.ebuild b/dev-qt/qtquick1/qtquick1-5.5.1-r1.ebuild
index 4993e3999c7d..c3f36801c5ae 100644
--- a/dev-qt/qtquick1/qtquick1-5.5.1-r1.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Legacy declarative UI module for the Qt5 framework (deprecated)"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE="designer gles2 opengl webkit xml"
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.5.1-r1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.5.1-r1.ebuild
index 3bc33b467020..05aa3a8d92b2 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.5.1-r1.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE="+widgets"
diff --git a/dev-qt/qtscript/qtscript-5.5.1-r1.ebuild b/dev-qt/qtscript/qtscript-5.5.1-r1.ebuild
index 1431ee915579..e1d6571b13a9 100644
--- a/dev-qt/qtscript/qtscript-5.5.1-r1.ebuild
+++ b/dev-qt/qtscript/qtscript-5.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Application scripting library for the Qt5 framework (deprecated)"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE="+jit scripttools"
diff --git a/dev-qt/qtsensors/qtsensors-5.5.1-r1.ebuild b/dev-qt/qtsensors/qtsensors-5.5.1-r1.ebuild
index 69c9d75b649d..6a0847b224bc 100644
--- a/dev-qt/qtsensors/qtsensors-5.5.1-r1.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Hardware sensor access library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
fi
IUSE="qml"
diff --git a/dev-qt/qtsql/qtsql-5.5.1.ebuild b/dev-qt/qtsql/qtsql-5.5.1.ebuild
index a01c4e7d7840..a214f1c92e1a 100644
--- a/dev-qt/qtsql/qtsql-5.5.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.5.1.ebuild
@@ -9,7 +9,7 @@ inherit multilib qt5-build
DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE="freetds mysql oci8 odbc postgres +sqlite"
diff --git a/dev-qt/qtsvg/qtsvg-5.5.1-r1.ebuild b/dev-qt/qtsvg/qtsvg-5.5.1-r1.ebuild
index 66ded4554346..0f5788e0f716 100644
--- a/dev-qt/qtsvg/qtsvg-5.5.1-r1.ebuild
+++ b/dev-qt/qtsvg/qtsvg-5.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="SVG rendering library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qttest/qttest-5.5.1.ebuild b/dev-qt/qttest/qttest-5.5.1.ebuild
index 26e4bc2d3e8c..8ab1cb37feef 100644
--- a/dev-qt/qttest/qttest-5.5.1.ebuild
+++ b/dev-qt/qttest/qttest-5.5.1.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
DESCRIPTION="Unit testing library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qttranslations/qttranslations-5.5.1-r1.ebuild b/dev-qt/qttranslations/qttranslations-5.5.1-r1.ebuild
index 27d5c55d2f41..da175594709e 100644
--- a/dev-qt/qttranslations/qttranslations-5.5.1-r1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Translation files for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtwayland/qtwayland-5.5.1-r1.ebuild b/dev-qt/qtwayland/qtwayland-5.5.1-r1.ebuild
index 3d7782fc0910..c21e5ccf878d 100644
--- a/dev-qt/qtwayland/qtwayland-5.5.1-r1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Wayland platform plugin for Qt"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
fi
IUSE="egl qml wayland-compositor xcomposite"
diff --git a/dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild b/dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild
index f343adca2535..d9894e371e1a 100644
--- a/dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild
+++ b/dev-qt/qtwebchannel/qtwebchannel-5.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Qt5 module for integrating C++ and QML applications with HTML/JavaScript clients"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm ~x86"
fi
IUSE="qml"
diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild
index f54851bf0a50..0af20e34ff2b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit python-any-r1 qt5-build
DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
# TODO: qttestlib
diff --git a/dev-qt/qtwidgets/qtwidgets-5.5.1-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.5.1-r1.ebuild
index 50e951be5143..d0b14d7cd320 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.5.1-r1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.5.1-r1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
# keep IUSE defaults in sync with qtgui
diff --git a/dev-qt/qtx11extras/qtx11extras-5.5.1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.5.1.ebuild
index d5a72d5ce0c6..c6b85488b401 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.5.1.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.5.1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtxml/qtxml-5.5.1.ebuild b/dev-qt/qtxml/qtxml-5.5.1.ebuild
index d083df6e9755..c9725d589138 100644
--- a/dev-qt/qtxml/qtxml-5.5.1.ebuild
+++ b/dev-qt/qtxml/qtxml-5.5.1.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="SAX and DOM implementation library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1-r1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1-r1.ebuild
index 51b8facee86b..b72f67a08f1e 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1-r1.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit qt5-build
DESCRIPTION="XPath, XQuery, and XSLT support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
fi
IUSE=""
diff --git a/dev-ros/audio_capture/Manifest b/dev-ros/audio_capture/Manifest
index 6ae18ef87063..fc10bbbe99d5 100644
--- a/dev-ros/audio_capture/Manifest
+++ b/dev-ros/audio_capture/Manifest
@@ -1,5 +1,6 @@
DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4
DIST audio_common-0.2.11.tar.gz 182449 SHA256 8ba3d3747cc7fcb45062368fbcd2d220b8d46d184c54247afefcb5be657cafbe SHA512 01ff1aaca6568ef0683501f0bf9ed6b451beddec5c2fc01362f91ba466bcea318fe1e998bde1424d824fa1f39922a2a397d5990d774478e355b6781cbbd7ea72 WHIRLPOOL 651e4bb9142a29dabd637b42f6db75e3b235632d9b2641c756fbd429fb12f3022edbc4cbea56c83d5f428a4265ea9f86e90905348e8797543a20d274256a6ce1
+DIST audio_common-0.2.12.tar.gz 182493 SHA256 c1cdb8cbf999020fb6c97f45de1ddb39fc4712dd7cf48e6a296e5b3a8695d336 SHA512 0d0b4814ad58e34ed0c605425f648c7bc2bc43e57ff2b44b23862bfc6f8ad3381b7aac2fb365b5c8194248ce769a33d5dd01ddd0add87303ce3fd6fcfd63f267 WHIRLPOOL cbdaba77dd6a765ebb99bd51c15ffd5baca253cf1a243200c6985dd602e58afd311c6af17f001f6da35346e51275a49388e23a89759448ae5e03bd1db5ade4c3
DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42
diff --git a/dev-ros/audio_capture/audio_capture-0.2.12.ebuild b/dev-ros/audio_capture/audio_capture-0.2.12.ebuild
new file mode 100644
index 000000000000..dd65eace76e5
--- /dev/null
+++ b/dev-ros/audio_capture/audio_capture-0.2.12.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-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Transports audio from a source to a destination"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/roscpp
+ dev-libs/boost:=[threads]
+ media-libs/gstreamer:0.10
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+ media-plugins/gst-plugins-lame:0.10
+ media-libs/gst-plugins-good:0.10
+ media-libs/gst-plugins-base:0.10
+"
diff --git a/dev-ros/audio_common_msgs/Manifest b/dev-ros/audio_common_msgs/Manifest
index 6ae18ef87063..fc10bbbe99d5 100644
--- a/dev-ros/audio_common_msgs/Manifest
+++ b/dev-ros/audio_common_msgs/Manifest
@@ -1,5 +1,6 @@
DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4
DIST audio_common-0.2.11.tar.gz 182449 SHA256 8ba3d3747cc7fcb45062368fbcd2d220b8d46d184c54247afefcb5be657cafbe SHA512 01ff1aaca6568ef0683501f0bf9ed6b451beddec5c2fc01362f91ba466bcea318fe1e998bde1424d824fa1f39922a2a397d5990d774478e355b6781cbbd7ea72 WHIRLPOOL 651e4bb9142a29dabd637b42f6db75e3b235632d9b2641c756fbd429fb12f3022edbc4cbea56c83d5f428a4265ea9f86e90905348e8797543a20d274256a6ce1
+DIST audio_common-0.2.12.tar.gz 182493 SHA256 c1cdb8cbf999020fb6c97f45de1ddb39fc4712dd7cf48e6a296e5b3a8695d336 SHA512 0d0b4814ad58e34ed0c605425f648c7bc2bc43e57ff2b44b23862bfc6f8ad3381b7aac2fb365b5c8194248ce769a33d5dd01ddd0add87303ce3fd6fcfd63f267 WHIRLPOOL cbdaba77dd6a765ebb99bd51c15ffd5baca253cf1a243200c6985dd602e58afd311c6af17f001f6da35346e51275a49388e23a89759448ae5e03bd1db5ade4c3
DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.2.12.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.2.12.ebuild
new file mode 100644
index 000000000000..e872a7e500db
--- /dev/null
+++ b/dev-ros/audio_common_msgs/audio_common_msgs-0.2.12.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/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for transmitting audio via ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/audio_play/Manifest b/dev-ros/audio_play/Manifest
index 6ae18ef87063..fc10bbbe99d5 100644
--- a/dev-ros/audio_play/Manifest
+++ b/dev-ros/audio_play/Manifest
@@ -1,5 +1,6 @@
DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4
DIST audio_common-0.2.11.tar.gz 182449 SHA256 8ba3d3747cc7fcb45062368fbcd2d220b8d46d184c54247afefcb5be657cafbe SHA512 01ff1aaca6568ef0683501f0bf9ed6b451beddec5c2fc01362f91ba466bcea318fe1e998bde1424d824fa1f39922a2a397d5990d774478e355b6781cbbd7ea72 WHIRLPOOL 651e4bb9142a29dabd637b42f6db75e3b235632d9b2641c756fbd429fb12f3022edbc4cbea56c83d5f428a4265ea9f86e90905348e8797543a20d274256a6ce1
+DIST audio_common-0.2.12.tar.gz 182493 SHA256 c1cdb8cbf999020fb6c97f45de1ddb39fc4712dd7cf48e6a296e5b3a8695d336 SHA512 0d0b4814ad58e34ed0c605425f648c7bc2bc43e57ff2b44b23862bfc6f8ad3381b7aac2fb365b5c8194248ce769a33d5dd01ddd0add87303ce3fd6fcfd63f267 WHIRLPOOL cbdaba77dd6a765ebb99bd51c15ffd5baca253cf1a243200c6985dd602e58afd311c6af17f001f6da35346e51275a49388e23a89759448ae5e03bd1db5ade4c3
DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42
diff --git a/dev-ros/audio_play/audio_play-0.2.12.ebuild b/dev-ros/audio_play/audio_play-0.2.12.ebuild
new file mode 100644
index 000000000000..d8c67040ec3b
--- /dev/null
+++ b/dev-ros/audio_play/audio_play-0.2.12.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-drivers/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Outputs audio to a speaker from a source node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/roscpp
+ dev-libs/boost:=[threads]
+ media-libs/gstreamer:0.10
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+ media-plugins/gst-plugins-alsa:0.10
+ media-libs/gst-plugins-good:0.10
+ media-libs/gst-plugins-base:0.10
+"
diff --git a/dev-ros/diagnostic_aggregator/Manifest b/dev-ros/diagnostic_aggregator/Manifest
index b6953773385b..13e70dd314c2 100644
--- a/dev-ros/diagnostic_aggregator/Manifest
+++ b/dev-ros/diagnostic_aggregator/Manifest
@@ -1 +1,2 @@
DIST diagnostics-1.8.8.tar.gz 508404 SHA256 e50eb7d49fd2ce13ce8bccb81cb67c198119d7524b3aada37035c8ab9fe2d3ec SHA512 f0e59442cf4cd277c1ef77e7bceec973a15519c9d81bbde21851592ba52c4c7d55a6358c6a65004490b3e3822a6edc772f20e41992a2b3604d9e64e9fd7124ef WHIRLPOOL 32c8fbdc6591abfd270c1c38aebc5dc8f5d7381e5675f6f50f07be0f433bc5a8b81ac33c438d56e753cb75c6914c8fd4c38d9cc82c720fb04b170b4afef597cb
+DIST diagnostics-1.8.9.tar.gz 525881 SHA256 d6102e9b1b98b5f3909a00694b1e3b856d69cdb9fd6b332f4320adf574e3a4a8 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80 WHIRLPOOL 914941b8c688ffaf22268832355d7d9d262d572b5fd1b3b48bbfbefb21240572830d81fb9aebcf252b8be99461cc404f106f3918210de7af49471ca1f244c568
diff --git a/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.8.9.ebuild b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.8.9.ebuild
new file mode 100644
index 000000000000..c01522baab44
--- /dev/null
+++ b/dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.8.9.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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Aggregates ROS diagnostics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/pluginlib
+ dev-ros/roscpp
+ dev-ros/rospy
+ dev-ros/rostest
+ dev-ros/xmlrpcpp
+ dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest )"
diff --git a/dev-ros/diagnostic_analysis/Manifest b/dev-ros/diagnostic_analysis/Manifest
index b6953773385b..13e70dd314c2 100644
--- a/dev-ros/diagnostic_analysis/Manifest
+++ b/dev-ros/diagnostic_analysis/Manifest
@@ -1 +1,2 @@
DIST diagnostics-1.8.8.tar.gz 508404 SHA256 e50eb7d49fd2ce13ce8bccb81cb67c198119d7524b3aada37035c8ab9fe2d3ec SHA512 f0e59442cf4cd277c1ef77e7bceec973a15519c9d81bbde21851592ba52c4c7d55a6358c6a65004490b3e3822a6edc772f20e41992a2b3604d9e64e9fd7124ef WHIRLPOOL 32c8fbdc6591abfd270c1c38aebc5dc8f5d7381e5675f6f50f07be0f433bc5a8b81ac33c438d56e753cb75c6914c8fd4c38d9cc82c720fb04b170b4afef597cb
+DIST diagnostics-1.8.9.tar.gz 525881 SHA256 d6102e9b1b98b5f3909a00694b1e3b856d69cdb9fd6b332f4320adf574e3a4a8 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80 WHIRLPOOL 914941b8c688ffaf22268832355d7d9d262d572b5fd1b3b48bbfbefb21240572830d81fb9aebcf252b8be99461cc404f106f3918210de7af49471ca1f244c568
diff --git a/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.9.ebuild b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.9.ebuild
new file mode 100644
index 000000000000..083a528ce6f2
--- /dev/null
+++ b/dev-ros/diagnostic_analysis/diagnostic_analysis-1.8.9.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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Converts diagnostics data into a series of CSV files"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-ros/rosbag[${PYTHON_USEDEP}]
+ dev-ros/rostest[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/diagnostic_common_diagnostics/Manifest b/dev-ros/diagnostic_common_diagnostics/Manifest
index b6953773385b..13e70dd314c2 100644
--- a/dev-ros/diagnostic_common_diagnostics/Manifest
+++ b/dev-ros/diagnostic_common_diagnostics/Manifest
@@ -1 +1,2 @@
DIST diagnostics-1.8.8.tar.gz 508404 SHA256 e50eb7d49fd2ce13ce8bccb81cb67c198119d7524b3aada37035c8ab9fe2d3ec SHA512 f0e59442cf4cd277c1ef77e7bceec973a15519c9d81bbde21851592ba52c4c7d55a6358c6a65004490b3e3822a6edc772f20e41992a2b3604d9e64e9fd7124ef WHIRLPOOL 32c8fbdc6591abfd270c1c38aebc5dc8f5d7381e5675f6f50f07be0f433bc5a8b81ac33c438d56e753cb75c6914c8fd4c38d9cc82c720fb04b170b4afef597cb
+DIST diagnostics-1.8.9.tar.gz 525881 SHA256 d6102e9b1b98b5f3909a00694b1e3b856d69cdb9fd6b332f4320adf574e3a4a8 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80 WHIRLPOOL 914941b8c688ffaf22268832355d7d9d262d572b5fd1b3b48bbfbefb21240572830d81fb9aebcf252b8be99461cc404f106f3918210de7af49471ca1f244c568
diff --git a/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.9.ebuild b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.9.ebuild
new file mode 100644
index 000000000000..c06f3cd578f1
--- /dev/null
+++ b/dev-ros/diagnostic_common_diagnostics/diagnostic_common_diagnostics-1.8.9.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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Generic nodes for monitoring a linux host"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ dev-ros/diagnostic_updater[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+ app-admin/hddtemp"
diff --git a/dev-ros/diagnostic_updater/Manifest b/dev-ros/diagnostic_updater/Manifest
index b6953773385b..13e70dd314c2 100644
--- a/dev-ros/diagnostic_updater/Manifest
+++ b/dev-ros/diagnostic_updater/Manifest
@@ -1 +1,2 @@
DIST diagnostics-1.8.8.tar.gz 508404 SHA256 e50eb7d49fd2ce13ce8bccb81cb67c198119d7524b3aada37035c8ab9fe2d3ec SHA512 f0e59442cf4cd277c1ef77e7bceec973a15519c9d81bbde21851592ba52c4c7d55a6358c6a65004490b3e3822a6edc772f20e41992a2b3604d9e64e9fd7124ef WHIRLPOOL 32c8fbdc6591abfd270c1c38aebc5dc8f5d7381e5675f6f50f07be0f433bc5a8b81ac33c438d56e753cb75c6914c8fd4c38d9cc82c720fb04b170b4afef597cb
+DIST diagnostics-1.8.9.tar.gz 525881 SHA256 d6102e9b1b98b5f3909a00694b1e3b856d69cdb9fd6b332f4320adf574e3a4a8 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80 WHIRLPOOL 914941b8c688ffaf22268832355d7d9d262d572b5fd1b3b48bbfbefb21240572830d81fb9aebcf252b8be99461cc404f106f3918210de7af49471ca1f244c568
diff --git a/dev-ros/diagnostic_updater/diagnostic_updater-1.8.9.ebuild b/dev-ros/diagnostic_updater/diagnostic_updater-1.8.9.ebuild
new file mode 100644
index 000000000000..042be479d1cc
--- /dev/null
+++ b/dev-ros/diagnostic_updater/diagnostic_updater-1.8.9.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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for updating diagnostics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/roscpp
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-ros/std_msgs[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/eigen_conversions/Manifest b/dev-ros/eigen_conversions/Manifest
index 5129c8c218c8..8a840c952071 100644
--- a/dev-ros/eigen_conversions/Manifest
+++ b/dev-ros/eigen_conversions/Manifest
@@ -1 +1,2 @@
DIST geometry-1.11.7.tar.gz 185886 SHA256 fbfbc707d239a76f7258372cb73a78341c0433d990d6f053340417c5ecb84231 SHA512 f5cf1ffdde96fc5fd375b3363192b355a2b423256bcbb9e1a7929a715b648a41919734653f9db9210fcd62a19a50c08b3c48c853dbaa4d370599732753a906e0 WHIRLPOOL 4958ca10d33d96d1d213ee778687d6d66e20bbf0b527d23bcdb4949fa8c3371831d9fe70ace862128c7018cf41f00c0280a64d9dd0eb6699dace50cf3f560b03
+DIST geometry-1.11.8.tar.gz 186749 SHA256 a372f2225d6d9625dadc9dee817281a22dfb4b4dc8fd129ee1fb9375993bfd88 SHA512 a7d1383635d96b8a95486cbb9d1fdfc762846cb6ecc41c0deef76cea4d9f9cde99c4b079527a25bc5ac559d4987fe7a4c3159e2435942bb3d4fb992da68e0e04 WHIRLPOOL e527970486796a67e1a8edfec0a8abfd562e36bbc9f38cf5a335bbd178f4dd68b067e526e4d308389e61852af8b17a59b0bb82a4faa3a45856c553ddd228fe3b
diff --git a/dev-ros/eigen_conversions/eigen_conversions-1.11.8.ebuild b/dev-ros/eigen_conversions/eigen_conversions-1.11.8.ebuild
new file mode 100644
index 000000000000..090f4611146e
--- /dev/null
+++ b/dev-ros/eigen_conversions/eigen_conversions-1.11.8.ebuild
@@ -0,0 +1,25 @@
+# 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/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions between Eigen and KDL and Eigen and geometry_msgs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ sci-libs/orocos_kdl
+ dev-cpp/eigen:3
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/cmake_modules
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/kdl_conversions/Manifest b/dev-ros/kdl_conversions/Manifest
index 5129c8c218c8..8a840c952071 100644
--- a/dev-ros/kdl_conversions/Manifest
+++ b/dev-ros/kdl_conversions/Manifest
@@ -1 +1,2 @@
DIST geometry-1.11.7.tar.gz 185886 SHA256 fbfbc707d239a76f7258372cb73a78341c0433d990d6f053340417c5ecb84231 SHA512 f5cf1ffdde96fc5fd375b3363192b355a2b423256bcbb9e1a7929a715b648a41919734653f9db9210fcd62a19a50c08b3c48c853dbaa4d370599732753a906e0 WHIRLPOOL 4958ca10d33d96d1d213ee778687d6d66e20bbf0b527d23bcdb4949fa8c3371831d9fe70ace862128c7018cf41f00c0280a64d9dd0eb6699dace50cf3f560b03
+DIST geometry-1.11.8.tar.gz 186749 SHA256 a372f2225d6d9625dadc9dee817281a22dfb4b4dc8fd129ee1fb9375993bfd88 SHA512 a7d1383635d96b8a95486cbb9d1fdfc762846cb6ecc41c0deef76cea4d9f9cde99c4b079527a25bc5ac559d4987fe7a4c3159e2435942bb3d4fb992da68e0e04 WHIRLPOOL e527970486796a67e1a8edfec0a8abfd562e36bbc9f38cf5a335bbd178f4dd68b067e526e4d308389e61852af8b17a59b0bb82a4faa3a45856c553ddd228fe3b
diff --git a/dev-ros/kdl_conversions/kdl_conversions-1.11.8.ebuild b/dev-ros/kdl_conversions/kdl_conversions-1.11.8.ebuild
new file mode 100644
index 000000000000..5ec510e94031
--- /dev/null
+++ b/dev-ros/kdl_conversions/kdl_conversions-1.11.8.ebuild
@@ -0,0 +1,22 @@
+# 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/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions between KDL and geometry_msgs types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ sci-libs/orocos_kdl
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/self_test/Manifest b/dev-ros/self_test/Manifest
index b6953773385b..13e70dd314c2 100644
--- a/dev-ros/self_test/Manifest
+++ b/dev-ros/self_test/Manifest
@@ -1 +1,2 @@
DIST diagnostics-1.8.8.tar.gz 508404 SHA256 e50eb7d49fd2ce13ce8bccb81cb67c198119d7524b3aada37035c8ab9fe2d3ec SHA512 f0e59442cf4cd277c1ef77e7bceec973a15519c9d81bbde21851592ba52c4c7d55a6358c6a65004490b3e3822a6edc772f20e41992a2b3604d9e64e9fd7124ef WHIRLPOOL 32c8fbdc6591abfd270c1c38aebc5dc8f5d7381e5675f6f50f07be0f433bc5a8b81ac33c438d56e753cb75c6914c8fd4c38d9cc82c720fb04b170b4afef597cb
+DIST diagnostics-1.8.9.tar.gz 525881 SHA256 d6102e9b1b98b5f3909a00694b1e3b856d69cdb9fd6b332f4320adf574e3a4a8 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80 WHIRLPOOL 914941b8c688ffaf22268832355d7d9d262d572b5fd1b3b48bbfbefb21240572830d81fb9aebcf252b8be99461cc404f106f3918210de7af49471ca1f244c568
diff --git a/dev-ros/self_test/self_test-1.8.9.ebuild b/dev-ros/self_test/self_test-1.8.9.ebuild
new file mode 100644
index 000000000000..031f298dd431
--- /dev/null
+++ b/dev-ros/self_test/self_test-1.8.9.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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Robot self-test node"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/diagnostic_msgs
+ dev-ros/diagnostic_updater
+ dev-ros/roscpp
+ dev-ros/rostest
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest )"
diff --git a/dev-ros/sound_play/Manifest b/dev-ros/sound_play/Manifest
index 6ae18ef87063..fc10bbbe99d5 100644
--- a/dev-ros/sound_play/Manifest
+++ b/dev-ros/sound_play/Manifest
@@ -1,5 +1,6 @@
DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4
DIST audio_common-0.2.11.tar.gz 182449 SHA256 8ba3d3747cc7fcb45062368fbcd2d220b8d46d184c54247afefcb5be657cafbe SHA512 01ff1aaca6568ef0683501f0bf9ed6b451beddec5c2fc01362f91ba466bcea318fe1e998bde1424d824fa1f39922a2a397d5990d774478e355b6781cbbd7ea72 WHIRLPOOL 651e4bb9142a29dabd637b42f6db75e3b235632d9b2641c756fbd429fb12f3022edbc4cbea56c83d5f428a4265ea9f86e90905348e8797543a20d274256a6ce1
+DIST audio_common-0.2.12.tar.gz 182493 SHA256 c1cdb8cbf999020fb6c97f45de1ddb39fc4712dd7cf48e6a296e5b3a8695d336 SHA512 0d0b4814ad58e34ed0c605425f648c7bc2bc43e57ff2b44b23862bfc6f8ad3381b7aac2fb365b5c8194248ce769a33d5dd01ddd0add87303ce3fd6fcfd63f267 WHIRLPOOL cbdaba77dd6a765ebb99bd51c15ffd5baca253cf1a243200c6985dd602e58afd311c6af17f001f6da35346e51275a49388e23a89759448ae5e03bd1db5ade4c3
DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42
diff --git a/dev-ros/sound_play/sound_play-0.2.12.ebuild b/dev-ros/sound_play/sound_play-0.2.12.ebuild
new file mode 100644
index 000000000000..c4b4cb101276
--- /dev/null
+++ b/dev-ros/sound_play/sound_play-0.2.12.ebuild
@@ -0,0 +1,35 @@
+# 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/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="ROS node that translates commands on a ROS topic (robotsound) into sounds"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/roscpp
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/roslib
+ media-libs/gstreamer:0.10
+ dev-ros/audio_common_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${RDEPEND}
+ dev-python/gst-python[${PYTHON_USEDEP}]
+ app-accessibility/festival
+ media-libs/gst-plugins-good:0.10
+ media-libs/gst-plugins-base:0.10
+"
diff --git a/dev-ros/test_diagnostic_aggregator/Manifest b/dev-ros/test_diagnostic_aggregator/Manifest
index b6953773385b..13e70dd314c2 100644
--- a/dev-ros/test_diagnostic_aggregator/Manifest
+++ b/dev-ros/test_diagnostic_aggregator/Manifest
@@ -1 +1,2 @@
DIST diagnostics-1.8.8.tar.gz 508404 SHA256 e50eb7d49fd2ce13ce8bccb81cb67c198119d7524b3aada37035c8ab9fe2d3ec SHA512 f0e59442cf4cd277c1ef77e7bceec973a15519c9d81bbde21851592ba52c4c7d55a6358c6a65004490b3e3822a6edc772f20e41992a2b3604d9e64e9fd7124ef WHIRLPOOL 32c8fbdc6591abfd270c1c38aebc5dc8f5d7381e5675f6f50f07be0f433bc5a8b81ac33c438d56e753cb75c6914c8fd4c38d9cc82c720fb04b170b4afef597cb
+DIST diagnostics-1.8.9.tar.gz 525881 SHA256 d6102e9b1b98b5f3909a00694b1e3b856d69cdb9fd6b332f4320adf574e3a4a8 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80 WHIRLPOOL 914941b8c688ffaf22268832355d7d9d262d572b5fd1b3b48bbfbefb21240572830d81fb9aebcf252b8be99461cc404f106f3918210de7af49471ca1f244c568
diff --git a/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.8.9.ebuild b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.8.9.ebuild
new file mode 100644
index 000000000000..8a16bb903747
--- /dev/null
+++ b/dev-ros/test_diagnostic_aggregator/test_diagnostic_aggregator-1.8.9.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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="diagnostic_aggregator tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/diagnostic_aggregator
+ dev-ros/diagnostic_msgs
+ dev-ros/pluginlib
+ dev-ros/roscpp
+ dev-ros/rospy
+ dev-ros/rostest
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/test_tf2/Manifest b/dev-ros/test_tf2/Manifest
index ec008bbcd231..e6ba39e1c4eb 100644
--- a/dev-ros/test_tf2/Manifest
+++ b/dev-ros/test_tf2/Manifest
@@ -1 +1,2 @@
DIST geometry_experimental-0.5.12.tar.gz 131234 SHA256 430115ef4a3352e8b00596ff7406e6cb14fc1720250cf164754cf724c7f371c3 SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711 WHIRLPOOL fd894a43e0110eeab1f085faa32a339a72d922d57ae68ee82c2b54f73c246090f3537483f1ca68147f5b7b7a5c7502f9fd4ab733da150c68af94ea2d87859ab1
+DIST geometry_experimental-0.5.13.tar.gz 134107 SHA256 20ad7d3b610c70e8c666937d6a29ef53dac9181025427ee6d0664c67ff94b43f SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d WHIRLPOOL 06da030383725aaeda8626f36b56911cc05c025b538904f33cdc69975027f610113945a3479d85fe83df841fcb1f4902b8927cae2a2272e44f59b86c97d844fc
diff --git a/dev-ros/test_tf2/test_tf2-0.5.13.ebuild b/dev-ros/test_tf2/test_tf2-0.5.13.ebuild
new file mode 100644
index 000000000000..76b129e0211f
--- /dev/null
+++ b/dev-ros/test_tf2/test_tf2-0.5.13.ebuild
@@ -0,0 +1,35 @@
+# 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_experimental"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 unit tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+ dev-ros/rosconsole
+ dev-ros/roscpp
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-ros/tf
+ dev-ros/tf2
+ dev-ros/tf2_bullet
+ dev-ros/tf2_ros[${PYTHON_USEDEP}]
+ dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
+ dev-ros/tf2_kdl[${PYTHON_USEDEP}]
+ dev-ros/tf2_msgs
+ sci-libs/orocos_kdl
+ dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+ dev-libs/boost:=[threads]
+ dev-cpp/gtest"
+
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/tf/Manifest b/dev-ros/tf/Manifest
index 5129c8c218c8..8a840c952071 100644
--- a/dev-ros/tf/Manifest
+++ b/dev-ros/tf/Manifest
@@ -1 +1,2 @@
DIST geometry-1.11.7.tar.gz 185886 SHA256 fbfbc707d239a76f7258372cb73a78341c0433d990d6f053340417c5ecb84231 SHA512 f5cf1ffdde96fc5fd375b3363192b355a2b423256bcbb9e1a7929a715b648a41919734653f9db9210fcd62a19a50c08b3c48c853dbaa4d370599732753a906e0 WHIRLPOOL 4958ca10d33d96d1d213ee778687d6d66e20bbf0b527d23bcdb4949fa8c3371831d9fe70ace862128c7018cf41f00c0280a64d9dd0eb6699dace50cf3f560b03
+DIST geometry-1.11.8.tar.gz 186749 SHA256 a372f2225d6d9625dadc9dee817281a22dfb4b4dc8fd129ee1fb9375993bfd88 SHA512 a7d1383635d96b8a95486cbb9d1fdfc762846cb6ecc41c0deef76cea4d9f9cde99c4b079527a25bc5ac559d4987fe7a4c3159e2435942bb3d4fb992da68e0e04 WHIRLPOOL e527970486796a67e1a8edfec0a8abfd562e36bbc9f38cf5a335bbd178f4dd68b067e526e4d308389e61852af8b17a59b0bb82a4faa3a45856c553ddd228fe3b
diff --git a/dev-ros/tf/tf-1.11.8.ebuild b/dev-ros/tf/tf-1.11.8.ebuild
new file mode 100644
index 000000000000..f81e4ccc6abe
--- /dev/null
+++ b/dev-ros/tf/tf-1.11.8.ebuild
@@ -0,0 +1,39 @@
+# 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/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Maintains the relationship between coordinate frames in a tree structure buffered in time"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-libs/boost:=[threads]
+ dev-ros/angles
+ dev-ros/message_filters
+ dev-ros/rosconsole
+ dev-ros/rostime
+ dev-ros/roscpp
+ dev-ros/tf2_ros
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-python/rospkg[${PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-ros/rostest[${PYTHON_USEDEP}]
+ dev-cpp/gtest
+ dev-python/nose[${PYTHON_USEDEP}]
+ )"
diff --git a/dev-ros/tf2/Manifest b/dev-ros/tf2/Manifest
index ec008bbcd231..e6ba39e1c4eb 100644
--- a/dev-ros/tf2/Manifest
+++ b/dev-ros/tf2/Manifest
@@ -1 +1,2 @@
DIST geometry_experimental-0.5.12.tar.gz 131234 SHA256 430115ef4a3352e8b00596ff7406e6cb14fc1720250cf164754cf724c7f371c3 SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711 WHIRLPOOL fd894a43e0110eeab1f085faa32a339a72d922d57ae68ee82c2b54f73c246090f3537483f1ca68147f5b7b7a5c7502f9fd4ab733da150c68af94ea2d87859ab1
+DIST geometry_experimental-0.5.13.tar.gz 134107 SHA256 20ad7d3b610c70e8c666937d6a29ef53dac9181025427ee6d0664c67ff94b43f SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d WHIRLPOOL 06da030383725aaeda8626f36b56911cc05c025b538904f33cdc69975027f610113945a3479d85fe83df841fcb1f4902b8927cae2a2272e44f59b86c97d844fc
diff --git a/dev-ros/tf2/tf2-0.5.13.ebuild b/dev-ros/tf2/tf2-0.5.13.ebuild
new file mode 100644
index 000000000000..932df2ccb859
--- /dev/null
+++ b/dev-ros/tf2/tf2-0.5.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/geometry_experimental"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-libs/console_bridge
+ dev-ros/rostime
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_bullet/Manifest b/dev-ros/tf2_bullet/Manifest
index ec008bbcd231..e6ba39e1c4eb 100644
--- a/dev-ros/tf2_bullet/Manifest
+++ b/dev-ros/tf2_bullet/Manifest
@@ -1 +1,2 @@
DIST geometry_experimental-0.5.12.tar.gz 131234 SHA256 430115ef4a3352e8b00596ff7406e6cb14fc1720250cf164754cf724c7f371c3 SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711 WHIRLPOOL fd894a43e0110eeab1f085faa32a339a72d922d57ae68ee82c2b54f73c246090f3537483f1ca68147f5b7b7a5c7502f9fd4ab733da150c68af94ea2d87859ab1
+DIST geometry_experimental-0.5.13.tar.gz 134107 SHA256 20ad7d3b610c70e8c666937d6a29ef53dac9181025427ee6d0664c67ff94b43f SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d WHIRLPOOL 06da030383725aaeda8626f36b56911cc05c025b538904f33cdc69975027f610113945a3479d85fe83df841fcb1f4902b8927cae2a2272e44f59b86c97d844fc
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.5.13.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.5.13.ebuild
new file mode 100644
index 000000000000..97d5f87470d0
--- /dev/null
+++ b/dev-ros/tf2_bullet/tf2_bullet-0.5.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/ros/geometry_experimental"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 bullet support"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf2
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+ sci-physics/bullet
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_geometry_msgs/Manifest b/dev-ros/tf2_geometry_msgs/Manifest
index ec008bbcd231..e6ba39e1c4eb 100644
--- a/dev-ros/tf2_geometry_msgs/Manifest
+++ b/dev-ros/tf2_geometry_msgs/Manifest
@@ -1 +1,2 @@
DIST geometry_experimental-0.5.12.tar.gz 131234 SHA256 430115ef4a3352e8b00596ff7406e6cb14fc1720250cf164754cf724c7f371c3 SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711 WHIRLPOOL fd894a43e0110eeab1f085faa32a339a72d922d57ae68ee82c2b54f73c246090f3537483f1ca68147f5b7b7a5c7502f9fd4ab733da150c68af94ea2d87859ab1
+DIST geometry_experimental-0.5.13.tar.gz 134107 SHA256 20ad7d3b610c70e8c666937d6a29ef53dac9181025427ee6d0664c67ff94b43f SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d WHIRLPOOL 06da030383725aaeda8626f36b56911cc05c025b538904f33cdc69975027f610113945a3479d85fe83df841fcb1f4902b8927cae2a2272e44f59b86c97d844fc
diff --git a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.5.13.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.5.13.ebuild
new file mode 100644
index 000000000000..b253c358e54c
--- /dev/null
+++ b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.5.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
+ROS_REPO_URI="https://github.com/ros/geometry_experimental"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf2_ros[${PYTHON_USEDEP}]
+ dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+ dev-ros/tf2
+ sci-libs/orocos_kdl
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_kdl/Manifest b/dev-ros/tf2_kdl/Manifest
index ec008bbcd231..e6ba39e1c4eb 100644
--- a/dev-ros/tf2_kdl/Manifest
+++ b/dev-ros/tf2_kdl/Manifest
@@ -1 +1,2 @@
DIST geometry_experimental-0.5.12.tar.gz 131234 SHA256 430115ef4a3352e8b00596ff7406e6cb14fc1720250cf164754cf724c7f371c3 SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711 WHIRLPOOL fd894a43e0110eeab1f085faa32a339a72d922d57ae68ee82c2b54f73c246090f3537483f1ca68147f5b7b7a5c7502f9fd4ab733da150c68af94ea2d87859ab1
+DIST geometry_experimental-0.5.13.tar.gz 134107 SHA256 20ad7d3b610c70e8c666937d6a29ef53dac9181025427ee6d0664c67ff94b43f SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d WHIRLPOOL 06da030383725aaeda8626f36b56911cc05c025b538904f33cdc69975027f610113945a3479d85fe83df841fcb1f4902b8927cae2a2272e44f59b86c97d844fc
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.5.13.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.5.13.ebuild
new file mode 100644
index 000000000000..8c415ce33eda
--- /dev/null
+++ b/dev-ros/tf2_kdl/tf2_kdl-0.5.13.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_experimental"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="KDL binding for tf2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-cpp/eigen:3
+ dev-ros/tf2
+ dev-ros/tf2_ros
+ dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+ sci-libs/orocos_kdl
+ dev-ros/tf2_msgs[${PYTHON_USEDEP}]
+ dev-ros/cmake_modules
+"
+DEPEND="${RDEPEND} test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf2_msgs/Manifest b/dev-ros/tf2_msgs/Manifest
index ec008bbcd231..e6ba39e1c4eb 100644
--- a/dev-ros/tf2_msgs/Manifest
+++ b/dev-ros/tf2_msgs/Manifest
@@ -1 +1,2 @@
DIST geometry_experimental-0.5.12.tar.gz 131234 SHA256 430115ef4a3352e8b00596ff7406e6cb14fc1720250cf164754cf724c7f371c3 SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711 WHIRLPOOL fd894a43e0110eeab1f085faa32a339a72d922d57ae68ee82c2b54f73c246090f3537483f1ca68147f5b7b7a5c7502f9fd4ab733da150c68af94ea2d87859ab1
+DIST geometry_experimental-0.5.13.tar.gz 134107 SHA256 20ad7d3b610c70e8c666937d6a29ef53dac9181025427ee6d0664c67ff94b43f SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d WHIRLPOOL 06da030383725aaeda8626f36b56911cc05c025b538904f33cdc69975027f610113945a3479d85fe83df841fcb1f4902b8927cae2a2272e44f59b86c97d844fc
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.5.13.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.5.13.ebuild
new file mode 100644
index 000000000000..2d7b8e6b98c9
--- /dev/null
+++ b/dev-ros/tf2_msgs/tf2_msgs-0.5.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
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry_experimental"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/Manifest b/dev-ros/tf2_py/Manifest
index ec008bbcd231..e6ba39e1c4eb 100644
--- a/dev-ros/tf2_py/Manifest
+++ b/dev-ros/tf2_py/Manifest
@@ -1 +1,2 @@
DIST geometry_experimental-0.5.12.tar.gz 131234 SHA256 430115ef4a3352e8b00596ff7406e6cb14fc1720250cf164754cf724c7f371c3 SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711 WHIRLPOOL fd894a43e0110eeab1f085faa32a339a72d922d57ae68ee82c2b54f73c246090f3537483f1ca68147f5b7b7a5c7502f9fd4ab733da150c68af94ea2d87859ab1
+DIST geometry_experimental-0.5.13.tar.gz 134107 SHA256 20ad7d3b610c70e8c666937d6a29ef53dac9181025427ee6d0664c67ff94b43f SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d WHIRLPOOL 06da030383725aaeda8626f36b56911cc05c025b538904f33cdc69975027f610113945a3479d85fe83df841fcb1f4902b8927cae2a2272e44f59b86c97d844fc
diff --git a/dev-ros/tf2_py/tf2_py-0.5.13.ebuild b/dev-ros/tf2_py/tf2_py-0.5.13.ebuild
new file mode 100644
index 000000000000..aaa13254f691
--- /dev/null
+++ b/dev-ros/tf2_py/tf2_py-0.5.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/ros/geometry_experimental"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 python bindings"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf2
+ dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_ros/Manifest b/dev-ros/tf2_ros/Manifest
index ec008bbcd231..e6ba39e1c4eb 100644
--- a/dev-ros/tf2_ros/Manifest
+++ b/dev-ros/tf2_ros/Manifest
@@ -1 +1,2 @@
DIST geometry_experimental-0.5.12.tar.gz 131234 SHA256 430115ef4a3352e8b00596ff7406e6cb14fc1720250cf164754cf724c7f371c3 SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711 WHIRLPOOL fd894a43e0110eeab1f085faa32a339a72d922d57ae68ee82c2b54f73c246090f3537483f1ca68147f5b7b7a5c7502f9fd4ab733da150c68af94ea2d87859ab1
+DIST geometry_experimental-0.5.13.tar.gz 134107 SHA256 20ad7d3b610c70e8c666937d6a29ef53dac9181025427ee6d0664c67ff94b43f SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d WHIRLPOOL 06da030383725aaeda8626f36b56911cc05c025b538904f33cdc69975027f610113945a3479d85fe83df841fcb1f4902b8927cae2a2272e44f59b86c97d844fc
diff --git a/dev-ros/tf2_ros/tf2_ros-0.5.13.ebuild b/dev-ros/tf2_ros/tf2_ros-0.5.13.ebuild
new file mode 100644
index 000000000000..248dddf79d08
--- /dev/null
+++ b/dev-ros/tf2_ros/tf2_ros-0.5.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/geometry_experimental"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/actionlib[${PYTHON_USEDEP}]
+ dev-ros/message_filters
+ dev-ros/roscpp
+ dev-ros/rosgraph
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf2
+ dev-ros/tf2_py[${PYTHON_USEDEP}]
+ dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+ dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf2_sensor_msgs/Manifest b/dev-ros/tf2_sensor_msgs/Manifest
index ec008bbcd231..e6ba39e1c4eb 100644
--- a/dev-ros/tf2_sensor_msgs/Manifest
+++ b/dev-ros/tf2_sensor_msgs/Manifest
@@ -1 +1,2 @@
DIST geometry_experimental-0.5.12.tar.gz 131234 SHA256 430115ef4a3352e8b00596ff7406e6cb14fc1720250cf164754cf724c7f371c3 SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711 WHIRLPOOL fd894a43e0110eeab1f085faa32a339a72d922d57ae68ee82c2b54f73c246090f3537483f1ca68147f5b7b7a5c7502f9fd4ab733da150c68af94ea2d87859ab1
+DIST geometry_experimental-0.5.13.tar.gz 134107 SHA256 20ad7d3b610c70e8c666937d6a29ef53dac9181025427ee6d0664c67ff94b43f SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d WHIRLPOOL 06da030383725aaeda8626f36b56911cc05c025b538904f33cdc69975027f610113945a3479d85fe83df841fcb1f4902b8927cae2a2272e44f59b86c97d844fc
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.5.13.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.5.13.ebuild
new file mode 100644
index 000000000000..db9168fc512a
--- /dev/null
+++ b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.5.13.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_experimental"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf2_ros[${PYTHON_USEDEP}]
+ dev-ros/tf2
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+ dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
+ dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_tools/Manifest b/dev-ros/tf2_tools/Manifest
index ec008bbcd231..e6ba39e1c4eb 100644
--- a/dev-ros/tf2_tools/Manifest
+++ b/dev-ros/tf2_tools/Manifest
@@ -1 +1,2 @@
DIST geometry_experimental-0.5.12.tar.gz 131234 SHA256 430115ef4a3352e8b00596ff7406e6cb14fc1720250cf164754cf724c7f371c3 SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711 WHIRLPOOL fd894a43e0110eeab1f085faa32a339a72d922d57ae68ee82c2b54f73c246090f3537483f1ca68147f5b7b7a5c7502f9fd4ab733da150c68af94ea2d87859ab1
+DIST geometry_experimental-0.5.13.tar.gz 134107 SHA256 20ad7d3b610c70e8c666937d6a29ef53dac9181025427ee6d0664c67ff94b43f SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d WHIRLPOOL 06da030383725aaeda8626f36b56911cc05c025b538904f33cdc69975027f610113945a3479d85fe83df841fcb1f4902b8927cae2a2272e44f59b86c97d844fc
diff --git a/dev-ros/tf2_tools/tf2_tools-0.5.13.ebuild b/dev-ros/tf2_tools/tf2_tools-0.5.13.ebuild
new file mode 100644
index 000000000000..047dbf6fc015
--- /dev/null
+++ b/dev-ros/tf2_tools/tf2_tools-0.5.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
+ROS_REPO_URI="https://github.com/ros/geometry_experimental"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 tools"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/rospy[${PYTHON_USEDEP}]
+ dev-ros/tf2_py[${PYTHON_USEDEP}]
+ dev-ros/tf2_ros[${PYTHON_USEDEP}]
+ dev-ros/roslib[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf_conversions/Manifest b/dev-ros/tf_conversions/Manifest
index 5129c8c218c8..8a840c952071 100644
--- a/dev-ros/tf_conversions/Manifest
+++ b/dev-ros/tf_conversions/Manifest
@@ -1 +1,2 @@
DIST geometry-1.11.7.tar.gz 185886 SHA256 fbfbc707d239a76f7258372cb73a78341c0433d990d6f053340417c5ecb84231 SHA512 f5cf1ffdde96fc5fd375b3363192b355a2b423256bcbb9e1a7929a715b648a41919734653f9db9210fcd62a19a50c08b3c48c853dbaa4d370599732753a906e0 WHIRLPOOL 4958ca10d33d96d1d213ee778687d6d66e20bbf0b527d23bcdb4949fa8c3371831d9fe70ace862128c7018cf41f00c0280a64d9dd0eb6699dace50cf3f560b03
+DIST geometry-1.11.8.tar.gz 186749 SHA256 a372f2225d6d9625dadc9dee817281a22dfb4b4dc8fd129ee1fb9375993bfd88 SHA512 a7d1383635d96b8a95486cbb9d1fdfc762846cb6ecc41c0deef76cea4d9f9cde99c4b079527a25bc5ac559d4987fe7a4c3159e2435942bb3d4fb992da68e0e04 WHIRLPOOL e527970486796a67e1a8edfec0a8abfd562e36bbc9f38cf5a335bbd178f4dd68b067e526e4d308389e61852af8b17a59b0bb82a4faa3a45856c553ddd228fe3b
diff --git a/dev-ros/tf_conversions/tf_conversions-1.11.8.ebuild b/dev-ros/tf_conversions/tf_conversions-1.11.8.ebuild
new file mode 100644
index 000000000000..6c8a46d49685
--- /dev/null
+++ b/dev-ros/tf_conversions/tf_conversions-1.11.8.ebuild
@@ -0,0 +1,28 @@
+# 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/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions to convert common tf datatypes into identical datatypes used by other libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+ dev-ros/kdl_conversions
+ dev-ros/tf[${PYTHON_USEDEP}]
+ sci-libs/orocos_kdl
+ dev-cpp/eigen:3
+ dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ruby/GeoRuby/GeoRuby-2.2.1-r2.ebuild b/dev-ruby/GeoRuby/GeoRuby-2.2.1-r2.ebuild
index 811992aa9de0..4ac9f8f596b3 100644
--- a/dev-ruby/GeoRuby/GeoRuby-2.2.1-r2.ebuild
+++ b/dev-ruby/GeoRuby/GeoRuby-2.2.1-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
# uses ruby19 hash syntax
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-ruby/GeoRuby/GeoRuby-2.2.1-r3.ebuild b/dev-ruby/GeoRuby/GeoRuby-2.2.1-r3.ebuild
deleted file mode 100644
index 7c1ec7ecf442..000000000000
--- a/dev-ruby/GeoRuby/GeoRuby-2.2.1-r3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# uses ruby19 hash syntax
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_NAME="georuby"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby data holder for OGC Simple Features"
-HOMEPAGE="https://github.com/nofxx/georuby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/dbf
- dev-ruby/nokogiri"
diff --git a/dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild b/dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild
index 17a3146a8df7..c09ecd0796ef 100644
--- a/dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild
+++ b/dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/RubyInline/RubyInline-3.12.3-r1.ebuild b/dev-ruby/RubyInline/RubyInline-3.12.3-r1.ebuild
deleted file mode 100644
index fefe01b69ea8..000000000000
--- a/dev-ruby/RubyInline/RubyInline-3.12.3-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ruby22 -> Code uses obsolete Config module.
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows to embed C/C++ in Ruby code"
-HOMEPAGE="http://www.zenspider.com/ZSS/Products/RubyInline/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/zentest"
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/hoe-3
- dev-ruby/hoe-seattlerb
- dev-ruby/minitest:5
- )"
-
-RUBY_PATCHES=(
- ruby-inline-3.12.2-gentoo.patch
- ruby-inline-3.11.1-ldflags.patch
-)
-
-all_ruby_prepare() {
- sed -i -e '/isolate/ s:^:#:' Rakefile || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- docinto examples
- dodoc example.rb example2.rb demo/*.rb
-}
diff --git a/dev-ruby/RubyInline/RubyInline-3.12.3.ebuild b/dev-ruby/RubyInline/RubyInline-3.12.3.ebuild
index 1faa922b090f..2edf86f3269d 100644
--- a/dev-ruby/RubyInline/RubyInline-3.12.3.ebuild
+++ b/dev-ruby/RubyInline/RubyInline-3.12.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/RubyInline/RubyInline-3.12.4.ebuild b/dev-ruby/RubyInline/RubyInline-3.12.4.ebuild
index fefe01b69ea8..d04472047c7b 100644
--- a/dev-ruby/RubyInline/RubyInline-3.12.4.ebuild
+++ b/dev-ruby/RubyInline/RubyInline-3.12.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
# ruby22 -> Code uses obsolete Config module.
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index b3a9124d8278..cf72b92c917b 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,3 +1 @@
-DIST asciidoctor-1.5.2.tar.gz 494239 SHA256 f10242d7ea5e8c3b6279c9535e67d58fb0b8ffe2c5625e7b211af3dd683dd368 SHA512 5d50134d4bed58bb5dc610929c30b1272c8d75e9748f6587a4e00cd8d76b4f86e8edd17b04a8579d984e9ce3864c3d96a81bc526988a6c6d71e418923c94d67a WHIRLPOOL 67cf1cdd71dd4819c2d829d729057ec0b7b6ac107a5754333eb257a80545c4229870a1ae83b14172bd52e5e8b145bc1f56db6bca6af341d6ee7ca6b63267e7c8
-DIST asciidoctor-1.5.3.tar.gz 509233 SHA256 b6aa27203bf9fc8ca55d0c0468f8f3e70ae1b3aa60f1bb50dd6aa53497275841 SHA512 17e5c930b2d2d1727b5b5f2100f6b625edf3af73e98aadf84135bdf01bbbef8587b310fe513508ae575ee6b8a08d573ac512fbfc3d6e9ea9e144048786865c35 WHIRLPOOL 9333bee73633e18b9c334d6f622df07e8d07c1a491852b710b2edc31c892ebbc00e2d915a9234253f7a13611988f8d53e3a791a73e4ca6cbd82e90444dce9fe1
DIST asciidoctor-1.5.4.tar.gz 520793 SHA256 2963fdf5ce12962e3a514d7d83426897184c947de5df89300ee524970dc2f3bc SHA512 c3a6405a6c39d1aa70e4d10ce42a6f6e01f3b7ddd8f695e8043fce9116ac91ad1f1f881a449ee8a61172213720dae1285f9c4de03a5cec908de906ed5b14e626 WHIRLPOOL bb06147e6c77fc5d0133b0b747103ec362cc724624087cb84756b2a193540e6b164aed1c8a20a1578298be135e7b65938ae07a902409ba778c25792bd6350ec9
diff --git a/dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild b/dev-ruby/asciidoctor/asciidoctor-1.5.2.ebuild
deleted file mode 100644
index 6448f8ffc6a4..000000000000
--- a/dev-ruby/asciidoctor/asciidoctor-1.5.2.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test features"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for converting AsciiDoc source files or strings into HTML 5, DocBook 4.5 and other formats"
-HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
- dev-util/cucumber
- dev-ruby/rspec-expectations:*
- dev-ruby/coderay
- dev-ruby/erubis
- dev-ruby/haml
- dev-ruby/nokogiri
- dev-ruby/slim
- dev-ruby/tilt )"
-
-all_ruby_prepare() {
- rm Gemfile || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- doman man/asciidoctor.1
-}
diff --git a/dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild b/dev-ruby/asciidoctor/asciidoctor-1.5.3.ebuild
deleted file mode 100644
index ff08e44858fa..000000000000
--- a/dev-ruby/asciidoctor/asciidoctor-1.5.3.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
-USE_RUBY="ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="test features"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats"
-HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RUBY_PATCHES=( ${P}-slim-options.patch )
-
-ruby_add_bdepend "test? (
- dev-util/cucumber
- dev-ruby/rspec-expectations:*
- dev-ruby/asciimath
- dev-ruby/coderay
- dev-ruby/erubis
- dev-ruby/haml
- dev-ruby/nokogiri
- dev-ruby/slim
- dev-ruby/tilt )"
-
-all_ruby_prepare() {
- rm Gemfile || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- doman man/asciidoctor.1
-}
diff --git a/dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch b/dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch
deleted file mode 100644
index 3494269743db..000000000000
--- a/dev-ruby/asciidoctor/files/asciidoctor-1.5.3-slim-options.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 04b9d6153d1e289bd450a2f52bffde754ef4d1b0 Mon Sep 17 00:00:00 2001
-From: Antonio Terceiro <terceiro@softwarelivre.org>
-Date: Tue, 17 Nov 2015 11:17:16 -0200
-Subject: [PATCH] Initialize slim-related attributes regardless of when slim
- was loaded
-
-Setting instance attributes of the Template class cannot depend on
-whether slim has been loaded before or not.
----
- lib/asciidoctor/converter/template.rb | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/asciidoctor/converter/template.rb b/lib/asciidoctor/converter/template.rb
-index 10eaa99..43be87b 100644
---- a/lib/asciidoctor/converter/template.rb
-+++ b/lib/asciidoctor/converter/template.rb
-@@ -253,10 +253,10 @@ def scan_dir template_dir, pattern, template_cache = nil
- unless defined? ::Slim
- # slim doesn't get loaded by Tilt, so we have to load it explicitly
- Helpers.require_library 'slim'
-- if @safe && ::Slim::VERSION >= '3.0'
-- slim_asciidoc_opts = (@engine_options[:slim][:asciidoc] ||= {})
-- slim_asciidoc_opts[:safe] ||= @safe
-- end
-+ end
-+ if @safe && ::Slim::VERSION >= '3.0'
-+ slim_asciidoc_opts = (@engine_options[:slim][:asciidoc] ||= {})
-+ slim_asciidoc_opts[:safe] ||= @safe
- end
- # load include plugin when using Slim >= 2.1
- require 'slim/include' unless (defined? ::Slim::Include) || ::Slim::VERSION < '2.1'
diff --git a/dev-ruby/awesome_print/Manifest b/dev-ruby/awesome_print/Manifest
index d2a308f265b2..021fa7e64bce 100644
--- a/dev-ruby/awesome_print/Manifest
+++ b/dev-ruby/awesome_print/Manifest
@@ -1,2 +1 @@
-DIST awesome_print-1.2.0.gem 29184 SHA256 f9fb1d1bafddc4739266c68f3a043e409716a620aea937d54d1ae07c278305cd SHA512 10e1d77ceb0b05aa9b0f12911c24ab63d20a3c88f9fbace518562e7e6de21f6db5dbe75fc0b2c50fa244a33f08cba920d48dc04069ac740394200a1d695e2f4f WHIRLPOOL 1de1eecbfd2e5e3f03b69a0b6d4afd130fad59b22807f1a8d9f1416fd946a574f23bfc59f8391975e9d10770c9530aba48caca0ed137c0bdaaf2a4a50a6a8b9d
DIST awesome_print-1.6.1.gem 32256 SHA256 0d8be8d9b270b900a337356cb9453ffdaf219d29902f14bbe4f120ecfdd38fef SHA512 394f5011d45f1daca77215e585d50c8505a63498b982aae32b206b99051fc27b903135fdb62976d9aeb4dfa80f5d6980b55c7fbe0fdc75feb979fd3b3b935c92 WHIRLPOOL 9d6c5f8fe60e3ba7ebbc16c5bcaf91337d2142d4846b490c75185c905ada1dd6f76fbd8f73a859bdeef91542ad3623758cfaa029d1b303dfc02d9b964199bc40
diff --git a/dev-ruby/awesome_print/awesome_print-1.2.0-r2.ebuild b/dev-ruby/awesome_print/awesome_print-1.2.0-r2.ebuild
deleted file mode 100644
index 13e7ce777e8b..000000000000
--- a/dev-ruby/awesome_print/awesome_print-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby library that pretty prints Ruby objects in full color with proper indentation"
-HOMEPAGE="https://github.com/michaeldv/awesome_print"
-LICENSE="MIT"
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
diff --git a/dev-ruby/awesome_print/awesome_print-1.6.1.ebuild b/dev-ruby/awesome_print/awesome_print-1.6.1.ebuild
index 6cb8d9c25d98..35214dd03610 100644
--- a/dev-ruby/awesome_print/awesome_print-1.6.1.ebuild
+++ b/dev-ruby/awesome_print/awesome_print-1.6.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
inherit ruby-fakegem
-DESCRIPTION="Ruby library that pretty prints Ruby objects in full color with proper indentation"
+DESCRIPTION="Library to pretty print Ruby objects in full color with proper indentation"
HOMEPAGE="https://github.com/michaeldv/awesome_print"
LICENSE="MIT"
diff --git a/dev-ruby/bcat/bcat-0.6.2-r1.ebuild b/dev-ruby/bcat/bcat-0.6.2-r1.ebuild
index 3d1e78366d73..8affb8eb58a2 100644
--- a/dev-ruby/bcat/bcat-0.6.2-r1.ebuild
+++ b/dev-ruby/bcat/bcat-0.6.2-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
RUBY_FAKEGEM_TASK_DOC="man"
RUBY_FAKEGEM_EXTRADOC="README"
inherit ruby-fakegem
-DESCRIPTION="A pipe to browser utility for use at the shell and within editors like Vim or Emacs"
+DESCRIPTION="Pipe to browser utility for use at the shell and within editors"
HOMEPAGE="https://github.com/rtomayko/bcat"
LICENSE="MIT"
diff --git a/dev-ruby/bcat/bcat-0.6.2-r2.ebuild b/dev-ruby/bcat/bcat-0.6.2-r2.ebuild
index 8051d398bda6..9b4f823fb84d 100644
--- a/dev-ruby/bcat/bcat-0.6.2-r2.ebuild
+++ b/dev-ruby/bcat/bcat-0.6.2-r2.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC="man"
RUBY_FAKEGEM_EXTRADOC="README"
inherit ruby-fakegem
-DESCRIPTION="A pipe to browser utility for use at the shell and within editors like Vim or Emacs"
+DESCRIPTION="Pipe to browser utility for use at the shell and within editors"
HOMEPAGE="https://github.com/rtomayko/bcat"
LICENSE="MIT"
diff --git a/dev-ruby/bcrypt-ruby/Manifest b/dev-ruby/bcrypt-ruby/Manifest
index e93d065b5d05..a30c7745f2db 100644
--- a/dev-ruby/bcrypt-ruby/Manifest
+++ b/dev-ruby/bcrypt-ruby/Manifest
@@ -1,2 +1,3 @@
DIST bcrypt-3.1.10.gem 44032 SHA256 86d25b7eaec3db734bf681aa0e3d58e121766d75c849113aeb602549ff3f8e95 SHA512 11e7a1ea28c53d22354abd3891b88c5f58bd8c18611a2964db69e56e5f9b819e5af184423fbd7fb2ebd1fb84b1618fbd043f0bfd62902515a07427846bef607a WHIRLPOOL e27e2dc2b2796aca39359617adb1261064a58d72b7fe30477f1a7b76678794483b8edebff558f18e68807a38634bf3ae65483c68c967c1ad2bb71589bb6df358
+DIST bcrypt-3.1.11.gem 44032 SHA256 a0fc22135205c851f46e8a661de8be242d54951cbd2c37a6fad5c8069b2645b4 SHA512 bf9ff0d3cdd7044b4ee5796cd04869f21bb3384143b0f336bc2cd9a8f0db3f9562aa23a39601c1d86f153b62f07469ef066616f8a52cfcd840377e331cb22454 WHIRLPOOL aa29be481270df60805b625ac90ee01b0da8c49ae95f6131b0d17bc91cdd8b85a676b2aa241dbddc1d4ffe259169720de2400a8848eff6d97fc1453644fb9256
DIST bcrypt-3.1.9.gem 44032 SHA256 10bda421e4423be8c3d719010b56be99a593de4c584737963c98fc939fadef3f SHA512 5fa1bcdff413abc6a36071f670c79b6d76404b3dc9aeb9a032b22e959674763f4d08afcff93211ad5fe56f20f63d8507688135a1878ca8fcf9bb9b33dc17882b WHIRLPOOL d3d477b412193073cff65ebad757c3c83c58939047481e8dd6e8056471daf4467214cde835d1e8430594f21da821921657b3a0b6fe03b40b29cc96c89dee71ed
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.11.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.11.ebuild
new file mode 100644
index 000000000000..1c4024969164
--- /dev/null
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.11.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_NAME="bcrypt"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="An easy way to keep your users' passwords secure"
+HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+all_ruby_prepare() {
+ rm Gemfile || die
+ sed -i -e '/git ls-files/d' bcrypt.gemspec || die
+}
+
+each_ruby_configure() {
+ ${RUBY} -Cext/mri extconf.rb || die
+}
+
+each_ruby_compile() {
+ emake -Cext/mri V=1
+ cp ext/mri/*$(get_modname) lib/ || die
+}
+
+each_ruby_install() {
+ each_fakegem_install
+
+ # bcrypt was called bcrypt-ruby before, so add a spec file that
+ # simply loads bcrypt to make sure that old projects load correctly
+ # we don't even need to create a file to load this: the `require
+ # bcrypt` was already part of bcrypt-ruby requirements.
+ cat - <<EOF > "${T}/bcrypt-ruby.gemspec"
+Gem::Specification.new do |s|
+ s.name = "bcrypt-ruby"
+ s.version = "${RUBY_FAKEGEM_VERSION}"
+ s.summary = "Fake gem to load bcrypt"
+ s.homepage = "${HOMEPAGE}"
+ s.specification_version = 3
+ s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
+end
+EOF
+ RUBY_FAKEGEM_NAME=bcrypt-ruby \
+ RUBY_FAKEGEM_GEMSPEC="${T}/bcrypt-ruby.gemspec" \
+ ruby_fakegem_install_gemspec
+}
diff --git a/dev-ruby/blankslate/Manifest b/dev-ruby/blankslate/Manifest
index b31a42245d98..7eb7d3307415 100644
--- a/dev-ruby/blankslate/Manifest
+++ b/dev-ruby/blankslate/Manifest
@@ -1,3 +1,2 @@
DIST blankslate-2.1.2.4.gem 6144 SHA256 9d35768449b5615bd3a2d21b278800d687b952dbc91ccadccac2f35670c1d64a SHA512 cfd3fdd4b4e0d2eb5bdaa70e7dec1f0255d97335aaafea72e84b586eb809345761b3dc6da7eb0e98c5d504e5037ebac287f0d19312984bb029fcf332d38b3ae8 WHIRLPOOL fa4419bd2c4657706d87cb55fd7a38e6a80fa82ff511090cfd46f6395cf2673ed059c60bd856520c86f1172ef5b03c00c3224ce8cfe8ad070b4e3e5cd892d151
-DIST blankslate-3.1.2.gem 17920 SHA256 2c31bf17c70b9fa96a5d05f8a33b2556ef23a6ba8a488bee42f278945c67b3b6 SHA512 b12737592b8d716a2255d1a08ce3fa3691fe1dcfb34fe770749b387aa07648f14fcd5b9fa3c91effa2b784b7401e75929c6ed94b4c280155d4545e9c359c84b3 WHIRLPOOL 672d4cf67526336fc4604c4aeafb24ccaeb1a98b0d50f593592b7a1605cca9fff0dc067bc779a2740d57325d4eff9d6be62f2e70c05793b61a33f186576dae2b
DIST blankslate-3.1.3.gem 8192 SHA256 dd3373df0478cb82e83a7711469ea2bc3ce11fdfdd0acbdb3eec25191a59933b SHA512 4164c2e9ecb6a294fbd0d25f70bae36ee9277da3a75aae6c99d37147f8111c40a6cfb85ddc3819e45c361c49fd9c3fc724ecea201763f7f9891b96589226f245 WHIRLPOOL c8a131597c9af64f7a48beedf4c198a0fcd55d77b390b24bcb57aac01657d3553099f7d10a20381c47eafbcceb190cfcb49d7bcf64effdd37acdb7e501d421d8
diff --git a/dev-ruby/blankslate/blankslate-2.1.2.4.ebuild b/dev-ruby/blankslate/blankslate-2.1.2.4.ebuild
index 1b0b0e38d05c..127826a9d664 100644
--- a/dev-ruby/blankslate/blankslate-2.1.2.4.ebuild
+++ b/dev-ruby/blankslate/blankslate-2.1.2.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_EXTRADOC="README"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec"
inherit ruby-fakegem
-DESCRIPTION="A base class where almost all of the methods from Object and Kernel have been removed"
+DESCRIPTION="Base class with almost all of the methods from Object and Kernel being removed"
HOMEPAGE="https://rubygems.org/gems/blankslate"
IUSE=""
diff --git a/dev-ruby/blankslate/blankslate-3.1.2.ebuild b/dev-ruby/blankslate/blankslate-3.1.2.ebuild
deleted file mode 100644
index 150ebd9e0223..000000000000
--- a/dev-ruby/blankslate/blankslate-3.1.2.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
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A base class where almost all of the methods from Object and Kernel have been removed"
-HOMEPAGE="https://rubygems.org/gems/blankslate"
-
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64"
-
-ruby_add_bdepend "test? ( dev-ruby/builder )"
-
-all_ruby_prepare() {
- sed -i -e "/test\/preload/d"\
- -e "/test_preload_method_added/,/end/d" test/test_blankslate.rb || die
- sed -i -e "/test\/preload/d" test/test_{method_caching,markupbuilder,eventbuilder}.rb || die
-
- # Avoid failure due to differing builder versions that render an
- # empty value differently.
- sed -i -e '/test_empty_value/,/end/ s:^:#:' test/test_markupbuilder.rb || die
-
- # Avoid failing encoding test on ruby20 for now. Not clear if this
- # will be a real problem, but looks like ruby20 properly supports
- # utf8 verbatim which the test suite does not expect.
- sed -i -e '/test_utf8_verbatim/,/end/ s:^:#:' test/test_xchar.rb || die
-
- rm -rf doc || die "Removing old builder documentation failed."
-}
-
-each_ruby_test() {
- ${RUBY} -I.:lib -e "Dir['test/test_*.rb'].each{|f| require f}" || die
-}
diff --git a/dev-ruby/blankslate/blankslate-3.1.3.ebuild b/dev-ruby/blankslate/blankslate-3.1.3.ebuild
index 1a6c98978bc2..11a69ebecb9c 100644
--- a/dev-ruby/blankslate/blankslate-3.1.3.ebuild
+++ b/dev-ruby/blankslate/blankslate-3.1.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec"
inherit ruby-fakegem
-DESCRIPTION="A base class where almost all of the methods from Object and Kernel have been removed"
+DESCRIPTION="Base class with almost all of the methods from Object and Kernel being removed"
HOMEPAGE="https://rubygems.org/gems/blankslate"
IUSE=""
diff --git a/dev-ruby/bourne/Manifest b/dev-ruby/bourne/Manifest
index 9d9158b3ec2a..dbef31150f53 100644
--- a/dev-ruby/bourne/Manifest
+++ b/dev-ruby/bourne/Manifest
@@ -1,2 +1 @@
-DIST bourne-1.5.0.gem 15872 SHA256 b96492d4805ca581173bc9e97b7a31f3986d749f94d42abc7bfef20d6ab7a8a1 SHA512 269731d6caea8865ebc12af390b65a4446c42fdfe7ed5308097bb612237a6917e8823ffd916eed67e7a6bcd21417cdfcb4c02325ab44bbaa204635047a7a3f0f WHIRLPOOL 1eef98d4c7c7080791ccaca0b81e8245584761136c9014687045ed81d223e91841a9b7aec448e7aa1ffa3e69b8e8d288b91e93be8b24b73b592066786f0cdba2
DIST bourne-1.6.0.gem 15872 SHA256 c889471ee13e7aeda661d84a6bb86aa5665b8b69610e949ffde32f419a3a25a5 SHA512 85bdc52b7e86bc86882ac3d815088da1ea882f828613079075a90b3a40cc41ac87bc503b36ee4ee5812374eb1cd83602832b15f2aaf0e01ea54244cc14bf71ac WHIRLPOOL 99c25d0bce9af4e16b1993383066e241ba73efd0ee11b4623318c741ae5323cb09881b68813a1f9a7e48a1958049ba1f97dc37e4c9973f72e732c1085f7af324
diff --git a/dev-ruby/bourne/bourne-1.5.0-r1.ebuild b/dev-ruby/bourne/bourne-1.5.0-r1.ebuild
deleted file mode 100644
index 48dcbe9a5310..000000000000
--- a/dev-ruby/bourne/bourne-1.5.0-r1.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_TASK_TEST="MOCHA_OPTIONS=use_test_unit_gem test:units test:acceptance"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Extends mocha to allow detailed tracking and querying of stub and mock invocations"
-HOMEPAGE="https://github.com/thoughtbot/bourne"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/mocha-0.13.2:0.13"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
- sed -i -e '/git ls-files/d' "${RUBY_FAKEGEM_GEMSPEC}" || die
- sed -i -e '/bundler/d' Rakefile || die
-}
diff --git a/dev-ruby/bourne/bourne-1.6.0.ebuild b/dev-ruby/bourne/bourne-1.6.0.ebuild
index eb3ffce6eab9..0c5e37feffbd 100644
--- a/dev-ruby/bourne/bourne-1.6.0.ebuild
+++ b/dev-ruby/bourne/bourne-1.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
inherit ruby-fakegem
-DESCRIPTION="Extends mocha to allow detailed tracking and querying of stub and mock invocations"
+DESCRIPTION="Extends mocha to allow tracking and querying of stub and mock invocations"
HOMEPAGE="https://github.com/thoughtbot/bourne"
LICENSE="MIT"
diff --git a/dev-ruby/celluloid/Manifest b/dev-ruby/celluloid/Manifest
index f21bd1f9c5da..ce47e22581c5 100644
--- a/dev-ruby/celluloid/Manifest
+++ b/dev-ruby/celluloid/Manifest
@@ -1,3 +1,2 @@
DIST celluloid-0.16.0-git.tgz 63859 SHA256 3f5d5be010c97b9a0a3a21008a0ad9880729e23cfda100b5df174279d427f338 SHA512 b1acc0daf35b16c086d720fccec93519de609e6c9e8f411ed70c48f3cfcb0c88f5ee665ac41e4a535e00eef112cae26ca2e8ab6b6de4738e13ed50579098d8ed WHIRLPOOL a9d583ff8495c978e3d042df781ae5ced30a97eea8b401bd8c763aa75c7f72cf0de49e1a131345ff1e991f4303745c58b491cd413e7cb6b287d8a5df85de254d
-DIST celluloid-0.17.2.gem 61440 SHA256 3de97f755dcd890a8b5a923d237c6730c20200159fb0940508c50d8714d128ad SHA512 9203cadbcae2b1d5f7e197e9aa682d0077e007ab9d2140ed4d65657c3d63e27382f0c53dff3de6dc4fb6afec592b3a093b9aaa53c27a69cafc093c713ffde771 WHIRLPOOL adf6ff49a4d10e7123c530878608c87aa0c0de58c892bd616ac1402e1c95d3f7549a2d8b5b35a5c3a657fc2162ae1decc8f4faf48dfa6110f793d53d5c418994
DIST celluloid-0.17.3.gem 61952 SHA256 afe25394c5954e3b14131389bb0550259deadaf37d90978b8399b6390f4e2282 SHA512 bb5005452ef7a2da1fb6b6515a6ad9df992dfd043caa605d1282a24b874c1f0798da0d19ee00f434486f9ef2c9467b1d6d2cadaa7883db98b885eeb842f1b94c WHIRLPOOL 8a006e779551327d8b583d014ad514fbf4b4f697f19c3c91dfd68e3455113e289ffaa083ca6355f191fe4ee4e32477758cc7f296d07d764fc34aae5685fe4128
diff --git a/dev-ruby/celluloid/celluloid-0.16.0.ebuild b/dev-ruby/celluloid/celluloid-0.16.0.ebuild
deleted file mode 100644
index e50a99e7ad4b..000000000000
--- a/dev-ruby/celluloid/celluloid-0.16.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
-# rbx or jruby recommended, but only in 1.9 mode.
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-#Needed by dev-ruby/listen
-RUBY_FAKEGEM_EXTRAINSTALL="spec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Celluloid provides a simple and natural way to build fault-tolerant concurrent programs in Ruby"
-HOMEPAGE="https://github.com/celluloid/celluloid"
-SRC_URI="https://github.com/celluloid/celluloid/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-IUSE=""
-SLOT="0"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RUBY_PATCHES=( "${P}-call-private-methods.patch" )
-
-ruby_add_rdepend ">=dev-ruby/timers-4.0.0:4"
-
-all_ruby_prepare() {
- rm Gemfile .rspec || die
-
- sed -i -e '/[Bb]undler/d' -e '/coveralls/I s:^:#:' spec/spec_helper.rb || die
-
- # Force loading of the correct timers slot to avoid a bundler dependency.
- sed -i -e '3igem "timers", "~>4.0.0"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/celluloid/celluloid-0.17.2.ebuild b/dev-ruby/celluloid/celluloid-0.17.2.ebuild
deleted file mode 100644
index 68e5e87f1d02..000000000000
--- a/dev-ruby/celluloid/celluloid-0.17.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-# Needed by packages writing specs for celluloid
-RUBY_FAKEGEM_EXTRAINSTALL="spec"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides a simple and natural way to build fault-tolerant concurrent programs"
-HOMEPAGE="https://github.com/celluloid/celluloid"
-IUSE=""
-SLOT="0"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-ruby_add_rdepend "
- dev-ruby/celluloid-essentials
- dev-ruby/celluloid-extras
- dev-ruby/celluloid-fsm
- dev-ruby/celluloid-pool
- dev-ruby/celluloid-supervision
- >=dev-ruby/timers-4.1.1"
-
-ruby_add_bdepend "test? (
- dev-ruby/dotenv
- dev-ruby/nenv
- dev-ruby/rspec-retry
-)"
-
-all_ruby_prepare() {
- sed -i -e '/[Bb]undler/d' -e '/coveralls/I s:^:#:' spec/spec_helper.rb || die
-
- sed -i -e '1irequire "spec_helper"' spec/celluloid/actor/system_spec.rb || die
-
- sed -i -e '1irequire "pathname"' spec/spec_helper.rb || die
- mkdir log || die
-}
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index 51d68d99c3f4..71730da55c98 100644
--- a/dev-ruby/childprocess/Manifest
+++ b/dev-ruby/childprocess/Manifest
@@ -1,3 +1,2 @@
DIST childprocess-0.5.3.gem 28160 SHA256 9cebed1bd68f7ba0deb54683a5c05a8c3e79037f682b5d0a6ecd1d4472bbb289 SHA512 f48ab94dc3da7ca82551f480cb18214ec65f9550ef053b25216239ed92c289a7353c632fff53148b1d6ce0c7bf70188bcecbdeede3df9b8130f815599a45ac05 WHIRLPOOL 68f7e9585c39a2628c4cb162d02c7d332d116be96ce8f325308e15d530e00139d43b9dcfcdfd490c6a252057947eed4c91843d8f37b96201d95b6ff3078055da
-DIST childprocess-0.5.8.gem 29184 SHA256 e06178990b906c23e47960c5fd38aadae69543a703766953655a4117625767d3 SHA512 e2871861f727945ee3635364152acbb4229f5b896039f28a9735f5c42230180e4142e7ee1473cd43724483cd63c93d58502e48c9f6554e1b3036dc3f82141a56 WHIRLPOOL 3037b5f1e25d7840bdd84262371d7f2a0764b88711a2b45a578739a811954d63a82c6526bff916b546e3fca5bfaac52ddb24fab157e0acefaf57e9615f8717dd
DIST childprocess-0.5.9.gem 29184 SHA256 221f98abeacce606ab3940785217c2d4a58ddbb7d267678b185acc54f92842c7 SHA512 5a671e59d19531347438dc149d5309218c7e439cfd0bfcfe201ae8e1099a2608a0170f9a3f3752fb709afc6b68fa3a10dc60d0632af545a9ba71483c7be2c21d WHIRLPOOL 8558622ef2f0ad3d9c2d84968378034d3293b7f485d30b6361326539e329b33bb52e5b472c8880485c23f85e457ad07894036ca2adfdf148ac4b05925407ac28
diff --git a/dev-ruby/childprocess/childprocess-0.5.3.ebuild b/dev-ruby/childprocess/childprocess-0.5.3.ebuild
index f89823fe620b..8de42c06a432 100644
--- a/dev-ruby/childprocess/childprocess-0.5.3.ebuild
+++ b/dev-ruby/childprocess/childprocess-0.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
inherit ruby-fakegem
-DESCRIPTION="A simple and reliable solution for controlling external programs running in the background"
+DESCRIPTION="Solution for controlling external programs running in the background"
HOMEPAGE="https://github.com/jarib/childprocess"
LICENSE="MIT"
diff --git a/dev-ruby/childprocess/childprocess-0.5.8.ebuild b/dev-ruby/childprocess/childprocess-0.5.8.ebuild
deleted file mode 100644
index 4530cd9175a1..000000000000
--- a/dev-ruby/childprocess/childprocess-0.5.8.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
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple and reliable solution for controlling external programs running in the background"
-HOMEPAGE="https://github.com/jarib/childprocess"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/rspec:3 )"
-
-ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
-
-all_ruby_prepare() {
- # Remove bundler support
- rm Gemfile || die
- sed -i -e "/[Bb]undler/d" Rakefile || die
- sed -i -e "/[Cc]overalls/d" spec/spec_helper.rb || die
- sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/colorize/Manifest b/dev-ruby/colorize/Manifest
index 2d436d15995d..5f3acdecac97 100644
--- a/dev-ruby/colorize/Manifest
+++ b/dev-ruby/colorize/Manifest
@@ -1,2 +1 @@
-DIST colorize-0.7.5.gem 14848 SHA256 c84253400dc0baf5a11c2b04b0b85e1a122f923771602dec45cee61d1a72c564 SHA512 a4d286d1b7b4e7c028200318718eaa02c01705ee4ae8f504737bfdd4ed5f70aa77b20cc94fd938a4e0b121fea478b5b757584d8b05202adb33bd2b9c9e294b36 WHIRLPOOL 2b0ad1a335071d4f33caef688bbfe9a2e6d58689ee5c7ea0e25688e55a28dc7d95a67fe362f7537d6b1ce18890c95abf82ec37a0ac67f2191a127391309f568b
DIST colorize-0.7.7.gem 15360 SHA256 d6ab95a5fcdea3c36c3327d38c1e79e2950ee1788506d8489ae35db330937a99 SHA512 ac55d281a3ac7aa72c02ecdc27a1936410cb2754e48e0c23b98eba5e98a8bf42e362fe3a86e73c12ff5445f2e0a92a7c561e82a4d85aae0ef08a9855b056f359 WHIRLPOOL 43576f9fcc4880644b610fcc7bbebf8c6a72381d40d33fc7c1d44f6145cc78998ad6bfcba3b5fb52ecb1fc9f15e1e2cf7973888a1bcf040597bb1b0abb8e9143
diff --git a/dev-ruby/colorize/colorize-0.7.5.ebuild b/dev-ruby/colorize/colorize-0.7.5.ebuild
deleted file mode 100644
index 90938a68441c..000000000000
--- a/dev-ruby/colorize/colorize-0.7.5.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add some methods to set color, background color and text effect on console easier"
-HOMEPAGE="https://github.com/fazibear/colorize"
-LICENSE="GPL-2+"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-each_ruby_test() {
- cd test || die
- ${RUBY} test_colorize.rb || die
-}
diff --git a/dev-ruby/colorize/colorize-0.7.7.ebuild b/dev-ruby/colorize/colorize-0.7.7.ebuild
index 3f7f1e5968d7..936f53ae36da 100644
--- a/dev-ruby/colorize/colorize-0.7.7.ebuild
+++ b/dev-ruby/colorize/colorize-0.7.7.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
inherit ruby-fakegem
-DESCRIPTION="Add some methods to set color, background color and text effect on console easier"
+DESCRIPTION="Adds methods to set color, background color and text effect on console easier"
HOMEPAGE="https://github.com/fazibear/colorize"
LICENSE="GPL-2+"
diff --git a/dev-ruby/countdownlatch/countdownlatch-1.0.0-r1.ebuild b/dev-ruby/countdownlatch/countdownlatch-1.0.0-r1.ebuild
index 551c1924770e..251431915eb1 100644
--- a/dev-ruby/countdownlatch/countdownlatch-1.0.0-r1.ebuild
+++ b/dev-ruby/countdownlatch/countdownlatch-1.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_TEST="test"
RUBY_FAKEGEM_TASK_DOC=""
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
inherit ruby-fakegem
-DESCRIPTION="Synchronization aid that allows threads to wait until a set of operations in other threads completes"
+DESCRIPTION="Synchronization aid to allow threads to wait for operations in other threads"
HOMEPAGE="https://github.com/benlangfeld/countdownlatch"
IUSE=""
SLOT="0"
diff --git a/dev-ruby/crass/crass-1.0.2.ebuild b/dev-ruby/crass/crass-1.0.2.ebuild
index be00847e01d4..32a896077286 100644
--- a/dev-ruby/crass/crass-1.0.2.ebuild
+++ b/dev-ruby/crass/crass-1.0.2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
inherit ruby-fakegem
-DESCRIPTION="A Ruby CSS parser that's fully compliant with the CSS Syntax Level 3 specification"
+DESCRIPTION="Ruby CSS parser that's fully compliant with the CSS Syntax Level 3 specification"
HOMEPAGE="https://github.com/rgrove/crass/"
LICENSE="MIT"
diff --git a/dev-ruby/daemon_controller/daemon_controller-1.2.0-r1.ebuild b/dev-ruby/daemon_controller/daemon_controller-1.2.0-r1.ebuild
index 7f04e6455a0c..ebe960c33d13 100644
--- a/dev-ruby/daemon_controller/daemon_controller-1.2.0-r1.ebuild
+++ b/dev-ruby/daemon_controller/daemon_controller-1.2.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_EXTRADOC="README.markdown"
inherit ruby-fakegem
-DESCRIPTION="A library for starting and stopping specific daemons programmatically in a robust manner"
+DESCRIPTION="Library to start and stop specific daemons programmatically in a robust manner"
HOMEPAGE="https://github.com/FooBarWidget/daemon_controller"
LICENSE="MIT"
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
index f77ded4b7937..db5df9bb334a 100644
--- a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
+++ b/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/fast_xs"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
IUSE=""
ruby_add_bdepend "test? (
diff --git a/dev-ruby/hashdiff/Manifest b/dev-ruby/hashdiff/Manifest
index 59f9f13e12c2..690b5a15c4a3 100644
--- a/dev-ruby/hashdiff/Manifest
+++ b/dev-ruby/hashdiff/Manifest
@@ -1,3 +1 @@
-DIST hashdiff-0.2.2.gem 14848 SHA256 109e5ebd20ac94de2fd8074959b9a1e0c6e69476206ab05e33852cc826eec959 SHA512 c26075c162baab018f2918d548042c15f8df70e03c184c1be07eab58b7accfd2a4c360001a5beadd686c2df6cfb3169216d55e9777f63635519a741132ea9ba0 WHIRLPOOL 21bce7e73d080dd2a497fef94b0755d8fe6fec9554468533e18a63c4668b884483cec862968b7887ef12c04507fd2dfcc559e4f7a5f9bd2c834656d5a42b5fd3
-DIST hashdiff-0.2.3.gem 15360 SHA256 e3b61e7c19235619296300cd7e8aa4e6ac7d257446bc4e47742761a5f177a6c4 SHA512 3bcb3af69329a1103136cb4cfb2cea23459e32edae12a9cc3a14fa6e819982d218aee828dc6a919226a1d1c13160707e88a64a15b52376b7af65daa52cfe9729 WHIRLPOOL f0b6ba39a346950a48e05aecf861e7f14d60fcc279007563e9f28ad172443eef5b7874a8b58ab71a6843a2dc63c72bc116a1c0deace0f488c4e9b5b553f3b4fb
DIST hashdiff-0.3.0.gem 15360 SHA256 04844d6f841e96ead0f1453597a92045cae5abb1c74fc0fcf790dc8fb27a06e4 SHA512 c40b400c5cfbc7a3cd5bd59936608ab4616e41937f355a3cea84b738d2fe51a88a80bc70a70a526a884326df93d2817be46c50065e20dda2a0de846b05f5f241 WHIRLPOOL d8e3a3fe4c7a36a8ec5965bc2a2401d4d57b785c402c7027f06558f3a02707df7e09beee197b9b6e9a032680d6adf6e68f521b79d0e8853fd7c6fdd79ff93eca
diff --git a/dev-ruby/hashdiff/hashdiff-0.2.2.ebuild b/dev-ruby/hashdiff/hashdiff-0.2.2.ebuild
deleted file mode 100644
index 3d6d3726e73b..000000000000
--- a/dev-ruby/hashdiff/hashdiff-0.2.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple Hash extension to make working with nested hashes easier and less error-prone"
-HOMEPAGE="https://github.com/liufengyun/hashdiff"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
-IUSE=""
diff --git a/dev-ruby/hashdiff/hashdiff-0.2.3.ebuild b/dev-ruby/hashdiff/hashdiff-0.2.3.ebuild
deleted file mode 100644
index 62682bb345e6..000000000000
--- a/dev-ruby/hashdiff/hashdiff-0.2.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
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple Hash extension to make working with nested hashes easier and less error-prone"
-HOMEPAGE="https://github.com/liufengyun/hashdiff"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
diff --git a/dev-ruby/hashr/hashr-0.0.22.ebuild b/dev-ruby/hashr/hashr-0.0.22.ebuild
index 068c4778a620..444398cb0bc6 100644
--- a/dev-ruby/hashr/hashr-0.0.22.ebuild
+++ b/dev-ruby/hashr/hashr-0.0.22.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="README.md"
inherit ruby-fakegem
-DESCRIPTION="Simple Hash extension to make working with nested hashes easier and less error-prone"
+DESCRIPTION="Simple Hash extension to make working with nested hashes easier"
HOMEPAGE="https://github.com/svenfuchs/hashr"
LICENSE="MIT"
diff --git a/dev-ruby/hashr/hashr-1.0.0.ebuild b/dev-ruby/hashr/hashr-1.0.0.ebuild
index 068c4778a620..444398cb0bc6 100644
--- a/dev-ruby/hashr/hashr-1.0.0.ebuild
+++ b/dev-ruby/hashr/hashr-1.0.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="README.md"
inherit ruby-fakegem
-DESCRIPTION="Simple Hash extension to make working with nested hashes easier and less error-prone"
+DESCRIPTION="Simple Hash extension to make working with nested hashes easier"
HOMEPAGE="https://github.com/svenfuchs/hashr"
LICENSE="MIT"
diff --git a/dev-ruby/hashr/hashr-2.0.0.ebuild b/dev-ruby/hashr/hashr-2.0.0.ebuild
index 91a320b25ae9..9fca026a7514 100644
--- a/dev-ruby/hashr/hashr-2.0.0.ebuild
+++ b/dev-ruby/hashr/hashr-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md"
inherit ruby-fakegem
-DESCRIPTION="Simple Hash extension to make working with nested hashes easier and less error-prone"
+DESCRIPTION="Simple Hash extension to make working with nested hashes easier"
HOMEPAGE="https://github.com/svenfuchs/hashr"
LICENSE="MIT"
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild
index 621218e3c81d..be187e49ca5b 100644
--- a/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.github.com/hpricot/hpricot"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
ruby_add_bdepend "dev-ruby/rake
diff --git a/dev-ruby/httpauth/httpauth-0.2.1.ebuild b/dev-ruby/httpauth/httpauth-0.2.1.ebuild
index f196221ad5fc..7b95c94ad397 100644
--- a/dev-ruby/httpauth/httpauth-0.2.1.ebuild
+++ b/dev-ruby/httpauth/httpauth-0.2.1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="README.md TODO"
inherit ruby-fakegem
-DESCRIPTION="A library supporting the full HTTP Authentication protocol as specified in RFC 2617"
+DESCRIPTION="Library implementing the full HTTP Authentication protocol (RFC 2617)"
HOMEPAGE="https://github.com/Manfred/HTTPauth"
SRC_URI="https://github.com/Manfred/HTTPauth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild b/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild
index 0f0bf14c851d..e49408ed1693 100644
--- a/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild
+++ b/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
# rbx: Kernel(Autoload)#allocate (method_missing)
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
@@ -15,7 +15,7 @@ inherit multilib ruby-fakegem
GITHUB_USER="tarcieri"
-DESCRIPTION="IO::Buffer is a fast byte queue which is primarily intended for non-blocking I/O applications"
+DESCRIPTION="IO::Buffer is a byte queue which is intended for non-blocking I/O applications"
HOMEPAGE="https://github.com/tarcieri/iobuffer"
SRC_URI="https://github.com/${GITHUB_USER}/iobuffer/tarball/v${PV} -> ${PN}-git-${PV}.tgz"
diff --git a/dev-ruby/jeweler/jeweler-2.0.1-r2.ebuild b/dev-ruby/jeweler/jeweler-2.0.1-r2.ebuild
index 002854aa7704..a8cbcaa4bece 100644
--- a/dev-ruby/jeweler/jeweler-2.0.1-r2.ebuild
+++ b/dev-ruby/jeweler/jeweler-2.0.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
RUBY_FAKEGEM_TASK_DOC="-Ilib yard"
RUBY_FAKEGEM_DOCDIR="doc"
@@ -17,7 +17,7 @@ RUBY_FAKEGEM_GEMSPEC="jeweler.gemspec"
inherit ruby-fakegem
-DESCRIPTION="Rake tasks for managing gems and versioning and a generator for creating a new project"
+DESCRIPTION="Rake tasks to manage gems, versioning and generate new projects"
HOMEPAGE="https://wiki.github.com/technicalpickles/jeweler"
LICENSE="MIT"
diff --git a/dev-ruby/kramdown/Manifest b/dev-ruby/kramdown/Manifest
index 63d8b2b93778..c04630bd09a5 100644
--- a/dev-ruby/kramdown/Manifest
+++ b/dev-ruby/kramdown/Manifest
@@ -1,4 +1,2 @@
DIST kramdown-1.10.0.gem 240128 SHA256 40e505358f6a9f359cee8f2e244344954ff3c9067108aed5603339d6cfc96c80 SHA512 fa0c8f1de6ea7306c7ca47a99f0d3e4a2e720e8d7d00f85a811b0ddd7f533960d583f94dee59f1d04900069163dd583c70520bedeeada77d673ff1b3d8b3782e WHIRLPOOL 637e229dc3d2dc6b1dd33ff14014db6c8830d2869fe8abc1bb3211c70b6fb5faf8dcddeccb338aa310b166e3cbf0efbdf79cc17a2a2d6cc1f9c0aeb6c511387b
DIST kramdown-1.4.2.gem 226816 SHA256 ae9b9456c69fa06f9c3058841e09b85e07cda875eb36c3202ea46baf8e123ea8 SHA512 31e7a30bcc453968ec6db0c1f0e5f8cea222dde8b8f6a26da72e0cf1b049c9f4c4e8384685a5e241e41fda526cd0f5fba4ac7debd0fb0d3eb6539dd9afc1dd27 WHIRLPOOL aa0166861584c2e3115923db1de9203581c02f4cab42866a88947a3e52fb32eee4ab2cdcc2fd623669a4c8a2e1972a340d9100a04fbc595bb40bde46e553223f
-DIST kramdown-1.8.0.gem 238080 SHA256 54287608f4399006ae5549f009053d2029ad75bf462dc70203c116580ac0d867 SHA512 8dace5b6ad764654c4375a4c2fad171e88448281936ced8d4efc5956e291e7c31b0ef295845241cb3e36976dc4a1e78886d2dff9fc172845622ab74a3b062230 WHIRLPOOL a58df1a8b19b274baea9feb7658b17d524c3abf983c9f56c80c69a7c180e1c48f22b106c2685acb950504531cf10dd388eaf0fc3699eeb3d8aac82cb3521adb7
-DIST kramdown-1.9.0.gem 238592 SHA256 e00ef90f083f845118577dd6a040b4a4aa475bd7a2a645b2ad6944da0555598b SHA512 0ac14adec59c4032d27ac0e3c66a0737688295562782c86f80c953fdca56b5611b7f32dfb570649421fdc1b47deea72715a21c907124c99663bc1a23c1f489ec WHIRLPOOL ba34d5e746e6e3515c40dd3716d4e277ba5c15978095dc91f4a74e2c981dbf4e04717185870f7cfba5e76edc7f3bd209aa6d51f901673ec9dcc6d1ba7c635775
diff --git a/dev-ruby/kramdown/kramdown-1.8.0.ebuild b/dev-ruby/kramdown/kramdown-1.8.0.ebuild
deleted file mode 100644
index 6e08470e09d7..000000000000
--- a/dev-ruby/kramdown/kramdown-1.8.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition"
-HOMEPAGE="http://kramdown.gettalong.org/"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="latex"
-
-LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
-RDEPEND+=" ${LATEX_DEPS}"
-DEPEND+=" test? ( ${LATEX_DEPS} app-text/htmltidy )"
-
-ruby_add_rdepend "dev-ruby/prawn:2
- dev-ruby/prawn-table
- >=dev-ruby/rouge-1.8
- >=dev-ruby/itextomml-1.5
- >=dev-ruby/coderay-1.0.0
- >=dev-ruby/ritex-1.0
- >=dev-ruby/stringex-1.5.1"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
- test? ( >=dev-ruby/minitest-5.0 )"
-
-all_ruby_prepare() {
- if ! use latex; then
- # Remove latex tests. They will fail gracefully when latex isn't
- # present at all, but not when components are missing (most
- # notable ucs.sty).
- sed -i -e '/latex -v/,/^ end/ s:^:#:' test/test_files.rb || die
- fi
-
- # Avoid tests requiring node to be installed with mathjaxnode.
- rm -f test/testcases/span/math/mathjaxnode* \
- test/testcases/block/15_math/mathjaxnode* || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- doman man/man1/kramdown.1
-}
diff --git a/dev-ruby/kramdown/kramdown-1.9.0.ebuild b/dev-ruby/kramdown/kramdown-1.9.0.ebuild
deleted file mode 100644
index fbace93b06dc..000000000000
--- a/dev-ruby/kramdown/kramdown-1.9.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21"
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS CONTRIBUTERS"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using strict syntax definition"
-HOMEPAGE="http://kramdown.gettalong.org/"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="latex"
-
-LATEX_DEPS="latex? ( dev-texlive/texlive-latex dev-texlive/texlive-latexextra )"
-RDEPEND+=" ${LATEX_DEPS}"
-DEPEND+=" test? ( ${LATEX_DEPS} app-text/htmltidy )"
-
-ruby_add_rdepend "dev-ruby/prawn:2
- dev-ruby/prawn-table
- >=dev-ruby/rouge-1.8
- >=dev-ruby/itextomml-1.5
- >=dev-ruby/coderay-1.0.0
- >=dev-ruby/ritex-1.0
- >=dev-ruby/stringex-1.5.1"
-
-ruby_add_bdepend "doc? ( dev-ruby/rdoc )
- test? ( >=dev-ruby/minitest-5.0 )"
-
-all_ruby_prepare() {
- if ! use latex; then
- # Remove latex tests. They will fail gracefully when latex isn't
- # present at all, but not when components are missing (most
- # notable ucs.sty).
- sed -i -e '/latex -v/,/^ end/ s:^:#:' test/test_files.rb || die
- fi
-
- # Avoid tests requiring node to be installed with mathjaxnode.
- rm -f test/testcases/span/math/mathjaxnode* \
- test/testcases/block/15_math/mathjaxnode* || die
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- doman man/man1/kramdown.1
-}
diff --git a/dev-ruby/log4r/log4r-1.1.10-r1.ebuild b/dev-ruby/log4r/log4r-1.1.10-r1.ebuild
index c2c149aead3a..d3538a4daec6 100644
--- a/dev-ruby/log4r/log4r-1.1.10-r1.ebuild
+++ b/dev-ruby/log4r/log4r-1.1.10-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
RUBY_FAKEGEM_TASK_DOC=""
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_DOCDIR="doc"
inherit ruby-fakegem
-DESCRIPTION="A comprehensive and flexible logging library written in Ruby for use in Ruby programs"
+DESCRIPTION="A comprehensive and flexible logging library written in Ruby"
HOMEPAGE="http://log4r.sourceforge.net/"
IUSE=""
diff --git a/dev-ruby/log4r/log4r-1.1.10-r2.ebuild b/dev-ruby/log4r/log4r-1.1.10-r2.ebuild
index 0afb55150231..08493269b7f7 100644
--- a/dev-ruby/log4r/log4r-1.1.10-r2.ebuild
+++ b/dev-ruby/log4r/log4r-1.1.10-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC=""
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_DOCDIR="doc"
inherit ruby-fakegem
-DESCRIPTION="A comprehensive and flexible logging library written in Ruby for use in Ruby programs"
+DESCRIPTION="A comprehensive and flexible logging library written in Ruby"
HOMEPAGE="http://log4r.sourceforge.net/"
IUSE=""
diff --git a/dev-ruby/logging/Manifest b/dev-ruby/logging/Manifest
index c5571d6fc1de..63d34ca01ad9 100644
--- a/dev-ruby/logging/Manifest
+++ b/dev-ruby/logging/Manifest
@@ -1,2 +1 @@
-DIST logging-1.8.2.gem 88064 SHA256 d7204b5ebacdf44756c1358b24ac78da39f63f5e6bfe0b6ffad0393de69d8c6d SHA512 3ecb691114994f91433250a4dbfb059ffd9d06420820b03619c1a9e7b79f22a217495cd27e28117f34f6aeb1517007d84d6340d6cfd1b9d62da3d4ba869b3641 WHIRLPOOL 4c4275e3c188a43ccec525297a55079bb06d26841394b4a449c3e8fea317e4ccbc428e2d444eea548ad9192076807cab983faa57295b127ea17b4174f49faabb
DIST logging-2.0.0.gem 81408 SHA256 6be3aaa3566738a12f2c3aa6bcaa8b3348cf3a97688c9fb23f5cb08d11c2454d SHA512 cddd1a8fb083662c60ac06adfd3a1ddb3db19bd249ddddee7580a16c15f3c2886abb367113affd43c7dcb7fd9358fd334f812815a4fdf55b674ba086792d482e WHIRLPOOL 5f6c2586a2824a534d91d93103fed4487b447787c56f0d56ffe507d1bb199c84f1a75f18ed3bb828f2d022bf36997738a6cc219e3a1253f648dd7bf5f8b88020
diff --git a/dev-ruby/logging/logging-1.8.2.ebuild b/dev-ruby/logging/logging-1.8.2.ebuild
deleted file mode 100644
index 6fdab1afa1dd..000000000000
--- a/dev-ruby/logging/logging-1.8.2.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RAKE_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="version.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Flexible logging library for use in Ruby programs based on the design of Java's log4j library"
-HOMEPAGE="http://rubygems.org/gems/logging"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/little-plugger-1.1.3 >=dev-ruby/multi_json-1.3.6"
-
-ruby_add_bdepend "dev-ruby/bones test? ( dev-ruby/flexmock )"
diff --git a/dev-ruby/logging/logging-2.0.0.ebuild b/dev-ruby/logging/logging-2.0.0.ebuild
index ff6712f847d5..a1be41d7fbcb 100644
--- a/dev-ruby/logging/logging-2.0.0.ebuild
+++ b/dev-ruby/logging/logging-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
RUBY_FAKEGEM_TASK_DOC="doc"
RAKE_FAKEGEM_DOCDIR="doc"
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
inherit ruby-fakegem
-DESCRIPTION="Flexible logging library for use in Ruby programs based on the design of Java's log4j library"
+DESCRIPTION="Flexible logging library based on the design of Java's log4j library"
HOMEPAGE="http://rubygems.org/gems/logging"
LICENSE="MIT"
diff --git a/dev-ruby/modernizr/modernizr-2.6.2.ebuild b/dev-ruby/modernizr/modernizr-2.6.2.ebuild
index 473ef16645d6..cfd0812dea85 100644
--- a/dev-ruby/modernizr/modernizr-2.6.2.ebuild
+++ b/dev-ruby/modernizr/modernizr-2.6.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_EXTRADOC="README.md"
RUBY_FAKEGEM_TASK_DOC=""
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_RECIPE_TEST="none"
inherit ruby-fakegem
-DESCRIPTION="Neatly packaged Modernizr JS assets for use in Sprockets or the Rails 3 asset pipeline"
+DESCRIPTION="Modernizr JS assets for use in Sprockets or the Rails 3 asset pipeline"
HOMEPAGE="https://github.com/josh/ruby-modernizr"
LICENSE="MIT"
diff --git a/dev-ruby/mustache/Manifest b/dev-ruby/mustache/Manifest
index 8528015be1b4..f716c64afacb 100644
--- a/dev-ruby/mustache/Manifest
+++ b/dev-ruby/mustache/Manifest
@@ -1,3 +1,2 @@
DIST mustache-0.99.5.gem 41472 SHA256 c84be205017ada80aa4d4ad16b7af4bd89f840b26125a0e8eead5a914d279005 SHA512 fa85db8a2d0beea5bac93bf4214db0b65d275b7a01b4a16dbfcab0084d6a7701060d7b7cf090901830fbae2db5caa1973af427396407040053af9966782b55ef WHIRLPOOL 2c8562417ecaf1abe3073ba6a47053692f844e4e66bee7c1ea0893f908dd9f2db304a5d0de5ebe25f6866e312a1a8b6c0dfe1d9cfa5654513cb9578060af1bab
-DIST mustache-1.0.1.gem 40960 SHA256 42412df1754bed24f0238efb561e51c2c53b8ea3ab003819723481a73a60ae27 SHA512 de4611c2c913fe64e688f7995feb4ce9809e28bedcab43ec2f355aed8ebc1e1c7dcc7433bd36c6b3fc37295d59316f411aaecdd5d13fb64d4d63be1d67ac5c80 WHIRLPOOL 9d5f5709f2f745402dc2d3339dca42c360c37cadc145417a0d557f6d3fc489a373c5427488ec62b87b1e1576de09c1c52b3c5b9ac5f80e4ab69a25ba3c949b9c
DIST mustache-1.0.2.gem 40960 SHA256 e79dbc8bae087011ace17bfbc4ee1e652b1d5efa5d56316b09b7c2256f447d34 SHA512 4bc50bf67317e9815b125c25cd94b6c6943b4c7cdeeae3118d29b002279386f00f73a38bfcba9072253cd389634c44a8da9aba775989ab235a444796e4634450 WHIRLPOOL 310359b29b8e9a948c92e9e82045ca7b2f8f01e52c63c13d345bc01c4b3ea5949d3f765d301e9cc209facb59748f459fadb98ac91bc6edfe50f1ba9026ab5f32
diff --git a/dev-ruby/mustache/mustache-0.99.5-r1.ebuild b/dev-ruby/mustache/mustache-0.99.5-r1.ebuild
deleted file mode 100644
index f08e241f644a..000000000000
--- a/dev-ruby/mustache/mustache-0.99.5-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC="man:build"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Mustache is a framework-agnostic way to render logic-free views"
-HOMEPAGE="https://mustache.github.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-ruby_add_bdepend "doc? ( app-text/ronn )"
-
-all_ruby_prepare() {
- # Fix rake deprecation
- sed -i -e 's:rake/rdoctask:rdoc/task:' Rakefile || die
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib:. -e "Dir['test/*.rb'].each{|f| require f}"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- doman man/mustache.1 man/mustache.5
-}
diff --git a/dev-ruby/mustache/mustache-1.0.1.ebuild b/dev-ruby/mustache/mustache-1.0.1.ebuild
deleted file mode 100644
index 97cb9b34623f..000000000000
--- a/dev-ruby/mustache/mustache-1.0.1.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
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC="man:build"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Mustache is a framework-agnostic way to render logic-free views"
-HOMEPAGE="https://mustache.github.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-ruby_add_bdepend "doc? ( app-text/ronn )"
-
-all_ruby_prepare() {
- # Fix rake deprecation
- sed -i -e 's:rake/rdoctask:rdoc/task:' Rakefile || die
-
- # Avoid code climate dependency.
- sed -i -e '/codeclimate/I s:^:#:' test/helper.rb || die
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib:. -e "Dir['test/*.rb'].each{|f| require f}"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- doman man/mustache.1 man/mustache.5
-}
diff --git a/dev-ruby/mustache/mustache-1.0.2.ebuild b/dev-ruby/mustache/mustache-1.0.2.ebuild
index 88900e337eb3..701df08aa72c 100644
--- a/dev-ruby/mustache/mustache-1.0.2.ebuild
+++ b/dev-ruby/mustache/mustache-1.0.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://mustache.github.com/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE=""
ruby_add_bdepend "doc? ( app-text/ronn )"
diff --git a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r1.ebuild b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r1.ebuild
index d592500e10a8..8da8a7854898 100644
--- a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r1.ebuild
+++ b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
RUBY_FAKEGEM_RECIPE_DOC="yard"
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
inherit ruby-fakegem
-DESCRIPTION="Calculate the differences (added or removed nodes) between two XML/HTML documents"
+DESCRIPTION="Calculate the differences between two XML/HTML documents"
HOMEPAGE="https://github.com/postmodern/nokogiri-diff"
LICENSE="MIT"
diff --git a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild
index 4ed6c56cda78..7433b48dc584 100644
--- a/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild
+++ b/dev-ruby/nokogiri-diff/nokogiri-diff-0.2.0-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
RUBY_FAKEGEM_RECIPE_DOC="yard"
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
inherit ruby-fakegem
-DESCRIPTION="Calculate the differences (added or removed nodes) between two XML/HTML documents"
+DESCRIPTION="Calculate the differences between two XML/HTML documents"
HOMEPAGE="https://github.com/postmodern/nokogiri-diff"
LICENSE="MIT"
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index d2e4fd408e14..bf150f77ae72 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -1 +1,2 @@
DIST oauth-0.4.7.gem 50688 SHA256 bca47d77c946af466872269e37e470837858b1305d5143e5a56c50356e02b2cc SHA512 7d8df61574aaf53ffcb206c6a210546c36b67b2c545d6b31afef2961ee135050923f427dc4720379b7689eef9d921015c26fedd8b11bbd13761dd498155fc550 WHIRLPOOL 5a9dd0eeb2137db2b9810482dca116bf38c06ed75dff2df434118c147ed907d4fdad55dfd2e9c0751b42a110cd240c2ff70bfca75bcffc7f08dd454f65ca7591
+DIST oauth-0.5.1.tar.gz 46675 SHA256 462839c6a685b72d619e050869d15abb889f98b010ee97a19ea5a2bc4e39ad91 SHA512 fe00e4455ab72edb38051e0c203f27b299b624cdc3ba031de9aea33c1429a54a364f066297dae86c22b723859ab8bd8854b02d344ec49a535c28b256e96593a6 WHIRLPOOL b9813500cc920a74ac7b48414bcb80f266cad4f8407fc9a62ac1c0da69c92dcd83f1b837de2b7caf8e2a89727c794bc3b0652f1091981e70d82122e7fd6470a9
diff --git a/dev-ruby/oauth/oauth-0.5.1.ebuild b/dev-ruby/oauth/oauth-0.5.1.ebuild
new file mode 100644
index 000000000000..39c3094c2d02
--- /dev/null
+++ b/dev-ruby/oauth/oauth-0.5.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="HISTORY README.rdoc TODO"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A RubyGem for implementing both OAuth clients and servers"
+HOMEPAGE="https://github.com/oauth-xx/oauth-ruby"
+SRC_URI="https://github.com/oauth-xx/oauth-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-ruby-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86-macos"
+IUSE=""
+
+ruby_add_bdepend "test? (
+ dev-ruby/test-unit:2
+ dev-ruby/mocha:1.0
+ dev-ruby/webmock
+ dev-ruby/rack )"
+
+all_ruby_prepare() {
+ # Require a compatible version of mocha
+ sed -i -e '1igem "mocha", "~> 1.0"' \
+ -e '2i gem "test-unit"; require "test/unit"' \
+ -e '/byebug/ s:^:#:' test/test_helper.rb || die
+
+ # Remove tests that require Rails 2.3 since that is ruby18-only.
+ rm -f test/test_action_controller_request_proxy.rb || die
+
+ # Remove typhoeus tests since they require an old version.
+ rm -f test/test_typhoeus_request_proxy.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} -I.:lib -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/oauth2/Manifest b/dev-ruby/oauth2/Manifest
index 8b821aad2ccb..4f93231da590 100644
--- a/dev-ruby/oauth2/Manifest
+++ b/dev-ruby/oauth2/Manifest
@@ -1,2 +1 @@
-DIST oauth2-1.0.0.gem 21504 SHA256 1925847287bba3d19b0755820f8eef86198754dfa9f77ad53063ffb82d3e4a7d SHA512 80e30c444ffb31a4a2e49a4851bcc0cdf907e9b24c38a6e5f580054ab70df89c951f6e05dec3e9e8b7f1d68ca332b6970fba350d7d309e8a0e6212ff1bafb31c WHIRLPOOL 993b648722f1fbe198339b94c702499de49c6e526358195db822d0ab21c8300b6cacf4af14c4c85e08cf9fc97ea074f196cee06d4b3ce19511aa871c9a450653
DIST v1.1.0.tar.gz 18376 SHA256 ea76a41dc7c559f9530e19961b5a8cd9a4b3f231f54901b9e6ef09031ce3aa77 SHA512 c4231093929733a662ed6246338508396eb0e8d1be48bff05c43a8e3f6dd38261667cad7db0dc44c3f6fd9152165b13fa46a779a05b3c1ae98f912f337820d2e WHIRLPOOL 0f9269df95ceabbcff65751d89bac5eef6bb18f34114b3045ac658325e7b8145f23fad311473c77e64f3170c45ccc880eb48c05ad6f174c7a42591995498a557
diff --git a/dev-ruby/oauth2/oauth2-1.0.0.ebuild b/dev-ruby/oauth2/oauth2-1.0.0.ebuild
deleted file mode 100644
index 3aa07445a471..000000000000
--- a/dev-ruby/oauth2/oauth2-1.0.0.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
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="doc:rdoc"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem eutils
-
-DESCRIPTION="Ruby wrapper for the OAuth 2.0 protocol built with a similar style to the original OAuth gem"
-HOMEPAGE="https://github.com/intridea/oauth2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.8
- >=dev-ruby/jwt-1.0 =dev-ruby/jwt-1*
- >=dev-ruby/multi_json-1.3 =dev-ruby/multi_json-1*
- >=dev-ruby/multi_xml-0.5:0
- >=dev-ruby/rack-1.2"
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.5.0:2 )"
-
-all_ruby_prepare() {
- sed -i -e '/simplecov/,/^end/ s:^:#:' spec/helper.rb || die
-
- sed -i -e '/yardstick/,/^end/ s:^:#:' \
- -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
- CI=true ${RUBY} -S rspec spec || die
-}
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index 54f5ea572c92..a8af5c1bf29d 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1 +1,2 @@
DIST octokit-4.2.0.tar.gz 2740295 SHA256 af4853f022677fd1c344e20d396912a3783f6bd43fffc9b608d9c4218eebcef8 SHA512 5b596da5c2b6bff4cbef3c3faa57a341e7e46dffa8b16d81072b567a5827138ce173a13c1054719853aaf821ad8f5ef8c7e1f666769f3a1e538ef886e64dc1c4 WHIRLPOOL 781bf01f770ee42568ce8278787542dc8840c7dc489042a1d52cb3c59e5ccf13cd3d8269ddc5f9443447060b10c0fd56c89218c1dfdd02c4989e3d20c0c6ebf8
+DIST octokit-4.3.0.tar.gz 2760618 SHA256 76ca1d4289f393c88556bc0c7518621db2d6371cb4c7ec68aa61d07327849fcc SHA512 2a0e680ef8b182722e4a7f489d69fc1d9e81864b29a7fddc4b1ab68a77deee7383ffac153662ceb9e55d7425a4f9e29f7303f0d8d0d821156ef1946734e197a6 WHIRLPOOL ab27fd63737604500a747496a3d040482de2532cfe5dd169d7144ba13476a6c14bf1d667385cd7f4b925030be8c9933e98ebfe72498e3be978574f1b206c7120
diff --git a/dev-ruby/octokit/octokit-4.3.0.ebuild b/dev-ruby/octokit/octokit-4.3.0.ebuild
new file mode 100644
index 000000000000..a16dcf84ca99
--- /dev/null
+++ b/dev-ruby/octokit/octokit-4.3.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CONTRIBUTING.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Ruby toolkit for the Github API"
+HOMEPAGE="https://github.com//octokit/octokit.rb"
+SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RUBY_S=octokit.rb-${PV}
+
+ruby_add_rdepend ">=dev-ruby/sawyer-0.5.3"
+ruby_add_bdepend "test? ( >=dev-ruby/netrc-0.7.7
+ dev-ruby/vcr:2
+ >=dev-ruby/webmock-1.9 )"
+
+all_ruby_prepare() {
+ sed -i -e "1,10d" -e "/require 'vcr'/i\gem 'vcr', '~> 2.9.2'" spec/helper.rb || die
+}
diff --git a/dev-ruby/permutation/permutation-0.1.8-r1.ebuild b/dev-ruby/permutation/permutation-0.1.8-r1.ebuild
index bc7b58e0f286..f4c001c90cd4 100644
--- a/dev-ruby/permutation/permutation-0.1.8-r1.ebuild
+++ b/dev-ruby/permutation/permutation-0.1.8-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="CHANGES README"
inherit multilib ruby-fakegem
-DESCRIPTION="Library to perform different operations with permutations of sequences (strings, arrays, etc.)"
+DESCRIPTION="Library performing operations with permutations of sequences (strings, arrays)"
HOMEPAGE="https://flori.github.com/permutation"
LICENSE="|| ( Ruby-BSD BSD-2 )"
diff --git a/dev-ruby/posix-spawn/Manifest b/dev-ruby/posix-spawn/Manifest
index 9296258d81a6..355fe8e3cf9e 100644
--- a/dev-ruby/posix-spawn/Manifest
+++ b/dev-ruby/posix-spawn/Manifest
@@ -1,3 +1 @@
-DIST posix-spawn-0.3.10.gem 28672 SHA256 15440fbfe25cc188e08e64f3bb632592368db669c2a13c1a9d56d81d1bbf54a1 SHA512 231f908c65c5b6f142239dbe52687f53139461826f25819aed905c0b3251c341dcc98db398d2f3e2b55bc27b61975adca1a5ac3caaedc64d178e6bb8485d952c WHIRLPOOL 7d8769fdc6e389b12a53df20e1e7e3f695e9a35138e26b685cd1e37dd435320bbe07d387937fe87b1a45df6b309b7373d30fbaf2b350f75e0913e4fc77dd039d
DIST posix-spawn-0.3.11.gem 29696 SHA256 b932835dd6eb241b255ba51767b68a58299abbb0fb344cb874dcd23d57b75414 SHA512 a053d80b5f8fca5c70b7aa0799ca07b3fb24b6cbf8b8c04e302f0864e72597e0843a120608838ca71a413a24422e571f4d3422141b726177d360b892e914cbc3 WHIRLPOOL 61898240d9487f476aadff17f9e405b6850fd5c9e3096737c08a6c9ce07464090851810ea754744b199203451db46e540510928fd55ac3dbfa612192426875f9
-DIST posix-spawn-0.3.9.gem 28672 SHA256 634746d6f090c1b15d2f92fa90c5ed4868e59c8752ca56a5d83af8f79c0a5110 SHA512 3afd9e26f04e7fedda176b47b3b48be4eb55d5ad8aa38983060acbbae49ec515e925cf223d4700a98f1293a702782bf80cb7aea715c351b5ebdc42618ea2a605 WHIRLPOOL 15d647f6fd95486c85cc98f8e498e586f3ac0c1686a36041f3dd38b43de860f4231ba37a0126e4fd7fe3f39620271a20c0dbb742198226e75d47d8f26d67dcf6
diff --git a/dev-ruby/posix-spawn/posix-spawn-0.3.10.ebuild b/dev-ruby/posix-spawn/posix-spawn-0.3.10.ebuild
deleted file mode 100644
index c63a60344b2f..000000000000
--- a/dev-ruby/posix-spawn/posix-spawn-0.3.10.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
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-KEYWORDS="~amd64"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md TODO HACKING"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The posix-spawn library aims to implement a subset of the Ruby 1.9 Process::spawn"
-HOMEPAGE="https://github.com/rtomayko/posix-spawn/"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-IUSE="test"
-
-each_ruby_configure() {
- ${RUBY} -Cext extconf.rb || die
-}
-
-each_ruby_compile() {
- emake V=1 -Cext
- cp ext/*$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/posix-spawn/posix-spawn-0.3.11.ebuild b/dev-ruby/posix-spawn/posix-spawn-0.3.11.ebuild
index c63a60344b2f..046b2c626622 100644
--- a/dev-ruby/posix-spawn/posix-spawn-0.3.11.ebuild
+++ b/dev-ruby/posix-spawn/posix-spawn-0.3.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
KEYWORDS="~amd64"
RUBY_FAKEGEM_TASK_DOC=""
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md TODO HACKING"
inherit ruby-fakegem
-DESCRIPTION="The posix-spawn library aims to implement a subset of the Ruby 1.9 Process::spawn"
+DESCRIPTION="Library that implements a subset of the Ruby 1.9 Process::spawn"
HOMEPAGE="https://github.com/rtomayko/posix-spawn/"
LICENSE="MIT LGPL-2.1"
diff --git a/dev-ruby/posix-spawn/posix-spawn-0.3.9.ebuild b/dev-ruby/posix-spawn/posix-spawn-0.3.9.ebuild
deleted file mode 100644
index 71f7d7ed4ed7..000000000000
--- a/dev-ruby/posix-spawn/posix-spawn-0.3.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
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-KEYWORDS="~amd64"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md TODO HACKING"
-
-inherit ruby-fakegem
-
-DESCRIPTION="The posix-spawn library aims to implement a subset of the Ruby 1.9 Process::spawn"
-HOMEPAGE="https://github.com/rtomayko/posix-spawn/"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-IUSE="test"
-
-each_ruby_configure() {
- ${RUBY} -Cext extconf.rb || die
-}
-
-each_ruby_compile() {
- emake V=1 -Cext
- cp ext/*$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib -S testrb test || die
-}
diff --git a/dev-ruby/psych/Manifest b/dev-ruby/psych/Manifest
index d8ab196256bb..746815ae5e89 100644
--- a/dev-ruby/psych/Manifest
+++ b/dev-ruby/psych/Manifest
@@ -1,3 +1 @@
-DIST psych-2.0.15.gem 128000 SHA256 ac7afd35a2e6ec6eef08a3c7b5e1127be20e6521b4c8346988acd3d46548982f SHA512 895d726a4ecd0d2d18c350aa9aa8bdfb8da3193211ce275313907dc46d45907731d60b41485e01a1ffb5d49133021d837416376340cc1468358970b2eeba7002 WHIRLPOOL 7e055e394cd9cb84d3c433cb80235e82a688a13d7e8d9be79e5b8c0c43cdbe414a14bb36fcd7ffe218b78d2ea0b324b6297837d36cae62fc008ebfeef9ca41b8
-DIST psych-2.0.16.gem 128000 SHA256 17e2e26295571de42a494e3cd74f7d0d8990e87defe5b1c4a1a3f958c26a1d5d SHA512 373f191163a677bdcbfe68ab6e81b7a4b020e86d3c4181f72e09ebe4b0016b728db67cf9055258357e2a786cab98c4e8765066693dfff3389a516f12c6bb1923 WHIRLPOOL 33064a1079f9039d13b4f592078c5daafc5a7681f6a4476216b642fcb526f6ef1130707b9b820da394719d569319c3e08564d1ffe58145e0fcfc77ece1c80a5d
DIST psych-2.0.17.gem 128000 SHA256 e85529ced4f91728a63c945f8bdf5206e71fc3192b9ac0e7ba251dbf0d398513 SHA512 f82bb015986941193878c6223fee69930c4e643d2432057d83399dd1763834ea0116b360b23c371d1b050414f2a769bb6762d3e0dd6e891d1b94ebe260194452 WHIRLPOOL 2455312625d12110e0de5514f1b52d8a7c7c3855289115edd270b0f7804f9bcef6c9879b731bcad696e4c038a4aef0b046bd23a58f771cc4b51d41c96c537483
diff --git a/dev-ruby/psych/psych-2.0.15.ebuild b/dev-ruby/psych/psych-2.0.15.ebuild
deleted file mode 100644
index 79e01d70654a..000000000000
--- a/dev-ruby/psych/psych-2.0.15.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A libyaml wrapper for Ruby"
-HOMEPAGE="https://github.com/tenderlove/psych"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" >=dev-libs/libyaml-0.1.6"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
- sed -i -e '1igem "minitest", "~>5.0"' test/psych/helper.rb || die
-}
-
-each_ruby_configure() {
- ${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
- emake V=1 -Cext/${PN}
- cp ext/${PN}/${PN}$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib:test:test/${PN}:. -e "Dir['test/psych/**/test_*.rb'].each {|f| require f}" || die
-}
diff --git a/dev-ruby/psych/psych-2.0.16.ebuild b/dev-ruby/psych/psych-2.0.16.ebuild
deleted file mode 100644
index 3d3ff13c68ce..000000000000
--- a/dev-ruby/psych/psych-2.0.16.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
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A libyaml wrapper for Ruby"
-HOMEPAGE="https://github.com/tenderlove/psych"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" >=dev-libs/libyaml-0.1.6"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
- sed -i -e '1igem "minitest", "~>5.0"' test/psych/helper.rb || die
-}
-
-each_ruby_configure() {
- ${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
- emake V=1 -Cext/${PN}
- cp ext/${PN}/${PN}$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib:test:test/${PN}:. -e "Dir['test/psych/**/test_*.rb'].each {|f| require f}" || die
-}
diff --git a/dev-ruby/psych/psych-2.0.17.ebuild b/dev-ruby/psych/psych-2.0.17.ebuild
index 3d3ff13c68ce..ad0bc4b6090e 100644
--- a/dev-ruby/psych/psych-2.0.17.ebuild
+++ b/dev-ruby/psych/psych-2.0.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
diff --git a/dev-ruby/rake-compiler/Manifest b/dev-ruby/rake-compiler/Manifest
index 59f56e43f343..6bcb01ce5898 100644
--- a/dev-ruby/rake-compiler/Manifest
+++ b/dev-ruby/rake-compiler/Manifest
@@ -1,2 +1,3 @@
DIST rake-compiler-0.9.2.tar.gz 30778 SHA256 72ced9a0ca9a034506de279e888fdec63d542d788ee1d2e7910f1bfd71c82dd3 SHA512 883157bf44540cd021bec22a84e907922756f74a61e84c62e51eed752da01d217a03aebd88582fbe779210116e7ab1a36023707fbdae445b5ac4499c7de9b8eb WHIRLPOOL 79b21689e08ac21005243a2f18bde0941c3a86bdd3bf36bf557d3c706cb64fcb379f2d3fd06c93d3c07f10e8c1e47c75933ba783cc23b57137d9fce6c3e7de78
DIST rake-compiler-0.9.5.tar.gz 31727 SHA256 c3ddd7cb4003d4116aef89313d4bf6ad338ea1c6e0552825c78a6109e80e931e SHA512 ce40ac3d57458e7369d3bf2c7cc033911775d6afee85867a96ea95f564cf9b294d4f1030530f547f27a0834ba4b33121abeb33a2f6b7a2d02346311ed11759b5 WHIRLPOOL df94ce4ce7e3842f4585f66c25422f59c03cf851cc596da9d35aac34cf6d79c615245ffe642116cd655454a8192b3985ca9d4db442d33894155191ab1f095038
+DIST rake-compiler-0.9.6.tar.gz 32261 SHA256 81fca307339b8232ebc672017cedbd0603e04ed96e9340e9517c92e7bf9e0ee4 SHA512 3a91f972b4355e5d578693a1e5daa874524207c3bb5f7abc234b39e33f9a3cf3c1161d45edb90656bf81154297b7d4a5faeddfa42fac4b989c16d2db71e4f9f9 WHIRLPOOL 02384e2b8ad7b1e5df596b7a12adf685b5bef9765c0cf1c2eb14ac32dee9c9b8764f97383c31f9268520215ae0b667357430173f1a9c3958b859dc699f3012ab
diff --git a/dev-ruby/rake-compiler/rake-compiler-0.9.5.ebuild b/dev-ruby/rake-compiler/rake-compiler-0.9.5.ebuild
index cde972a37ae3..0d6a8a2027ff 100644
--- a/dev-ruby/rake-compiler/rake-compiler-0.9.5.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-0.9.5.ebuild
@@ -24,7 +24,7 @@ IUSE=""
ruby_add_rdepend "dev-ruby/rake"
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
USE_RUBY="ruby19 ruby20" ruby_add_bdepend "test? ( dev-util/cucumber )"
diff --git a/dev-ruby/rake-compiler/rake-compiler-0.9.6.ebuild b/dev-ruby/rake-compiler/rake-compiler-0.9.6.ebuild
new file mode 100644
index 000000000000..59f00b319488
--- /dev/null
+++ b/dev-ruby/rake-compiler/rake-compiler-0.9.6.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Provide a standard and simplified way to build and package Ruby extensions"
+HOMEPAGE="https://github.com/luislavena/rake-compiler"
+LICENSE="MIT"
+
+SRC_URI="https://github.com/luislavena/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rake"
+
+ruby_add_bdepend "test? ( dev-ruby/rspec:2 )"
+
+USE_RUBY="ruby20 ruby21" ruby_add_bdepend "test? ( dev-util/cucumber )"
+
+all_ruby_prepare() {
+ # Make sure the right rspec version is used in cucumber.
+ sed -i -e "1igem 'rspec', '~>2.0'" features/support/env.rb || die
+}
+
+each_ruby_prepare() {
+ case ${RUBY} in
+ *ruby19)
+ # Remove this task so that it won't load on Ruby 1.9
+ # that lack the package_task file. It is, though, needed for the
+ # tests
+ rm tasks/gem.rake || die
+ # Remove specs aimed at a C-compiling ruby implementation.
+ rm spec/lib/rake/extensiontask_spec.rb || die
+ ;;
+ *)
+ ;;
+ esac
+}
+
+each_ruby_test() {
+ # Skip cucumber for ruby22 (not ready yet)
+ case ${RUBY} in
+ *ruby20|*ruby21)
+ ruby-ng_rspec
+ ruby-ng_cucumber
+ ;;
+ *)
+ ruby-ng_rspec
+ ;;
+ esac
+}
diff --git a/dev-ruby/rake-remote_task/rake-remote_task-2.3.0.ebuild b/dev-ruby/rake-remote_task/rake-remote_task-2.3.0.ebuild
index 4c924d6a264e..b868b53bd5fc 100644
--- a/dev-ruby/rake-remote_task/rake-remote_task-2.3.0.ebuild
+++ b/dev-ruby/rake-remote_task/rake-remote_task-2.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC="docs"
RUBY_FAKEGEM_DOCDIR="doc"
@@ -11,8 +11,8 @@ RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
inherit ruby-fakegem
-DESCRIPTION="Vlad the Deployer's sexy brainchild is rake-remote_task, extending Rake with remote task goodness"
-HOMEPAGE="http://rubyhitsquad.com/"
+DESCRIPTION="Extends Rake with remote task goodness"
+HOMEPAGE="https://github.com/seattlerb/rake-remote_task"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-ruby/rgen/Manifest b/dev-ruby/rgen/Manifest
index b402178f6d90..daa47de63ab8 100644
--- a/dev-ruby/rgen/Manifest
+++ b/dev-ruby/rgen/Manifest
@@ -1,3 +1,2 @@
DIST rgen-0.6.6.gem 278016 SHA256 f09d05909a4190b70e09b88a1e036cc8d73ed0d39116e5e8d03fed86cee1152f SHA512 0c0cadfa2f2aeb3932e50955674886369b9b902f6904d7225c78bf589d36d527e5ad110778e4b6af1a258a44652d9a35fcf92472f34998398fabf8e9b322b758 WHIRLPOOL 3cbd7995dd9b5203f35f36de5ace30c1c8a480308e9a381cd68109a739f645fa603132cb653be6663d194abe33eb43817243fb64712a3bdafdae9512d60cb4b8
-DIST rgen-0.7.0.gem 278016 SHA256 961599ecc1714201c646d6817bab407994b50395d294db122afa2836e6057579 SHA512 a0e6464d6e2a148cf5064f5aaf422a7f14b470335c76a1831d3c480952604733b822b95b10034fc654134002f2f3181bc9aeb6f09e2a2aadbbcbfba16cf8559f WHIRLPOOL a2492a54004d611a7bfd9957eb2f42453c90bd083613686568932e789b56c586224047fe031a4b9e627fdd201e34f068122bce62f9f3deac0618893f9c8f53e3
DIST rgen-0.8.0.gem 382976 SHA256 1a85daf3812bb76f12801e55c9e03114ba0a3eb87ab326276abdc6c853c4cca7 SHA512 cf4f5435fdc78850a05b44477804f511f52be0be3999dfabd52cbaeb26e93c2e2eb9d18a094373ddaa61076a437f0b26e9371de0a10158969b3934d530b230b6 WHIRLPOOL 886fa95f02ef60516e9d6c3556ae1bcc375dd26335226d010a2c40cdf81733184a5237c5cd0c03ece646f0380e782551ff02328e2eb60bc84479102e50e2d095
diff --git a/dev-ruby/rgen/rgen-0.7.0.ebuild b/dev-ruby/rgen/rgen-0.7.0.ebuild
deleted file mode 100644
index 905193ea9f41..000000000000
--- a/dev-ruby/rgen/rgen-0.7.0.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
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby Modelling and Generator Framework"
-HOMEPAGE="https://github.com/mthiede/rgen"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
-
-ruby_add_rdepend "dev-ruby/nokogiri"
-
-ruby_add_bdepend "doc? ( >=dev-ruby/rdoc-4.2.0 )"
-
-all_ruby_prepare() {
- # Skip Bignum test since it fails on 64bit machines. Reported
- # upstream: https://github.com/mthiede/rgen/pull/18
- sed -e '273 s:^:#:' -i test/metamodel_builder_test.rb || die
-}
-
-each_ruby_test() {
- ${RUBY} -Ilib -S testrb $(find test -type f -name '*_test.rb') || die
-}
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index 08c4db3b6d4c..3f3cb103f04b 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -1,3 +1 @@
DIST rouge-1.10.1.tar.gz 410921 SHA256 b149923df1b62d2c0f6a3d6fda725edff2267d3c89572e90108c489f6daceb77 SHA512 10f7ca3c3901fb3cbaa14f3d767d710b38c57cc01716a8f8332b02bdcaad82a1bdb0c6670114a8746cec3c7e0f89943ea30cf3a7b74480d494e90633f705d50c WHIRLPOOL 3d948f0732e3a8c93ac381a2873d490888ff8662d1ceff8ad3213f734e2270109e7b7a97c8f0a7a5cdb21ce4413a72680d8143307ed6f2b3386797a13e70b15b
-DIST rouge-1.9.0.tar.gz 400489 SHA256 0e984b91fe2b2eccb35d83735235dd918cc1820338915c20a3d8f34505c586fc SHA512 23853debad31b97bec4644d36692c28078120707db024f6bec18eec9aa7b1f14a1b23c4d553b21c50af29ce7c0bac6774eb1693590a5975acfc0483f6711ff28 WHIRLPOOL d9e5b8c47fbb870cc528c6c9758e7e70ab3022c02e67919fa52f1d948ca6e55a6bbdc3ecbe6b20c832732d5b0e91463d506f9e677fd4dfac443db7cd7e90cf50
-DIST rouge-1.9.1.tar.gz 404243 SHA256 cb858abd36a3f8523ee055ce7c815c6757493f82ffa3db307b90e2ec3bfad15e SHA512 8cffcd8cda0ec76eae198d3a3391be421f223b8ec80054b5bcedce6d6c8b16425ce5476be6de2f1fc92d25b0be2eac621d7e17cd40e5d895549e1ece1e2b24a3 WHIRLPOOL f6a36f93cab5ff69359c7597708f3a18707ecb7ec0c33b6bc7eea6b64bdc320fa388a5871180c16dd7d31a8ea83df09b2938b2487d7b921164653a41bce52a94
diff --git a/dev-ruby/rouge/rouge-1.10.1.ebuild b/dev-ruby/rouge/rouge-1.10.1.ebuild
index 8fccd95078e3..3c6dfc2e4335 100644
--- a/dev-ruby/rouge/rouge-1.10.1.ebuild
+++ b/dev-ruby/rouge/rouge-1.10.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
RUBY_FAKEGEM_TASK_TEST="spec"
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_RECIPE_DOC="yard"
inherit ruby-fakegem
-DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition"
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
HOMEPAGE="https://github.com/jneen/rouge"
SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-ruby/rouge/rouge-1.9.0.ebuild b/dev-ruby/rouge/rouge-1.9.0.ebuild
deleted file mode 100644
index 81827a8cc7c0..000000000000
--- a/dev-ruby/rouge/rouge-1.9.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition"
-HOMEPAGE="https://github.com/jneen/rouge"
-SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )"
-ruby_add_rdepend "dev-ruby/redcarpet"
-
-RESTRICT="test"
-# Depends on dev-ruby/wrong, which is not packaged yet.
diff --git a/dev-ruby/rouge/rouge-1.9.1.ebuild b/dev-ruby/rouge/rouge-1.9.1.ebuild
deleted file mode 100644
index 81827a8cc7c0..000000000000
--- a/dev-ruby/rouge/rouge-1.9.1.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser but fast, pure Ruby, using a strict syntax definition"
-HOMEPAGE="https://github.com/jneen/rouge"
-SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )"
-ruby_add_rdepend "dev-ruby/redcarpet"
-
-RESTRICT="test"
-# Depends on dev-ruby/wrong, which is not packaged yet.
diff --git a/dev-ruby/rr/rr-1.1.2-r1.ebuild b/dev-ruby/rr/rr-1.1.2-r1.ebuild
index d54123e756b8..c6081c4c4024 100644
--- a/dev-ruby/rr/rr-1.1.2-r1.ebuild
+++ b/dev-ruby/rr/rr-1.1.2-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_TEST="none"
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
inherit ruby-fakegem
-DESCRIPTION="A double framework that features a rich selection of double techniques and a terse syntax"
+DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
HOMEPAGE="http://pivotallabs.com/"
SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-ruby/rr/rr-1.1.2.ebuild b/dev-ruby/rr/rr-1.1.2.ebuild
index 30d1cfd8a668..84252dc153c0 100644
--- a/dev-ruby/rr/rr-1.1.2.ebuild
+++ b/dev-ruby/rr/rr-1.1.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
RUBY_FAKEGEM_TASK_TEST="none"
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
inherit ruby-fakegem
-DESCRIPTION="A double framework that features a rich selection of double techniques and a terse syntax"
+DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
HOMEPAGE="http://pivotallabs.com/"
SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 34d06363b483..1424bf0b3947 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,6 +1,4 @@
DIST rspec-core-2.14.8-git.tgz 195949 SHA256 757febdcc4465b62fb41572e1fb7e0deb86f903127cb2941ea65d2c1d4ac29db SHA512 2be487f0a820cb959771b0c2a725aa7a43cd80a76f85ed42f3341420cefa4ba6413b5dbd86e8fba9f5515afef3e895e0f1f2f8239d50f0b764f037d5f0791095 WHIRLPOOL 5b2422d7f1d087caf654ea04d81f269ae90be63eb73135d34691839c27e6dfa152aac425f64a860b3af50ef0bf513ac7f4a68c979c254083f187e57a96c20fe3
DIST rspec-core-2.99.2-git.tgz 212935 SHA256 75794e3f94f3323b1212b93e827d37d6ab2813dea2f5f927929b40e9ee170c43 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44 WHIRLPOOL 5584be2da2310688155c4fe600a4a36f68434440ebc00b063e9fcdcb3188138831a210f482ac86a469984fcf9838d795511ea02433020ecc6bc1d6aacc8c72bd
-DIST rspec-core-3.2.3-git.tgz 276647 SHA256 7122fe372cdf0d4ff60aef42768fc9cc0350bd1943f5c1fa6189153829519ab2 SHA512 a5eb294c4770275662205b4edde2426c7d7ab7f9fb3cea6fc1171071b941a94b6d6386348fd83ba9e76a35512ea56be0b657ba2d8e210fe73c8564e76ebea7ae WHIRLPOOL 895d5fab418ddc5adc9a33078499f59b2865b636516110f0042bd08b4d9ecdb304f135655c0b05102f47725b94da831c986889b8a76eed3e8aa2c693f2d29d63
DIST rspec-core-3.3.2-git.tgz 332730 SHA256 aef9a2867a435aa7be57826c850e88e593232077dc42f12bfed89a92c7704d26 SHA512 6cadfa43d63df8d24105d88d6e8b22a495a30f04b289c71c8887ea3fead9ec8f071a6c734a140b1e4910f25094fd36c7c37b54a0724e734233ca584202f0cf32 WHIRLPOOL 1e385223ea8c9b32bfc6ecc93146ccad793441bae3426f6cb4acc07d7a1f2bc6e20be11597fcd27f3c6bb207482213e2eaf214835041df631d06b9bc524e5b70
-DIST rspec-core-3.4.2-git.tgz 354859 SHA256 bcb93520f5cb2bc0f2f66c09579970c524e7404575cefc5aefcd3da594d775b6 SHA512 33fc3336a01b86f9c22e5e9fe9f78f2b4f66a309fd0bff90d565484912d2ae6525dc80b0e6e2c6d2b5d698c2848e0b025cc4f065b533b9936ba6e7dfb03bae88 WHIRLPOOL 451f5b70bdd9db53fc7fabc84dacff6cd3cbda3422ca475a1090e5bcd2ec42249e91953c0d648c5a4d2ab12af85e778b392a1e75717526d89577ecffe88f0cfa
DIST rspec-core-3.4.3-git.tgz 355961 SHA256 9dea290b7a1e30e483d61451e968554591a0ce385b66bc75d27d0f9eed7455e3 SHA512 26973fb7de7e2055cfafece0b3d68c2dab3498f6e3705bc2a4d41633b18783d142c7c9bee82fbec0d577b7d97d85c747c8cbdeb0cf8d2b5c017009fa087f2ec2 WHIRLPOOL f52dfaa2dc83efb49f66693e7b9eff20d5237d0593985ed88283247d50e2fa24d6f3739d9c01c0a4fa298b9da1072a01b055b0d4618eadeb8de9e7403cccb7be
diff --git a/dev-ruby/rspec-core/rspec-core-3.2.3-r1.ebuild b/dev-ruby/rspec-core/rspec-core-3.2.3-r1.ebuild
deleted file mode 100644
index e8884f75dd62..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.2.3-r1.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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="highlight"
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
- =dev-ruby/rspec-support-${SUBVERSION}*
- !!<dev-ruby/rspec-core-2.14.8-r4
- highlight? ( >=dev-ruby/coderay-1.0.9 )
-"
-
-ruby_add_bdepend "test? (
- >=dev-ruby/nokogiri-1.5.2
- >=dev-ruby/coderay-1.0.9
- dev-ruby/syntax
- >=dev-ruby/zentest-4.6.2
- >=dev-ruby/rspec-expectations-3.0.0:3
- >=dev-ruby/rspec-mocks-2.99.0:3
- )"
-
-# Skip yard for ruby21 for now since we don't support ruby21 eselected
-# yet and we can't bootstrap otherwise.
-USE_RUBY=${USE_RUBY/ruby21 ruby22/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
- # Don't set up bundler: it doesn't understand our setup.
- sed -i -e '/[Bb]undler/d' Rakefile || die
-
- # Avoid dependency on cucumber since we can't run the features anyway.
- sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
- # Duplicate exe also in bin. We can't change it since internal stuff
- # also depends on this and fixing that is going to be fragile. This
- # way we can at least install proper bin scripts.
- cp -R exe bin || die
-
- # Avoid unneeded dependency on git.
- sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
- # Avoid aruba dependency so that we don't end up in dependency hell.
- sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
- rm spec/integration/{filtering,order}_spec.rb spec/support/aruba_support.rb || die
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
- case ${RUBY} in
- *ruby22)
- # The rubygems version bundled with ruby 2.2 causes warnings.
- sed -i -e '/a library that issues no warnings when loaded/,/^ end/ s:^:#:' spec/rspec/core_spec.rb || die
- ;;
- esac
-}
-
-all_ruby_compile() {
- if use doc ; then
- yardoc || die
- fi
-}
-
-each_ruby_test() {
- PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild b/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild
index 58aa02ea66ce..43b6fb919e06 100644
--- a/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.3.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_TEST="none"
RUBY_FAKEGEM_TASK_DOC="none"
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
LICENSE="MIT"
SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64"
IUSE="highlight"
SUBVERSION="$(get_version_component_range 1-2)"
@@ -39,7 +39,6 @@ ruby_add_bdepend "test? (
>=dev-ruby/coderay-1.0.9
dev-ruby/syntax
>=dev-ruby/thread_order-1.1.0
- >=dev-ruby/zentest-4.6.2
>=dev-ruby/rspec-expectations-3.3.0:3
>=dev-ruby/rspec-mocks-2.99.0:3
)"
diff --git a/dev-ruby/rspec-core/rspec-core-3.4.2.ebuild b/dev-ruby/rspec-core/rspec-core-3.4.2.ebuild
deleted file mode 100644
index 25460b389ddc..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.4.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_TASK_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="highlight"
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
- =dev-ruby/rspec-support-${SUBVERSION}*
- !!<dev-ruby/rspec-core-2.14.8-r4
- highlight? ( >=dev-ruby/coderay-1.0.9 )
-"
-
-ruby_add_bdepend "test? (
- >=dev-ruby/nokogiri-1.5.2
- >=dev-ruby/coderay-1.0.9
- dev-ruby/syntax
- >=dev-ruby/thread_order-1.1.0
- >=dev-ruby/zentest-4.6.2
- >=dev-ruby/rspec-expectations-3.3.0:3
- >=dev-ruby/rspec-mocks-2.99.0:3
- )"
-
-all_ruby_prepare() {
- # Don't set up bundler: it doesn't understand our setup.
- sed -i -e '/[Bb]undler/d' Rakefile || die
-
- # Avoid dependency on cucumber since we can't run the features anyway.
- sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
- # Duplicate exe also in bin. We can't change it since internal stuff
- # also depends on this and fixing that is going to be fragile. This
- # way we can at least install proper bin scripts.
- cp -R exe bin || die
-
- # Avoid unneeded dependency on git.
- sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
- # Avoid aruba dependency so that we don't end up in dependency hell.
- sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
- rm spec/integration/{failed_line_detection,filtering,order,persistence_failures}_spec.rb spec/support/aruba_support.rb || die
-
- # Avoid a spec failing due to path issues
- sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
- spec/rspec/core/configuration_spec.rb || die
-
- # Avoid specs for older coderay version which is no longer packaged
- sed -i -e '/highlights the syntax of the provided lines/ s/do/,skip: true do/' \
- -e '/dynamically adjusts to changing color config/ s/do/,skip: true do/' \
- spec/rspec/core/source/syntax_highlighter_spec.rb
-}
-
-each_ruby_prepare() {
- sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
- # case ${RUBY} in
- # *ruby22)
- # # The rubygems version bundled with ruby 2.2 causes warnings.
- # sed -i -e '/a library that issues no warnings when loaded/,/^ end/ s:^:#:' spec/rspec/core_spec.rb || die
- # ;;
- # esac
-}
-
-all_ruby_compile() {
- if use doc ; then
- yardoc || die
- fi
-}
-
-each_ruby_test() {
- PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.4.3.ebuild b/dev-ruby/rspec-core/rspec-core-3.4.3.ebuild
index 25460b389ddc..5e7d2c105aca 100644
--- a/dev-ruby/rspec-core/rspec-core-3.4.3.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.4.3.ebuild
@@ -39,7 +39,6 @@ ruby_add_bdepend "test? (
>=dev-ruby/coderay-1.0.9
dev-ruby/syntax
>=dev-ruby/thread_order-1.1.0
- >=dev-ruby/zentest-4.6.2
>=dev-ruby/rspec-expectations-3.3.0:3
>=dev-ruby/rspec-mocks-2.99.0:3
)"
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 18bc45abfa39..c05fbf539850 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -1,6 +1,4 @@
DIST rspec-expectations-2.14.5-git.tgz 93680 SHA256 ceba7a62ad87285f1ea01db4798efbbde4020b82a109cc260ec358061367e5b9 SHA512 237ed56cd185bc5d0d60ed14e20ded1840ef10711693c43ffaa20ec65cdd6b891aba3a6f1f38bb6962c31d51364758d1898e3bcba14a95c4abc73dff4dac1b65 WHIRLPOOL b9860d7bbd7e33143de655d3bcae6925a91ae5992f47b75ae9c61203c9cddcfb5a2ad0d8d3152a725ff4174359bdf56c5d8dbe24b4b1bb56e3aab292ddfc7a5d
DIST rspec-expectations-2.99.2-git.tgz 106884 SHA256 4c1b38198d214ab2d4e297fdfbd89d3c3ae20c6b144882e53e935cfbc9878f68 SHA512 6042cafe225b2b16df458c7bf69e1694b637afcac6f6195e35a0be199432610457ccaa3e7e4bd114b27a7a6c3d530d94f4c0603c65f469cbadc55bd3f75b6f3a WHIRLPOOL 4a390f55bac3180a876bd59f58ce7c2ed87611b94c9610c950dc138ef14c8966e62d79aa4f63771c373760d0b9f4f51a9aaa6cbc4fc600573c6cb12ddc0e278d
-DIST rspec-expectations-3.2.1-git.tgz 157533 SHA256 fd3813bb56818fcea59a71aec649546c33c3d10ad1473deb4b051ab8f2bd1940 SHA512 144609a9b148daeb95e23e421bdd00ba3571f6e751915ba699089d52567f9cd7a35a51be37772947d7fe59945281bf8c5afea6a68b6d0e87007266333342b773 WHIRLPOOL 5046afddb29a42b3456b25077d3f1f2be83e5db6a8e69c02e93711725466ecbe792c4670cd8bbd371e405b0706a1eaadb7c7d7b81df50c7c88732e98d1e32cf4
-DIST rspec-expectations-3.3.0-git.tgz 170643 SHA256 1bf5062cd45c12cfa048deb73caa572372767513fffe9f12328ffaf8970a0891 SHA512 edbe9ec9482fb93ba4834b023b3574f6771936a17df7b0f049b090b10077bb2d336a30a2bf734fa2d2f207b04bcb63be9a4e1a33c905d3614c93bec1a23be51c WHIRLPOOL 2a396b888261094efce98cea6d2359ce1b604801de20884b69f2b6f0c6ea16d0546ce9a5c101a10ad19ae225c498e6e80068958aef2ee12e350c31a228fcb0ef
DIST rspec-expectations-3.3.1-git.tgz 171117 SHA256 a40feb73c5c54fd6464ca262af4be50ef9d5e4a785b5ae7862946da42837e112 SHA512 fe0e5fc4e00c8d51866bc9699bc25b1e702c765c5443abbebe2f016833c6f09f9f8f35d86520b59d51ad0a196551f68c39a5ec707658826af838ed274f4986ff WHIRLPOOL 5dc55d62ec1df5add711c07470d2d7020b875bf43a57788ceb84b05807ec9d3b2e395fde16f14c06d265e8c36b44e9a9c9da306c049a019289a1bc3d265e18e1
DIST rspec-expectations-3.4.0-git.tgz 181527 SHA256 4cfdedf39382d27335208fc1ce7efbf3babd3212e021ece5593e39feb3e51556 SHA512 688fcee04517e1354ce7d180c9e8c8e55614261af416b80dfc663293f9d66348fc2c17dc9b31aec7bc12fd9045d6507d9f11017bb5a757e41dbcaea18efa684f WHIRLPOOL 3d9a8f9b7515433b80dc70ba922813f0b2564bd0e1a0f1fe6dd370befef76a8453b1ce59b8fede435a99f8f604a24a56c158bd5c0be5bc3627c0b2181193ca16
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.2.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.2.1.ebuild
deleted file mode 100644
index 11bcf83a8577..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.2.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="http://rspec.rubyforge.org/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
- =dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "test? (
- >=dev-ruby/rspec-mocks-3.2.0:3
- )"
-
-all_ruby_prepare() {
- # Don't set up bundler: it doesn't understand our setup.
- sed -i -e '/[Bb]undler/d' Rakefile || die
-
- # Remove the Gemfile to avoid running through 'bundle exec'
- rm Gemfile || die
-
- # fix up the gemspecs
- sed -i \
- -e '/git ls/d' \
- -e '/add_development_dependency/d' \
- "${RUBY_FAKEGEM_GEMSPEC}" || die
-
- #
- sed -i -e '1irequire "spec_helper"' spec/rspec/expectations/configuration_spec.rb || die
-
- # Avoid a weird, and failing, test testing already installed code.
- sed -e '/has an up-to-date caller_filter file/,/end/ s:^:#:' -i spec/rspec/expectations_spec.rb || die
-}
-
-each_ruby_prepare() {
- case ${RUBY} in
- *ruby22)
- # The rubygems version bundled with ruby 2.2 causes warnings.
- sed -i -e '/a library that issues no warnings when loaded/,/^ end/ s:^:#:' spec/rspec/expectations_spec.rb || die
- ;;
- esac
-}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.3.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.3.0.ebuild
deleted file mode 100644
index 80f010bd641a..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.3.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-expectations"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
- =dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "test? (
- >=dev-ruby/rspec-mocks-3.2.0:3
- )"
-
-all_ruby_prepare() {
- # Don't set up bundler: it doesn't understand our setup.
- sed -i -e '/[Bb]undler/d' Rakefile || die
-
- # Remove the Gemfile to avoid running through 'bundle exec'
- rm Gemfile || die
-
- # fix up the gemspecs
- sed -i \
- -e '/git ls/d' \
- -e '/add_development_dependency/d' \
- "${RUBY_FAKEGEM_GEMSPEC}" || die
-
- #
- sed -i -e '1irequire "spec_helper"' spec/rspec/expectations/configuration_spec.rb || die
-
- # Avoid a weird, and failing, test testing already installed code.
- sed -e '/has an up-to-date caller_filter file/,/end/ s:^:#:' -i spec/rspec/expectations_spec.rb || die
-}
-
-each_ruby_prepare() {
- case ${RUBY} in
- *ruby22)
- # The rubygems version bundled with ruby 2.2 causes warnings.
- sed -i -e '/a library that issues no warnings when loaded/,/^ end/ s:^:#:' spec/rspec/expectations_spec.rb || die
- ;;
- esac
-}
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index ad298585ee88..92ad0e98ab4e 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,7 +1,5 @@
DIST rspec-mocks-2.14.6-git.tgz 94286 SHA256 2453766688b33a5cd743f4ebc3ffccd4277e3daca069828c7206bd0f12d5fee4 SHA512 a079c0b860c7ca4b4da366fa131617ddcb636918cd0c065ef3d8d585938228f442bb58ab5fcd2cd84b590bf6ab468d637fa7ab0181864a59c131f0a890e46702 WHIRLPOOL d29599bf4465c38433d7ddf70a12c43a523c289fd9857aadeb41610aef4980d8ea43cd1aef48d3d1d736e67a201bba131ea151a0ecb297e887fac51baf35655b
DIST rspec-mocks-2.99.2-git.tgz 101731 SHA256 fad961e30ef67e014625fb6b4bb62db0f6f101142a897b4cad31e60f8faf8c57 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d WHIRLPOOL 06e8c3dd38fa17fbd82c97fe1c19928450234c761185cf636556955df9a081f4685d002a8fe501690c5457c63014ce8a60c5aca32b7c4bc24eb368368e5e33c3
-DIST rspec-mocks-3.2.1-git.tgz 162789 SHA256 4ff4e500cf46a6a90920f64b18f88a41a0c62808183f593f3b6ff616c1d3fdf7 SHA512 005eb4214a98104a9366a8974486813cc098c53352bc877133c2e6efeeac6b14a1ff9bbc8a57227bb42f73727f56dfd244674833505ae1c64d4c21dee70dd9fe WHIRLPOOL bc4559879d7e2c768fddb4e98e02bf17136a7b8759495d9d7d63d257388a95149d4ee32408f0a041593ead8807a5f8c193db22f95df0bae026e7a45f62999422
-DIST rspec-mocks-3.3.1-git.tgz 173312 SHA256 43f7a1de0f3fa2083af889f3a5be13b0629358bf53ee09aac61ddb53865f5914 SHA512 1ae4f6915a136ef238edc6561034bc756673c33cb3ea934253bc3b9718027cb7020cf29d125a2b95bc3dfbe49fa4d06762a2315fd9f62b590f23f5b80ca642c2 WHIRLPOOL 720c04a8bbbfd07573378f118ddafb223825efae39459c6cae09668a52942416794ad5e3514182855858823660d73513c25ad1946b863d5f7552721833b94eca
DIST rspec-mocks-3.3.2-git.tgz 174849 SHA256 faec1a03eecdda1217238df7989c80f4201cf7613580af3824b2fa3af2c45ec0 SHA512 b03dd81232650d851db51dd62a11c6f34df7e3d47db9ec96168259f7d4045d2497098de903b5ef6865c29a5f4835ee1865ff64a8177f9212e8f699175ec7fe90 WHIRLPOOL 33936705596662c74c31b74b1bc5ac57bb76290b4fda1375edb18b9491c7b1ced0dd545c21ae6b67174275235ff767ddc322b73da97685a0dc6eeff13b9c9b61
DIST rspec-mocks-3.4.0-git.tgz 182517 SHA256 87673a6c2a2c4c4054dcf2694c6deecc304fc8a1cb8684e3b55b21536ee1e593 SHA512 1d697c501a256031c1070706082d4dcd86c7441935f9427a9479a79da91fa432414ffdce0cf0b32178e2c2731f8947446780b1bd9f325bff61878425d5f86328 WHIRLPOOL 15dec1303e4d58d471e6833317d282ba1cf3e6a370b4f32297e8b6a97755402cf83517fb4ca36766934946fe70baf6a41cdc74d8999581d1c6a7fa5ab99ed5e9
DIST rspec-mocks-3.4.1-git.tgz 182922 SHA256 0d749c3c9a229b2c9811986ae9676b6fd644b950eebac73155e7202bb275c72d SHA512 1e5b0bad9ef95f2479cf5fe5488076fd42c3fbcd2d35278b9da6d45106819e0bde29564a3962f8214565c944cb2b44475660d3f53fd64b11916aa85f7af94fdd WHIRLPOOL 0cbfffc2c79056da2134fa1217d535c8ba52362181f7bcd638ff876c64b1c70a32e049e81714a260daca21481c6c30dbaf024620eacdc660a1930974869c1f93
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.2.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.2.1.ebuild
deleted file mode 100644
index 2ae0a2db2b20..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.2.1.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/rspec-core-3.2.0:3
- >=dev-ruby/rspec-expectations-2.99.0:3
- )"
-
-all_ruby_prepare() {
- # Don't set up bundler: it doesn't understand our setup.
- sed -i -e '/[Bb]undler/d' Rakefile || die
-
- # Remove the Gemfile to avoid running through 'bundle exec'
- rm Gemfile || die
-
- # Remove .rspec options to avoid dependency on newer rspec when
- # bootstrapping.
- rm .rspec || die
-
- sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-
- # Avoid a weird, and failing, test testing already installed code.
- sed -e '/has an up-to-date caller_filter file/,/end/ s:^:#:' -i spec/rspec/mocks_spec.rb || die
-
- # Avoid failing specs in yield code. Not clear why verify would not
- # be defined. We can revisit this later so we can move on with
- # rspec-3 introduction for now.
- rm spec/rspec/mocks/and_yield_spec.rb || die
-}
-
-each_ruby_prepare() {
- case ${RUBY} in
- *ruby22)
- # The rubygems version bundled with ruby 2.2 causes warnings.
- sed -i -e '/a library that issues no warnings when loaded/,/^ end/ s:^:#:' spec/rspec/mocks_spec.rb || die
- ;;
- esac
-}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.3.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.3.1.ebuild
deleted file mode 100644
index 5574f5772deb..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.3.1.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "
- test? (
- >=dev-ruby/rspec-core-3.3.0:3
- >=dev-ruby/rspec-expectations-2.99.0:3
- )"
-
-all_ruby_prepare() {
- # Don't set up bundler: it doesn't understand our setup.
- sed -i -e '/[Bb]undler/d' Rakefile || die
-
- # Remove the Gemfile to avoid running through 'bundle exec'
- rm Gemfile || die
-
- # Remove .rspec options to avoid dependency on newer rspec when
- # bootstrapping.
- rm .rspec || die
-
- sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-
- # Avoid a weird, and failing, test testing already installed code.
- sed -e '/has an up-to-date caller_filter file/,/end/ s:^:#:' -i spec/rspec/mocks_spec.rb || die
-
- # Avoid failing specs in yield code. Not clear why verify would not
- # be defined. We can revisit this later so we can move on with
- # rspec-3 introduction for now.
- rm spec/rspec/mocks/and_yield_spec.rb || die
-}
-
-each_ruby_prepare() {
- case ${RUBY} in
- *ruby22)
- # The rubygems version bundled with ruby 2.2 causes warnings.
- sed -i -e '/a library that issues no warnings when loaded/,/^ end/ s:^:#:' spec/rspec/mocks_spec.rb || die
- ;;
- esac
-}
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index d07af3986036..2fd23416dd30 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,7 +1,4 @@
DIST rspec-rails-2.14.2.tar.gz 75049 SHA256 c5ec91e3c360033a7ef640d0a08b4f9167032b5d6d5cdee020f4df949f916a24 SHA512 2dcc568c578f3201dbdc6a757c84d0e689c3f221fe7cbd57849524680e40150c972436a2c6fcc1220e99c9d2e6c97c62bb6d4c5c59e9d6890a67caceb94ed5cd WHIRLPOOL d721b1dbec6cf4d35560868981087f5f7950353bb281d277fd17d012d71302986c5645b3d0c28bf61d270a2b90596d324ad072184eb195b642718f33f83ede4e
DIST rspec-rails-2.99.0.tar.gz 78448 SHA256 81ff54e638432c2b734ebefd5398f646960bcc72b92e381393d2420fc9525882 SHA512 0453450cf5a5435dc4f870ae7a37a299c6b17a4df04de730c14ca3d070808c9a9a70a6f485a1d0c6f4f8ddf3def6e4710ae5842e9e8f0b59c10b2177299670f4 WHIRLPOOL 0a5774bab31786cca0a3146641306cce38d2a809bc94a9728cc2c479be761b66246cb54bdf9185c478519434d95f7808f9d8f7f9ddecac1ffc01251cf9dcd5a6
-DIST rspec-rails-3.2.3.tar.gz 97589 SHA256 d70416a471a6e83b10a3b2c18f2dcfcb22897306cc1b238bb47fb4b6ee824ecb SHA512 1efeea5b742c9ded10dfdf432439b05765773bc19bb127a68f5cabd16e35d6bbead79c51343a419de03b5fe36d3ccf3754916ec55e28d6d9bf095508f1233af8 WHIRLPOOL 502d944adc28e9ac5b78db924cc985213067af60d5d238675feacd6e5625c479a9d7870cd43c49c12aac928d11f9361e7f7e85211a25403794a73e6933af69c0
-DIST rspec-rails-3.3.2.tar.gz 102934 SHA256 efdfadb375e0a64b6a306482ab705bdd9f147ff8c6b1acebb1981e50d5043b1c SHA512 59d8c516e3b7b5138c08d6cc2d68e21078dec0b340f9c0f709c9fa9cb7c318718454a8e11737a3ff1f2e940fc7d8db425b36bffda6966ad5f270923ffb9345bc WHIRLPOOL 6501d7b3467dcbec069472e6510a8c48a0a50b5f02ad6be5336b8c0bd2f841e72d865a3a8260bc4ef47744f6fd39eb4554c0c14d47153b2c1dce829d446b3672
DIST rspec-rails-3.3.3.tar.gz 102963 SHA256 b0edc645a25c929deb39a7334894922cdf67cf7cb895bb728751d0d3a459fac9 SHA512 72c8a027d3ac7c8487c4dec23c91c7014456e6d8ed10f80f72e71c90e7bde0a3c005dd6b57985b1f3e32b32cb6d4610f651f8aa4b81156536a667a266e816603 WHIRLPOOL 78b00968fe75cd632b94bd4b2f244dc6ac50e708b9023baf882bba6ef76b827b681f55dd88be0220988c49d308b9bde4e3344456980db0d9a5654e39f65edd93
-DIST rspec-rails-3.4.0.tar.gz 113846 SHA256 8cbe0b54e1000e3b5f9810c22b8387f95d34c482eea00177c4895b6a5d38673e SHA512 d9bc98a2af31dba2149c678025b2e9ffc7120daec2a0326fd50f1dd3e47efd8cb636fda10728d637792a4a9bdeeed54650892af11aafa4ec4baaa7577329985e WHIRLPOOL b8e0934ba838acbab96123d6327e1910c86117b5f3b16206ec782d4e12c4cf2e59f2fce481a29d6cb3b80804407859523a9bbc38c6e58b8d35f2d7ef0e09fb2f
DIST rspec-rails-3.4.2.tar.gz 114252 SHA256 ff54962e135baad173aa987ba08ea4d35b2479cc32beaa2d348e2dfb95bffc85 SHA512 922a666ac674d6e91083caf5b5526556add9ffc8783f3f5af8a7d60afb2353b99730e367d522b91bf487fcbe9282fbf51648487c9d0bed005882dc57d7fb57bc WHIRLPOOL 7004dec656c42d2c0ad1a930c4df04955acb0b936c75699f902cd42acb1e42fc9cab7340acf8da834b769d5740431d2ad6e83ea1b61d60939d7d523bb6462977
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.2.3.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.2.3.ebuild
deleted file mode 100644
index f6db2b9b01f4..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-3.2.3.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
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
- >=dev-ruby/actionpack-3.0:*
- >=dev-ruby/railties-3.0:*
- =dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? ( =dev-ruby/mocha-0.10* >=dev-ruby/capybara-2.0.0 >=dev-ruby/ammeter-1.1.2 ~dev-ruby/rspec-rails-${PV} )"
-
-all_ruby_prepare() {
- # Remove .rspec options to avoid dependency on newer rspec when
- # bootstrapping.
- rm .rspec || die
-
- # Avoid bundler-specific specs.
- rm spec/sanity_check_spec.rb || die
-}
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.3.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.3.2.ebuild
deleted file mode 100644
index 04464e0d3be7..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-3.3.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
- >=dev-ruby/actionpack-3.0:*
- >=dev-ruby/railties-3.0:*
- =dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
- =dev-ruby/mocha-0.10*
- >=dev-ruby/capybara-2.0.0
- >=dev-ruby/ammeter-1.1.2
- ~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
- # Remove .rspec options to avoid dependency on newer rspec when
- # bootstrapping.
- rm -f .rspec || die
-
- # Avoid bundler-specific specs.
- rm -f spec/sanity_check_spec.rb || die
-
- # Avoid broken controller generator specs for now.
- rm -fr spec/generators/rspec || die
-}
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.4.0.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.4.0.ebuild
deleted file mode 100644
index d15ad70e3dc0..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-3.4.0.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
-
-USE_RUBY="ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
- >=dev-ruby/actionpack-3.0:*
- >=dev-ruby/railties-3.0:*
- =dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
- =dev-ruby/mocha-0.10*
- >=dev-ruby/capybara-2.0.0
- >=dev-ruby/ammeter-1.1.2
- ~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
- # Remove .rspec options to avoid dependency on newer rspec when
- # bootstrapping.
- rm -f .rspec || die
-
- # Avoid bundler-specific specs.
- rm -f spec/sanity_check_spec.rb || die
-
- # Avoid broken controller generator specs for now.
- rm -fr spec/generators/rspec || die
-
- # Avoid loading rspec/rails explicitly since ammeter/init will also
- # do this and loading it twice causes an error
- sed -i -e '/rspec\/rails/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 11e114ca181c..a702ca12bb82 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,4 +1,3 @@
-DIST rspec-support-3.2.1-git.tgz 38054 SHA256 5b4349b9139124d2dfc6900ddde20583503f2147b452b59afaf0a2ec858987a4 SHA512 2813bbd7c875aa3aa958e7ce0ac01f4ad19c581814369daee67d73130de0d0de136a78930ee2da38333892edd3e64bcdb67ac2f8ccd2fa468f4f8a99f96b1344 WHIRLPOOL 98e62fffe7c7f45769c1ec5751ad7b20884c3826183d773da5dc46f9c5652067472f00d1c24318ebd42ae23591c3d94c0e591777455e485b3826653a20c01867
DIST rspec-support-3.3.0-git.tgz 45380 SHA256 cea58331f616e407c4ee25bb0b74bad26dbdc793fd341010d37749dea15e30a2 SHA512 88f0fdbc7609093c8f14bff220a03d0788847315e5ac73c025cd181d84a3ac120c294aca8ffff9a0c11c9f11e35019dc337f9e43fc2c33cabe4856d87e36fa1e WHIRLPOOL 6f355bb1dc71bbb7804fd3d4a4227042bbe0d166ef336e4121730abce52e1596b25b94ae38e72a6284ca2eac6d0eb6146a02f54d08792b1ff5a6320d40524a2a
DIST rspec-support-3.4.0-git.tgz 55405 SHA256 07826d61234ab87ff935c74ce15b5b96a2cc5ad0c66e6aea2ebe906f986081c0 SHA512 a309e86b57c6c0e89c39f9bccf01479a1ef42b51017d4e012de4a223a3d6d7f348362c4b5da3bdaafaf53564761b1c8d4e3d19e1a058923116b40f086a6eb9b7 WHIRLPOOL 62a5c1be1b4fb1ca39965826c1a3ab10af74c6b10c89a37677dc737d10baf9d99c9f73742145ee42f6b06206aabe43710a83014feff8df3d27e70458ed660707
DIST rspec-support-3.4.1-git.tgz 55558 SHA256 e5e641ee3e42d8e7bd33927d8b5388f8a4a85f9c3204fbbe29675a8f6fa14116 SHA512 7318d8701d4e38dc9be5b2633c8acbe7d329f9b713da90b8307570b952ede435d2e0f0dcf42e6692491df8a54b81dc8908250739d3916cf11068d37d7b906b40 WHIRLPOOL 4ad29f8e1ff586cf3fe92b74813a17c62e3cc5556a1f66298c6d97f5f8803bddd762289b9fcf3f14efef6142dab010ed5208579a493d41d09d1a947c706659cb
diff --git a/dev-ruby/rspec-support/rspec-support-3.2.1.ebuild b/dev-ruby/rspec-support/rspec-support-3.2.1.ebuild
deleted file mode 100644
index 43baa8506882..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.2.1.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-support"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.2.0:3 )"
-
-all_ruby_prepare() {
- sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
- # Remove spec that, by following symlinks, tries to scan pretty much
- # the whole filesystem.
- rm spec/rspec/support/caller_filter_spec.rb || die
-}
-
-each_ruby_prepare() {
- case ${RUBY} in
- *ruby22)
- # The rubygems version bundled with ruby 2.2 causes warnings.
- rm spec/rspec/support_spec.rb spec/rspec/support/spec/shell_out_spec.rb || die
- ;;
- esac
-}
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 0763c107d9d4..2846afa23538 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -1,6 +1,5 @@
DIST rspec-1.3.2.gem 214016 SHA256 cced85c55b92477272d157ea92b925676db76c373f8040a62b8dbe1365296aba SHA512 c4a02214ce825fa3c03c7332963aaa04313687ba343ee1c9a33d40b0b22c9007f4dade734ed388a986d32a5bd64f413edd4a6c508c5f81161530b87960b4a315 WHIRLPOOL d4bdbfbbadc2e4861dc24002ced78e3c560384c628db545e9f3dae3ee11028310f888ad1b225f65792fd418136983011e33667ab3f8138ed712b69f0bf1566bc
DIST rspec-2.14.1.gem 4608 SHA256 4f9fc6c58696faa22571ca80d710fd0e4f30eaeb700155968d36df303f279e8c SHA512 cb5f7b720860c7a0f9f3aabf08b2b6ebf0a6cd220fb019c4b9a03368b9fd5b8049c3a374dff1251d261f6d0046f120e574f59b16f3775a478c04bb691785f720 WHIRLPOOL 760e9cf6e61ab097f797d0900bcf4341749a6502d620de2ec3d7bde228e417f4b72a7bdd9f622445314b0890af06307e5545949bebfb6c783aa9cea463158ee5
DIST rspec-2.99.0.gem 5632 SHA256 432b31d528aac0dd192b3fa7c83f6cc22dec4a0385fb4020d293cc6777870393 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8 WHIRLPOOL 7c71c569e3dd2a94f4564298c7af1069d29c0a1ca8b6045cd5b8ba0ae6833fa2e948b572d048397adc2aae90578e2cdf1f98e3fb0197697927538e925bef7b1c
-DIST rspec-3.2.0.gem 10240 SHA256 8e30e6401ab05fd1ae253067b262d7837b0b67a2211b5ede589c754f64007f52 SHA512 743c739b7716430c2b5b75aa57e6d3c17749e8100eca86873cb3c86e9f31a9e80959dd6876eb12d27da363968e7417acb36503ad4a208a3b905e47e0f3fe3a7c WHIRLPOOL fa606b40501b4ed8b183f4b1e48f4cd75308abf49176b5a1a30b3155299d3f83168880f3989ecee2a91c57b9486038b4e6a7e83c983154526cea8cbf97ad69e7
DIST rspec-3.3.0.gem 10240 SHA256 99548f038d0b9e55f670e77edb0f1ebcaf127d456c64a1adff803d158efec5ae SHA512 cafc2bcfae261da8f990a8c6327db88f800d73c9fed2dbf4ca360930376906ae6621349ac9cc92b900e069647eb9d1dde1e41feb6ba25b84d30228ae038efbd4 WHIRLPOOL ecf1b141131b60c9b074ed09d794bfc797487c369aa3e9e632c6ca187760b43063fb9eb3d4b354e7516bc8cbbf4f44069afd365020befe1ecfd374c67ea11907
DIST rspec-3.4.0.gem 10752 SHA256 1a1d69ef92aaa50f80aba930880886a19a51cda9be5350866fa00a69c5875d89 SHA512 b73040fd946931d5dcdf6d48456fda50f614ecab5853308b7c02432614c080cde05bc0eeeb0302f81dae3f25767eb2d4529ae0ae48c824ef077d299e5fea25de WHIRLPOOL 9ec06dc235a4fe964921016570f92973087b365902a5ff56a3015c84b80dc601616fc18a80f433adc4498d287ef45147a514f6da42830203722a2ef3b3be2596
diff --git a/dev-ruby/rspec/rspec-3.2.0.ebuild b/dev-ruby/rspec/rspec-3.2.0.ebuild
deleted file mode 100644
index 3965a54e082b..000000000000
--- a/dev-ruby/rspec/rspec-3.2.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
- =dev-ruby/rspec-core-${SUBVERSION}*
- =dev-ruby/rspec-expectations-${SUBVERSION}*
- =dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index ea462f92e684..1e471ec47277 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,7 +1,4 @@
DIST gettext-3.1.1.gem 221184 SHA256 323a1b07db0863e032436f6935a0e63a5ab7475ac8c387d2632065ee7bafc12a SHA512 b59462fd5c75aa64c1671fd54248ff86325be9aa53df2b4e720e663ae04d40febe83205c6ec75f6200dcf75abfdefe23db1effe838dc1149154457acc2fadc05 WHIRLPOOL 445999cff5241654252073b027388b058f272ffbaaa7d844208908996275cc22ed15c7055bd99a89977737192e60af84e0539bd6461b2da748bf97d41d5744f3
DIST gettext-3.1.2.gem 224768 SHA256 1ed987d0a46448cfc76617b486ad9a991e0d48501855e49eacb781aa531df6eb SHA512 14fbccf1d853bd58ae3ecbda3188294147404fb8473a54caeac505b93ffa25f96098786bd1171449aa1f0f74c4116e93b5d2f7c0705930dd014b210720667479 WHIRLPOOL 5a31bf87b38370276bf4c61886025f8721a7cb297012fbe6d1947abf82d1d35d779838506f5e56adbdda090a0ae20d4e5c74b9c4a08a4c782998d78b3a7c1768
-DIST gettext-3.1.6.gem 282112 SHA256 b3b0d6cd779e3f99b3bd541300fd5ae8f5425f90d0314209b6eb70a7772c8a81 SHA512 8bf0f8203eef8b181400dfca8c67376b6dd64c7fc00177c20ced840791883c3988f12eefe55bb6b487473d8875f86ea8143feb15e814c83e29dcd0133dc2f73c WHIRLPOOL 5976fba52e84da77aa92aa61e498537ae8ee6294cdd64a0b18257b9df52e803e7ad3233a3964bdac9048cc4e78fc7a372b31cdbc117b2e164a84385419cc0f57
-DIST gettext-3.1.7.gem 283136 SHA256 383ab62cfef66247e6907fb735aac53048a79e0bea93a6c9aa448c3aa98ee9c1 SHA512 e7cd1674b0e40ac8593d398a874355216544cba9e5aa082dab4aecd8ab8ee5a30ba3003bda4f097db2ac10bd3861ff8fa6a0c389f68b4467f22d90b88120cad5 WHIRLPOOL 8945141b1d9534b2bcc177f3711bfd4b9e24560e4f704f6c3d7640aef207547e000287a25f6f6e895abf75702af1d26b9af424a0183763a2a62b3a3726c56c2f
DIST gettext-3.1.9.gem 283136 SHA256 68901981aa98cfebb1b1d65c800aafba73ad82b82047c060b51ab52470a25f61 SHA512 b06da799bde3d2d704283387d5bd79bb6a88cfd74200d7a566408b5c6078e23fb10aad72135feeece05b77b76f90a282ead7482ff0436d3615a13729aa7945a5 WHIRLPOOL 42602b14eaf7c9a37f933695314b9f317d869a6168b072ae278204c7d79c0f2c0277acfc9d47902ab8bb7c1118979fe3967eb029413eb2f3519501e03776fb97
-DIST gettext-3.2.0.gem 283136 SHA256 f5990fe05b286d7fbef4aae4fd2466e1a46d6409a5d1532a22c2d7ea4fcb8406 SHA512 4ebb1a5a1eb4c6fe0fb6e78ae1dbc6c477649d2c73bc422ecaf285bc4dd2a1567ff027416740d30b9c746ca2e16cac2b04f115e68c7e1be2e67050018f4a4b93 WHIRLPOOL 08925a181b67b47f23055e801bc77d40a539b59dcc9c75477e677ccbc8d10a0aefdbf47bd171b9be3540ba476de43634c9d7d6420ca54bff803726de4097f4d9
DIST gettext-3.2.1.gem 283136 SHA256 a2ab0c7dc294cc7b5b0b9a589d5b392caffc17852939c47b3ae4d21499843bd5 SHA512 8adf2e09ca2973242e622e34e6b581ac81d51b097762f91bb7ac8f909c34e42d3b2fb5db1dd3e70383f90da1102f4edb86e8d62076095c81e2e13cea3b559d11 WHIRLPOOL f85229f156cd60cacbe733158baf017e6eb0bfc56ec8b37a25d4f332a5405969b61198838954296820ddda885435b2da8b7f68fe2c5d8ed7238c5534995803ab
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.1.1.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.1.1.ebuild
index b9bc5be47bd8..2a7b0a557965 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.1.1.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.1.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
RUBY_FAKEGEM_NAME="${PN/ruby-/}"
RUBY_FAKEGEM_VERSION="${PV%_*}"
@@ -18,7 +18,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="po"
inherit ruby-fakegem
-DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
+DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
HOMEPAGE="http://www.yotabanana.com/hiki/ruby-gettext.html"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc"
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild
index cc48d54b8c48..3db7f0bce1a8 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.1.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
RUBY_FAKEGEM_NAME="${PN/ruby-/}"
RUBY_FAKEGEM_VERSION="${PV%_*}"
@@ -18,7 +18,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="po"
inherit ruby-fakegem
-DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
+DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
HOMEPAGE="http://www.yotabanana.com/hiki/ruby-gettext.html"
KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.1.6.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.1.6.ebuild
deleted file mode 100644
index d7915fe45238..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.1.6.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
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locale po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="http://ruby-gettext.github.io/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-SLOT="0"
-LICENSE="|| ( Ruby LGPL-3+ )"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
- dev-ruby/racc"
-ruby_add_bdepend "test? (
- dev-ruby/test-unit:2
- dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
- # Fix broken racc invocation
- sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
- # Avoid bundler dependency
- sed -i -e '/bundler/,/helper.install/ s:^:#:' \
- -e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
- # Avoid dependency on developer-specific tools.
- sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-}
-
-each_ruby_test() {
- # Upstream tries to daisy-chain rake calls but they fail badly
- # with our setup, so run it manually.
- ${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- insinto /usr/share/doc/${PF}
- doins -r samples
-}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.1.7.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.1.7.ebuild
deleted file mode 100644
index 29b49b48ac68..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.1.7.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locale po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="http://ruby-gettext.github.io/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-SLOT="0"
-LICENSE="|| ( Ruby LGPL-3+ )"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
- dev-ruby/racc"
-ruby_add_bdepend "test? (
- dev-ruby/test-unit:2
- dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
- # Fix broken racc invocation
- sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
- # Avoid bundler dependency
- sed -i -e '/bundler/,/helper.install/ s:^:#:' \
- -e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
- # Avoid dependency on developer-specific tools.
- sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-
- # Avoid tests failing due to a missing test file.
- sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
-}
-
-each_ruby_test() {
- # Upstream tries to daisy-chain rake calls but they fail badly
- # with our setup, so run it manually.
- ${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- insinto /usr/share/doc/${PF}
- doins -r samples
-}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.1.9.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.1.9.ebuild
index fb25ab3a1141..fec74e9f81ff 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.1.9.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,7 +18,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="locale po"
inherit ruby-fakegem
-DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
+DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
HOMEPAGE="http://ruby-gettext.github.io/"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.2.0.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.2.0.ebuild
deleted file mode 100644
index 9fb4d26e1861..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.2.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_NAME="${PN/ruby-/}"
-RUBY_FAKEGEM_VERSION="${PV%_*}"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="locale po"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
-HOMEPAGE="http://ruby-gettext.github.io/"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-SLOT="0"
-LICENSE="|| ( Ruby LGPL-3+ )"
-
-ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
- dev-ruby/racc"
-ruby_add_bdepend "test? (
- dev-ruby/test-unit:2
- dev-ruby/test-unit-rr )"
-
-RDEPEND+=" sys-devel/gettext"
-DEPEND+=" sys-devel/gettext"
-
-all_ruby_prepare() {
- # Fix broken racc invocation
- sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
-
- # Avoid bundler dependency
- sed -i -e '/bundler/,/helper.install/ s:^:#:' \
- -e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
-
- # Avoid dependency on developer-specific tools.
- sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
-
- # Avoid tests failing due to a missing test file.
- sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
-}
-
-each_ruby_test() {
- # Upstream tries to daisy-chain rake calls but they fail badly
- # with our setup, so run it manually.
- ${RUBY} test/run-test.rb || die "tests failed"
-}
-
-all_ruby_install() {
- all_fakegem_install
-
- insinto /usr/share/doc/${PF}
- doins -r samples
-}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.2.1.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.2.1.ebuild
index 9fb4d26e1861..fec74e9f81ff 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.2.1.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.2.1.ebuild
@@ -18,7 +18,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="locale po"
inherit ruby-fakegem
-DESCRIPTION="Ruby GetText Package is Native Language Support Library and Tools modeled after GNU gettext package"
+DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
HOMEPAGE="http://ruby-gettext.github.io/"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-ruby/ruby-ldap/Manifest b/dev-ruby/ruby-ldap/Manifest
index 37b0ca5fd4bd..bd94fba8dbe6 100644
--- a/dev-ruby/ruby-ldap/Manifest
+++ b/dev-ruby/ruby-ldap/Manifest
@@ -1,2 +1,3 @@
DIST ruby-ldap-0.9.16.gem 65024 SHA256 a068e0b0d52621c2a72583e07211f4795b3cd9496dd6b5cf7a2c8a746018ce21 SHA512 b81a9b24f29a7c40b5d1c020008bfd14666a15c3b407e5495ac7b12e470783d696c8ad25c9a508b9933829695a8ac3fcb52a209fdb4fb7de499308af61a4b832 WHIRLPOOL dea6d8f4c716f3c0408ca2ba11e4fd411916f9afd07a497deb91fe38c2f0440482a893527b8976801a41742da15f3cacc7330c85a26ec1c948e49e0a99a1f432
DIST ruby-ldap-0.9.17.gem 66560 SHA256 951ab18e8dbc2b9791555c38833df07e322992d3eb53aefca88a085fc55686c6 SHA512 b6400faa4ae19f3d783810a6b2f7af36e89cbf001aa48a343e1ff6e5f9e74639bb84db2dc58a1465f91130248eaf17767a6c125e1d416aaf7d45ff8c14c3b68e WHIRLPOOL 00b9f4508a94b0c4ecb61e3f3749142b2daa4645d80feccd86d7ed1ff9163a2cc5dcec9d516ebd4b8587573e49abdeadc31427b09e057494f8389b35009ced49
+DIST ruby-ldap-0.9.18.gem 67072 SHA256 cf96420e778dade4851234a3be3b3ffd96a7c3f91a266b4fd60022a14883c5d5 SHA512 698375840498e3cbe6e4ad962b3754bf74b0e0c356f95e59a71267841014a31dc85235e736c2ecd23e86c1ae0f9da00074c1612427afea1b409f0d8e7f596a07 WHIRLPOOL 69f1ec1a6e97eb9d016f62a4be348b1c586d90c38aaad6207177ad8beaf791adee5c6f0a80b7ef1ff0e7a356825f081370929c2a45180303fe612066f66a0efd
diff --git a/dev-ruby/ruby-ldap/ruby-ldap-0.9.18.ebuild b/dev-ruby/ruby-ldap/ruby-ldap-0.9.18.ebuild
new file mode 100644
index 000000000000..aa8cf8f6457b
--- /dev/null
+++ b/dev-ruby/ruby-ldap/ruby-ldap-0.9.18.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit multilib ruby-fakegem
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_EXTRADOC="ChangeLog FAQ NOTES README TODO"
+
+DESCRIPTION="A Ruby interface to some LDAP libraries"
+HOMEPAGE="http://ruby-ldap.sourceforge.net/"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-macos"
+IUSE="ssl"
+DEPEND=">=net-nds/openldap-2
+ dev-libs/cyrus-sasl
+ ssl? ( dev-libs/openssl:0 )"
+RDEPEND="${DEPEND}"
+
+# Current test set is interactive due to certificate generation and requires
+# running LDAP daemon
+RESTRICT="test"
+
+each_ruby_configure() {
+ local myconf="--with-openldap2"
+ if ! use ssl ; then
+ myconf="${myconf} --without-libcrypto --without-libssl"
+ fi
+ ${RUBY} extconf.rb ${myconf} || die "extconf.rb failed"
+ sed -i -e 's:-Wl,--no-undefined::' \
+ -e "s/^ldflags = /ldflags = $\(LDFLAGS\) /" Makefile || die
+}
+
+each_ruby_compile() {
+ emake V=1
+ cp ldap$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 0bf332744cdf..4dcd5d888dc5 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,3 +1,4 @@
DIST rubygems-2.2.5.tgz 416772 SHA256 0f015d63ee3f48be2cc440332d992a33f6df113ced25b7a0007372d304bfeaa4 SHA512 eac6d7c4801d7bf65ac8e244ff88677929e491db8c5054a31d936eaf1e1fabfc8c4b560040c01c7d9707758cfbad9a8063144bb37b494dd1b6f66a0222871e03 WHIRLPOOL 6e02359ce84352f39b13c3f59d9fd82788a5a2ae88d069df05642d5349cb33c06c3477de56c937a44742fb6aa6cfdb7b32dbadac131fb12e6387f983564879c6
DIST rubygems-2.5.1.tgz 469494 SHA256 02d4bb76687983d973ea8700912e798ca23be32bcce7956171254c93a2365273 SHA512 fd333398f9ce3a0c734fc66bf936a8287a64f8dfafe01987cf85497be57f021fc64c1015de9b4f0a36d24ffda152c2b02055a425c05cbd43266f55c0b1d5f052 WHIRLPOOL 8f4a7ee94cb9825ea35606347734e53c95dabfdf458cc6914ca4eb875451314a520a4849c607aff61afb25f29e6e44e7ed0667b0757ea15fe53f9d4a71710e3d
DIST rubygems-2.5.2.tgz 475434 SHA256 5171ce6fa04c74606991f9c318a924f095241d7ce18c21a00455c8ebe4aeecca SHA512 43544619799ac6f0b22285954a3b46a2d8aea425ef16a26de4ebb5ea1b3a4f2d3a2031ac53bb890554fe935ca1d03101a5d4d9eae4619aaab72a079650fd8921 WHIRLPOOL 59806bd34ab0bfa66bd770c02054c16bd5c5bb836d0213018151339fda422780e5ace4bfecfad408075ae25d6c74e40d0925dccdc7a46aff545b93cc21faa4b2
+DIST rubygems-2.6.1.tgz 477342 SHA256 c9c4d1a8367a1c05bc568fa0eb5c830974d0f328dd73827cc129c0905aae1f4f SHA512 e854140abb4b8e1d48ee612122818525c92e47871fd26835047fcb968da069c6b259f03ae6ba424f95d667b5a2e7c8afbcc07711a60c73ea7ab64e12ac7ddb63 WHIRLPOOL 3dc87db7f71ce4f3db745b1c5fa0c54220db48cedfee143329ed36c68b24f0e3a0397363390b780829308d4ce324b82e494bee034fa6d7081d264b30a5eb557e
diff --git a/dev-ruby/rubygems/rubygems-2.6.1.ebuild b/dev-ruby/rubygems/rubygems-2.6.1.ebuild
new file mode 100644
index 000000000000..84e580465ff6
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-2.6.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="|| ( Ruby MIT )"
+
+SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+
+PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
+
+ruby_add_bdepend "
+ test? (
+ >=dev-ruby/minitest-4:0
+ dev-ruby/rdoc
+ )"
+
+all_ruby_prepare() {
+
+ mkdir -p lib/rubygems/defaults || die
+ cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
+
+ eprefixify lib/rubygems/defaults/operating_system.rb
+
+ # Disable broken tests when changing default values:
+ sed -i -e '/test_default_path/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die
+
+ # Skip tests for default gems that all fail
+ sed -i -e '/test_default_gems_use_full_paths/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die
+ sed -i -e '/test_execute_ignore_default_gem_verbose/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
+ sed -i -e '/test_execute_default_gem/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
+ sed -i -e '/test_execute_default_details/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
+ sed -i -e '/test_execute_all/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
+ sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^ end/ s:^:#:' \
+ test/rubygems/test_{gem_installer,require}.rb || die
+ sed -i -e '/test_\(load_default_gem\|default_spec_stub\)/,/^ end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
+ sed -i -e '/test_uninstall_default_gem/,/^ end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
+ rm -f test/rubygems/test_gem_indexer.rb || die
+
+ # Avoid tests playing tricks with ruby engine that don't seem to
+ # work for us.
+ rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
+
+ # Avoid test requiring network access
+ sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
+}
+
+each_ruby_compile() {
+ # Not really a build but...
+ sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+ # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+ #unset RUBYOPT
+
+ if [[ "${EUID}" -ne "0" ]]; then
+ RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
+ -e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+ else
+ ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+ eerror "Testsuite will not be run."
+ fi
+}
+
+each_ruby_install() {
+ # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+ unset RUBYOPT
+ export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+ pushd lib &>/dev/null
+ doruby -r *
+ popd &>/dev/null
+
+ local sld=$(ruby_rbconfig_value 'sitelibdir')
+ insinto "${sld#${EPREFIX}}" # bug #320813
+ newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
+
+ newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
+}
+
+all_ruby_install() {
+ dodoc History.txt README.rdoc
+
+ if use server; then
+ newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
+ newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
+ fi
+}
+
+pkg_postinst() {
+ if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
+ eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+ fi
+
+ ewarn
+ ewarn "To switch between available Ruby profiles, execute as root:"
+ ewarn "\teselect ruby set ruby(20|21|...)"
+ ewarn
+}
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.4-r1.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.4-r1.ebuild
deleted file mode 100644
index 5ebccb71f2d3..000000000000
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.4-r1.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
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse YAML safely, without that pesky arbitrary object deserialization vulnerability"
-HOMEPAGE="https://dtao.github.com/safe_yaml"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/hashie
- dev-ruby/heredoc_unindent
- dev-ruby/rspec:2 )"
-
-each_ruby_test() {
- # Run specs with monkeypatch
- ${RUBY} -S rspec --tag ~libraries || die
-
- # Running specs without monkeypatch
- ${RUBY} -S rspec --tag libraries || die
-}
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.4-r2.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.4-r2.ebuild
index 05f7e82dddd0..e5465b59a8ec 100644
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.4-r2.ebuild
+++ b/dev-ruby/safe_yaml/safe_yaml-1.0.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_RECIPE_TEST="none"
inherit ruby-fakegem
-DESCRIPTION="Parse YAML safely, without that pesky arbitrary object deserialization vulnerability"
+DESCRIPTION="Parse YAML safely, alternative implementation of YAML.load"
HOMEPAGE="https://dtao.github.com/safe_yaml"
LICENSE="MIT"
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.4.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.4.ebuild
index 4dea9cf7475e..39e820ea781b 100644
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.4.ebuild
+++ b/dev-ruby/safe_yaml/safe_yaml-1.0.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_RECIPE_TEST="none"
inherit ruby-fakegem
-DESCRIPTION="Parse YAML safely, without that pesky arbitrary object deserialization vulnerability"
+DESCRIPTION="Parse YAML safely, alternative implementation of YAML.load"
HOMEPAGE="https://dtao.github.com/safe_yaml"
LICENSE="MIT"
diff --git a/dev-ruby/sass/Manifest b/dev-ruby/sass/Manifest
index ef1a6135f8d1..1f32cd604577 100644
--- a/dev-ruby/sass/Manifest
+++ b/dev-ruby/sass/Manifest
@@ -1,6 +1,4 @@
DIST sass-3.2.19.gem 261632 SHA256 ddcd7d76d98daa8f3ebbaec196972500a6cf6e854f9c328fcfc9aa556f29bfac SHA512 6c288985d53b905aa3cc5ed471359c8a47b82fc30e9c576332fcf20c3d033e1f683c390e2b300295aa3b4be4f7b640ed5578e937793d0bc3537c268ed6986429 WHIRLPOOL 8a3ac79e5c287b1049fe21058704f81b7817fa217a165c0daeaa17ad68cc4189f75b92cd659ec5afc0b4254ee5a368f4657c00a3228a3b27a802fb8c0e60894e
DIST sass-3.3.14.gem 315392 SHA256 95435ddef3aee817ef727e3576852e9cb12f7020027c9f2da8a3835f16ec46c1 SHA512 816c3aa7869648b51708a6a3bb14598dffdbb6335db7800ddb789c3f325f58822e2f3031f25f036eca2aabdd5ce8da1507ce58a75d0edcda17b7ae7a3484f39a WHIRLPOOL 544f2cfceff59872737dc9c564be5a328212c714bfbe78fb954511e5a70ad43cf80eac556026b13ea3fc48943d331925d8d2e7bc8954614e0a1b63e42648581e
DIST sass-3.4.15.gem 336896 SHA256 6b461a469d29ec80b52b1401b5e5d58c48762a8f3e00f3b0b2d37b6791a87a59 SHA512 9a6db0d6bdcb788b850e47fb61c5b803e156178eecce7b0c7d0edd2a3578405fa6dc88d397051d738b8bf52c70b6457618afbaf14b5b6fb4bf5f43f057229d0b WHIRLPOOL c3691b0eae97f5b7f4ef1398b99e3702ac32d1894308f9c0ccd2c81a2d30c812e9b775b96d8898ea1941ad11de7f378cf988d38cac6fd8c4e32e678ddedcbaef
-DIST sass-3.4.19.gem 338944 SHA256 2faca8aa3b76beb0bc59dccabc5114eb4118af9d613121fbaa120e1c8b7f0290 SHA512 7ef5d6887784b98c19d389beb6f7d9d423f72e42c8f8da4b720482ba13a11273dc1ad86021e43e3e9325f57a8ca55b4b68504a21a9652eac96d23d871810aa83 WHIRLPOOL 3e9f2e3b1afdf4a65f820a9d63578572284e8ca64b2cdf40f2c67ae04fa554c4bf8ab847cf22d86ddaacb93068fcb38e4dc958cf1b29d7bec2a96531ee1865f0
-DIST sass-3.4.20.gem 343552 SHA256 ced77e1f57c82f0e548a978f78d75accb46ff1823acdf6b88059a1222e6b3713 SHA512 3df8eb248499b5b08d1dee828cd359f86d47fe487e442f073c84cf18b88d004e41bcf0e5505fc38e1a37d985ad2d6863487406773ff0a0d876676fb72c774cdb WHIRLPOOL 381d838d13054f72c2ab4065d5796a1daee24378ecaa5543ed92c1ff0e91ca05a9add54774b2e4c73b6da75900fa24603eabea846f9a45eb86b6e3cccc9d9140
DIST sass-3.4.21.gem 345088 SHA256 05f907ae3bde56e0133298295ff0befcfec2cb29799ef4f40236eb7abb5173d2 SHA512 10b46c79690edfca10704824b562385b39842832dedeaed80c7b2fb8921174120c48a6997aad4e61c1bfa4bc5a7deaed46e42005f49060f62ff93b6311368a07 WHIRLPOOL 754d00ff51ec34c4b4c08e71773cef0e296f8b1fbc0e40e156afb742e2b59e1d0c3821708945a411326b9458432edb545d16c83ebda67f1fbdda27420fbbfb6f
diff --git a/dev-ruby/sass/sass-3.3.14.ebuild b/dev-ruby/sass/sass-3.3.14.ebuild
deleted file mode 100644
index abc619703927..000000000000
--- a/dev-ruby/sass/sass-3.3.14.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 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_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 !!<dev-ruby/haml-3.1 !!<dev-ruby/sass-3.2.19-r1"
-
-# 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/sass/sass-3.4.19.ebuild b/dev-ruby/sass/sass-3.4.19.ebuild
deleted file mode 100644
index 2e6adb8a9c21..000000000000
--- a/dev-ruby/sass/sass-3.4.19.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
-
-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/sass/sass-3.4.20.ebuild b/dev-ruby/sass/sass-3.4.20.ebuild
deleted file mode 100644
index 7c56b2956c81..000000000000
--- a/dev-ruby/sass/sass-3.4.20.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
-
-USE_RUBY="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/sawyer/sawyer-0.7.0.ebuild b/dev-ruby/sawyer/sawyer-0.7.0.ebuild
index da866baeccbe..50673c564ef6 100644
--- a/dev-ruby/sawyer/sawyer-0.7.0.ebuild
+++ b/dev-ruby/sawyer/sawyer-0.7.0.ebuild
@@ -20,3 +20,8 @@ IUSE=""
ruby_add_rdepend "<dev-ruby/faraday-0.10
<dev-ruby/addressable-2.5"
+
+all_ruby_prepare() {
+ # Avoid tests that require network acces
+ sed -i -e '/test_blank_response_doesnt_raise/,/^ end/ s:^:#:' test/agent_test.rb || die
+}
diff --git a/dev-ruby/seed-fu/Manifest b/dev-ruby/seed-fu/Manifest
index 03b0c4c58404..674046a6042b 100644
--- a/dev-ruby/seed-fu/Manifest
+++ b/dev-ruby/seed-fu/Manifest
@@ -1,4 +1 @@
-DIST seed-fu-2.2.0.tar.gz 11863 SHA256 1826184dc0496084c8a0f0219944d2a28e8560f301cdff8fb556db6c0ec392e9 SHA512 beb5cddc6ce36c81abd044cf0a9009f6e6ffc45fe62325551a904871e0e65c40e926c5e27c9f5c576f735106b6257a726a87a164a118586a9dd7d245af92dfd1 WHIRLPOOL be07dafa7bad63b5b017efe239dadb02c755ad9ea5e77e421ad948d1447bd6cab9a97c1bb551e97c9591145436f9721d5a5c79f26e469293980626bf5f1cf344
-DIST seed-fu-2.3.3.tar.gz 13139 SHA256 7b3c9f2b672e120d341e83745b60786aa26c5a100bf9d0f1c43d2bbd6844ef7e SHA512 d0e37496184e361b7f00c2795ea6b13a5ce2c54cad89e5191aec5e1d4307dbfa6c7476c31755549b4f5cfeefd1966a88b8dc589ca007b25d63ae94a6df94ab12 WHIRLPOOL 3d7888d121cfc322bec11c8282e4097ad73df418e594a6aec6ead84df2edc56c701958b480221f7866e7f00c4b622e018014a4b561c289fb0198e72fcc9ffe64
-DIST seed-fu-2.3.4.tar.gz 13146 SHA256 6c9040538f66622ddd58e00e225991b1da4c7b8bad2cb60009b5e3eba7aaca2a SHA512 c4ada95957216da0f2743f728a716152ccca80ac443467adca5fdd1cc00b8f6622a84cfdb0380ba4087ac1d95e219dad1052deb4b13cd699e318a2ff1c5e3361 WHIRLPOOL 63955060a649e16b27724fed4bcf635309e8adf66367e9e3af55438abe21c193a1b84d5e86650e32e467b20f029ec859f7efcb1ba6f27f24c937aebf1ff91998
DIST seed-fu-2.3.5.tar.gz 13158 SHA256 6e7c996116102c36c27100716ce081ee492745448430f3366515114474874fde SHA512 1a0f91ae7a357789d2be57de89d57fb9e76552532f5cf2e3b933b6c67a46e42c54de260fdc0a68fa03bf9e59dc25ac019b959ac5ba178b1a1674559fbc1a9a89 WHIRLPOOL 4f3e643bc87666906c96a7bdc3f7d6dd69175bcc15d974775d4935382111faa67301447dd92cf9731a83be36f487455e6dbeee61b539981028b96cced4fc3b24
diff --git a/dev-ruby/seed-fu/seed-fu-2.2.0.ebuild b/dev-ruby/seed-fu/seed-fu-2.2.0.ebuild
deleted file mode 100644
index bbb25627d3ae..000000000000
--- a/dev-ruby/seed-fu/seed-fu-2.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Advanced seed data handling for Rails, combining the best practices of several methods together"
-HOMEPAGE="https://github.com/mbleigh/seed-fu"
-SRC_URI="https://github.com/mbleigh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "
- >=dev-ruby/activerecord-3.1
- >=dev-ruby/activesupport-3.1"
-ruby_add_bdepend "test? ( dev-ruby/sqlite3 )"
-
-all_ruby_prepare() {
- sed -i -e '/bundler/d' spec/spec_helper.rb || die "sed failed"
-}
diff --git a/dev-ruby/seed-fu/seed-fu-2.3.3.ebuild b/dev-ruby/seed-fu/seed-fu-2.3.3.ebuild
deleted file mode 100644
index a77458a90683..000000000000
--- a/dev-ruby/seed-fu/seed-fu-2.3.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Advanced seed data handling for Rails, combining the best practices of several methods together"
-HOMEPAGE="https://github.com/mbleigh/seed-fu"
-SRC_URI="https://github.com/mbleigh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "
- >=dev-ruby/activerecord-3.1
- >=dev-ruby/activesupport-3.1"
-ruby_add_bdepend "test? ( dev-ruby/sqlite3 )"
-
-all_ruby_prepare() {
- sed -i -e '/bundler/d' spec/spec_helper.rb || die "sed failed"
-}
diff --git a/dev-ruby/seed-fu/seed-fu-2.3.4.ebuild b/dev-ruby/seed-fu/seed-fu-2.3.4.ebuild
deleted file mode 100644
index a77458a90683..000000000000
--- a/dev-ruby/seed-fu/seed-fu-2.3.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Advanced seed data handling for Rails, combining the best practices of several methods together"
-HOMEPAGE="https://github.com/mbleigh/seed-fu"
-SRC_URI="https://github.com/mbleigh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "
- >=dev-ruby/activerecord-3.1
- >=dev-ruby/activesupport-3.1"
-ruby_add_bdepend "test? ( dev-ruby/sqlite3 )"
-
-all_ruby_prepare() {
- sed -i -e '/bundler/d' spec/spec_helper.rb || die "sed failed"
-}
diff --git a/dev-ruby/seed-fu/seed-fu-2.3.5.ebuild b/dev-ruby/seed-fu/seed-fu-2.3.5.ebuild
index 18f0b935f721..73b5e6705ba4 100644
--- a/dev-ruby/seed-fu/seed-fu-2.3.5.ebuild
+++ b/dev-ruby/seed-fu/seed-fu-2.3.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
RUBY_FAKEGEM_RECIPE_DOC="yard"
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_DOCDIR="doc"
inherit ruby-fakegem
-DESCRIPTION="Advanced seed data handling for Rails, combining the best practices of several methods together"
+DESCRIPTION="Advanced seed data handling for Rails"
HOMEPAGE="https://github.com/mbleigh/seed-fu"
SRC_URI="https://github.com/mbleigh/${PN}/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-0.1.1.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-0.1.1.ebuild
index a2468e811285..3e66fbe68330 100644
--- a/dev-ruby/semantic_puppet/semantic_puppet-0.1.1.ebuild
+++ b/dev-ruby/semantic_puppet/semantic_puppet-0.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
inherit ruby-fakegem
-DESCRIPTION="Library of useful tools for working with Semantic Versions and module dependencies."
+DESCRIPTION="Library of tools for working with Semantic Versions and module dependencies"
HOMEPAGE="https://github.com/puppetlabs/semantic_puppet"
LICENSE="Apache-2.0"
diff --git a/dev-ruby/sfl/sfl-2.2-r1.ebuild b/dev-ruby/sfl/sfl-2.2-r1.ebuild
index 11907e8feb4a..8af876c040eb 100644
--- a/dev-ruby/sfl/sfl-2.2-r1.ebuild
+++ b/dev-ruby/sfl/sfl-2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_DOC="none"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec"
inherit ruby-fakegem
-DESCRIPTION="This library provides spawn() which is almost perfectly compatible with ruby 1.9's"
+DESCRIPTION="Library providing spawn() which is almost perfectly compatible with ruby 1.9's"
HOMEPAGE="https://github.com/ujihisa/spawn-for-legacy"
LICENSE="|| ( Ruby BSD-2 )"
diff --git a/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild b/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
index 1a8ae8c24c52..cf8ada044271 100644
--- a/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
+++ b/dev-ruby/shorturl/shorturl-1.0.0-r2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://shorturl.rubyforge.org/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd ~x86-macos"
IUSE=""
# All tests require network connectivity.
diff --git a/dev-ruby/simplecov-html/simplecov-html-0.10.0.ebuild b/dev-ruby/simplecov-html/simplecov-html-0.10.0.ebuild
index 913c7f933dc5..a2a9ec74ef7b 100644
--- a/dev-ruby/simplecov-html/simplecov-html-0.10.0.ebuild
+++ b/dev-ruby/simplecov-html/simplecov-html-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="assets public views"
inherit ruby-fakegem
-DESCRIPTION="Generates a nice HTML report of your SimpleCov ruby code coverage results on Ruby 1.9"
+DESCRIPTION="Generates a HTML report of your SimpleCov ruby code coverage results"
HOMEPAGE="https://github.com/colszowka/simplecov"
LICENSE="MIT"
diff --git a/dev-ruby/sinatra/sinatra-1.4.6-r1.ebuild b/dev-ruby/sinatra/sinatra-1.4.6-r1.ebuild
deleted file mode 100644
index c7592f4e624b..000000000000
--- a/dev-ruby/sinatra/sinatra-1.4.6-r1.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-# no documentation is generable, it needs hanna, which is broken
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGES"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort"
-HOMEPAGE="http://www.sinatrarb.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/rack-1*:* >=dev-ruby/rack-1.4:*
- >=dev-ruby/rack-protection-1.4:1
- >=dev-ruby/tilt-1.3.4:* <dev-ruby/tilt-3:*"
-ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder )"
-
-# haml tests are optional and not yet marked for ruby20.
-USE_RUBY="ruby19" ruby_add_bdepend "test? ( >=dev-ruby/haml-3.0 )"
-
-all_ruby_prepare() {
- # Remove implicit build dependency on git.
- sed -i -e '/\(s.files\|s.test_files\|s.extra_rdoc_files\)/d' sinatra.gemspec || die
-}
diff --git a/dev-ruby/sinatra/sinatra-1.4.6.ebuild b/dev-ruby/sinatra/sinatra-1.4.6.ebuild
index 4d4c86648098..14e8b85cce74 100644
--- a/dev-ruby/sinatra/sinatra-1.4.6.ebuild
+++ b/dev-ruby/sinatra/sinatra-1.4.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
# no documentation is generable, it needs hanna, which is broken
RUBY_FAKEGEM_TASK_DOC=""
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGES"
inherit ruby-fakegem
-DESCRIPTION="Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort"
+DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
HOMEPAGE="http://www.sinatrarb.com/"
LICENSE="MIT"
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 9f7d6935249e..7405087a3119 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,3 +1,2 @@
-DIST slim-2.0.3.gem 80896 SHA256 ba637becab0090feb16923c808ccf92ab42728eb1799e2bed45d7ca2e34e47fc SHA512 b519bde5725f0eae37f0aa5b0eef99f62749ff19ee17fc87291c5cd38c053106aa57fabc0ead05992c3316c509381c5bb30a9ac42b8584f99beb7f3e59c91bdf WHIRLPOOL 331dec490db9a2d145006e57d072a86eb8b0e45c8fad81fd6ab5bea5b3a2da9cac248fa7dce679f67d3c46f95a869b0ffd981f9d7d943518f7025651172946dc
DIST slim-2.1.0.gem 92160 SHA256 de574c991afb2d2b3e081e9d1e4f4e20b339d3b2895b51f7bf022a35a82acd6b SHA512 a092689e62f1189aac9b6657572f76ee9915f1dbfcea7ed90c07386958cbeb6c974d25b7bc85f4cc6887312ab373487618e8dfd8e0f2b9f4dbd0574b0f4b928f WHIRLPOOL a7d141d7c9ce2e88770cc9ffb590465b0d597da1dd3df858a0e0843dc9b182426cc28793df9f56d06f770aff91208433c8fbdef8e5d9780c22edf91d2474989b
DIST slim-3.0.6.gem 96256 SHA256 1315604e79dcf6c89916007ad297e716c35109e19d2d6ce42b5557006138faeb SHA512 06b13f2880752be7e00ee61a86f0d88926b1f0f108b496355a40b30d32101bb777062079b4727eafe7166d404374badb9d2ee50c53dbf4d2206d583c71fb6e7c WHIRLPOOL 4485de92621f7944d74400a561220e1434d0c009cf985864a0169699794028db404ea93d3872e739d49b0c781454e46d85c10d0f5c6b5ba8505c109f1c17362a
diff --git a/dev-ruby/slim/slim-2.0.3.ebuild b/dev-ruby/slim/slim-2.0.3.ebuild
deleted file mode 100644
index 1f212728636c..000000000000
--- a/dev-ruby/slim/slim-2.0.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_TASK_DOC="yard"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A template language whose goal is reduce the syntax to the essential parts without becoming cryptic"
-HOMEPAGE="http://slim-lang.com/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE="doc"
-
-ruby_add_rdepend ">=dev-ruby/tilt-1.3.3:0
- >=dev-ruby/temple-0.6.6:0"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
-
-ruby_add_bdepend "test? ( dev-ruby/sass )"
-
-all_ruby_prepare() {
- # This sinatra code expects tests to be installed but we strip those.
- sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
-
- # Avoid tests for things we don't have.
- sed -i -e '/test_wip_render_with_asciidoc/,/^ end/ s:^:#:' \
- -e '/test_render_with_wiki/,/^ end/ s:^:#:' \
- -e '/test_render_with_creole/,/^ end/ s:^:#:' \
- -e '/test_render_with_org/,/^ end/ s:^:#:' test/core/test_embedded_engines.rb || die
-
-}
diff --git a/dev-ruby/slim/slim-2.1.0.ebuild b/dev-ruby/slim/slim-2.1.0.ebuild
index 81675d7c4e6d..0edb671f64fd 100644
--- a/dev-ruby/slim/slim-2.1.0.ebuild
+++ b/dev-ruby/slim/slim-2.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby20 ruby21"
RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_TASK_DOC="yard"
inherit ruby-fakegem
-DESCRIPTION="A template language whose goal is reduce the syntax to the essential parts without becoming cryptic"
+DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
HOMEPAGE="http://slim-lang.com/"
LICENSE="MIT"
diff --git a/dev-ruby/slim/slim-3.0.6.ebuild b/dev-ruby/slim/slim-3.0.6.ebuild
index 8493f8c4d344..03858e3d6c19 100644
--- a/dev-ruby/slim/slim-3.0.6.ebuild
+++ b/dev-ruby/slim/slim-3.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_TASK_DOC="yard"
inherit ruby-fakegem
-DESCRIPTION="A template language whose goal is reduce the syntax to the essential parts without becoming cryptic"
+DESCRIPTION="A template language aiming to reduce the syntax to the essential parts"
HOMEPAGE="http://slim-lang.com/"
LICENSE="MIT"
diff --git a/dev-ruby/stomp/stomp-1.3.4.ebuild b/dev-ruby/stomp/stomp-1.3.4.ebuild
index 7a0b39bc9689..653cd4c7b894 100644
--- a/dev-ruby/stomp/stomp-1.3.4.ebuild
+++ b/dev-ruby/stomp/stomp-1.3.4.ebuild
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/stompgem/stomp"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index 180795368de8..825f9d0de7ca 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,3 +1,2 @@
DIST tilt-1.4.1.gem 42496 SHA256 39820562c4f5db45fe18de87ccc30a0e77a998bf5334b1d8c10a2f7dbc1f5903 SHA512 10fec263596d0e18a7a1440a7edfa08a161526cc46cc70427bc251951c447c40b4a4e8675e9162a9ed288879682b4aceeeb35b48cf3f4925921025194543363f WHIRLPOOL 5d70949358b97e867cdec160bd3c3726dabfec94bfeadc3a12f17463d378779d8502dda6458c7deb92bd3d9def91e306077ef806a7f75bd6c892554739ce46e9
-DIST tilt-2.0.1.gem 44544 SHA256 73dc6e2cd2fe4251cb7d15c92d0e66c884f17d0be580500d00cb426eb29881e1 SHA512 9451b2387c7c2535c9c78ae07dc0893f675e921d845f8eb5bc24c13a1e726888baba0d813195a81014370b640b290fab2e1b47871b6b2ab1e3eddb10c71217df WHIRLPOOL 92773f66291c193e912f810b8ad3da827782e744b19e2ef0ece7db262ff8a66324e9e08362f3b37ce14d125a196e743f1e264ef739bfeeaecd37c1a29c15c7e6
DIST tilt-2.0.2.gem 48640 SHA256 04c91dcf7533576196e3ea2ba22514f37811ab7419bab6c71877e2e63a206d52 SHA512 93540d673f1c0e841be43e54e85451482f6ea8f967d14bce46c997be69a9ff16684aa5966c91cfd8d590cc32ef590974151183839ec315d46df5d398fd016832 WHIRLPOOL 051c29727ce157bf73d1c276c500471a48bde23a8a0ce516ad75e88a99b738e7c1a0283070db2c127922582e4f674e8591c69d36821744d5d09a3d0f9d0bd03f
diff --git a/dev-ruby/tilt/tilt-2.0.1-r1.ebuild b/dev-ruby/tilt/tilt-2.0.1-r1.ebuild
deleted file mode 100644
index 1a420c2adb12..000000000000
--- a/dev-ruby/tilt/tilt-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A thin interface over a Ruby template engines to make their usage as generic as possible"
-HOMEPAGE="https://github.com/rtomayko/tilt"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Block on some of the potential test dependencies. These dependencies
-# are optional for the test suite, and we don't want to depend on all of
-# them to faciliate keywording and stabling.
-ruby_add_bdepend "test? (
- dev-ruby/bluecloth
- dev-ruby/coffee-script
- dev-ruby/erubis
- dev-ruby/nokogiri
- !!<dev-ruby/maruku-0.7.2 )"
-
-# Most dependencies are optional: skip haml and radius for ruby20 and ruby21
-# because haml depends on rails.
-USE_RUBY="ruby19" ruby_add_bdepend "test? ( dev-ruby/haml )"
-USE_RUBY="ruby19 ruby20 ruby21" ruby_add_bdepend "test? ( dev-ruby/radius )"
-
-ruby_add_rdepend ">=dev-ruby/builder-2.0.0:*
- !!<dev-ruby/tilt-1.4.1-r2:0"
-
-all_ruby_prepare() {
- rm Gemfile || die
- sed -e '/bundler/I s:^:#:' -i Rakefile test/test_helper.rb || die
-
- # Avoid tests with minor syntax differences since this happens all
- # the time when details in the dependencies change.
- sed -e '/test_smarty_pants_true/,/^ end/ s:^:#:' -i test/tilt_markdown_test.rb || die
- sed -e '/smartypants when :smart is set/,/^ end/ s:^:#:' -i test/tilt_rdiscounttemplate_test.rb || die
- sed -i -e '/docbook templates/,/^ end/ s:^:#:' test/tilt_asciidoctor_test.rb || die
-}
diff --git a/dev-ruby/turbolinks/Manifest b/dev-ruby/turbolinks/Manifest
index 9f12dfb49366..2264e681d551 100644
--- a/dev-ruby/turbolinks/Manifest
+++ b/dev-ruby/turbolinks/Manifest
@@ -1,2 +1 @@
-DIST turbolinks-2.5.1.gem 21504 SHA256 a5daa156152cea92b3b5b348ac16a0100c9039603b5f8ac77b89af489b3f7fc7 SHA512 2f2eed08ad96e10c8bd59c055c827104d1ad5c50919543dac3b3d90910fac86cc7a042cc4d54b010100bd7d51b309aab354d2bb5a4469dbbd20c232c22f35392 WHIRLPOOL 3ba840f11b49c6387a7e4cf6fbbe4ea5df1ed378392bc884409637a57170f7fc1d8172ed7dc06889a9291a8ba9b83bb9073153aacda883cbb8e4396954f00f14
DIST turbolinks-2.5.3.gem 20992 SHA256 5606242743a4c9bb1ef49bc5bb88ebdc2dc1a0ac99a602c9a71defbd8be8b9b5 SHA512 3ac0bd52793ae60d57ab8936646157eccd3e83b112ff4456286caea61c195a855f6b3d0b474aa3f298515bda537545fb8c328254144a958ff9a7271183011d2e WHIRLPOOL 5656e2a76f289580ee795a2b6e66f1711720731302990a53eb174d79ae1244f5da0ab4ebccb8949c8ca2933b1ab89b09c058ceea5c3916cd3f4806dde9d412b6
diff --git a/dev-ruby/turbolinks/turbolinks-2.5.1.ebuild b/dev-ruby/turbolinks/turbolinks-2.5.1.ebuild
deleted file mode 100644
index 19a5e903bbdb..000000000000
--- a/dev-ruby/turbolinks/turbolinks-2.5.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-# The gem does not contain runnable tests.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Makes following links in your web application faster"
-HOMEPAGE="https://github.com/rails/turbolinks"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/coffee-rails"
diff --git a/dev-ruby/uglifier/Manifest b/dev-ruby/uglifier/Manifest
index abc5d070077d..672b542e38f9 100644
--- a/dev-ruby/uglifier/Manifest
+++ b/dev-ruby/uglifier/Manifest
@@ -1,3 +1 @@
-DIST uglifier-2.7.0.gem 79360 SHA256 d8f5f54ad0297d6faa518388b9c8aa6e226b1848465235d440d420d0a7b235f4 SHA512 e0e97a697f50421c476e29fb9220f872cbb528d175ae1a6d26069041a0958d0146fc69350e91f2b3c3bd5bfb1268f283f2e904c78a8c8a067a246c0038f602df WHIRLPOOL 66758e1812a4df6bf3cbac75480e8908298f241b86d25123399660f46ea7ab38e64971cf9544b0a63e8cd210760390d89ad87dce97ad452dd80963ddb9f85402
-DIST uglifier-2.7.1.gem 79360 SHA256 9a5168195314d2b5facc25b40db8eec2d5510b77bc27c85c72427b209adbdda0 SHA512 36725b6b60d0a57160d623604a05d89414bf5c9b5eb0a2d58282dd6b62e34c012d7c25af32f1ea748091000f92a478ff87e228f7eb7e1947eafcd3bb2b4bfd59 WHIRLPOOL ec5af86105f8e87ff081062963fdfdd7b5f0defbef54b0d497fec137905d9fad0889553bf82bf2b18054533d1f01e9ab9852d63a0355a14da75a3255f09ee7bd
DIST uglifier-2.7.2.gem 84480 SHA256 9f05989ffbcdef532a58062443ab7107319dbec3b76b6d604669853a3e31fa57 SHA512 03c8fffbd385db9ee0fa8f422bf571ba99803f810828d536f1b00bc99a21108ac0ed232015d39f1ab88441fef0a3371df10944873fbadae6c8bd2624e3e1a65d WHIRLPOOL e28e8ebbee1e677e8e0eff453ef37e795df3b0e18414a8af5c1143fe463b987bca157fef3aebab247176fd6931cd07993caa462409832a3c8632110bd49e7e8f
diff --git a/dev-ruby/uglifier/uglifier-2.7.0.ebuild b/dev-ruby/uglifier/uglifier-2.7.0.ebuild
deleted file mode 100644
index e20820dc84a0..000000000000
--- a/dev-ruby/uglifier/uglifier-2.7.0.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
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
-HOMEPAGE="https://github.com/lautis/uglifier"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/execjs-0.3.0 >=dev-ruby/json-1.8.0"
-
-ruby_add_bdepend "test? ( dev-ruby/source_map )"
diff --git a/dev-ruby/uglifier/uglifier-2.7.1.ebuild b/dev-ruby/uglifier/uglifier-2.7.1.ebuild
deleted file mode 100644
index 3462be68ada6..000000000000
--- a/dev-ruby/uglifier/uglifier-2.7.1.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
-HOMEPAGE="https://github.com/lautis/uglifier"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/execjs-0.3.0 >=dev-ruby/json-1.8.0"
-
-ruby_add_bdepend "test? ( dev-ruby/source_map )"
diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index 72f9fe3a7e8f..7a547d69e0e4 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -1,4 +1,3 @@
DIST vcr-1.11.3.gem 87552 SHA256 6dcdd782d631b1464192d47db2a5a86d2325c80a723a4b2970f47da98f006f1d SHA512 0d62b0699e42484a4ba385a2ec653881183b44d85fd46ffc1ea693ebb746b225566cdb2799cdb60235c24adecd7575e0f20d743968326eeeb5b24fbd3232354a WHIRLPOOL f2c91385bc6dd68340f1a4960f3ec4944afd1907d33c8163ebe99d1e72c5b0f45e665463161654d4a330d2cfad25674b8a8e97a3cf2e1ae309d7ae6c4fd2be09
DIST vcr-2.9.3.gem 152576 SHA256 041361620a613e18c514b5e680bfbed3a8db69e1ffe5916957ba36966dd92190 SHA512 2d71a84439fb92393641d211372b476bb2b55c70dff8c8f17a4af9fcb3e8f9104e1da860cfeafc8ceea9499023c7f6206124dee36ee9690188cc444bab61b2a7 WHIRLPOOL 0994aab3f00da3c628fe1ad5e752bc694b6096ace92edeb1d3f5877864a80ffdd4c3d1ce69d0119ca91dae8d72a6172de1901ab4db1c27750bf83f25825c0052
-DIST vcr-3.0.0.tar.gz 149918 SHA256 7687c290a43915d4b6b0a030e389434c89662b6c92b1685c3898a23fd65a51f0 SHA512 65029b582ea5cf3f0031a5f6489232a6ef22cf0c927046a37894000fa71907a4da004e1f2f6b35443ad4738b96411135cac1d763fe7734648354f2cb18c97de9 WHIRLPOOL 72100ad4d5395355cbf75863c420b2d01c2fc6b980c920462ffddffa10e7c8797fa21f643446a447fb2da422d6fbeb23a5c11651bdd2334527fb733acc4d392c
DIST vcr-3.0.1.tar.gz 151273 SHA256 fdb3e015f15c03a3660e77585b4f7c843d04758bd2c4149599185f1f5b0711aa SHA512 a0265a2ad57ac748f326c161406c3c18bbe4c90827b9aa7be1d70b26094fb8d20d7c96cd8a871b948d95f6a03f852973d8622ceefde8694018e94e0cfc0687af WHIRLPOOL 480fa04e833821c4b858caf0f01e88487d036cde1ac7eecc2fd671b7a04ece72a3a94575cdae125842bc21b7bb51d07a7dda2c9434fbf4cca3fc551eac4a6349
diff --git a/dev-ruby/vcr/vcr-1.11.3.ebuild b/dev-ruby/vcr/vcr-1.11.3.ebuild
index 42c5203f5b9a..708b9cb3a4cb 100644
--- a/dev-ruby/vcr/vcr-1.11.3.ebuild
+++ b/dev-ruby/vcr/vcr-1.11.3.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
inherit ruby-fakegem
-DESCRIPTION="Records your test suite's HTTP interactions and replay them during future test runs."
+DESCRIPTION="Records your test suite's HTTP interactions and replay them during test runs"
HOMEPAGE="https://github.com/myronmarston/vcr/"
LICENSE="MIT"
diff --git a/dev-ruby/vcr/vcr-2.9.3.ebuild b/dev-ruby/vcr/vcr-2.9.3.ebuild
index ebcd708076a1..a46dce947682 100644
--- a/dev-ruby/vcr/vcr-2.9.3.ebuild
+++ b/dev-ruby/vcr/vcr-2.9.3.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
inherit ruby-fakegem
-DESCRIPTION="Records your test suite's HTTP interactions and replay them during future test runs."
+DESCRIPTION="Records your test suite's HTTP interactions and replay them during test runs"
HOMEPAGE="https://github.com/myronmarston/vcr/"
LICENSE="MIT"
diff --git a/dev-ruby/vcr/vcr-3.0.0.ebuild b/dev-ruby/vcr/vcr-3.0.0.ebuild
deleted file mode 100644
index e3b5c63d22bd..000000000000
--- a/dev-ruby/vcr/vcr-3.0.0.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Records your test suite's HTTP interactions and replay them during future test runs."
-HOMEPAGE="https://github.com/vcr/vcr/"
-SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="3"
-IUSE="test"
-
-# Tests require all supported HTTP libraries to be present, and it is
-# not possible to avoid some of them without very extensive patches.
-RESTRICT="test"
diff --git a/dev-ruby/vlad/Manifest b/dev-ruby/vlad/Manifest
index 26a6a851b379..ffe2f55d8d32 100644
--- a/dev-ruby/vlad/Manifest
+++ b/dev-ruby/vlad/Manifest
@@ -1,3 +1 @@
-DIST vlad-2.6.3.gem 29184 SHA256 61d560f74c08844648fee9820c6d83da32c4c74e7ee541d15628151c3658889e SHA512 13246b98ee7238f1a5ff8ec9df3a1ecb3c137a1ab2e07af6f8a01c61ebc9798a6a1dd0f8080d31dcfff7d81268848868a6960939dd02713e585aeb732be95a52 WHIRLPOOL 525fb6b885c8f6dd20ec0f369ff6d8c973971bd65b36bb9ff99823cd7dd537f861fb4bf9b6540b07c23802b3fa1c30ceeef7789dcd7ffdd2540afe9b1d0331d5
-DIST vlad-2.6.4.gem 29184 SHA256 ad1c2cd8c0c9584aaa4061baaebfeba2df619e8c7ccbe25ff1e22b4696ea045d SHA512 e9d233c3caf01a7c77317e1bf64fb3832939fe5b85734874215160d9dd9b89967eeb80edc9ffdc4af47bc3f9c1b32eef77c29d99ad0535835c1a35cc55d5538e WHIRLPOOL ec730a456547e9c1e1f56c12fd5fa48f50eac04531f737ecb8c63c9fd7383cd7ee0748ffc34601bf6ed33cfe772dc61662aede26e7d097ba2d86025463e05348
DIST vlad-2.6.5.gem 29184 SHA256 2447cce7b2db8695fcb9eb4fef5ed22932f217132e65ef95c3d66c5a07976044 SHA512 d1cf81372b973ad383cba7ad42512e9f734efc2034ae40ba6ef68277693c01568ee68613b97c8ead81793c748b848d5201f3b45cc00c16e3b460a95e42702f4f WHIRLPOOL 50942dd5fb0cff59da56613b146edc2bc565b5e755bfea8cc6dc0df9f3e9e73590ddc3063068df134cbfd1600e43cf0cd6b6a61dd41ebc5c2993c79910a75fcc
diff --git a/dev-ruby/vlad/vlad-2.6.3.ebuild b/dev-ruby/vlad/vlad-2.6.3.ebuild
deleted file mode 100644
index 838ff17050d2..000000000000
--- a/dev-ruby/vlad/vlad-2.6.3.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="considerations.txt History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pragmatic application deployment automation, without mercy"
-HOMEPAGE="http://rubyhitsquad.com/Vlad_the_Deployer.html"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend ">=dev-ruby/hoe-2.9.2
- test? ( dev-ruby/minitest )"
-ruby_add_rdepend ">=dev-ruby/rake-remote_task-2.1"
-
-all_ruby_prepare() {
- # Keep Isolate from managing the dependencies.
- sed -i -e '/isolate/ s:^:#:' -e '/rubyforge/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/vlad/vlad-2.6.4.ebuild b/dev-ruby/vlad/vlad-2.6.4.ebuild
deleted file mode 100644
index 838ff17050d2..000000000000
--- a/dev-ruby/vlad/vlad-2.6.4.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
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_TASK_DOC="docs"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="considerations.txt History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pragmatic application deployment automation, without mercy"
-HOMEPAGE="http://rubyhitsquad.com/Vlad_the_Deployer.html"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend ">=dev-ruby/hoe-2.9.2
- test? ( dev-ruby/minitest )"
-ruby_add_rdepend ">=dev-ruby/rake-remote_task-2.1"
-
-all_ruby_prepare() {
- # Keep Isolate from managing the dependencies.
- sed -i -e '/isolate/ s:^:#:' -e '/rubyforge/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/vlad/vlad-2.6.5.ebuild b/dev-ruby/vlad/vlad-2.6.5.ebuild
index 7dd1ea2d83f3..83a76ff09eed 100644
--- a/dev-ruby/vlad/vlad-2.6.5.ebuild
+++ b/dev-ruby/vlad/vlad-2.6.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC="docs"
RUBY_FAKEGEM_DOCDIR="doc"
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_EXTRADOC="considerations.txt History.txt README.txt"
inherit ruby-fakegem
DESCRIPTION="Pragmatic application deployment automation, without mercy"
-HOMEPAGE="http://rubyhitsquad.com/Vlad_the_Deployer.html"
+HOMEPAGE="https://github.com/seattlerb/vlad"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-ruby/xml-simple/Manifest b/dev-ruby/xml-simple/Manifest
index 6a47dce93c7d..ee2818a53000 100644
--- a/dev-ruby/xml-simple/Manifest
+++ b/dev-ruby/xml-simple/Manifest
@@ -1,3 +1,2 @@
DIST xml-simple-1.1.3.gem 11776 SHA256 acf399ebf7585480868e241dda40314b3fe37063a871b7066e771688943c58c5 SHA512 321eba774f85f45914b98c53cba2cffdeb0725e602145a84bf5d21f72eb0a2033612410b07eee5de9777817403630c8b1c2e0cfc421429b2b34bfaa492b624ad WHIRLPOOL b5222c821c68e331dac1882df54ecae48fe36febdcacf6533bb37506e7d75915666abcb47cf01086a06f62ba8f22e325a46154ee990720c066c3ce09907a2b0c
-DIST xml-simple-1.1.4.gem 11776 SHA256 dabc3f159942450dc932b748b88c1d9603d9572a26108cf187084205711dac74 SHA512 0363adde2f11b7b10b335fa7bea349f1adf00aa09659e394a8bf4685e2dd37318760805435dc8b2372ba15762d5fe44031b9082201df87543a3a8311841d8c69 WHIRLPOOL ccfbb77a900727d6a62ac5cda0ef4fa52bcab31dd1211feaf6c6e9282a43073355d794ad8582860c3e38a4d1554b434d310aa2d28d9896eaf7d666bca86c9e25
DIST xml-simple-1.1.5.tar.gz 126288 SHA256 e0d4602bea9fcff1bec440fdb8bd4ce27f4003899a60ac62a217a495038e62c4 SHA512 df81a05a0c32141cb5a0328fb782292438ec3ad6037c150e2ff4fee07b65ba9a739987f25f28c196ff8565af53c62120c3a729820a94dd3da0551fe43948f9a3 WHIRLPOOL 570bda1a0fc083601585fec646f3ca0158fa7d740fbc47adc936f5101fec3a6f1b4f6720fb1f41680d541fdf4051175c2d0a3bf881f27a36360dbacc33b0a846
diff --git a/dev-ruby/xml-simple/xml-simple-1.1.3.ebuild b/dev-ruby/xml-simple/xml-simple-1.1.3.ebuild
index 8d28030b94e4..c49cf853e0af 100644
--- a/dev-ruby/xml-simple/xml-simple-1.1.3.ebuild
+++ b/dev-ruby/xml-simple/xml-simple-1.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
# Gem only contains lib code, and github repository has no tags.
RUBY_FAKEGEM_TASK_DOC=""
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_TASK_TEST=""
inherit ruby-fakegem
-DESCRIPTION="Easy API to maintain XML. It is a Ruby port of Grant McLean's Perl module XML::Simple"
+DESCRIPTION="Easy API to maintain XML. A Ruby port of Grant McLean's Perl module XML::Simple"
HOMEPAGE="https://github.com/maik/xml-simple"
LICENSE="Ruby"
diff --git a/dev-ruby/xml-simple/xml-simple-1.1.4.ebuild b/dev-ruby/xml-simple/xml-simple-1.1.4.ebuild
deleted file mode 100644
index 5a09d11d90f6..000000000000
--- a/dev-ruby/xml-simple/xml-simple-1.1.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-# Gem only contains lib code, and github repository has no tags.
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Easy API to maintain XML. It is a Ruby port of Grant McLean's Perl module XML::Simple"
-HOMEPAGE="https://github.com/maik/xml-simple"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
diff --git a/dev-ruby/xml-simple/xml-simple-1.1.5.ebuild b/dev-ruby/xml-simple/xml-simple-1.1.5.ebuild
index ae8af5c52590..fe6d02e442e1 100644
--- a/dev-ruby/xml-simple/xml-simple-1.1.5.ebuild
+++ b/dev-ruby/xml-simple/xml-simple-1.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
# Gem only contains lib code, and github repository has no tags.
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_RECIPE_DOC="rdoc"
inherit ruby-fakegem
SRC_URI="https://github.com/maik/xml-simple/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Easy API to maintain XML. It is a Ruby port of Grant McLean's Perl module XML::Simple"
+DESCRIPTION="Easy API to maintain XML. A Ruby port of Grant McLean's Perl module XML::Simple"
HOMEPAGE="https://github.com/maik/xml-simple"
LICENSE="Ruby"
diff --git a/dev-ruby/xpath/xpath-0.1.4-r1.ebuild b/dev-ruby/xpath/xpath-0.1.4-r1.ebuild
index 8b4c2defcea8..2f2e37f91699 100644
--- a/dev-ruby/xpath/xpath-0.1.4-r1.ebuild
+++ b/dev-ruby/xpath/xpath-0.1.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_EXTRADOC="README.rdoc"
diff --git a/dev-ruby/xpath/xpath-2.0.0-r1.ebuild b/dev-ruby/xpath/xpath-2.0.0-r1.ebuild
index e9723d9a59ae..564891be3dca 100644
--- a/dev-ruby/xpath/xpath-2.0.0-r1.ebuild
+++ b/dev-ruby/xpath/xpath-2.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index a6b0267a976f..c69fc24923ff 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1,3 +1,2 @@
DIST yajl-ruby-1.1.0.gem 557056 SHA256 95b85940c96c0745e780f363170b8bd1b7b66d36073a061b1461b1788834446a SHA512 bde81b5fbe467c6403d27b49075822ff07b5cf356c05f711757fea5162543af36846f1f1da36acd5da359133f05e2cb3186215dc5597f3255da74c76cc8bf3ec WHIRLPOOL baa8f6ec2bfe70cd8f3441c971b2854a99b9f132eb2cae22f9fe6a9de7c7ccbf84f0f3ec982296d4cbc998051529b464aaf16b268049193aa4170ec7ec1ca11b
-DIST yajl-ruby-1.2.0.gem 549376 SHA256 07073d6b857d8befff70c25e919b244e5e4acb2056a552ae5c40c1f16856658e SHA512 58c16292207ec0e12de1451fcfb1e48f2ef29a7c6506b20db76e84898a2523886d4d44822242d50e8886b5d80dbc3ce29620285d7b956e11fb00c97906f529b2 WHIRLPOOL 0db240f21ed886568549b01c20f1a0cda87d9d14f710d91678563fa8c50a734be2d9fbaa9d16589bed4177d39a2501cd9bf26137491b0f4b50196e68b3cea4f3
DIST yajl-ruby-1.2.1.gem 549888 SHA256 6e27d8d37744e346004af7d8e23d133703acd54edde636ff9828d115e2597b7f SHA512 32722b7c8a8408752716654f91b50aad98fd24ef72438d69531553ece4f63ffd3f78d7745a9e053e297f2c4a96af7638eea6271893b586a6a01482f71ab27fe6 WHIRLPOOL 3ecc638e17b4fb5727bbfb05cae628d79545dca41bff73fe6694e1ca9f3a89a9467c5cfb59963c4ae9959f4a5e2cea6f9335c6fd2623590acb82589d3dd3727d
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.1.0-r1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.1.0-r1.ebuild
index 52159d7a9f33..7f42c69ab18e 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.1.0-r1.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.1.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.2.0.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.2.0.ebuild
deleted file mode 100644
index 310f6f03a555..000000000000
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby C bindings to the Yajl JSON stream-based parser library"
-HOMEPAGE="https://github.com/brianmario/yajl-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~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=""
-
-RDEPEND="${RDEPEND} dev-libs/yajl"
-DEPEND="${DEPEND} dev-libs/yajl"
-
-each_ruby_configure() {
- ${RUBY} -Cext/yajl extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
- emake -Cext/yajl CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
- cp ext/yajl/yajl$(get_modname) lib/yajl/ || die
-}
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.2.1.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.2.1.ebuild
index 430bd3e59a38..3fa7adc74f15 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.2.1.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.2.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
diff --git a/dev-ruby/zentest/zentest-4.11.0.ebuild b/dev-ruby/zentest/zentest-4.11.0.ebuild
index cc27e26cd3a3..919bcafb80a6 100644
--- a/dev-ruby/zentest/zentest-4.11.0.ebuild
+++ b/dev-ruby/zentest/zentest-4.11.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
RUBY_FAKEGEM_NAME=ZenTest
@@ -13,7 +13,7 @@ RUBY_FAKEGEM_EXTRADOC="README.txt History.txt example.txt example1.rb example2.r
inherit ruby-fakegem
-DESCRIPTION="ZenTest provides tools to support testing: zentest, unit_diff, autotest, multiruby, and Test::Rails"
+DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Rails"
HOMEPAGE="https://github.com/seattlerb/zentest"
LICENSE="Ruby"
@@ -27,3 +27,13 @@ ruby_add_bdepend "
dev-ruby/hoe-seattlerb
dev-ruby/minitest:5
)"
+
+each_ruby_prepare() {
+ case ${RUBY} in
+ *ruby23)
+ sed -i -e '/test_testcase9/a skip "ruby 2.3 defines more methods"' test/test_zentest.rb || die
+ ;;
+ *)
+ ;;
+ esac
+}
diff --git a/dev-ruby/zentest/zentest-4.9.5.ebuild b/dev-ruby/zentest/zentest-4.9.5.ebuild
index eb9f1a1f7e8a..2b2460d0736b 100644
--- a/dev-ruby/zentest/zentest-4.9.5.ebuild
+++ b/dev-ruby/zentest/zentest-4.9.5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby20"
RUBY_FAKEGEM_NAME=ZenTest
@@ -14,7 +14,7 @@ RUBY_FAKEGEM_EXTRADOC="README.txt History.txt example.txt example1.rb example2.r
inherit ruby-fakegem
-DESCRIPTION="ZenTest provides tools to support testing: zentest, unit_diff, autotest, multiruby, and Test::Rails"
+DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Rails"
HOMEPAGE="https://github.com/seattlerb/zentest"
LICENSE="Ruby"
diff --git a/dev-scheme/slib/slib-3.2.2.ebuild b/dev-scheme/slib/slib-3.2.2.ebuild
index 6e6c6be70488..681dfb8324e4 100644
--- a/dev-scheme/slib/slib-3.2.2.ebuild
+++ b/dev-scheme/slib/slib-3.2.2.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SLIB"
SLOT="0"
LICENSE="public-domain BSD"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="" #test"
#unzip for unpacking
diff --git a/dev-tcltk/tclpython/tclpython-4.1-r5.ebuild b/dev-tcltk/tclpython/tclpython-4.1-r5.ebuild
new file mode 100644
index 000000000000..a8787e6cd686
--- /dev/null
+++ b/dev-tcltk/tclpython/tclpython-4.1-r5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils multilib python-single-r1 toolchain-funcs
+
+DESCRIPTION="Python package for Tcl"
+HOMEPAGE="http://jfontain.free.fr/tclpython.htm"
+SRC_URI="http://jfontain.free.fr/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+ dev-lang/tcl:0=
+ sys-devel/binutils:0="
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-python-3.patch
+)
+
+src_prepare() {
+ epatch ${PATCHES[@]}
+}
+
+src_compile() {
+ local cfile="tclpython tclthread"
+ for src in ${cfile}; do
+ compile="$(tc-getCC) -shared -fPIC ${CFLAGS} -I$(python_get_includedir) -c ${src}.c"
+ einfo "${compile}"
+ eval "${compile}" || die
+ done
+
+ link="$(tc-getCC) -fPIC -shared ${LDFLAGS} -o tclpython.so.${PV} tclpython.o tclthread.o -lpthread -lutil $(python_get_LIBS) -ltcl"
+ einfo "${link}"
+ eval "${link}" || die
+}
+
+src_install() {
+ insinto /usr/$(get_libdir)/tclpython
+ doins tclpython.so.${PV} pkgIndex.tcl
+ fperms 775 /usr/$(get_libdir)/tclpython/tclpython.so.${PV}
+ dosym tclpython.so.${PV} /usr/$(get_libdir)/tclpython/tclpython.so
+
+ dodoc CHANGES INSTALL README
+ dohtml tclpython.htm
+}
diff --git a/dev-tex/latex-beamer/latex-beamer-3.36.ebuild b/dev-tex/latex-beamer/latex-beamer-3.36.ebuild
index 1ccff3e3136d..647b854ab5b6 100644
--- a/dev-tex/latex-beamer/latex-beamer-3.36.ebuild
+++ b/dev-tex/latex-beamer/latex-beamer-3.36.ebuild
@@ -32,6 +32,7 @@ src_install() {
if use doc ; then
docinto doc
dodoc -r doc/*
+ dosym "/usr/share/doc/${PF}/doc/" "${TEXMF}/doc/latex/beamer"
fi
use examples && dodoc -r examples solutions
diff --git a/dev-util/anjuta/anjuta-3.18.2.ebuild b/dev-util/anjuta/anjuta-3.18.2.ebuild
index 1671bb66883e..950dfcd1dccd 100644
--- a/dev-util/anjuta/anjuta-3.18.2.ebuild
+++ b/dev-util/anjuta/anjuta-3.18.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~sparc x86 ~x86-fbsd"
IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index d036cc373a7a..4a8ca9e0b646 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,4 +1,2 @@
-DIST astyle_2.02.1_linux.tar.gz 153253 SHA256 0bece9a32887e51f42c57617cf7c4f9b63d0a386749fe3a094f5525b639ef953 SHA512 5a156910a2610b1c49bfe78ac237e1bb13e9627912db107ef98fead88a29f000ed355446c033fd052112d54a4f2bbdf3f484ef58b9976c311c06cde951fda274 WHIRLPOOL 96451afd3f4bb6eaa51f33b2f565e545f401973a00ef6653ee4dbeff85ca7c06928e12d54249a8221e881c20f4d1bdea023fbe04ac57631601e15a3453dc2b79
-DIST astyle_2.03_linux.tar.gz 142577 SHA256 22b5249a0b8c9fab3b3bcd467abcb3c6b4a78458b528028634a83dca4c6ca389 SHA512 5f23ef010edba0ddd7377b2a6023a0d97e22f7247e20a0c94d56252fef55b6de291b3c9de67f5ddfa02906cd44470e136ae49e38f7bd2afe65a204245230a579 WHIRLPOOL b97a212dd4c92e24af9c5aa99fafcc5de929e94a81e160244d9cbc66bc7b97e0ca415e21b8e1eae35ef659b42423e1dd9b154fbddf36fef7fc344deca39dc156
DIST astyle_2.04_linux.tar.gz 156974 SHA256 70b37f4853c418d1e2632612967eebf1bdb93dfbe558c51d7d013c9b4e116b60 SHA512 bc0f6351fac4198ab969251342c4e453064b07512a2d06825a93c75daf86b06469c9971f35fbadad872d23368dc546019d8d174e07ceaad6e10007f562fdeffd WHIRLPOOL d9aa3f537885e373d791204652ed5c8d5231be0840ef5dde3714bb8c9c524e327585a51b7b14da1aae2952f7c9248401bc2769290bc5828d15f030f41d95c1fe
DIST astyle_2.05.1_linux.tar.gz 152765 SHA256 fbdfc6f1966a972d19a215927266c76d4183eee235ed1e2bd7ec551c2a270eac SHA512 853bf84cb196f2300ca00fb7f18fe336764f1205ae0674a75c1a019bf734495d8fb3d9b6aca0ea258b6632921fb268906128c1afb80596532489749cd2cbe495 WHIRLPOOL ceef3bfa64632a4fe9afcc332fdf742e60b6e7d21655449372bd6c89db7444eddf6bbfee48684bb9f18e119cf040f36c62544cfc8bb040ed83095e9aed9fce56
diff --git a/dev-util/astyle/astyle-2.02.1.ebuild b/dev-util/astyle/astyle-2.02.1.ebuild
deleted file mode 100644
index 66bf3afacb91..000000000000
--- a/dev-util/astyle/astyle-2.02.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils java-pkg-opt-2 multilib toolchain-funcs
-
-DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code"
-HOMEPAGE="http://astyle.sourceforge.net/"
-SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-IUSE="doc java static-libs"
-
-DEPEND="app-arch/xz-utils
- java? ( >=virtual/jdk-1.6 )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- tc-export CXX
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-build_system.patch
- java-pkg-opt-2_src_prepare
- sed -e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \
- -e "s:ar crs:$(tc-getAR) crs:" \
- -i build/gcc/Makefile || die
-}
-
-src_compile() {
- local mk_opts="-f ../build/gcc/Makefile -C src"
- emake ${mk_opts} ${PN}
- emake ${mk_opts} shared
- if use java ; then
- emake ${mk_opts} java
- fi
- if use static-libs ; then
- emake ${mk_opts} static
- fi
-}
-
-src_install() {
- insinto /usr/include
- doins src/${PN}.h
-
- pushd src/bin &> /dev/null
- dobin ${PN}
-
- dolib.so lib${PN}.so.0.0.0
- dosym lib${PN}.so.0.0.0 /usr/$(get_libdir)/lib${PN}.so.0
- dosym lib${PN}.so.0.0.0 /usr/$(get_libdir)/lib${PN}.so
- if use java ; then
- dolib.so lib${PN}j.so.0.0.0
- dosym lib${PN}j.so.0.0.0 /usr/$(get_libdir)/lib${PN}j.so.0
- dosym lib${PN}j.so.0.0.0 /usr/$(get_libdir)/lib${PN}j.so
- fi
- if use static-libs ; then
- dolib lib${PN}.a
- fi
- popd &> /dev/null
-
- use doc && dohtml doc/*
-}
diff --git a/dev-util/astyle/astyle-2.03.ebuild b/dev-util/astyle/astyle-2.03.ebuild
deleted file mode 100644
index a29b39744a42..000000000000
--- a/dev-util/astyle/astyle-2.03.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils java-pkg-opt-2 multilib toolchain-funcs
-
-DESCRIPTION="Artistic Style is a reindenter and reformatter of C++, C and Java source code"
-HOMEPAGE="http://astyle.sourceforge.net/"
-SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-IUSE="doc java static-libs"
-
-DEPEND="app-arch/xz-utils
- java? ( >=virtual/jdk-1.6 )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- tc-export CXX
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.02.1-build_system.patch
- java-pkg-opt-2_src_prepare
- sed -e "s:^\(JAVAINCS\s*\)=.*$:\1= $(java-pkg_get-jni-cflags):" \
- -e "s:ar crs:$(tc-getAR) crs:" \
- -i build/gcc/Makefile || die
-}
-
-src_compile() {
- local mk_opts="-f ../build/gcc/Makefile -C src"
- emake ${mk_opts} ${PN}
- emake ${mk_opts} shared
- if use java ; then
- emake ${mk_opts} java
- fi
- if use static-libs ; then
- emake ${mk_opts} static
- fi
-}
-
-src_install() {
- insinto /usr/include
- doins src/${PN}.h
-
- pushd src/bin &> /dev/null
- dobin ${PN}
-
- dolib.so lib${PN}.so.0.0.0
- dosym lib${PN}.so.0.0.0 /usr/$(get_libdir)/lib${PN}.so.0
- dosym lib${PN}.so.0.0.0 /usr/$(get_libdir)/lib${PN}.so
- if use java ; then
- dolib.so lib${PN}j.so.0.0.0
- dosym lib${PN}j.so.0.0.0 /usr/$(get_libdir)/lib${PN}j.so.0
- dosym lib${PN}j.so.0.0.0 /usr/$(get_libdir)/lib${PN}j.so
- fi
- if use static-libs ; then
- dolib lib${PN}.a
- fi
- popd &> /dev/null
-
- use doc && dohtml doc/*
-}
diff --git a/dev-util/byacc/byacc-20150711.ebuild b/dev-util/byacc/byacc-20150711.ebuild
index abf4408702d1..d37fc1f279e5 100644
--- a/dev-util/byacc/byacc-20150711.ebuild
+++ b/dev-util/byacc/byacc-20150711.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://invisible-island.net/byacc/${P}.tgz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index eb5a46725288..f02e164bcf86 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -1 +1,2 @@
DIST catkin-0.6.16.tar.gz 199054 SHA256 2cb7efdaecc238a156929861645c5cfd96977a8606fb7765e131304072d1c82c SHA512 907e3545e74e798e76e66cf24fa58ae9385a309a42e251e4871f4bee28026ed05faf50950b0deb8c3e2d234dafa1188031759c3acbc53a31fd35a7e3e29c1ef6 WHIRLPOOL 9c2c5e51e6e6d1d8b47c1b6d1061471de8d34304fb6fe2df19beccd68b6595c591ca3318ba72c0261b11e96c11d58998d180f44749127cec6cf7d5d38a1e9ac3
+DIST catkin-0.7.0.tar.gz 199935 SHA256 253508b40241ceb334eddfd70b0eef791cc0b48fa303ef4968e364c3ebde4d00 SHA512 58823ee3f3bb071c0508f97fc288eefed65cb76aa72e69a18e4a1c493f092e7e1cefd2af4836edf276740118f83429c3f44ad1e91ab51afdd6c20ae9eb21a6e1 WHIRLPOOL 673efad52e115b3c96e56453081d90bf435515fa3cf2c5e646b6fefecf3ff0a31499c3132c3b292b424baeb41892af71b112cde6054567aacb4184b5bb9c4100
diff --git a/dev-util/catkin/catkin-0.7.0.ebuild b/dev-util/catkin/catkin-0.7.0.ebuild
new file mode 100644
index 000000000000..f9a32a87c9f0
--- /dev/null
+++ b/dev-util/catkin/catkin-0.7.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SCM="git-r3"
+ EGIT_REPO_URI="http://github.com/ros/catkin"
+fi
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+
+inherit ${SCM} cmake-utils python-r1 python-utils-r1
+
+DESCRIPTION="Cmake macros and associated python code used to build some parts of ROS"
+HOMEPAGE="http://wiki.ros.org/catkin"
+if [ "${PV#9999}" != "${PV}" ] ; then
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="http://github.com/ros/catkin/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+ dev-python/catkin_pkg[${PYTHON_USEDEP}]
+ dev-python/empy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}/tests.patch"
+ "${FILESDIR}/distutils.patch"
+ "${FILESDIR}/catkin_prefix_path.patch"
+ "${FILESDIR}/gnuinstalldirs.patch"
+)
+
+src_prepare() {
+ # fix libdir
+ sed -i \
+ -e 's:LIBEXEC_DESTINATION lib:LIBEXEC_DESTINATION libexec:' \
+ -e 's:}/lib:}/${CMAKE_INSTALL_LIBDIR}:' \
+ -e 's:DESTINATION lib):DESTINATION ${CMAKE_INSTALL_LIBDIR}):' \
+ -e 's:DESTINATION lib/:DESTINATION ${CMAKE_INSTALL_LIBDIR}/:' \
+ -e 's:PYTHON_INSTALL_DIR lib:PYTHON_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}:' \
+ cmake/*.cmake || die
+ cmake-utils_src_prepare
+}
+
+catkin_src_configure_internal() {
+ mycmakeargs+=( -DPYTHON_EXECUTABLE="${PYTHON}" )
+ python_export PYTHON_SCRIPTDIR
+ cmake-utils_src_configure
+}
+
+src_configure() {
+ local mycmakeargs=(
+ "$(cmake-utils_use test CATKIN_ENABLE_TESTING)"
+ "-DCATKIN_BUILD_BINARY_PACKAGE=ON"
+ )
+ python_foreach_impl catkin_src_configure_internal
+}
+
+src_compile() {
+ python_foreach_impl cmake-utils_src_compile
+}
+
+src_test() {
+ unset PYTHON_SCRIPTDIR
+ python_foreach_impl cmake-utils_src_test
+}
+
+catkin_src_install_internal() {
+ python_export PYTHON_SCRIPTDIR
+ cmake-utils_src_install
+ if [ ! -f "${T}/.catkin_python_symlinks_generated" ]; then
+ dodir /usr/bin
+ for i in "${D}/${PYTHON_SCRIPTDIR}"/* ; do
+ dosym ../lib/python-exec/python-exec2 "/usr/bin/${i##*/}" || die
+ done
+ touch "${T}/.catkin_python_symlinks_generated"
+ fi
+}
+
+src_install() {
+ python_foreach_impl catkin_src_install_internal
+
+ doenvd "${FILESDIR}/40catkin"
+
+ # needed to be considered as a workspace
+ touch "${ED}/usr/.catkin"
+}
diff --git a/dev-util/devhelp/devhelp-3.18.1.ebuild b/dev-util/devhelp/devhelp-3.18.1.ebuild
index 9022eb7a58ba..00e43a9df59b 100644
--- a/dev-util/devhelp/devhelp-3.18.1.ebuild
+++ b/dev-util/devhelp/devhelp-3.18.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
LICENSE="GPL-2+"
SLOT="0/3-1" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="gedit"
REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
index ca8fee9b8993..199f3a6c5bde 100644
--- a/dev-util/dogtail/Manifest
+++ b/dev-util/dogtail/Manifest
@@ -1 +1,2 @@
DIST dogtail-0.9.0.tar.gz 119882 SHA256 564dae5fba4fa3a7f6d53503e0877dad56ae8bce10e181d3d2c0bdbf063f4e36 SHA512 cf2956fad923f0f325f5dc3cd8f5a575491f6c455e2fa597b034b09e1579054b84b6ae80b67cbbe161c012c0de48457f872cfe27a5e0274447d32e21e4a8360d WHIRLPOOL 771606a4bc3d59bd75df85ab9ef3dd8bd4e28161e13fc792bb4108f7b058db18f42c1174499b90d3c307c3302e254278aecf94e03ff894222bc7f12021611c1f
+DIST dogtail-0.9.9.tar.gz 123884 SHA256 5d94620bac19b23606d3ecb28e85628c5ceb505beb530af7023ce5bfb576bc5c SHA512 5283dea40b8193e7380aeebab6c7ad149c232ac3d7360df477bed0e623bacc79fc895694d2aff788dd5f986591c1460c447428d8c2acf25ba240946323eabef8 WHIRLPOOL 4d855893e9da54bca09260729f3dc551e973a47a0ef9db31507c071e0014bb70d809aebb50bb47355c9b536f499f912e6b75846a2fe98f3ed8a2a8df20f43a5f
diff --git a/dev-util/dogtail/dogtail-0.9.9.ebuild b/dev-util/dogtail/dogtail-0.9.9.ebuild
new file mode 100644
index 000000000000..7990654e637d
--- /dev/null
+++ b/dev-util/dogtail/dogtail-0.9.9.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit eutils distutils-r1 gnome2-utils xdg
+
+DESCRIPTION="GUI test tool and automation framework using accessibility framework"
+HOMEPAGE="https://fedorahosted.org/dogtail/"
+SRC_URI="https://fedorahosted.org/released/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/gobject-introspection
+ dev-python/pyatspi[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ x11-libs/gdk-pixbuf:2[introspection]
+ x11-libs/gtk+:3[introspection]
+ x11-libs/libwnck:3[introspection]
+ x11-base/xorg-server[xvfb]
+ x11-apps/xinit
+"
+DEPEND="${DEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+src_prepare() {
+ # Install docs in one place
+ sed "s:doc/${PN}:doc/${PF}:" -i setup.py || die
+
+ # Fix current user detection, upstream bug #46
+ # Also, respect TMPDIR
+ epatch "${FILESDIR}"/${PN}-0.9.9-get-user.patch
+
+ # Upstream loads resources relative to __file__, which doesn't work with
+ # gentoo's dev-lang/python-exec. So we need to add hard-coded paths.
+ epatch "${FILESDIR}"/${PN}-0.9.9-gentoo-paths.patch
+ sed -e "s:@EPREFIX_USR@:'${EPREFIX}/usr':" -i sniff/sniff || die "sed failed"
+
+ xdg_src_prepare
+ distutils-r1_src_prepare
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+ gnome2_icon_cache_update
+}
diff --git a/dev-util/dogtail/files/dogtail-0.9.9-gentoo-paths.patch b/dev-util/dogtail/files/dogtail-0.9.9-gentoo-paths.patch
new file mode 100644
index 000000000000..522249949228
--- /dev/null
+++ b/dev-util/dogtail/files/dogtail-0.9.9-gentoo-paths.patch
@@ -0,0 +1,64 @@
+From 069a17e22a73ecff686b650ba158a292cc508cb5 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 5 Mar 2016 19:38:08 +0100
+Subject: [PATCH] Load resources from well-known location
+
+Using __file__ does not work with Gentoo's dev-python/python-exec
+wrapping. Better use hard-coded paths.
+
+Also adds support for prefix.
+---
+ sniff/sniff | 26 +++++++++-----------------
+ 1 file changed, 9 insertions(+), 17 deletions(-)
+
+diff --git a/sniff/sniff b/sniff/sniff
+index a83a1c2..ff43f38 100755
+--- a/sniff/sniff
++++ b/sniff/sniff
+@@ -47,22 +47,18 @@ class SniffApp(object):
+ if os.path.exists('sniff.ui'):
+ self.builder.add_from_file('sniff.ui')
+ else:
+- import os
+- path = os.path.abspath(
+- os.path.join(__file__, os.path.pardir, os.path.pardir))
+- if path == '/': # in case the path is /bin/sniff
+- path = '/usr'
+- self.builder.add_from_file(path + '/share/dogtail/glade/sniff.ui')
++ self.builder.add_from_file(os.path.join(
++ @EPREFIX_USR@,
++ 'share/dogtail/glade/sniff.ui')
++ )
+ self.app = self.builder.get_object(self.appName)
+ try:
+ self.app.set_icon_from_file('../icons/dogtail-head.svg')
+ except Exception:
+- import os
+- path = os.path.abspath(
+- os.path.join(__file__, os.path.pardir, os.path.pardir))
+- if path is '/':
+- path = '/usr'
+- self.app.set_icon_from_file(os.path.join(path, 'share/icons/hicolor/scalable/apps/dogtail-head.svg'))
++ self.app.set_icon_from_file(os.path.join(
++ @EPREFIX_USR@,
++ 'share/icons/hicolor/scalable/apps/dogtail-head.svg')
++ )
+ self.setUpWidgets()
+ self.connectSignals()
+ self.app.show_all()
+@@ -650,11 +646,7 @@ def loadIcon(iconName):
+ pixbuf = GdkPixbuf.Pixbuf.new_from_file('icons/' + iconName)
+ except GObject.GError:
+ import os
+- path = os.path.abspath(
+- os.path.join(__file__, os.path.pardir, os.path.pardir))
+- if path == '/':
+- path = '/usr'
+- iconName = os.path.join(path, 'share/dogtail/icons/', iconName)
++ iconName = os.path.join(@EPREFIX_USR@, 'share/dogtail/icons/', iconName)
+ pixbuf = GdkPixbuf.Pixbuf.new_from_file(iconName)
+ return pixbuf
+
+--
+2.7.2
+
diff --git a/dev-util/dogtail/files/dogtail-0.9.9-get-user.patch b/dev-util/dogtail/files/dogtail-0.9.9-get-user.patch
new file mode 100644
index 000000000000..a3f7ef77230d
--- /dev/null
+++ b/dev-util/dogtail/files/dogtail-0.9.9-get-user.patch
@@ -0,0 +1,43 @@
+From 1ee93bf9d0d8a143f5faf9d1310d768d1de4ece4 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 5 Mar 2016 20:32:17 +0100
+Subject: [PATCH] Do not use USER as it can be unset.
+
+Use LOGNAME first as recommended by python documentation, then try alternatives.
+
+Also, use tempfile to respect environment variables changing tmpdir.
+
+Upstream: https://fedorahosted.org/dogtail/ticket/46
+Debian: http://bugs.debian.org/743500
+---
+ dogtail/config.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/dogtail/config.py b/dogtail/config.py
+index 80f08bf..1b6ac15 100644
+--- a/dogtail/config.py
++++ b/dogtail/config.py
+@@ -3,6 +3,8 @@ from __future__ import absolute_import, division, print_function, unicode_litera
+ import locale
+ import os
++import pwd
+ import sys
++import tempfile
+
+ """
+ The configuration module.
+@@ -12,7 +13,10 @@ __author__ = "Zack Cerza <zcerza@redhat.com>, David Malcolm <dmalcolm@redhat.com
+
+ def _userTmpDir(baseName):
+ # i.e. /tmp/dogtail-foo
+- return '-'.join(('/'.join(('/tmp', baseName)), os.environ['USER']))
++ return '-'.join((
++ '/'.join((tempfile.gettempdir(), baseName)),
++ os.getenv('LOGNAME', os.getenv('USER', pwd.getpwuid(os.getuid())[0]))
++ ))
+
+
+ class _Config(object):
+--
+2.7.2
+
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild
index 67f9bc2bab72..40f5d01f62f0 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.46.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild
index 1671e1d3121d..7eaf98cb2301 100644
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://developer.gnome.org/"
LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
RDEPEND=""
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild
index e61fe6c77e24..d5042340a03d 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.29.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~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=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild
index ca5f441a8401..3fb6e27eb9c9 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.18.4.ebuild
@@ -15,7 +15,7 @@ LICENSE="LGPL-2+"
SLOT="0"
IUSE=""
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.45.8:2
diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index e973f2237479..0690d60f77d2 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1,5 +1,8 @@
DIST idea-ultimate-14.1.5.141.2735.5.tar.gz 318054935 SHA256 6912902ec97a57f5553247367d6dd5b8e3041e99faf32c48b672cd31413dab73 SHA512 7ab3a45593c2324957455b254ae0257a36e8ecbc63014e18feba813413432dccb25d18971840f43cf22174c3338738eec44304091eb30c6ba2d0119b73cc6fa0 WHIRLPOOL 44a4bef99fdb638cf3cb0f24559b7765b7a4c7cb94aed5c3b8e503cbdf9fa1354f6d6026a9650fc58faec037b95482190891681f41219c61fc7d67a40e71f168
+DIST idea-ultimate-14.1.5.141.3056.5.tar.gz 318054935 SHA256 6912902ec97a57f5553247367d6dd5b8e3041e99faf32c48b672cd31413dab73 SHA512 7ab3a45593c2324957455b254ae0257a36e8ecbc63014e18feba813413432dccb25d18971840f43cf22174c3338738eec44304091eb30c6ba2d0119b73cc6fa0 WHIRLPOOL 44a4bef99fdb638cf3cb0f24559b7765b7a4c7cb94aed5c3b8e503cbdf9fa1354f6d6026a9650fc58faec037b95482190891681f41219c61fc7d67a40e71f168
DIST ideaIU-143.1821.5.tar.gz 392844742 SHA256 90c2a880c03bc1213c41be05e56d50a5104175e2589e492ba140987b94d8680b SHA512 0841c3ea509500949358f826405d5c62d84f51657ce4ad621d3b33100a1966d8d85b793286cd4b85c6d2d6d0ca99c4b6a2f84cf5d596538cf530abf73fe8be21 WHIRLPOOL d59367e7671121619d0f787f585a4be436027e4ff39f10849566e441b407295166131cda8af506a7ecf5c34c21231bedd1419c4ee1e2657a38fa3b70a6b424dc
DIST ideaIU-143.2287.1.tar.gz 395915812 SHA256 c4365098055f492483204742626b77d6005f559bba2bb46ec161aa9ce7f12610 SHA512 ccf1191b1b94c8374f7abd3014970f6c85c0284e6bec43b0aafaa06bdb2c0e384c6681436d5b67714429fe9af9e2724123a39e674703055bd715608a91900327 WHIRLPOOL 7b9a7af5a380f5e6166e811f27750ea00b88e475f9e3a89421688e7cf0cf9c50dd63a66a70bf70d935aeadb66abca6308eb4da3fc287ed7aabfd9b325b6b4bad
DIST ideaIU-144.3143.6-custom-jdk-linux.tar.gz 444026233 SHA256 7d43fef31ec373fa700c1bcf6408429abf5549314f134e458335f52feb44772b SHA512 86ef4f9d89184acfcbaee8fbce67be8e226ab363df9892f803bb61fe61c50972bcf1ec260c9a9652998fc3f73cc72311950df3ae23bf01ae4a45336b7830ca01 WHIRLPOOL 9dee3db866fa55f2ddd3fa28120def4455ff4e7bc0a3a86289c6cb46f7a8a48c5fa0c6e9f35753b52cf66848831c3de2540d41673239130529c8848dba914aa6
DIST ideaIU-144.3143.6-no-jdk.tar.gz 399209252 SHA256 c11de6c199c90873976958c4e319176647fb4458370a041b8611007277a057d3 SHA512 6c4b8224901be58b0d41ca59dc6d8215510617470ed15b25c9d84074d4f660e335d6bb450062e353df3bb217a4892eb8783fc9086d2f4e4addada5aa7c5c7e85 WHIRLPOOL 2ea6bfc95c47fb20008c6503a2158a5a6d677e072cb9db41fba198d4dfda0df57db784b3289ecccd64849d1dc59fdb0f3b35aa3490323a7f40df383547cf940f
+DIST ideaIU-145.184.1-no-jdk.tar.gz 404208089 SHA256 95c9e116e090050676641dab9c00bfb3e04c690ea05346c4a1fdfeb15c773315 SHA512 32702e36f6a4b8ade2cf944dbcaf3da5031fc29c61c65a82361ad582d05ed735dbd1d1b8861e85d9ae27e758cb2e7747be0103719d0a8cf59cacaa74e12cba07 WHIRLPOOL 2097058d595e191bb52365a0094f2d43af1fd06c97724265d7bf0e334cb07b9de3005d269bc290d3b54aac9327f82a3d0e487371e1001c642e574ebbf2d996f3
+DIST ideaIU-145.184.1.tar.gz 449217363 SHA256 a434ef20468f5349dc8ebb6e21cd8710bb61014c2398df6c2636d040c5bd94bf SHA512 750b57c07b308466e9a05713e765e51b00f60213b88578c34dcec6786350a3100893fc23ca7c50b29cc90cf245ea23a5184b7371e09e63bb1f03cdf5ea5506c8 WHIRLPOOL b60ab29d8a792b7c53802e3af56b884f74976caab4f83e0cf887024d729a3087b8c7f653d98a04375066bf07b9bccf4122e60a4bcd856e66512eb94f6b7b4aac
diff --git a/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.3056.5.ebuild b/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.3056.5.ebuild
new file mode 100644
index 000000000000..f98f0e573093
--- /dev/null
+++ b/dev-util/idea-ultimate/idea-ultimate-14.1.5.141.3056.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator
+
+SLOT="0"
+PV_STRING="$(get_version_component_range 4-6)" # Always name EAP-versions with '_pre' for clarity!
+MY_PV="$(get_version_component_range 1-3)"
+MY_PN="idea"
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="http://www.jetbrains.com/idea"
+SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="IDEA IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal"
+IUSE=""
+KEYWORDS="~amd64 ~x86" # No keywords for EAP versions. Code quality sucks.
+
+DEPEND="!dev-util/${PN}:14
+ !dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+ >=virtual/jdk-1.7"
+S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
+
+QA_TEXTRELS="opt/${PN}-${MY_PV}/bin/libbreakgen.so"
+QA_PRESTRIPPED="opt/${PN}-${MY_PV}/lib/libpty/linux/x86/libpty.so
+ opt/${PN}-${MY_PV}/lib/libpty/linux/x86_64/libpty.so
+ opt/${PN}-${MY_PV}/bin/libyjpagent-linux.so
+ opt/${PN}-${MY_PV}/bin/libyjpagent-linux64.so"
+
+src_install() {
+ local dir="/opt/${PN}-${MY_PV}"
+
+ insinto "${dir}"
+ doins -r *
+ fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
+
+ make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+
+ # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+ mkdir -p "${D}/etc/sysctl.d/"
+ echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf"
+}
+
+pkg_postinst() {
+ if [[ "$(get_version_component_range 7)x" = "prex" ]]
+ then
+ ewarn "Be aware, this is a release from their EAP. According to JetBrains, the code"
+ ewarn "quality of such releases may be considerably below of what you might usually"
+ ewarn "be used to from beta releases."
+ ewarn "Don't use it for critical tasks. You have been warned."
+ fi
+}
diff --git a/dev-util/idea-ultimate/idea-ultimate-16.0.0.145.184.1_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-16.0.0.145.184.1_pre.ebuild
new file mode 100644
index 000000000000..b5f96c74c4e0
--- /dev/null
+++ b/dev-util/idea-ultimate/idea-ultimate-16.0.0.145.184.1_pre.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils versionator
+
+SLOT="0"
+PV_STRING="$(get_version_component_range 4-6)"
+MY_PV="$(get_version_component_range 1-3)"
+MY_PN="idea"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(get_version_component_range 7)x" = "prex" ]]
+then
+ # upstream EAP
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="custom-jdk? ( http://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz )
+ !custom-jdk? ( http://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )"
+else
+ # upstream stable
+ KEYWORDS="amd64 x86"
+ SRC_URI="http://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="http://www.jetbrains.com/idea"
+
+LICENSE="IDEA
+ || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+IUSE="-custom-jdk"
+
+DEPEND="!dev-util/${PN}:14
+ !dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+ >=virtual/jdk-1.7:*"
+S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+src_prepare() {
+ if ! use amd64; then
+ rm -r plugins/tfsIntegration/lib/native/linux/x86_64 || die
+ fi
+ if ! use arm; then
+ rm bin/fsnotifier-arm || die
+ rm -r plugins/tfsIntegration/lib/native/linux/arm || die
+ fi
+ if ! use ppc; then
+ rm -r plugins/tfsIntegration/lib/native/linux/ppc || die
+ fi
+ if ! use x86; then
+ rm -r plugins/tfsIntegration/lib/native/linux/x86 || die
+ fi
+ rm -r plugins/tfsIntegration/lib/native/solaris || die
+ rm -r plugins/tfsIntegration/lib/native/hpux || die
+}
+
+src_install() {
+ local dir="/opt/${PN}-${MY_PV}"
+
+ insinto "${dir}"
+ doins -r *
+ fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
+
+ make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+ newicon "bin/${MY_PN}.png" "${PN}.png"
+ make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${PN}" "Development;IDE;"
+
+ # recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+ mkdir -p "${D}/etc/sysctl.d/" || die
+ echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/insight/insight-6.8.1-r1.ebuild b/dev-util/insight/insight-6.8.1-r1.ebuild
index b92c1e7aeb73..09433a02b99c 100644
--- a/dev-util/insight/insight-6.8.1-r1.ebuild
+++ b/dev-util/insight/insight-6.8.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="ftp://sources.redhat.com/pub/${PN}/releases/${MY_P}a.tar.bz2
LICENSE="GPL-2 LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="nls"
RDEPEND="
diff --git a/dev-util/meld/meld-3.14.2.ebuild b/dev-util/meld/meld-3.14.2.ebuild
index 97b12453e52d..bf465c68b4c3 100644
--- a/dev-util/meld/meld-3.14.2.ebuild
+++ b/dev-util/meld/meld-3.14.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://meldmerge.org/"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="${PYTHON_DEPS}
diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
index 4f7a368da203..264fd89c2892 100644
--- a/dev-util/pkgconfig/Manifest
+++ b/dev-util/pkgconfig/Manifest
@@ -1,2 +1,3 @@
DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
+DIST pkg-config-0.29.1.tar.gz 2013454 SHA256 beb43c9e064555469bd4390dcfd8030b1536e0aa103f08d7abf7ae8cac0cb001 SHA512 d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2 WHIRLPOOL 6e7ff88253a4ff2e5b8c7e07bd9b5ab9b78b7f13dfe3af0a8607a8a20205a2340d02a400857d43aca5265ddb299c889b4a71c0c840c2d1b0e956434eb1980341
DIST pkg-config-0.29.tar.gz 1973875 SHA256 c8507705d2a10c67f385d66ca2aae31e81770cc0734b4191eb8c489e864a006b SHA512 c2857cd67801c0db5d204912453ff6bdc7da3ea61f8b1c6b38983d48dffb958725e7723f909abbc057c7b34a85c27290eec6943808312a75909306076064aa63 WHIRLPOOL 06355dfebc42d3f090ffd02e0e680a0a1d74eb009f4d013f7fe6269d42964c1cdfc2d3ea6e82d3261b818c9b57d30f2c2c82042e97ea0da822875586ba20aa5d
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
new file mode 100644
index 000000000000..37d870612862
--- /dev/null
+++ b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856
+inherit eutils flag-o-matic libtool multilib multilib-minimal
+
+MY_P=pkg-config-${PV}
+
+if [[ ${PV} == *9999* ]]; then
+ # 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
+ # weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
+ WANT_AUTOMAKE=1.12
+ EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
+ EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
+ inherit autotools git-r3
+else
+ 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"
+ SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
+fi
+
+DESCRIPTION="Package config system that manages compile/link flags"
+HOMEPAGE="http://pkgconfig.freedesktop.org/wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="elibc_FreeBSD elibc_glibc hardened internal-glib"
+
+RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
+ !dev-util/pkgconf[pkg-config]
+ !dev-util/pkg-config-lite
+ !dev-util/pkgconfig-openbsd[pkg-config]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+ sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
+
+ eapply_user
+
+ if [[ ${PV} == *9999* ]]; then
+ eautoreconf
+ else
+ elibtoolize # Required for FreeMiNT wrt #333429
+ fi
+}
+
+multilib_src_configure() {
+ local myconf
+
+ if use internal-glib; then
+ myconf+=' --with-internal-glib'
+ # non-glibc platforms use GNU libiconv, but configure needs to
+ # know about that not to get confused when it finds something
+ # outside the prefix too
+ if use prefix && use !elibc_glibc ; then
+ myconf+=" --with-libiconv=gnu"
+ # add the libdir for libtool, otherwise it'll make love with system
+ # installed libiconv
+ append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
+ # the glib objects reference symbols from these frameworks,
+ # not good, esp. since Carbon should be deprecated
+ [[ ${CHOST} == *-darwin* ]] && \
+ append-ldflags -framework CoreFoundation -framework Carbon
+ fi
+ else
+ if ! has_version dev-util/pkgconfig; then
+ export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+ export GLIB_LIBS="-lglib-2.0"
+ fi
+ fi
+
+ use ppc64 && use hardened && replace-flags -O[2-3] -O1
+
+ # Force using all the requirements when linking, so that needed -pthread
+ # lines are inherited between libraries
+ use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
+
+ [[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
+
+ ECONF_SOURCE=${S} \
+ econf \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ --with-system-include-path="${EPREFIX}"/usr/include \
+ --with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
+ ${myconf}
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ if use prefix; then
+ # Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
+ # simplify cross-prefix builds
+ echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
+ doenvd "${T}"/99${PN}
+ fi
+}
diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
index 6829e0b89208..579ef6af0714 100644
--- a/dev-util/trinity/Manifest
+++ b/dev-util/trinity/Manifest
@@ -1 +1,2 @@
DIST trinity-1.5.tar.xz 171684 SHA256 e7b641d21954873bac7b5c27e7a9986837e83ec14fa20c55901c4333cce22655 SHA512 58884c8e226258de6037e06029b6c593a99b467e9b107562458557954fd4af185f88fbcacc04fc52f05318a860ebab4605c227e6a02b32253439807d4071cd8d WHIRLPOOL e737ac877b95a62e40a2cc9273f0b0d4dc79275b6dafab85b54815f1581c9c824189d88781cc26468c56166f6e87273fc5df1b786b69069b1dc4654d2a874f43
+DIST trinity-1.6.tar.xz 177808 SHA256 e40efa320ddc814943e90be0386b5052ce0bbbc457b3f308fa973669d393a6d9 SHA512 43ceb5ef96e97d3c338deb582b250202073d6f203ee596ce676d77a52bcfe06f53e068d07a0ee9f1d49f74319e24ba885cb7529d8868ac67f0237f2c4cfde2de WHIRLPOOL f7afe7514fe2ac2b6de3c4a05f8a4bb0bb7a328267c093e924e6345f03ffa864be06a3223b32c24ab4e334b016868f66696417d7de30d2561ea71a1a67f45183
diff --git a/dev-util/trinity/files/trinity-1.6-cflags.patch b/dev-util/trinity/files/trinity-1.6-cflags.patch
new file mode 100644
index 000000000000..9243619decdf
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.6-cflags.patch
@@ -0,0 +1,11 @@
+--- trinity-1.6/Makefile
++++ trinity-1.6/Makefile
+@@ -10,7 +10,7 @@
+ CC := $(CROSS_COMPILE)$(CC)
+ LD := $(CROSS_COMPILE)$(LD)
+
+-CFLAGS += -Wall -W -g -O2 -I. -Iinclude/ -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D__linux__
++CFLAGS += -Wall -W -I. -Iinclude/ -Wimplicit -D_GNU_SOURCE -D__linux__
+
+ # Only enabled during development, and on gcc 4.9+
+ CPP_MAJOR := $(shell $(CPP) -dumpversion 2>&1 | cut -d'.' -f1)
diff --git a/dev-util/trinity/trinity-1.6.ebuild b/dev-util/trinity/trinity-1.6.ebuild
new file mode 100644
index 000000000000..86d54f41a649
--- /dev/null
+++ b/dev-util/trinity/trinity-1.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A Linux system call fuzz tester"
+HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
+SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="
+ app-arch/xz-utils
+ sys-kernel/linux-headers
+"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-cflags.patch
+ tc-export CC
+}
+
+src_configure() {
+ ./configure.sh || die
+}
+
+src_compile() {
+ emake V=1
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc Documentation/* README
+
+ if use examples ; then
+ exeinto /usr/share/doc/${PF}/scripts
+ doexe scripts/*
+ docompress -x /usr/share/doc/${PF}/scripts
+ fi
+}
diff --git a/dev-vcs/git-num/Manifest b/dev-vcs/git-num/Manifest
new file mode 100644
index 000000000000..994b0c9c213f
--- /dev/null
+++ b/dev-vcs/git-num/Manifest
@@ -0,0 +1 @@
+DIST git-num-2.0.1.tar.gz 53833 SHA256 e8f0f80ad54b88e3653696e1ff8228f604f0a22c903d8b285afcbdbdac8494e4 SHA512 f35599a74b91efb3ccb6e8509ca1c7eb7c2f67cb90b131efc6693f8f36ea97adcb01026ad307746bdf0613200646da289aa315095cbae2580c4443b03e9dd040 WHIRLPOOL a2a7fdcea11e63136d97a7cf4da869988b51bb186c1912be1d6c8535c81cf847056d8ad8969b898f78f27d04053fff5b2d6b08bb3850ac6e1b2a6edfffd88d75
diff --git a/dev-vcs/git-num/git-num-2.0.1.ebuild b/dev-vcs/git-num/git-num-2.0.1.ebuild
new file mode 100644
index 000000000000..bd4e97b74979
--- /dev/null
+++ b/dev-vcs/git-num/git-num-2.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Quickly reference files in Git using numbers"
+HOMEPAGE="https://github.com/schreifels/git-num"
+SRC_URI="https://github.com/schreifels/git-num/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+ mkdir bin || die
+ mv git-num bin || die
+}
diff --git a/dev-vcs/git-num/metadata.xml b/dev-vcs/git-num/metadata.xml
new file mode 100644
index 000000000000..e4831e88daed
--- /dev/null
+++ b/dev-vcs/git-num/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>mrueg@gentoo.org</email>
+ <name>Manuel Rüger</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">schreifels/git-num</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-vcs/gitg/gitg-3.18.0.ebuild b/dev-vcs/gitg/gitg-3.18.0.ebuild
index 729bfdef8b53..74e0f8ab432d 100644
--- a/dev-vcs/gitg/gitg-3.18.0.ebuild
+++ b/dev-vcs/gitg/gitg-3.18.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="debug glade +python"
REQUIRED_USE="python? ( ^^ ( $(python_gen_useflags '*') ) )"
diff --git a/eclass/latex-package.eclass b/eclass/latex-package.eclass
index 171110171dd5..a17e5b389f72 100644
--- a/eclass/latex-package.eclass
+++ b/eclass/latex-package.eclass
@@ -71,6 +71,13 @@ TEXMF="/usr/share/texmf-site"
# DESCRIPTION above)
SUPPLIER="misc"
+# @ECLASS-VARIABLE: LATEX_DOC_ARGUMENTS
+# @DESCRIPTION:
+# When compiling documentation (.tex/.dtx), this variable will be passed
+# to pdflatex as additional argument (e.g. -shell-escape). This variable
+# must be set after inherit, as it gets automatically cleared otherwise.
+LATEX_DOC_ARGUMENTS=""
+
# Kept for backwards compatibility
latex-package_has_tetex_3() {
case ${EAPI:-0} in
@@ -128,8 +135,8 @@ latex-package_src_doinstall() {
for i in `find . -maxdepth 1 -type f -name "*.${1}"`
do
einfo "Making documentation: $i"
- if pdflatex --interaction=batchmode $i &> /dev/null ; then
- pdflatex --interaction=batchmode $i &> /dev/null || die
+ if pdflatex ${LATEX_DOC_ARGUMENTS} --interaction=batchmode $i &> /dev/null ; then
+ pdflatex ${LATEX_DOC_ARGUMENTS} --interaction=batchmode $i &> /dev/null || die
else
einfo "pdflatex failed, trying texi2dvi"
texi2dvi -q -c --language=latex $i &> /dev/null || die
diff --git a/games-action/openclonk/openclonk-7.0.ebuild b/games-action/openclonk/openclonk-7.0.ebuild
index 5fcb67a5c4ca..c3ac4ed0a2b3 100644
--- a/games-action/openclonk/openclonk-7.0.ebuild
+++ b/games-action/openclonk/openclonk-7.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.openclonk.org/builds/release/${PV}/openclonk-${PV}-src.tar.b
LICENSE="BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="dedicated doc"
RDEPEND="
diff --git a/games-arcade/gnome-nibbles/gnome-nibbles-3.18.2.ebuild b/games-arcade/gnome-nibbles/gnome-nibbles-3.18.2.ebuild
index 92f0904f1611..2f790a9ecb90 100644
--- a/games-arcade/gnome-nibbles/gnome-nibbles-3.18.2.ebuild
+++ b/games-arcade/gnome-nibbles/gnome-nibbles-3.18.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Nibbles"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="
diff --git a/games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild b/games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild
index ce5433864266..61ed5211b4f6 100644
--- a/games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild
+++ b/games-arcade/gnome-robots/gnome-robots-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Robots"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="
diff --git a/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild b/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild
index 6ca9645387b9..290600a37e54 100644
--- a/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild
+++ b/games-board/four-in-a-row/four-in-a-row-3.18.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Four-in-a-row"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="
diff --git a/games-board/gnome-chess/gnome-chess-3.18.0.ebuild b/games-board/gnome-chess/gnome-chess-3.18.0.ebuild
index 23e686927558..df1f5e1fd38d 100644
--- a/games-board/gnome-chess/gnome-chess-3.18.0.ebuild
+++ b/games-board/gnome-chess/gnome-chess-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Chess"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="
diff --git a/games-board/gnome-mahjongg/gnome-mahjongg-3.18.0.ebuild b/games-board/gnome-mahjongg/gnome-mahjongg-3.18.0.ebuild
index f297072c2ddc..a8cfd7a15ba9 100644
--- a/games-board/gnome-mahjongg/gnome-mahjongg-3.18.0.ebuild
+++ b/games-board/gnome-mahjongg/gnome-mahjongg-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Mahjongg"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="
diff --git a/games-board/gnome-mines/gnome-mines-3.18.2.ebuild b/games-board/gnome-mines/gnome-mines-3.18.2.ebuild
index 147a54be19fc..d9d965135908 100644
--- a/games-board/gnome-mines/gnome-mines-3.18.2.ebuild
+++ b/games-board/gnome-mines/gnome-mines-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Mines"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
COMMON_DEPEND="
diff --git a/games-board/iagno/iagno-3.18.2.ebuild b/games-board/iagno/iagno-3.18.2.ebuild
index bc814400a87c..d30aee50bb94 100644
--- a/games-board/iagno/iagno-3.18.2.ebuild
+++ b/games-board/iagno/iagno-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Iagno"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
COMMON_DEPEND="
diff --git a/games-board/pychess/Manifest b/games-board/pychess/Manifest
index 5910da123d9b..82b5cedfe34d 100644
--- a/games-board/pychess/Manifest
+++ b/games-board/pychess/Manifest
@@ -1,2 +1,3 @@
DIST pychess-0.10.1.tar.gz 1939605 SHA256 8a8ac9fc6a4605d189a9728f55183130b6a304cbf2dc5b2e923297303fe4ae8a SHA512 1000c840954b93bd3720fd3265b6cc0ac33df22373eb965d4ac03d16f7589af3b10bf2ebc28a2ff555b5e4101bffbfe96d52051e6c51a084229a3cc1691f1dd8 WHIRLPOOL 7554456eea487cefe3d8303aacdfa5748345b9682a8c557a2ed53090cc9a5beacc5b2e874db222b75fc03bcaf61dd9d7c3e2df23a13a4db820d4bd34c2f7b66e
DIST pychess-0.12.2.tar.gz 4653011 SHA256 feecabcea35cce0d69100e0c995f0a88d83d1246be512f2348c13e40bff9916e SHA512 d20ff665f47b58dce92ee822c6495fb31b84f19b15e70644cb7caefda837597e075f62cd0aa6bdd36f342d3eaa66174f9fa950800ec77346ef1cccfa7e37c735 WHIRLPOOL 0bca1361412f316f6446579646f1d51d525228a4427137711efdca01c75ed3c769fd83d0c4e942db36daa3dbc22e74dd5410c8a33c06a96458d0755a6fca0131
+DIST pychess-0.12.3.tar.gz 4666113 SHA256 11d5e2d447bb945283f0239a407d8069b13afd77d3a2d491c9c352f1b7862e67 SHA512 597fd4c28a970df0d2ce3805eedd7530e259c1b60dd4e51bf1c56eb2376fe6256df30f12b077db3c9f1aab8baed06f023696827b57fb0963b9569b613656d4af WHIRLPOOL 295bf01c221b273abc2a60cdfd77a399af75a2e9f2de43188ea744204dad39220f152d7667699290d88b7dd75b26b5262b513f8ab6a114bb171a702ba184319b
diff --git a/games-board/pychess/pychess-0.12.3.ebuild b/games-board/pychess/pychess-0.12.3.ebuild
new file mode 100644
index 000000000000..767d80cfd32a
--- /dev/null
+++ b/games-board/pychess/pychess-0.12.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit fdo-mime gnome2-utils distutils-r1 games
+
+DESCRIPTION="A chess client for Gnome"
+HOMEPAGE="http://pychess.org/"
+SRC_URI="http://pychess.org/download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gstreamer"
+
+DEPEND="dev-python/librsvg-python
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygobject:2[${PYTHON_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
+ gstreamer? ( dev-python/gst-python:0.10[${PYTHON_USEDEP}] )
+ dev-python/gconf-python
+ x11-themes/gnome-icon-theme"
+RDEPEND=${DEPEND}
+
+python_install() {
+ distutils-r1_python_install --install-scripts="${GAMES_BINDIR}"
+
+ # bug 487706
+ sed -i \
+ -e "s/@PYTHON@/${EPYTHON}/" \
+ "${ED%/}/$(python_get_sitedir)"/${PN}/Players/engineNest.py || die
+}
+
+python_install_all() {
+ DOCS="AUTHORS README.md" \
+ distutils-r1_python_install_all
+ prepgamesdirs
+}
+
+src_prepare() {
+ distutils-r1_src_prepare
+}
+
+src_compile() {
+ distutils-r1_src_compile
+}
+
+src_install() {
+ distutils-r1_src_install
+}
+
+pkg_preinst() {
+ games_pkg_preinst
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
diff --git a/games-board/tali/tali-3.18.0.ebuild b/games-board/tali/tali-3.18.0.ebuild
index 8b9394f02f67..5d481bee3783 100644
--- a/games-board/tali/tali-3.18.0.ebuild
+++ b/games-board/tali/tali-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tali"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index 33a6bf881323..b12563f7dd2f 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -139,7 +139,6 @@ src_configure() {
fi
local mycmakeargs=(
- "-DDOLPHIN_WC_REVISION=${PV}"
"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
"-Dprefix=${GAMES_PREFIX}"
"-Ddatadir=${GAMES_DATADIR}/${PN}"
@@ -174,7 +173,8 @@ src_install() {
dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
fi
- doicon Installer/dolphin-emu.xpm
+ doicon -s 48 Installer/dolphin-emu.png
+ doicon -s scalable Installer/dolphin-emu.svg
make_desktop_entry "dolphin-emu" "Dolphin Emulator" "dolphin-emu" "Game;Emulator;"
prepgamesdirs
diff --git a/games-fps/doomsday/doomsday-1.15.7.ebuild b/games-fps/doomsday/doomsday-1.15.7.ebuild
index cdd9e8051dd8..6e05e09380e6 100644
--- a/games-fps/doomsday/doomsday-1.15.7.ebuild
+++ b/games-fps/doomsday/doomsday-1.15.7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/deng/Doomsday%20Engine/${PV}/${PN}-stable-${PV}.ta
LICENSE="GPL-3+ LGPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="dedicated fluidsynth openal snowberry +doom demo freedoom heretic hexen resources tools"
# we need python at build time, so
# snowberry? ( ${PYTHON_REQUIRED_USE} )
diff --git a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
index bdde5080cbc8..1e01cc2950c0 100644
--- a/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2013.02.03.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sauerbraten/sauerbraten/2013_02_03/sauerbraten_${P
LICENSE="ZLIB freedist"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="debug dedicated server"
RDEPEND="
diff --git a/games-puzzle/five-or-more/five-or-more-3.18.0.ebuild b/games-puzzle/five-or-more/five-or-more-3.18.0.ebuild
index ae3f99e4a745..fa6bc6fa0d3c 100644
--- a/games-puzzle/five-or-more/five-or-more-3.18.0.ebuild
+++ b/games-puzzle/five-or-more/five-or-more-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Five%20or%20more"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
COMMON_DEPEND="
diff --git a/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild b/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild
index dbf478873464..8bc657d71635 100644
--- a/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild
+++ b/games-puzzle/gnome-klotski/gnome-klotski-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Klotski"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="
diff --git a/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild b/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild
index 3141af6a0ad1..c28356571bc1 100644
--- a/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild
+++ b/games-puzzle/gnome-sudoku/gnome-sudoku-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Sudoku"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
# fixed vala & gtk+ from gnome-3.16 branch
diff --git a/games-puzzle/gnome-taquin/gnome-taquin-3.18.2.ebuild b/games-puzzle/gnome-taquin/gnome-taquin-3.18.2.ebuild
index 1119c5955504..6cb09870a34b 100644
--- a/games-puzzle/gnome-taquin/gnome-taquin-3.18.2.ebuild
+++ b/games-puzzle/gnome-taquin/gnome-taquin-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Taquin"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/games-puzzle/gnome-tetravex/gnome-tetravex-3.18.0.ebuild b/games-puzzle/gnome-tetravex/gnome-tetravex-3.18.0.ebuild
index 5b65ff7a0063..88f7b74d1fff 100644
--- a/games-puzzle/gnome-tetravex/gnome-tetravex-3.18.0.ebuild
+++ b/games-puzzle/gnome-tetravex/gnome-tetravex-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Tetravex"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="
diff --git a/games-puzzle/hitori/hitori-3.16.2.ebuild b/games-puzzle/hitori/hitori-3.16.2.ebuild
index c49dee8548a5..bbc70712cf9b 100644
--- a/games-puzzle/hitori/hitori-3.16.2.ebuild
+++ b/games-puzzle/hitori/hitori-3.16.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="
diff --git a/games-puzzle/lightsoff/lightsoff-3.18.0.ebuild b/games-puzzle/lightsoff/lightsoff-3.18.0.ebuild
index c03826800fae..dd4f8a288477 100644
--- a/games-puzzle/lightsoff/lightsoff-3.18.0.ebuild
+++ b/games-puzzle/lightsoff/lightsoff-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Lightsoff"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="
diff --git a/games-puzzle/quadrapassel/quadrapassel-3.18.0.ebuild b/games-puzzle/quadrapassel/quadrapassel-3.18.0.ebuild
index be61444993d7..43419e824a6d 100644
--- a/games-puzzle/quadrapassel/quadrapassel-3.18.0.ebuild
+++ b/games-puzzle/quadrapassel/quadrapassel-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Quadrapassel"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="
diff --git a/games-puzzle/swell-foop/swell-foop-3.18.1.ebuild b/games-puzzle/swell-foop/swell-foop-3.18.1.ebuild
index 33ebd862168f..065624f82e6b 100644
--- a/games-puzzle/swell-foop/swell-foop-3.18.1.ebuild
+++ b/games-puzzle/swell-foop/swell-foop-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Swell%20Foop"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="
diff --git a/games-puzzle/xbomb/xbomb-2.2b.ebuild b/games-puzzle/xbomb/xbomb-2.2b.ebuild
index 19a9d672ed33..facae6b4fbac 100644
--- a/games-puzzle/xbomb/xbomb-2.2b.ebuild
+++ b/games-puzzle/xbomb/xbomb-2.2b.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.gedanken.org.uk/software/xbomb/download/${P}.tgz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
IUSE=""
DEPEND="x11-libs/libXaw"
diff --git a/gnome-base/dconf-editor/dconf-editor-3.18.2.ebuild b/gnome-base/dconf-editor/dconf-editor-3.18.2.ebuild
index a144e6cadfae..16955cf5eb06 100644
--- a/gnome-base/dconf-editor/dconf-editor-3.18.2.ebuild
+++ b/gnome-base/dconf-editor/dconf-editor-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/dconf-editor"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
COMMON_DEPEND="
>=dev-libs/glib-2.39.3:2
diff --git a/gnome-base/gconf/gconf-3.2.6-r4.ebuild b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
index a1f1fe1872cf..51e0e553e8be 100644
--- a/gnome-base/gconf/gconf-3.2.6-r4.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-r4.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://projects.gnome.org/gconf/"
LICENSE="LGPL-2+"
SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="debug +introspection ldap policykit"
RDEPEND="
diff --git a/gnome-base/gdm/gdm-3.18.2.ebuild b/gnome-base/gdm/gdm-3.18.2.ebuild
index b52aa88557c2..6c0a33a98fd8 100644
--- a/gnome-base/gdm/gdm-3.18.2.ebuild
+++ b/gnome-base/gdm/gdm-3.18.2.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
IUSE="accessibility audit branding fprint +introspection ipv6 plymouth selinux smartcard tcpd test wayland xinerama"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
# NOTE: x11-base/xorg-server dep is for X_SERVER_PATH etc, bug #295686
# nspr used by smartcard extension
diff --git a/gnome-base/gnome-common/gnome-common-3.18.0.ebuild b/gnome-base/gnome-common/gnome-common-3.18.0.ebuild
index 515b9cf0e677..c20b3726a054 100644
--- a/gnome-base/gnome-common/gnome-common-3.18.0.ebuild
+++ b/gnome-base/gnome-common/gnome-common-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-common"
LICENSE="GPL-3"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~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 ~x64-solaris ~x86-solaris"
IUSE="+autoconf-archive"
RDEPEND="autoconf-archive? ( >=sys-devel/autoconf-archive-2015.02.04 )
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
index 714ffc27fd63..8af818fd1bab 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
LICENSE="GPL-2+"
SLOT="2"
IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
# False positives caused by nested configure scripts
QA_CONFIGURE_OPTIONS=".*"
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.18.0.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.18.0.ebuild
index ef4c5052b4ea..73b8730a094d 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.18.0.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.18.0.ebuild
@@ -12,7 +12,7 @@ IUSE="+bluetooth +cdr cups"
# when unmasking for an arch
# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
# Note to developers:
# This is a wrapper for the core apps tightly integrated with GNOME 3
diff --git a/gnome-base/gnome-core-libs/gnome-core-libs-3.18.0.ebuild b/gnome-base/gnome-core-libs/gnome-core-libs-3.18.0.ebuild
index dae9c7f9157b..e139d3342788 100644
--- a/gnome-base/gnome-core-libs/gnome-core-libs-3.18.0.ebuild
+++ b/gnome-base/gnome-core-libs/gnome-core-libs-3.18.0.ebuild
@@ -12,7 +12,7 @@ IUSE="cups python"
# when unmasking for an arch
# double check none of the deps are still masked !
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
# Note to developers:
# This is a wrapper for the core libraries used by GNOME 3
diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild
index 0151f31e0ce8..189e0b005edb 100644
--- a/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild
+++ b/gnome-base/gnome-desktop/gnome-desktop-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-desktop"
LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
SLOT="3/12" # subslot = libgnome-desktop-3 soname version
IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
# cairo[X] needed for gnome-bg
COMMON_DEPEND="
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0-r2.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0-r2.ebuild
new file mode 100644
index 000000000000..bf91585b28a8
--- /dev/null
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+DESCRIPTION="Sub-meta package for the applications of GNOME 3"
+HOMEPAGE="https://www.gnome.org/"
+LICENSE="metapackage"
+SLOT="3.0"
+IUSE="+games +share +shotwell +tracker"
+
+# when unmasking for an arch
+# double check none of the deps are still masked !
+KEYWORDS="~amd64 ~x86"
+
+# Note to developers:
+# This is a wrapper for the extra apps integrated with GNOME 3
+# New package
+#
+# cantarell upstream relies on noto, unifont and symbola fonts for
+# the fonts they cannot handle due to lack of enough manpower:
+# https://bugzilla.gnome.org/show_bug.cgi?id=762890
+RDEPEND="
+ >=gnome-base/gnome-core-libs-${PV}
+
+ >=app-admin/gnome-system-log-3.9.90
+ >=app-arch/file-roller-3.16.4
+ >=app-dicts/gnome-dictionary-${PV}
+ >=gnome-base/dconf-editor-${PV}
+ >=gnome-extra/gconf-editor-3
+ >=gnome-extra/gnome-calculator-${PV}
+ >=gnome-extra/gnome-calendar-${PV}
+ >=gnome-extra/gnome-characters-${PV}
+ >=gnome-extra/gnome-power-manager-${PV}
+ >=gnome-extra/gnome-search-tool-3.6
+ >=gnome-extra/gnome-system-monitor-${PV}
+ >=gnome-extra/gnome-tweak-tool-${PV}
+ >=gnome-extra/gnome-weather-${PV}
+ >=gnome-extra/gucharmap-${PV}:2.90
+ >=gnome-extra/nautilus-sendto-3.8.2
+ >=gnome-extra/sushi-${PV}
+ >=mail-client/evolution-${PV}
+ >=media-gfx/gnome-font-viewer-3.16.2
+ >=media-gfx/gnome-screenshot-${PV}
+ >=media-sound/sound-juicer-${PV}
+ >=media-video/cheese-${PV}
+ >=net-analyzer/gnome-nettool-3.8
+ >=net-misc/vinagre-${PV}
+ >=net-misc/vino-${PV}
+ >=sys-apps/baobab-${PV}
+ >=sys-apps/gnome-disk-utility-${PV}
+ >=www-client/epiphany-${PV}
+
+ >=media-fonts/noto-20160305
+ >=media-fonts/symbola-8.00
+ >=media-fonts/unifont-8.0.01
+
+ games? (
+ >=games-arcade/gnome-nibbles-${PV}
+ >=games-arcade/gnome-robots-${PV}
+ >=games-board/four-in-a-row-${PV}
+ >=games-board/gnome-chess-${PV}
+ >=games-board/gnome-mahjongg-${PV}
+ >=games-board/gnome-mines-${PV}
+ >=games-board/iagno-${PV}
+ >=games-board/tali-${PV}
+ >=games-puzzle/five-or-more-${PV}
+ >=games-puzzle/gnome-klotski-${PV}
+ >=games-puzzle/gnome-sudoku-${PV}
+ >=games-puzzle/gnome-taquin-${PV}
+ >=games-puzzle/gnome-tetravex-${PV}
+ >=games-puzzle/hitori-3.16.2
+ >=games-puzzle/lightsoff-${PV}
+ >=games-puzzle/quadrapassel-${PV}
+ >=games-puzzle/swell-foop-${PV} )
+ share? ( >=gnome-extra/gnome-user-share-${PV} )
+ shotwell? ( >=media-gfx/shotwell-0.22 )
+ tracker? (
+ >=app-misc/tracker-1.6
+ >=gnome-extra/gnome-documents-${PV}
+ >=media-gfx/gnome-photos-${PV}
+ >=media-sound/gnome-music-${PV} )
+"
+DEPEND=""
+S=${WORKDIR}
diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0.ebuild
index 338685d4dd49..d460d88a24a2 100644
--- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0.ebuild
+++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.18.0.ebuild
@@ -12,7 +12,7 @@ IUSE="+games +share +shotwell +tracker"
# when unmasking for an arch
# double check none of the deps are still masked !
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
# Note to developers:
# This is a wrapper for the extra apps integrated with GNOME 3
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.18.3.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.18.3.ebuild
index 8633663a55ec..e7b4606d2512 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.18.3.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.18.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeKeyring"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+caps pam selinux +ssh-agent test"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
# Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
COMMON_DEPEND="
diff --git a/gnome-base/gnome-light/gnome-light-3.18.0.ebuild b/gnome-base/gnome-light/gnome-light-3.18.0.ebuild
index 9a88dd6ca543..31ad34aa7267 100644
--- a/gnome-base/gnome-light/gnome-light-3.18.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.18.0.ebuild
@@ -12,7 +12,7 @@ IUSE="cups +gnome-shell"
# when unmasking for an arch
# double check none of the deps are still masked !
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
# XXX: Note to developers:
# This is a wrapper for the 'light' GNOME 3 desktop, and should only consist of
diff --git a/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild b/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
index 718d22641642..3e61051bd4d0 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.13.3-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-menus"
LICENSE="GPL-2+ LGPL-2+"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="+introspection test"
diff --git a/gnome-base/gnome-session/gnome-session-3.18.1.2.ebuild b/gnome-base/gnome-session/gnome-session-3.18.1.2.ebuild
index 5c7bea4ce1a7..201bf5288599 100644
--- a/gnome-base/gnome-session/gnome-session-3.18.1.2.ebuild
+++ b/gnome-base/gnome-session/gnome-session-3.18.1.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-session"
LICENSE="GPL-2 LGPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="doc elibc_FreeBSD ipv6 systemd"
# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.2.ebuild
index 429147429578..3efe02b7dc67 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.18.2.ebuild
@@ -20,7 +20,7 @@ REQUIRED_USE="
smartcard? ( udev )
test? ( ${PYTHON_REQUIRED_USE} )
"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
COMMON_DEPEND="
>=dev-libs/glib-2.37.7:2[dbus]
diff --git a/gnome-base/gnome-shell/gnome-shell-3.18.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.18.3.ebuild
index f51bd3fc0324..6410a0dcfcae 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.18.3.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.18.3.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+bluetooth +networkmanager +nls -openrc-force"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
# libXfixes-5.0 needed for pointer barriers
# FIXME:
diff --git a/gnome-base/gnome/gnome-3.18.0.ebuild b/gnome-base/gnome/gnome-3.18.0.ebuild
index 929513a565ad..f8b73ac36a74 100644
--- a/gnome-base/gnome/gnome-3.18.0.ebuild
+++ b/gnome-base/gnome/gnome-3.18.0.ebuild
@@ -12,7 +12,7 @@ SLOT="2.0" # Cannot be installed at the same time as gnome-2
# when unmasking for an arch
# double check none of the deps are still masked !
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
IUSE="accessibility +bluetooth +classic +cdr cups +extras"
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.1.ebuild
index ee9a32769b96..b17d6e97f67a 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.31:2
diff --git a/gnome-base/gvfs/gvfs-1.26.3.ebuild b/gnome-base/gvfs/gvfs-1.26.3.ebuild
index 792fb6983257..e59b899246b7 100644
--- a/gnome-base/gvfs/gvfs-1.26.3.ebuild
+++ b/gnome-base/gvfs/gvfs-1.26.3.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
udisks? ( udev )
systemd? ( udisks )
"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
# Can use libgphoto-2.5.0 as well. Automagic detection.
RDEPEND="
diff --git a/gnome-base/libgtop/libgtop-2.32.0.ebuild b/gnome-base/libgtop/libgtop-2.32.0.ebuild
index 1dcc15316387..7f0c86424d33 100644
--- a/gnome-base/libgtop/libgtop-2.32.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.32.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
LICENSE="GPL-2"
SLOT="2/10" # libgtop soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE="+introspection"
RDEPEND=">=dev-libs/glib-2.26:2"
diff --git a/gnome-base/librsvg/librsvg-2.40.13.ebuild b/gnome-base/librsvg/librsvg-2.40.13.ebuild
index 9615467ff2da..fa04d8aff78d 100644
--- a/gnome-base/librsvg/librsvg-2.40.13.ebuild
+++ b/gnome-base/librsvg/librsvg-2.40.13.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/LibRsvg"
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 ~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 ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+introspection vala tools"
REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-base/nautilus/nautilus-3.18.5.ebuild b/gnome-base/nautilus/nautilus-3.18.5.ebuild
index 82561ef9e588..6809ba6522c5 100644
--- a/gnome-base/nautilus/nautilus-3.18.5.ebuild
+++ b/gnome-base/nautilus/nautilus-3.18.5.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
SLOT="0"
IUSE="exif gnome +introspection packagekit +previewer selinux sendto tracker xmp"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
# FIXME: tests fails under Xvfb, but pass when building manually
# "FAIL: check failed in nautilus-file.c, line 8307"
diff --git a/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild b/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
index 53b4a9213af8..cd644081800f 100644
--- a/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
+++ b/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.kdau.com/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
IUSE=""
RDEPEND="
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
index f1ff33df81aa..e5747f6de330 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-control-center/archive/${PV}.tar.
LICENSE="GPL-2+"
SLOT="0"
IUSE="+colord +cups input_devices_wacom"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
# False positives caused by nested configure scripts
QA_CONFIGURE_OPTIONS=".*"
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.0.ebuild
index 9e6068aaee60..d62c8da72305 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.0.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-desktop/archive/${PV}.tar.gz -> $
LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
SLOT="0/4" # subslot = libcinnamon-desktop soname version
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+introspection systemd"
COMMON_DEPEND="
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild
index e53cb629f89d..794c5648d567 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-menus/archive/${PV}.tar.gz -> ${P
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+introspection"
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
index 902bda93f792..8b0d4a7909cd 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-screensaver/archive/${PV}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
IUSE="doc pam systemd"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
COMMON_DEPEND="
>=dev-libs/glib-2.37.3:2[dbus]
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
index f9d700a6bca9..75c495d0e8f3 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-session/archive/${PV}.tar.gz -> $
LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc ipv6 systemd"
COMMON_DEPEND="
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
index 9caab862e317..4d7a659dbb87 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-settings-daemon/archive/${PV}.tar
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+colord cups input_devices_wacom smartcard systemd"
# udev is non-optional since lots of plugins, not just gudev, pull it in
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild
index 8dd62f7be62a..6e67a21a28f8 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/cinnamon-translations/archive/${PV}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND=""
diff --git a/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
index 5452e342014f..6601403ace81 100644
--- a/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.8.6.ebuild
@@ -30,7 +30,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
|| ( python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
COMMON_DEPEND="
app-accessibility/at-spi2-atk:2
diff --git a/gnome-extra/cjs/cjs-2.8.0.ebuild b/gnome-extra/cjs/cjs-2.8.0.ebuild
index 902f86491dc1..b7c2cade7bfb 100644
--- a/gnome-extra/cjs/cjs-2.8.0.ebuild
+++ b/gnome-extra/cjs/cjs-2.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
SLOT="0"
IUSE="+cairo examples gtk test"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-lang/spidermonkey:24
diff --git a/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild b/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
index 459be20bb30a..157a0aff741e 100644
--- a/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
+++ b/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://rofi.roger-ferrer.org/eiciel/download/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="xattr"
RDEPEND="
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.18.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.18.5.ebuild
index 091471e1cee2..bafbc08a524d 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.18.5.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.18.5.ebuild
@@ -20,7 +20,7 @@ SLOT="0/54" # subslot = libcamel-1.2 soname version
IUSE="api-doc-extras +berkdb +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
# sys-libs/db is only required for migrating from <3.13 versions
# gdata-0.15.1 is required for google tasks
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.18.5.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.18.5.ebuild
index f8320ee5200d..e2bcc43a07e5 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.18.5.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.18.5.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND="
diff --git a/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild b/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
index 8c3413245036..d685a364e2a5 100644
--- a/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
+++ b/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+introspection python vala"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.18.3.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.18.3.ebuild
index e3e9533c6ae3..445b75b52ccd 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.18.3.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.18.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calculator"
LICENSE="GPL-2"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
COMMON_DEPEND="
>=dev-libs/glib-2.40:2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild
index 60a80692daa0..6e8e8097847a 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.18.2.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Calendar"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
# >=libical-1.0.1 for https://bugzilla.gnome.org/show_bug.cgi?id=751244
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild
index 44fe15b38634..4bcdfc90c73d 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/CharacterMap"
LICENSE="GPL-2 BSD"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND="
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild
index b5fcfd15a44f..c4ed0d41c09e 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Clocks"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild
index 6369b2b5384e..f8849da532a3 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-color-manager"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="packagekit raw"
# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.18.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.18.1.ebuild
index 50d80ec7c195..621c0ab30b7f 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.18.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.18.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Contacts"
LICENSE="GPL-2+"
SLOT="0"
IUSE="v4l"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
VALA_DEPEND="
$(vala_depend)
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.18.2-r1.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.18.2-r1.ebuild
index 8521ad266d68..4d32372c3b02 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.18.2-r1.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.18.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Documents"
LICENSE="GPL-2+"
SLOT="0"
IUSE=""
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
# Need gdk-pixbuf-2.25 for gdk_pixbuf_get_pixels_with_length
COMMON_DEPEND="
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.2.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.2.ebuild
index 91424da1359b..b7985fda6946 100644
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.2.ebuild
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.18.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://help.gnome.org/"
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
RDEPEND="gnome-extra/gnome-user-docs"
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild
index 03c180487939..05b32c249ec0 100644
--- a/gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild
+++ b/gnome-extra/gnome-logs/gnome-logs-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Logs"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND="
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild
index c288e7f49be6..417288b6f69c 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://projects.gnome.org/gnome-power-manager/"
LICENSE="GPL-2"
SLOT="0"
IUSE="test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
COMMON_DEPEND="
>=dev-libs/glib-2.45.8:2
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.3.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.3.ebuild
index e8cc601bce16..5fbc73b438d7 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.3.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.18.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell/Extensions"
LICENSE="GPL-2"
SLOT="0"
IUSE="examples"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
COMMON_DEPEND="
>=dev-libs/glib-2.26:2
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild
index 75f42adead3e..7772948f5192 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://frippery.org/extensions/${P}.tgz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.2.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.2.ebuild
index 80e7fe9dace4..d79c3c0b7396 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.2.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/"
LICENSE="GPL-2"
SLOT="0"
IUSE="systemd X"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
RDEPEND="
>=dev-libs/glib-2.37.3:2
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r1.ebuild
index 58ad6438717e..6c3fc650fc27 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r1.ebuild
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.18.1-r1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
# Newer pygobject needed due upstream bug #723951
COMMON_DEPEND="
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild
index 949c77c6e549..010662395a0a 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs"
LICENSE="CC-BY-3.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="test"
RDEPEND=""
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild
index f038e821ffde..94abf39504b1 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-user-share"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
# FIXME: could libnotify be made optional ?
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild
index 1d3d892c31fe..55cbd050745d 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/Weather"
LICENSE="GPL-2+ LGPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND="
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
index 4a97faf8d573..7f9522bdf0c4 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gtkhtml"
LICENSE="GPL-2+ LGPL-2+"
SLOT="4.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
IUSE=""
# orbit is referenced in configure, but is not used anywhere else
diff --git a/gnome-extra/gucharmap/gucharmap-3.18.2.ebuild b/gnome-extra/gucharmap/gucharmap-3.18.2.ebuild
index 87bc0a1b28de..01eb43d9d2c7 100644
--- a/gnome-extra/gucharmap/gucharmap-3.18.2.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gucharmap"
LICENSE="GPL-3"
SLOT="2.90"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE="cjk +introspection test vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/gnome-extra/libgda/libgda-5.2.4-r1.ebuild b/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
index 082ba4575c48..064ca8b361a4 100644
--- a/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
# firebird license is not GPL compatible
SLOT="5/4" # subslot = libgda-5.0 soname version
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
RDEPEND="
app-text/iso-codes
diff --git a/gnome-extra/libgsf/libgsf-1.14.36.ebuild b/gnome-extra/libgsf/libgsf-1.14.36.ebuild
index 38c8e3383d1f..92c5dc2010b9 100644
--- a/gnome-extra/libgsf/libgsf-1.14.36.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.36.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://developer.gnome.org/gsf/"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0/114" # libgsf-1.so version
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 gtk +introspection"
RDEPEND="
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild
index c8eb8043ccf4..d61fef519988 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/nautilus-sendto/"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND="
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.1.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.1.ebuild
index 9f96299b4dc1..c5784a9b0e58 100644
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.1.ebuild
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.6.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Tracker"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
COMMON_DEPEND="
diff --git a/gnome-extra/nemo/nemo-2.8.6.ebuild b/gnome-extra/nemo/nemo-2.8.6.ebuild
index 383e1b776699..5a4d4eef0563 100644
--- a/gnome-extra/nemo/nemo-2.8.6.ebuild
+++ b/gnome-extra/nemo/nemo-2.8.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/linuxmint/nemo/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2+ LGPL-2+ FDL-1.1"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="exif +introspection +nls packagekit tracker xmp"
COMMON_DEPEND="
diff --git a/gnome-extra/nm-applet/nm-applet-1.0.10.ebuild b/gnome-extra/nm-applet/nm-applet-1.0.10.ebuild
index 1eb3f3c92fbb..fd1e47be0788 100644
--- a/gnome-extra/nm-applet/nm-applet-1.0.10.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.0.10.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
LICENSE="GPL-2+"
SLOT="0"
IUSE="bluetooth +introspection modemmanager"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="
app-crypt/libsecret
diff --git a/gnome-extra/sushi/sushi-3.18.0.ebuild b/gnome-extra/sushi/sushi-3.18.0.ebuild
index 6c483facc76f..9ed7234fc150 100644
--- a/gnome-extra/sushi/sushi-3.18.0.ebuild
+++ b/gnome-extra/sushi/sushi-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/sushi"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="office"
# Optional app-office/unoconv support (OOo to pdf)
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-3.18.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.18.1.ebuild
index 5b77b6ea154b..86c2b3026f75 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.18.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/yelp-xsl"
LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
RDEPEND="
>=dev-libs/libxml2-2.6.12:=
diff --git a/gnome-extra/yelp/yelp-3.18.1-r1.ebuild b/gnome-extra/yelp/yelp-3.18.1-r1.ebuild
index 3f8f65b6be80..eb14fd92bbcc 100644
--- a/gnome-extra/yelp/yelp-3.18.1-r1.ebuild
+++ b/gnome-extra/yelp/yelp-3.18.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
LICENSE="GPL-2+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
RDEPEND="
app-arch/bzip2:=
diff --git a/gnome-extra/zenity/zenity-3.18.1.1.ebuild b/gnome-extra/zenity/zenity-3.18.1.1.ebuild
index 4936d5956989..c973532d30b2 100644
--- a/gnome-extra/zenity/zenity-3.18.1.1.ebuild
+++ b/gnome-extra/zenity/zenity-3.18.1.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Zenity"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="libnotify test webkit"
RDEPEND="
diff --git a/kde-apps/akonadiconsole/akonadiconsole-4.14.10.ebuild b/kde-apps/akonadiconsole/akonadiconsole-4.14.10.ebuild
index 773ff3d54b42..0e562cb561a7 100644
--- a/kde-apps/akonadiconsole/akonadiconsole-4.14.10.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-4.14.10.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-apps/akregator/akregator-4.14.10.ebuild b/kde-apps/akregator/akregator-4.14.10.ebuild
index cd35b0a1475a..70bb11967068 100644
--- a/kde-apps/akregator/akregator-4.14.10.ebuild
+++ b/kde-apps/akregator/akregator-4.14.10.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-apps/amor/amor-15.08.3.ebuild b/kde-apps/amor/amor-15.08.3.ebuild
index 584f546aed65..e2e692c3c8da 100644
--- a/kde-apps/amor/amor-15.08.3.ebuild
+++ b/kde-apps/amor/amor-15.08.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
inherit kde4-base
DESCRIPTION="KDE: Amusing Misuse Of Resources - desktop-dwelling creature"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="x11-libs/libX11
diff --git a/kde-apps/attica/attica-15.08.3.ebuild b/kde-apps/attica/attica-15.08.3.ebuild
index 90dcbedba715..30cdd179a905 100644
--- a/kde-apps/attica/attica-15.08.3.ebuild
+++ b/kde-apps/attica/attica-15.08.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="Open Collaboration Services provider management"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/audiocd-kio/audiocd-kio-15.08.3.ebuild b/kde-apps/audiocd-kio/audiocd-kio-15.08.3.ebuild
index e59b4cefa9a1..08b9903415a5 100644
--- a/kde-apps/audiocd-kio/audiocd-kio-15.08.3.ebuild
+++ b/kde-apps/audiocd-kio/audiocd-kio-15.08.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
inherit kde4-base
DESCRIPTION="KDE kioslaves from the kdemultimedia package"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug flac vorbis"
DEPEND="
diff --git a/kde-apps/blogilo/blogilo-4.14.10.ebuild b/kde-apps/blogilo/blogilo-4.14.10.ebuild
index fc65a4f8b61a..29f9567dd2ec 100644
--- a/kde-apps/blogilo/blogilo-4.14.10.ebuild
+++ b/kde-apps/blogilo/blogilo-4.14.10.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-apps/calendarjanitor/calendarjanitor-4.14.10.ebuild b/kde-apps/calendarjanitor/calendarjanitor-4.14.10.ebuild
index bf027dfa27b6..388030383eac 100644
--- a/kde-apps/calendarjanitor/calendarjanitor-4.14.10.ebuild
+++ b/kde-apps/calendarjanitor/calendarjanitor-4.14.10.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-apps/cervisia/cervisia-15.08.3.ebuild b/kde-apps/cervisia/cervisia-15.08.3.ebuild
index f71fc3061a98..042a0e61d207 100644
--- a/kde-apps/cervisia/cervisia-15.08.3.ebuild
+++ b/kde-apps/cervisia/cervisia-15.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="A KDE CVS frontend"
HOMEPAGE="https://www.kde.org/applications/development/cervisia"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
RDEPEND="
diff --git a/kde-apps/dolphin/dolphin-4.14.3-r1.ebuild b/kde-apps/dolphin/dolphin-4.14.3-r1.ebuild
index ae6d9f7cb132..198fa72401f3 100644
--- a/kde-apps/dolphin/dolphin-4.14.3-r1.ebuild
+++ b/kde-apps/dolphin/dolphin-4.14.3-r1.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
DESCRIPTION="A KDE filemanager focusing on usability"
HOMEPAGE="https://dolphin.kde.org https://www.kde.org/applications/system/dolphin"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug semantic-desktop thumbnail"
DEPEND="
diff --git a/kde-apps/drkonqi/drkonqi-15.08.3.ebuild b/kde-apps/drkonqi/drkonqi-15.08.3.ebuild
index 8732efad5a74..e842a6362f30 100644
--- a/kde-apps/drkonqi/drkonqi-15.08.3.ebuild
+++ b/kde-apps/drkonqi/drkonqi-15.08.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.3.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.3.ebuild
index 792e865cfd27..04bfcc40c77a 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.3.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-15.08.3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit kde4-base
DESCRIPTION="FFmpeg based thumbnail generator for video files"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/gpgmepp/gpgmepp-4.14.10.ebuild b/kde-apps/gpgmepp/gpgmepp-4.14.10.ebuild
index 49fc3e83f179..a74982de3f6a 100644
--- a/kde-apps/gpgmepp/gpgmepp-4.14.10.ebuild
+++ b/kde-apps/gpgmepp/gpgmepp-4.14.10.ebuild
@@ -9,7 +9,7 @@ EGIT_BRANCH="KDE/4.14"
inherit kde4-base
DESCRIPTION="C++ bindings for gpgme"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
LICENSE="LGPL-2.1"
IUSE="debug"
diff --git a/kde-apps/jovie/jovie-15.08.3.ebuild b/kde-apps/jovie/jovie-15.08.3.ebuild
index b03a612a8d3b..456aba91d3ae 100644
--- a/kde-apps/jovie/jovie-15.08.3.ebuild
+++ b/kde-apps/jovie/jovie-15.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="Jovie is a text to speech application"
HOMEPAGE="https://www.kde.org/applications/utilities/jovie/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/juk/juk-15.08.3.ebuild b/kde-apps/juk/juk-15.08.3.ebuild
index 673ca6787df4..371c74df63bc 100644
--- a/kde-apps/juk/juk-15.08.3.ebuild
+++ b/kde-apps/juk/juk-15.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="Jukebox and music manager for KDE"
HOMEPAGE="https://www.kde.org/applications/multimedia/juk/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kabcclient/kabcclient-4.14.10.ebuild b/kde-apps/kabcclient/kabcclient-4.14.10.ebuild
index 65cb44161468..254af0417a3e 100644
--- a/kde-apps/kabcclient/kabcclient-4.14.10.ebuild
+++ b/kde-apps/kabcclient/kabcclient-4.14.10.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-apps/kaccessible/kaccessible-15.08.3.ebuild b/kde-apps/kaccessible/kaccessible-15.08.3.ebuild
index 7ae0eee01891..d9b5b4174086 100644
--- a/kde-apps/kaccessible/kaccessible-15.08.3.ebuild
+++ b/kde-apps/kaccessible/kaccessible-15.08.3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit kde4-base
DESCRIPTION="Provides accessibility services like focus tracking"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug +speechd"
DEPEND="speechd? ( app-accessibility/speech-dispatcher )"
diff --git a/kde-apps/kaddressbook/kaddressbook-4.14.10.ebuild b/kde-apps/kaddressbook/kaddressbook-4.14.10.ebuild
index a4e0e45960ba..ea6441766968 100644
--- a/kde-apps/kaddressbook/kaddressbook-4.14.10.ebuild
+++ b/kde-apps/kaddressbook/kaddressbook-4.14.10.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-apps/kajongg/kajongg-15.08.3.ebuild b/kde-apps/kajongg/kajongg-15.08.3.ebuild
index 9489b49f9b21..512b16f296d8 100644
--- a/kde-apps/kajongg/kajongg-15.08.3.ebuild
+++ b/kde-apps/kajongg/kajongg-15.08.3.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 kde4-base
DESCRIPTION="The classical Mah Jongg for four players"
HOMEPAGE="https://www.kde.org/applications/games/kajongg/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/kde-apps/kalarm/kalarm-4.14.10.ebuild b/kde-apps/kalarm/kalarm-4.14.10.ebuild
index c6104974ab89..47ee59d9137b 100644
--- a/kde-apps/kalarm/kalarm-4.14.10.ebuild
+++ b/kde-apps/kalarm/kalarm-4.14.10.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-apps/kamera/kamera-15.08.3.ebuild b/kde-apps/kamera/kamera-15.08.3.ebuild
index f74d5de7a068..c87c1e276a28 100644
--- a/kde-apps/kamera/kamera-15.08.3.ebuild
+++ b/kde-apps/kamera/kamera-15.08.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
inherit kde4-base
DESCRIPTION="KDE digital camera manager"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kcachegrind/kcachegrind-15.08.3.ebuild b/kde-apps/kcachegrind/kcachegrind-15.08.3.ebuild
index b5aa15716956..2bde9a8b7186 100644
--- a/kde-apps/kcachegrind/kcachegrind-15.08.3.ebuild
+++ b/kde-apps/kcachegrind/kcachegrind-15.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-base
DESCRIPTION="KDE Frontend for Cachegrind"
HOMEPAGE="https://www.kde.org/applications/development/kcachegrind
http://kcachegrind.sourceforge.net"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
RDEPEND="
diff --git a/kde-apps/kcmshell/kcmshell-15.08.3.ebuild b/kde-apps/kcmshell/kcmshell-15.08.3.ebuild
index d7de1aafba0f..3430dfc57f77 100644
--- a/kde-apps/kcmshell/kcmshell-15.08.3.ebuild
+++ b/kde-apps/kcmshell/kcmshell-15.08.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="Utility to host KDE control modules independently of SystemSettings"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kcolorchooser/kcolorchooser-15.08.3.ebuild b/kde-apps/kcolorchooser/kcolorchooser-15.08.3.ebuild
index 01c44fd309c1..10ed72d7bfe9 100644
--- a/kde-apps/kcolorchooser/kcolorchooser-15.08.3.ebuild
+++ b/kde-apps/kcolorchooser/kcolorchooser-15.08.3.ebuild
@@ -8,5 +8,5 @@ inherit kde4-base
DESCRIPTION="KDE color selector/editor"
HOMEPAGE="https://www.kde.org/applications/graphics/kcolorchooser/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kcontrol/kcontrol-15.08.3.ebuild b/kde-apps/kcontrol/kcontrol-15.08.3.ebuild
index 5819e2edb811..7612ac099dc5 100644
--- a/kde-apps/kcontrol/kcontrol-15.08.3.ebuild
+++ b/kde-apps/kcontrol/kcontrol-15.08.3.ebuild
@@ -9,7 +9,7 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="The KDE Control Center"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 x86"
IUSE="debug"
RDEPEND="
diff --git a/kde-apps/kde-base-artwork/kde-base-artwork-15.08.3.ebuild b/kde-apps/kde-base-artwork/kde-base-artwork-15.08.3.ebuild
index 27e384e67537..954afddefeff 100644
--- a/kde-apps/kde-base-artwork/kde-base-artwork-15.08.3.ebuild
+++ b/kde-apps/kde-base-artwork/kde-base-artwork-15.08.3.ebuild
@@ -9,4 +9,4 @@ inherit kde4-base
DESCRIPTION="KDE base artwork"
IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/kde-apps/kde-dev-utils/kde-dev-utils-15.08.3.ebuild b/kde-apps/kde-dev-utils/kde-dev-utils-15.08.3.ebuild
index c7139c97e531..d053dc967795 100644
--- a/kde-apps/kde-dev-utils/kde-dev-utils-15.08.3.ebuild
+++ b/kde-apps/kde-dev-utils/kde-dev-utils-15.08.3.ebuild
@@ -7,5 +7,5 @@ EAPI=5
inherit kde4-base
DESCRIPTION="KDE Development Utilities"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kde-meta/kde-meta-4.14.3-r1.ebuild b/kde-apps/kde-meta/kde-meta-4.14.3-r1.ebuild
index 4301557edcfd..8103e786c13b 100644
--- a/kde-apps/kde-meta/kde-meta-4.14.3-r1.ebuild
+++ b/kde-apps/kde-meta/kde-meta-4.14.3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit kde4-meta-pkg
DESCRIPTION="KDE - merge this to pull in all split kde-base/* packages"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="accessibility kdepim minimal nls sdk"
RDEPEND="
diff --git a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild
index 3be80f18a3cb..03d1f070381d 100644
--- a/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild
+++ b/kde-apps/kde-wallpapers/kde-wallpapers-15.08.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-wallpapers"
inherit kde4-base
DESCRIPTION="KDE 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"
IUSE="+minimal"
src_configure() {
diff --git a/kde-apps/kde4-l10n/kde4-l10n-15.08.3-r2.ebuild b/kde-apps/kde4-l10n/kde4-l10n-15.08.3-r2.ebuild
index d4568982b834..53837040be33 100644
--- a/kde-apps/kde4-l10n/kde4-l10n-15.08.3-r2.ebuild
+++ b/kde-apps/kde4-l10n/kde4-l10n-15.08.3-r2.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
!<kde-apps/kde-l10n-${PV}
"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="minimal"
REMOVE_DIRS="${FILESDIR}/${PN}-15.07.90-remove-dirs"
diff --git a/kde-apps/kdeartwork-colorschemes/kdeartwork-colorschemes-15.08.3.ebuild b/kde-apps/kdeartwork-colorschemes/kdeartwork-colorschemes-15.08.3.ebuild
index 91292019b953..8ec7e0bc395c 100644
--- a/kde-apps/kdeartwork-colorschemes/kdeartwork-colorschemes-15.08.3.ebuild
+++ b/kde-apps/kdeartwork-colorschemes/kdeartwork-colorschemes-15.08.3.ebuild
@@ -10,5 +10,5 @@ KDE_SCM="svn"
inherit kde4-meta
DESCRIPTION="KDE extra colorschemes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
diff --git a/kde-apps/kdeartwork-desktopthemes/kdeartwork-desktopthemes-15.08.3.ebuild b/kde-apps/kdeartwork-desktopthemes/kdeartwork-desktopthemes-15.08.3.ebuild
index df3f6e7692f1..70da1c074c23 100644
--- a/kde-apps/kdeartwork-desktopthemes/kdeartwork-desktopthemes-15.08.3.ebuild
+++ b/kde-apps/kdeartwork-desktopthemes/kdeartwork-desktopthemes-15.08.3.ebuild
@@ -10,5 +10,5 @@ KDE_SCM="svn"
inherit kde4-meta
DESCRIPTION="Additional KDE4 Plasma themes"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
diff --git a/kde-apps/kdeartwork-emoticons/kdeartwork-emoticons-15.08.3.ebuild b/kde-apps/kdeartwork-emoticons/kdeartwork-emoticons-15.08.3.ebuild
index 652b5812ced1..c0f4b63b7f70 100644
--- a/kde-apps/kdeartwork-emoticons/kdeartwork-emoticons-15.08.3.ebuild
+++ b/kde-apps/kdeartwork-emoticons/kdeartwork-emoticons-15.08.3.ebuild
@@ -12,5 +12,5 @@ KDE_SCM="svn"
inherit kde4-meta
DESCRIPTION="EmotIcons (icons for things like smilies :-) for kde"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
diff --git a/kde-apps/kdeartwork-iconthemes/kdeartwork-iconthemes-15.08.3.ebuild b/kde-apps/kdeartwork-iconthemes/kdeartwork-iconthemes-15.08.3.ebuild
index edb2a64fa309..1a3bc9fec3b8 100644
--- a/kde-apps/kdeartwork-iconthemes/kdeartwork-iconthemes-15.08.3.ebuild
+++ b/kde-apps/kdeartwork-iconthemes/kdeartwork-iconthemes-15.08.3.ebuild
@@ -10,7 +10,7 @@ KDE_SCM="svn"
inherit kde4-meta
DESCRIPTION="Icon themes for kde"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
# Provides nuvola icon theme
diff --git a/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-15.08.3-r1.ebuild b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-15.08.3-r1.ebuild
index 128763936b70..bbc36d72f310 100644
--- a/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-15.08.3-r1.ebuild
+++ b/kde-apps/kdeartwork-kscreensaver/kdeartwork-kscreensaver-15.08.3-r1.ebuild
@@ -11,7 +11,7 @@ KDE_SCM="svn"
inherit kde4-meta
DESCRIPTION="Extra screensavers for kde"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug +eigen +kexiv2 xscreensaver"
# libkworkspace - only as a stub to provide KDE4Workspace config
diff --git a/kde-apps/kdeartwork-styles/kdeartwork-styles-15.08.3.ebuild b/kde-apps/kdeartwork-styles/kdeartwork-styles-15.08.3.ebuild
index e80bb95822ca..0ed55ea1d910 100644
--- a/kde-apps/kdeartwork-styles/kdeartwork-styles-15.08.3.ebuild
+++ b/kde-apps/kdeartwork-styles/kdeartwork-styles-15.08.3.ebuild
@@ -10,7 +10,7 @@ KDE_SCM="svn"
inherit kde4-meta
DESCRIPTION="Extra KWin styles and window decorations"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kdeartwork-wallpapers/kdeartwork-wallpapers-15.08.3.ebuild b/kde-apps/kdeartwork-wallpapers/kdeartwork-wallpapers-15.08.3.ebuild
index 4218d927eee4..d124d3455326 100644
--- a/kde-apps/kdeartwork-wallpapers/kdeartwork-wallpapers-15.08.3.ebuild
+++ b/kde-apps/kdeartwork-wallpapers/kdeartwork-wallpapers-15.08.3.ebuild
@@ -12,7 +12,7 @@ KDE_SCM="svn"
inherit kde4-meta
DESCRIPTION="Wallpapers from kde"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
KMEXTRA="
diff --git a/kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-15.08.3.ebuild b/kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-15.08.3.ebuild
index ec7272eaefe6..e03234f5003b 100644
--- a/kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-15.08.3.ebuild
+++ b/kde-apps/kdeartwork-weatherwallpapers/kdeartwork-weatherwallpapers-15.08.3.ebuild
@@ -10,7 +10,7 @@ KDE_SCM="svn"
inherit kde4-meta
DESCRIPTION="Weather aware wallpapers. Changes with weather outside"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/kde-apps/kdebase-data/kdebase-data-15.08.3.ebuild b/kde-apps/kdebase-data/kdebase-data-15.08.3.ebuild
index 026703a5489e..3b23d7908f1b 100644
--- a/kde-apps/kdebase-data/kdebase-data-15.08.3.ebuild
+++ b/kde-apps/kdebase-data/kdebase-data-15.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
DESCRIPTION="Icons, localization data and various .desktop files from kdebase"
IUSE="+wallpapers"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="
x11-themes/hicolor-icon-theme
diff --git a/kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-15.08.3.ebuild b/kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-15.08.3.ebuild
index 9d1d89b573ca..ddb1a52260de 100644
--- a/kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-15.08.3.ebuild
+++ b/kde-apps/kdebase-desktoptheme/kdebase-desktoptheme-15.08.3.ebuild
@@ -10,4 +10,4 @@ inherit kde4-meta
DESCRIPTION="Oxygen KDE4 desktop theme"
IUSE=""
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.08.3.ebuild b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.08.3.ebuild
index 806469486d9c..acc801230b18 100644
--- a/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.08.3.ebuild
+++ b/kde-apps/kdebase-kioslaves/kdebase-kioslaves-15.08.3.ebuild
@@ -9,7 +9,7 @@ KMNAME="kde-runtime"
KMMODULE="kioslave"
inherit kde4-meta
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
DESCRIPTION="KDE VFS framework - kioslaves present a filesystem-like view of arbitrary data"
IUSE="+bzip2 exif debug lzma openexr samba +sftp"
diff --git a/kde-apps/kdebase-menu-icons/kdebase-menu-icons-15.08.3.ebuild b/kde-apps/kdebase-menu-icons/kdebase-menu-icons-15.08.3.ebuild
index 3c664971af66..21fa21c655a0 100644
--- a/kde-apps/kdebase-menu-icons/kdebase-menu-icons-15.08.3.ebuild
+++ b/kde-apps/kdebase-menu-icons/kdebase-menu-icons-15.08.3.ebuild
@@ -9,5 +9,5 @@ KMMODULE="menu"
inherit kde4-meta
DESCRIPTION="KDE menu icons"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
diff --git a/kde-apps/kdebase-menu/kdebase-menu-15.08.3.ebuild b/kde-apps/kdebase-menu/kdebase-menu-15.08.3.ebuild
index 9002018f5b3f..6d76097e6150 100644
--- a/kde-apps/kdebase-menu/kdebase-menu-15.08.3.ebuild
+++ b/kde-apps/kdebase-menu/kdebase-menu-15.08.3.ebuild
@@ -9,5 +9,5 @@ KMMODULE="kde-menu"
inherit kde4-meta
DESCRIPTION="KDE Menu query tool"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kdebase-meta/kdebase-meta-4.14.3-r2.ebuild b/kde-apps/kdebase-meta/kdebase-meta-4.14.3-r2.ebuild
index 75781dc786a0..e8bfc446d987 100644
--- a/kde-apps/kdebase-meta/kdebase-meta-4.14.3-r2.ebuild
+++ b/kde-apps/kdebase-meta/kdebase-meta-4.14.3-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
inherit kde4-meta-pkg
DESCRIPTION="Merge this to pull in all kdebase-derived packages"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="+display-manager minimal +wallpapers"
RDEPEND="
diff --git a/kde-apps/kdebugdialog/kdebugdialog-15.08.3.ebuild b/kde-apps/kdebugdialog/kdebugdialog-15.08.3.ebuild
index ba6b119aa3c4..bc623843c279 100644
--- a/kde-apps/kdebugdialog/kdebugdialog-15.08.3.ebuild
+++ b/kde-apps/kdebugdialog/kdebugdialog-15.08.3.ebuild
@@ -9,5 +9,5 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDE: A dialog box for setting preferences for debug output"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-15.08.3.ebuild b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-15.08.3.ebuild
index ab86380cda0e..0b69e45d9758 100644
--- a/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-15.08.3.ebuild
+++ b/kde-apps/kdegraphics-mobipocket/kdegraphics-mobipocket-15.08.3.ebuild
@@ -7,5 +7,5 @@ EAPI=5
inherit kde4-base
DESCRIPTION="Library to support mobipocket ebooks"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.08.3.ebuild b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.08.3.ebuild
index 4698dd9acb77..830194ae3e76 100644
--- a/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.08.3.ebuild
+++ b/kde-apps/kdenetwork-filesharing/kdenetwork-filesharing-15.08.3.ebuild
@@ -7,5 +7,5 @@ EAPI=5
inherit kde4-base
DESCRIPTION="kcontrol filesharing config module for SMB"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kdepasswd/kdepasswd-15.08.3.ebuild b/kde-apps/kdepasswd/kdepasswd-15.08.3.ebuild
index 5395eb5eb6f2..18f398a64cfb 100644
--- a/kde-apps/kdepasswd/kdepasswd-15.08.3.ebuild
+++ b/kde-apps/kdepasswd/kdepasswd-15.08.3.ebuild
@@ -9,7 +9,7 @@ KMNAME="kde-baseapps"
inherit kde4-meta
DESCRIPTION="KDE GUI for passwd"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.10.ebuild b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.10.ebuild
index 2cb9bfb19783..458dc711143b 100644
--- a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.10.ebuild
+++ b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.10.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 google"
DEPEND="
diff --git a/kde-apps/kdepim-icons/kdepim-icons-4.14.10.ebuild b/kde-apps/kdepim-icons/kdepim-icons-4.14.10.ebuild
index 12e3b7fe406a..cb02d13ad574 100644
--- a/kde-apps/kdepim-icons/kdepim-icons-4.14.10.ebuild
+++ b/kde-apps/kdepim-icons/kdepim-icons-4.14.10.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_kdeapps_dep kdepimlibs 'akonadi(+)')"
RDEPEND=""
diff --git a/kde-apps/kdepim-kresources/kdepim-kresources-4.14.10.ebuild b/kde-apps/kdepim-kresources/kdepim-kresources-4.14.10.ebuild
index d945cca66a1d..39af8e3e223c 100644
--- a/kde-apps/kdepim-kresources/kdepim-kresources-4.14.10.ebuild
+++ b/kde-apps/kdepim-kresources/kdepim-kresources-4.14.10.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_kdeapps_dep kdepimlibs 'akonadi(+)')
diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild
index 7fe98fc18f81..66fbf7209700 100644
--- a/kde-apps/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild
+++ b/kde-apps/kdepim-l10n/kdepim-l10n-4.14.3-r1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
!<kde-apps/kde4-l10n-4.14.3-r1
"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
MY_LANGS="ar bg bs ca ca@valencia cs da de el en_GB es et eu fa fi fr ga gl he
diff --git a/kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild b/kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild
index 2cdcd78977ec..7252976b44b7 100644
--- a/kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild
+++ b/kde-apps/kdepim-l10n/kdepim-l10n-4.4.11.1-r2.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
!<kde-apps/kde4-l10n-4.14.3-r1
"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
IUSE=""
MY_LANGS="ar bg ca ca@valencia cs csb da de el en_GB eo es et eu
diff --git a/kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild b/kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild
index dfb1b5d94660..6806ccb62cbf 100644
--- a/kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.ebuild
+++ b/kde-apps/kdepim-meta/kdepim-meta-4.14.10-r1.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-apps/kdepim-runtime/kdepim-runtime-4.14.10.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.10.ebuild
index 2a0dbb53fa01..41280b48f03b 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.10.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.10.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-apps/kdepimlibs/kdepimlibs-4.14.10.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.10.ebuild
index 1da6f380075b..7743f222cf90 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.10.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.10.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-apps/kdesdk-kioslaves/kdesdk-kioslaves-15.08.3.ebuild b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-15.08.3.ebuild
index c09bdb542b98..b4776cd34bc4 100644
--- a/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-15.08.3.ebuild
+++ b/kde-apps/kdesdk-kioslaves/kdesdk-kioslaves-15.08.3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit kde4-base
DESCRIPTION="kioslaves from kdesdk package"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug subversion"
KMNAME="kdesdk-kioslaves"
diff --git a/kde-apps/kdesu/kdesu-15.08.3.ebuild b/kde-apps/kdesu/kdesu-15.08.3.ebuild
index 1800359c95e4..dd841b43b1ab 100644
--- a/kde-apps/kdesu/kdesu-15.08.3.ebuild
+++ b/kde-apps/kdesu/kdesu-15.08.3.ebuild
@@ -12,7 +12,7 @@ inherit kde4-meta
# if not, USE-flag ?
DESCRIPTION="KDE: gui for su(1)"
HOMEPAGE+=" https://techbase.kde.org/Projects/kdesu"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 x86"
IUSE="debug"
src_configure() {
diff --git a/kde-apps/kdf/kdf-15.08.3.ebuild b/kde-apps/kdf/kdf-15.08.3.ebuild
index 4a1a49cc6ce7..300989d6bb98 100644
--- a/kde-apps/kdf/kdf-15.08.3.ebuild
+++ b/kde-apps/kdf/kdf-15.08.3.ebuild
@@ -9,5 +9,5 @@ inherit kde4-base
DESCRIPTION="KDE free disk space utility"
HOMEPAGE="https://utils.kde.org/projects/kdf"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kdialog/kdialog-15.08.3.ebuild b/kde-apps/kdialog/kdialog-15.08.3.ebuild
index fac0be3c6131..5a9085defcf6 100644
--- a/kde-apps/kdialog/kdialog-15.08.3.ebuild
+++ b/kde-apps/kdialog/kdialog-15.08.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-baseapps"
inherit kde4-meta
DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kdontchangethehostname/kdontchangethehostname-15.08.3.ebuild b/kde-apps/kdontchangethehostname/kdontchangethehostname-15.08.3.ebuild
index e7681fd9c1c4..ac9a7f9e566b 100644
--- a/kde-apps/kdontchangethehostname/kdontchangethehostname-15.08.3.ebuild
+++ b/kde-apps/kdontchangethehostname/kdontchangethehostname-15.08.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="Tool to inform KDE about a change in hostname"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
RDEPEND="
diff --git a/kde-apps/keditbookmarks/keditbookmarks-15.08.3.ebuild b/kde-apps/keditbookmarks/keditbookmarks-15.08.3.ebuild
index 18a538962964..8cc56cff7d7f 100644
--- a/kde-apps/keditbookmarks/keditbookmarks-15.08.3.ebuild
+++ b/kde-apps/keditbookmarks/keditbookmarks-15.08.3.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
inherit kde4-meta
DESCRIPTION="KDE's bookmarks editor"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/keditfiletype/keditfiletype-15.08.3.ebuild b/kde-apps/keditfiletype/keditfiletype-15.08.3.ebuild
index c0c829346085..062d77490d06 100644
--- a/kde-apps/keditfiletype/keditfiletype-15.08.3.ebuild
+++ b/kde-apps/keditfiletype/keditfiletype-15.08.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDE mime/file type assocciation editor"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
# test fails, last checked for 4.2.89
diff --git a/kde-apps/kfile/kfile-15.08.3.ebuild b/kde-apps/kfile/kfile-15.08.3.ebuild
index 66700b8310f4..9732d881966d 100644
--- a/kde-apps/kfile/kfile-15.08.3.ebuild
+++ b/kde-apps/kfile/kfile-15.08.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="A commandline frontend to KFileMetaInfo"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kfilereplace/kfilereplace-15.08.3.ebuild b/kde-apps/kfilereplace/kfilereplace-15.08.3.ebuild
index 473d1369b31a..ef3f660aec8a 100644
--- a/kde-apps/kfilereplace/kfilereplace-15.08.3.ebuild
+++ b/kde-apps/kfilereplace/kfilereplace-15.08.3.ebuild
@@ -10,5 +10,5 @@ inherit kde4-meta
DESCRIPTION="KDE web development - powerful search and replace in multiple files"
HOMEPAGE="https://www.kde.org/applications/utilities/kfilereplace/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kfind/kfind-15.08.3.ebuild b/kde-apps/kfind/kfind-15.08.3.ebuild
index 1e88b1d0e3cd..ef0e14924aed 100644
--- a/kde-apps/kfind/kfind-15.08.3.ebuild
+++ b/kde-apps/kfind/kfind-15.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
DESCRIPTION="KDE file finder utility"
HOMEPAGE="https://www.kde.org/applications/utilities/kfind/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kfloppy/kfloppy-15.08.3.ebuild b/kde-apps/kfloppy/kfloppy-15.08.3.ebuild
index f314d3bc91eb..bf3e269c9ee0 100644
--- a/kde-apps/kfloppy/kfloppy-15.08.3.ebuild
+++ b/kde-apps/kfloppy/kfloppy-15.08.3.ebuild
@@ -12,5 +12,5 @@ HOMEPAGE="
https://www.kde.org/applications/utilities/kfloppy/
https://utils.kde.org/projects/kfloppy/
"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kfmclient/kfmclient-15.08.3.ebuild b/kde-apps/kfmclient/kfmclient-15.08.3.ebuild
index 62c0c808d0f7..b4344a7cac78 100644
--- a/kde-apps/kfmclient/kfmclient-15.08.3.ebuild
+++ b/kde-apps/kfmclient/kfmclient-15.08.3.ebuild
@@ -9,7 +9,7 @@ KMMODULE="konqueror/client"
inherit kde4-meta
DESCRIPTION="KDE tool for opening URLs from the command line"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
KMEXTRACTONLY="
diff --git a/kde-apps/kget/kget-15.08.3.ebuild b/kde-apps/kget/kget-15.08.3.ebuild
index 3aa7459efc06..1a2c8b7780a7 100644
--- a/kde-apps/kget/kget-15.08.3.ebuild
+++ b/kde-apps/kget/kget-15.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="An advanced download manager for KDE"
HOMEPAGE="https://www.kde.org/applications/internet/kget/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug bittorrent gpg mms sqlite webkit"
RDEPEND="
diff --git a/kde-apps/kglobalaccel/kglobalaccel-15.08.3.ebuild b/kde-apps/kglobalaccel/kglobalaccel-15.08.3.ebuild
index 1a2e0f80b6e7..bd4b1738f496 100644
--- a/kde-apps/kglobalaccel/kglobalaccel-15.08.3.ebuild
+++ b/kde-apps/kglobalaccel/kglobalaccel-15.08.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDE's Global Shortcut Daemon"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
src_configure() {
diff --git a/kde-apps/kgoldrunner/kgoldrunner-15.08.3.ebuild b/kde-apps/kgoldrunner/kgoldrunner-15.08.3.ebuild
index 30650d8ede77..6a7c446542e5 100644
--- a/kde-apps/kgoldrunner/kgoldrunner-15.08.3.ebuild
+++ b/kde-apps/kgoldrunner/kgoldrunner-15.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kgoldrunner/
https://games.kde.org/game.php?game=kgoldrunner
"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kgpg/kgpg-15.08.3.ebuild b/kde-apps/kgpg/kgpg-15.08.3.ebuild
index 3e7f8ab7359a..29a5dc004c11 100644
--- a/kde-apps/kgpg/kgpg-15.08.3.ebuild
+++ b/kde-apps/kgpg/kgpg-15.08.3.ebuild
@@ -11,7 +11,7 @@ inherit kde4-base
DESCRIPTION="KDE gpg keyring manager"
HOMEPAGE="https://www.kde.org/applications/utilities/kgpg
https://utils.kde.org/projects/kgpg"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kiconfinder/kiconfinder-15.08.3.ebuild b/kde-apps/kiconfinder/kiconfinder-15.08.3.ebuild
index 7c09946bb311..1e99a807cc0d 100644
--- a/kde-apps/kiconfinder/kiconfinder-15.08.3.ebuild
+++ b/kde-apps/kiconfinder/kiconfinder-15.08.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="Finds an icon based on its name"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kigo/kigo-15.08.3.ebuild b/kde-apps/kigo/kigo-15.08.3.ebuild
index 2fb60a5a669f..09c87988331d 100644
--- a/kde-apps/kigo/kigo-15.08.3.ebuild
+++ b/kde-apps/kigo/kigo-15.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="KDE Go game"
HOMEPAGE="https://www.kde.org/applications/games/kigo/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/kimagemapeditor/kimagemapeditor-15.08.3.ebuild b/kde-apps/kimagemapeditor/kimagemapeditor-15.08.3.ebuild
index 24612da0299b..09040f46902c 100644
--- a/kde-apps/kimagemapeditor/kimagemapeditor-15.08.3.ebuild
+++ b/kde-apps/kimagemapeditor/kimagemapeditor-15.08.3.ebuild
@@ -11,5 +11,5 @@ inherit kde4-meta
DESCRIPTION="KDE web development - image map editor"
HOMEPAGE="https://www.kde.org/applications/development/kimagemapeditor/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kimgio/kimgio-15.08.3.ebuild b/kde-apps/kimgio/kimgio-15.08.3.ebuild
index 2401e4db9eca..1b8dea973fee 100644
--- a/kde-apps/kimgio/kimgio-15.08.3.ebuild
+++ b/kde-apps/kimgio/kimgio-15.08.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDE WebP image format plugin"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 x86"
IUSE="debug"
DEPEND="media-libs/libwebp:="
diff --git a/kde-apps/kioclient/kioclient-15.08.3.ebuild b/kde-apps/kioclient/kioclient-15.08.3.ebuild
index 04773d10e675..eabcbaa9cb34 100644
--- a/kde-apps/kioclient/kioclient-15.08.3.ebuild
+++ b/kde-apps/kioclient/kioclient-15.08.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="Command-line tool for network-transparent operations"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kjots/kjots-4.14.10.ebuild b/kde-apps/kjots/kjots-4.14.10.ebuild
index 0a07dbf5c5b8..458d70cf3ecf 100644
--- a/kde-apps/kjots/kjots-4.14.10.ebuild
+++ b/kde-apps/kjots/kjots-4.14.10.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-apps/kleopatra/kleopatra-4.14.10.ebuild b/kde-apps/kleopatra/kleopatra-4.14.10.ebuild
index f98295360eb4..6ed36a095036 100644
--- a/kde-apps/kleopatra/kleopatra-4.14.10.ebuild
+++ b/kde-apps/kleopatra/kleopatra-4.14.10.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-apps/klickety/klickety-15.08.3.ebuild b/kde-apps/klickety/klickety-15.08.3.ebuild
index e140a20aaafb..7757289688e6 100644
--- a/kde-apps/klickety/klickety-15.08.3.ebuild
+++ b/kde-apps/klickety/klickety-15.08.3.ebuild
@@ -9,7 +9,7 @@ KDE_SELINUX_MODULE="games"
inherit kde4-base
DESCRIPTION="A KDE game almost the same as ksame, but a bit different"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/kmag/kmag-15.08.3.ebuild b/kde-apps/kmag/kmag-15.08.3.ebuild
index f55848fd6fd0..3e9870ccb0cc 100644
--- a/kde-apps/kmag/kmag-15.08.3.ebuild
+++ b/kde-apps/kmag/kmag-15.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="KDE screen magnifier"
HOMEPAGE="https://www.kde.org/applications/utilities/kmag/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
RDEPEND="
diff --git a/kde-apps/kmahjongg/kmahjongg-15.08.3.ebuild b/kde-apps/kmahjongg/kmahjongg-15.08.3.ebuild
index 68090fb1387d..258ff246a56e 100644
--- a/kde-apps/kmahjongg/kmahjongg-15.08.3.ebuild
+++ b/kde-apps/kmahjongg/kmahjongg-15.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kmahjongg/
https://games.kde.org/game.php?game=kmahjongg
"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kmail/kmail-4.14.10.ebuild b/kde-apps/kmail/kmail-4.14.10.ebuild
index a023bd6e71ce..47e0d6043d33 100644
--- a/kde-apps/kmail/kmail-4.14.10.ebuild
+++ b/kde-apps/kmail/kmail-4.14.10.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-apps/kmimetypefinder/kmimetypefinder-15.08.3.ebuild b/kde-apps/kmimetypefinder/kmimetypefinder-15.08.3.ebuild
index e76ab061ce65..c67969360dc6 100644
--- a/kde-apps/kmimetypefinder/kmimetypefinder-15.08.3.ebuild
+++ b/kde-apps/kmimetypefinder/kmimetypefinder-15.08.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDE application to report the mimetype for a given file"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kmix/kmix-4.14.3-r1.ebuild b/kde-apps/kmix/kmix-4.14.3-r1.ebuild
index ad6e473455d9..6bc8cffcbc95 100644
--- a/kde-apps/kmix/kmix-4.14.3-r1.ebuild
+++ b/kde-apps/kmix/kmix-4.14.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="KDE mixer gui"
HOMEPAGE="https://www.kde.org/applications/multimedia/kmix/"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="alsa debug canberra pulseaudio"
DEPEND="
diff --git a/kde-apps/kmousetool/kmousetool-15.08.3.ebuild b/kde-apps/kmousetool/kmousetool-15.08.3.ebuild
index 88a9de060934..79039d5d6919 100644
--- a/kde-apps/kmousetool/kmousetool-15.08.3.ebuild
+++ b/kde-apps/kmousetool/kmousetool-15.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="KDE program that clicks the mouse for you"
HOMEPAGE="https://www.kde.org/applications/utilities/kmousetool/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
RDEPEND="
diff --git a/kde-apps/kmouth/kmouth-15.08.3.ebuild b/kde-apps/kmouth/kmouth-15.08.3.ebuild
index dc6179759686..4d64d158951f 100644
--- a/kde-apps/kmouth/kmouth-15.08.3.ebuild
+++ b/kde-apps/kmouth/kmouth-15.08.3.ebuild
@@ -9,5 +9,5 @@ inherit kde4-base
DESCRIPTION="Text-to-speech synthesizer front end"
HOMEPAGE="https://www.kde.org/applications/utilities/kmouth/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/knavalbattle/knavalbattle-15.08.3.ebuild b/kde-apps/knavalbattle/knavalbattle-15.08.3.ebuild
index 2324823e73ae..3646cc54e6d9 100644
--- a/kde-apps/knavalbattle/knavalbattle-15.08.3.ebuild
+++ b/kde-apps/knavalbattle/knavalbattle-15.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/navalbattle/
https://games.kde.org/game.php?game=kbattleship
"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/knetattach/knetattach-15.08.3.ebuild b/kde-apps/knetattach/knetattach-15.08.3.ebuild
index 2fba1d49ca56..03da3097b5a2 100644
--- a/kde-apps/knetattach/knetattach-15.08.3.ebuild
+++ b/kde-apps/knetattach/knetattach-15.08.3.ebuild
@@ -9,5 +9,5 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDE network wizard"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/knewstuff/knewstuff-15.08.3.ebuild b/kde-apps/knewstuff/knewstuff-15.08.3.ebuild
index 86b39136df7f..cf86c6212a17 100644
--- a/kde-apps/knewstuff/knewstuff-15.08.3.ebuild
+++ b/kde-apps/knewstuff/knewstuff-15.08.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDE4 software to download and upload 'new stuff'"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/knode/knode-4.14.10.ebuild b/kde-apps/knode/knode-4.14.10.ebuild
index 89ac748c3569..4fd75dad4d59 100644
--- a/kde-apps/knode/knode-4.14.10.ebuild
+++ b/kde-apps/knode/knode-4.14.10.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-apps/knotes/knotes-4.14.10.ebuild b/kde-apps/knotes/knotes-4.14.10.ebuild
index b62f291fcce6..7d37abd5dd33 100644
--- a/kde-apps/knotes/knotes-4.14.10.ebuild
+++ b/kde-apps/knotes/knotes-4.14.10.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-apps/knotify/knotify-15.08.3.ebuild b/kde-apps/knotify/knotify-15.08.3.ebuild
index 53650927f24e..231d985f8dd6 100644
--- a/kde-apps/knotify/knotify-15.08.3.ebuild
+++ b/kde-apps/knotify/knotify-15.08.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="The KDE notification daemon"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kolf/kolf-15.08.3.ebuild b/kde-apps/kolf/kolf-15.08.3.ebuild
index f42de3434adf..f5c2db5a06a6 100644
--- a/kde-apps/kolf/kolf-15.08.3.ebuild
+++ b/kde-apps/kolf/kolf-15.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kolf/
https://games.kde.org/game.php?game=kolf
"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/kolourpaint/kolourpaint-15.08.3.ebuild b/kde-apps/kolourpaint/kolourpaint-15.08.3.ebuild
index 3c47ceecd315..0a1791a9e6ff 100644
--- a/kde-apps/kolourpaint/kolourpaint-15.08.3.ebuild
+++ b/kde-apps/kolourpaint/kolourpaint-15.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="Paint Program for KDE"
HOMEPAGE="https://www.kde.org/applications/graphics/kolourpaint/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
LICENSE="BSD LGPL-2"
IUSE="debug"
diff --git a/kde-apps/kommander/kommander-15.08.3.ebuild b/kde-apps/kommander/kommander-15.08.3.ebuild
index ea5d9aed907b..3dee97301760 100644
--- a/kde-apps/kommander/kommander-15.08.3.ebuild
+++ b/kde-apps/kommander/kommander-15.08.3.ebuild
@@ -11,5 +11,5 @@ inherit kde4-meta
DESCRIPTION="KDE dialog system for scripting"
HOMEPAGE="https://www.kde.org/applications/development/kommander/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/konq-plugins/konq-plugins-15.08.3.ebuild b/kde-apps/konq-plugins/konq-plugins-15.08.3.ebuild
index 1c8a9f9bd3e9..c285d2195dd8 100644
--- a/kde-apps/konq-plugins/konq-plugins-15.08.3.ebuild
+++ b/kde-apps/konq-plugins/konq-plugins-15.08.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-baseapps"
inherit kde4-meta
DESCRIPTION="Various plugins for konqueror"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug tidy"
DEPEND="
diff --git a/kde-apps/konqueror/konqueror-15.08.3.ebuild b/kde-apps/konqueror/konqueror-15.08.3.ebuild
index 8b102c169de9..c8293448b5a7 100644
--- a/kde-apps/konqueror/konqueror-15.08.3.ebuild
+++ b/kde-apps/konqueror/konqueror-15.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/internet/konqueror/
https://konqueror.org/
"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+bookmarks debug svg"
# 4 of 4 tests fail. Last checked for 4.0.3
RESTRICT="test"
diff --git a/kde-apps/konquest/konquest-15.08.3.ebuild b/kde-apps/konquest/konquest-15.08.3.ebuild
index e41fe1c4f128..d144ec478aae 100644
--- a/kde-apps/konquest/konquest-15.08.3.ebuild
+++ b/kde-apps/konquest/konquest-15.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/konquest/
https://games.kde.org/game.php?game=konquest
"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/konsole/konsole-4.14.3-r2.ebuild b/kde-apps/konsole/konsole-4.14.3-r2.ebuild
index be55c4a353ca..b773196237de 100644
--- a/kde-apps/konsole/konsole-4.14.3-r2.ebuild
+++ b/kde-apps/konsole/konsole-4.14.3-r2.ebuild
@@ -12,7 +12,7 @@ inherit kde4-base
DESCRIPTION="X terminal for use with KDE"
HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.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-apps/konsolekalendar/konsolekalendar-4.14.10.ebuild b/kde-apps/konsolekalendar/konsolekalendar-4.14.10.ebuild
index 02eb7b2df455..0bf1d1ea8251 100644
--- a/kde-apps/konsolekalendar/konsolekalendar-4.14.10.ebuild
+++ b/kde-apps/konsolekalendar/konsolekalendar-4.14.10.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-apps/konsolepart/konsolepart-4.14.3.ebuild b/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
index af82f3dec530..7b367e422795 100644
--- a/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
+++ b/kde-apps/konsolepart/konsolepart-4.14.3.ebuild
@@ -12,7 +12,7 @@ inherit kde4-base
DESCRIPTION="X terminal kpart for use by konsole and other KDE applications"
HOMEPAGE="https://www.kde.org/applications/system/konsole https://konsole.kde.org"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="debug minimal"
COMMONDEPEND="
diff --git a/kde-apps/kontact/kontact-4.14.10.ebuild b/kde-apps/kontact/kontact-4.14.10.ebuild
index f2c6a3b6430f..4a757d4fabbd 100644
--- a/kde-apps/kontact/kontact-4.14.10.ebuild
+++ b/kde-apps/kontact/kontact-4.14.10.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-apps/kopete/kopete-15.08.3.ebuild b/kde-apps/kopete/kopete-15.08.3.ebuild
index afc7d183f25c..c9373a9323e1 100644
--- a/kde-apps/kopete/kopete-15.08.3.ebuild
+++ b/kde-apps/kopete/kopete-15.08.3.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 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug ssl v4l"
# tests hang, last checked for 4.2.96
diff --git a/kde-apps/korganizer/korganizer-4.14.10.ebuild b/kde-apps/korganizer/korganizer-4.14.10.ebuild
index c837c201f0e7..bf69761f31cb 100644
--- a/kde-apps/korganizer/korganizer-4.14.10.ebuild
+++ b/kde-apps/korganizer/korganizer-4.14.10.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-apps/kpasswdserver/kpasswdserver-15.08.3.ebuild b/kde-apps/kpasswdserver/kpasswdserver-15.08.3.ebuild
index 7e9ccaf1278c..e03a064942e8 100644
--- a/kde-apps/kpasswdserver/kpasswdserver-15.08.3.ebuild
+++ b/kde-apps/kpasswdserver/kpasswdserver-15.08.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDED Password Module"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
RESTRICT="test"
diff --git a/kde-apps/kppp/kppp-15.08.3.ebuild b/kde-apps/kppp/kppp-15.08.3.ebuild
index 5a7ba54097d1..e645e4c0a2d9 100644
--- a/kde-apps/kppp/kppp-15.08.3.ebuild
+++ b/kde-apps/kppp/kppp-15.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="KDE: A dialer and front-end to pppd"
HOMEPAGE="https://www.kde.org/applications/internet/kppp"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
RDEPEND="
diff --git a/kde-apps/kquitapp/kquitapp-15.08.3.ebuild b/kde-apps/kquitapp/kquitapp-15.08.3.ebuild
index e80c31a8387d..233c0a5ef086 100644
--- a/kde-apps/kquitapp/kquitapp-15.08.3.ebuild
+++ b/kde-apps/kquitapp/kquitapp-15.08.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="A CLI application quitter"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/krdc/krdc-15.08.3.ebuild b/kde-apps/krdc/krdc-15.08.3.ebuild
index 6db5a22c0c36..2ea3ca74ec8f 100644
--- a/kde-apps/krdc/krdc-15.08.3.ebuild
+++ b/kde-apps/krdc/krdc-15.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="KDE remote desktop connection (RDP and VNC) client"
HOMEPAGE="https://www.kde.org/applications/internet/krdc/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 x86"
IUSE="debug jpeg +rdesktop telepathy vnc zeroconf"
#nx? ( >=net-misc/nxcl-0.9-r1 ) disabled upstream, last checked 4.13.1
diff --git a/kde-apps/kreadconfig/kreadconfig-15.08.3.ebuild b/kde-apps/kreadconfig/kreadconfig-15.08.3.ebuild
index 664adbea0abd..a4b4e1a22544 100644
--- a/kde-apps/kreadconfig/kreadconfig-15.08.3.ebuild
+++ b/kde-apps/kreadconfig/kreadconfig-15.08.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDE: A command-line tool to read KConfig entries"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kremotecontrol/kremotecontrol-15.08.3.ebuild b/kde-apps/kremotecontrol/kremotecontrol-15.08.3.ebuild
index 3ab5c1f88623..b5c4cddda3b2 100644
--- a/kde-apps/kremotecontrol/kremotecontrol-15.08.3.ebuild
+++ b/kde-apps/kremotecontrol/kremotecontrol-15.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-base
DESCRIPTION="KDE frontend for the Linux Infrared Remote Control system"
HOMEPAGE="https://www.kde.org/applications/utilities/kremotecontrol
https://utils.kde.org/projects/kremotecontrol"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
RDEPEND="
diff --git a/kde-apps/kreversi/kreversi-15.08.3.ebuild b/kde-apps/kreversi/kreversi-15.08.3.ebuild
index 1a70f807636c..00ae0142bc01 100644
--- a/kde-apps/kreversi/kreversi-15.08.3.ebuild
+++ b/kde-apps/kreversi/kreversi-15.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kreversi/
https://games.kde.org/game.php?game=kreversi
"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/krfb/krfb-15.08.3.ebuild b/kde-apps/krfb/krfb-15.08.3.ebuild
index 45fb14345523..4cea75a39cdf 100644
--- a/kde-apps/krfb/krfb-15.08.3.ebuild
+++ b/kde-apps/krfb/krfb-15.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="VNC-compatible server to share KDE desktops"
HOMEPAGE="https://www.kde.org/applications/system/krfb/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug telepathy ktp"
REQUIRED_USE="ktp? ( telepathy )"
diff --git a/kde-apps/ksaneplugin/ksaneplugin-15.08.3.ebuild b/kde-apps/ksaneplugin/ksaneplugin-15.08.3.ebuild
index 7a7294b8409e..dd8fc692873d 100644
--- a/kde-apps/ksaneplugin/ksaneplugin-15.08.3.ebuild
+++ b/kde-apps/ksaneplugin/ksaneplugin-15.08.3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit kde4-base
DESCRIPTION="SANE Plugin for KDE"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kscd/kscd-15.08.3.ebuild b/kde-apps/kscd/kscd-15.08.3.ebuild
index 96ce961469ac..ee6d8a3f4e8c 100644
--- a/kde-apps/kscd/kscd-15.08.3.ebuild
+++ b/kde-apps/kscd/kscd-15.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="KDE CD player"
HOMEPAGE="https://www.kde.org/applications/multimedia/kscd/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/ksirk/ksirk-15.08.3.ebuild b/kde-apps/ksirk/ksirk-15.08.3.ebuild
index 0e8d25a6948f..1320008281a0 100644
--- a/kde-apps/ksirk/ksirk-15.08.3.ebuild
+++ b/kde-apps/ksirk/ksirk-15.08.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/ksirk/
https://games.kde.org/game.php?game=ksirk
"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS=" amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/ksnakeduel/ksnakeduel-15.08.3.ebuild b/kde-apps/ksnakeduel/ksnakeduel-15.08.3.ebuild
index f233154470f9..cf0515554da5 100644
--- a/kde-apps/ksnakeduel/ksnakeduel-15.08.3.ebuild
+++ b/kde-apps/ksnakeduel/ksnakeduel-15.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="KDE Tron game"
HOMEPAGE="https://www.kde.org/applications/games/ksnakeduel/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/ksnapshot/ksnapshot-15.08.3-r1.ebuild b/kde-apps/ksnapshot/ksnapshot-15.08.3-r1.ebuild
index f7ed699bfb24..b150754803fa 100644
--- a/kde-apps/ksnapshot/ksnapshot-15.08.3-r1.ebuild
+++ b/kde-apps/ksnapshot/ksnapshot-15.08.3-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE Screenshot Utility"
HOMEPAGE="https://www.kde.org/applications/graphics/ksnapshot/"
SRC_URI="mirror://kde/stable/apps/KDE4.x/utils/${PN}-${MY_PV}.tar.xz"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug kipi"
DEPEND="
diff --git a/kde-apps/kspaceduel/kspaceduel-15.08.3.ebuild b/kde-apps/kspaceduel/kspaceduel-15.08.3.ebuild
index 95a3dfe8e5d3..567304a333b5 100644
--- a/kde-apps/kspaceduel/kspaceduel-15.08.3.ebuild
+++ b/kde-apps/kspaceduel/kspaceduel-15.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/kspaceduel/
https://games.kde.org/game.php?game=kspaceduel
"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/kstart/kstart-15.08.3.ebuild b/kde-apps/kstart/kstart-15.08.3.ebuild
index 2579e6c73ba4..e4d60f23a8d1 100644
--- a/kde-apps/kstart/kstart-15.08.3.ebuild
+++ b/kde-apps/kstart/kstart-15.08.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/ksudoku/ksudoku-15.08.3.ebuild b/kde-apps/ksudoku/ksudoku-15.08.3.ebuild
index cd4ceb3ae6a2..620fc17c9d9b 100644
--- a/kde-apps/ksudoku/ksudoku-15.08.3.ebuild
+++ b/kde-apps/ksudoku/ksudoku-15.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/ksudoku/
https://games.kde.org/game.php?game=ksudoku
"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/ksystemlog/ksystemlog-15.08.3.ebuild b/kde-apps/ksystemlog/ksystemlog-15.08.3.ebuild
index a935bcd3f21f..3ee09491b77d 100644
--- a/kde-apps/ksystemlog/ksystemlog-15.08.3.ebuild
+++ b/kde-apps/ksystemlog/ksystemlog-15.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-base
DESCRIPTION="KDE system log viewer"
HOMEPAGE="https://www.kde.org/applications/system/ksystemlog/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug test"
RESTRICT=test
diff --git a/kde-apps/ktimetracker/ktimetracker-4.14.10.ebuild b/kde-apps/ktimetracker/ktimetracker-4.14.10.ebuild
index 4c01c43530ef..5003cdfafad0 100644
--- a/kde-apps/ktimetracker/ktimetracker-4.14.10.ebuild
+++ b/kde-apps/ktimetracker/ktimetracker-4.14.10.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-apps/ktimezoned/ktimezoned-15.08.3.ebuild b/kde-apps/ktimezoned/ktimezoned-15.08.3.ebuild
index b8ba951b7e8b..501544451036 100644
--- a/kde-apps/ktimezoned/ktimezoned-15.08.3.ebuild
+++ b/kde-apps/ktimezoned/ktimezoned-15.08.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDE: Timezone daemon"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/ktnef/ktnef-4.14.10.ebuild b/kde-apps/ktnef/ktnef-4.14.10.ebuild
index b75b85cc92b8..d5422f6957f4 100644
--- a/kde-apps/ktnef/ktnef-4.14.10.ebuild
+++ b/kde-apps/ktnef/ktnef-4.14.10.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-apps/ktraderclient/ktraderclient-15.08.3.ebuild b/kde-apps/ktraderclient/ktraderclient-15.08.3.ebuild
index d93cc312e3a0..f489756631c4 100644
--- a/kde-apps/ktraderclient/ktraderclient-15.08.3.ebuild
+++ b/kde-apps/ktraderclient/ktraderclient-15.08.3.ebuild
@@ -9,4 +9,4 @@ inherit kde4-meta
DESCRIPTION="A command-line tool for querying the KDE trader system"
IUSE="debug"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
diff --git a/kde-apps/ktuberling/ktuberling-15.08.3.ebuild b/kde-apps/ktuberling/ktuberling-15.08.3.ebuild
index b9a673f97335..733b76462dec 100644
--- a/kde-apps/ktuberling/ktuberling-15.08.3.ebuild
+++ b/kde-apps/ktuberling/ktuberling-15.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/ktuberling/
https://games.kde.org/game.php?game=ktuberling
"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/ktux/ktux-15.08.3.ebuild b/kde-apps/ktux/ktux-15.08.3.ebuild
index 0a67a8cd9183..7397c047f0f0 100644
--- a/kde-apps/ktux/ktux-15.08.3.ebuild
+++ b/kde-apps/ktux/ktux-15.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde4-base
DESCRIPTION="KDE: screensaver featuring the Space-Faring Tux"
HOMEPAGE+=" https://userbase.kde.org/KTux"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
# libkworkspace - only as a stub to provide KDE4Workspace config
diff --git a/kde-apps/kubrick/kubrick-15.08.3.ebuild b/kde-apps/kubrick/kubrick-15.08.3.ebuild
index 41fc432d4d9b..1766dd23264c 100644
--- a/kde-apps/kubrick/kubrick-15.08.3.ebuild
+++ b/kde-apps/kubrick/kubrick-15.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-base
DESCRIPTION="A game based on the \"Rubik's Cube\" puzzle"
HOMEPAGE="https://www.kde.org/applications/games/kubrick/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
RDEPEND="$(add_kdeapps_dep libkdegames)
diff --git a/kde-apps/kuiserver/kuiserver-15.08.3.ebuild b/kde-apps/kuiserver/kuiserver-15.08.3.ebuild
index 7ac3d5f37d8d..84327d4c51cc 100644
--- a/kde-apps/kuiserver/kuiserver-15.08.3.ebuild
+++ b/kde-apps/kuiserver/kuiserver-15.08.3.ebuild
@@ -8,5 +8,5 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDE: Progress Info UI server"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/kurifilter-plugins/kurifilter-plugins-15.08.3.ebuild b/kde-apps/kurifilter-plugins/kurifilter-plugins-15.08.3.ebuild
index d5c0a25e1837..1863d6727be2 100644
--- a/kde-apps/kurifilter-plugins/kurifilter-plugins-15.08.3.ebuild
+++ b/kde-apps/kurifilter-plugins/kurifilter-plugins-15.08.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDE: Plugins to manage filtering URIs"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
RESTRICT=test
diff --git a/kde-apps/kuser/kuser-15.08.3.ebuild b/kde-apps/kuser/kuser-15.08.3.ebuild
index 45b4cbd87668..022df20a5749 100644
--- a/kde-apps/kuser/kuser-15.08.3.ebuild
+++ b/kde-apps/kuser/kuser-15.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="KDE application that helps you manage system users"
HOMEPAGE="https://www.kde.org/applications/system/kuser/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/kwalletd/kwalletd-15.08.3.ebuild b/kde-apps/kwalletd/kwalletd-15.08.3.ebuild
index 9efed89c3ac4..5326927b5ed5 100644
--- a/kde-apps/kwalletd/kwalletd-15.08.3.ebuild
+++ b/kde-apps/kwalletd/kwalletd-15.08.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-runtime"
inherit kde4-meta
DESCRIPTION="KDE Password Server"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug gpg"
DEPEND="
diff --git a/kde-apps/kwalletmanager/kwalletmanager-15.04.3.ebuild b/kde-apps/kwalletmanager/kwalletmanager-15.04.3.ebuild
index c1758bb87d97..a9c6b6e0b4ca 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-15.04.3.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-15.04.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-base
DESCRIPTION="KDE Wallet Management Tool"
HOMEAGE="https://www.kde.org/applications/system/kwalletmanager
https://utils.kde.org/projects/kwalletmanager"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug minimal"
src_install() {
diff --git a/kde-apps/kwalletmanager/kwalletmanager-15.08.3-r1.ebuild b/kde-apps/kwalletmanager/kwalletmanager-15.08.3-r1.ebuild
index 8c5bd6f41a20..51891556d128 100644
--- a/kde-apps/kwalletmanager/kwalletmanager-15.08.3-r1.ebuild
+++ b/kde-apps/kwalletmanager/kwalletmanager-15.08.3-r1.ebuild
@@ -10,7 +10,7 @@ KDE_HANDBOOK="forceoptional"
inherit kde5
DESCRIPTION="KDE Wallet management tool"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/libkcddb/libkcddb-15.08.3.ebuild b/kde-apps/libkcddb/libkcddb-15.08.3.ebuild
index 49799c2c0534..1f0c47c7a511 100644
--- a/kde-apps/libkcddb/libkcddb-15.08.3.ebuild
+++ b/kde-apps/libkcddb/libkcddb-15.08.3.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
inherit kde4-base
DESCRIPTION="KDE library for CDDB"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug musicbrainz"
# tests require network access and compare static data with online data
diff --git a/kde-apps/libkcompactdisc/libkcompactdisc-15.08.3.ebuild b/kde-apps/libkcompactdisc/libkcompactdisc-15.08.3.ebuild
index 02cb6ac9222d..74eae16baa43 100644
--- a/kde-apps/libkcompactdisc/libkcompactdisc-15.08.3.ebuild
+++ b/kde-apps/libkcompactdisc/libkcompactdisc-15.08.3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit kde4-base
DESCRIPTION="KDE library for playing & ripping CDs"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="alsa debug"
src_configure() {
diff --git a/kde-apps/libkdcraw/libkdcraw-15.08.3.ebuild b/kde-apps/libkdcraw/libkdcraw-15.08.3.ebuild
index 4c94c8fb9ed7..7be7d8e1be29 100644
--- a/kde-apps/libkdcraw/libkdcraw-15.08.3.ebuild
+++ b/kde-apps/libkdcraw/libkdcraw-15.08.3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit kde4-base
DESCRIPTION="KDE digital camera raw image library wrapper"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/libkdegames/libkdegames-4.14.3-r1.ebuild b/kde-apps/libkdegames/libkdegames-4.14.3-r1.ebuild
index e084af1a66c9..dd52ab1f83f2 100644
--- a/kde-apps/libkdegames/libkdegames-4.14.3-r1.ebuild
+++ b/kde-apps/libkdegames/libkdegames-4.14.3-r1.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit kde4-base
DESCRIPTION="Base library common to many KDE games"
-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-apps/libkexiv2/libkexiv2-15.08.3.ebuild b/kde-apps/libkexiv2/libkexiv2-15.08.3.ebuild
index c1a11bcd7d63..a1c22c2ca5d2 100644
--- a/kde-apps/libkexiv2/libkexiv2-15.08.3.ebuild
+++ b/kde-apps/libkexiv2/libkexiv2-15.08.3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit kde4-base
DESCRIPTION="KDE Image Plugin Interface: an exiv2 library wrapper"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug +xmp"
DEPEND="
diff --git a/kde-apps/libkgeomap/libkgeomap-15.08.3.ebuild b/kde-apps/libkgeomap/libkgeomap-15.08.3.ebuild
index 0c3e4bb3f7fa..10146719aaa5 100644
--- a/kde-apps/libkgeomap/libkgeomap-15.08.3.ebuild
+++ b/kde-apps/libkgeomap/libkgeomap-15.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Wrapper library for world map components as marble, openstreetmap a
HOMEPAGE="https://www.digikam.org/"
LICENSE="GPL-2"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="
diff --git a/kde-apps/libkipi/libkipi-15.08.3.ebuild b/kde-apps/libkipi/libkipi-15.08.3.ebuild
index 11efafc8d1e9..663fbaf90c9b 100644
--- a/kde-apps/libkipi/libkipi-15.08.3.ebuild
+++ b/kde-apps/libkipi/libkipi-15.08.3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit kde4-base
DESCRIPTION="A library for image plugins accross KDE applications"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug minimal"
src_install() {
diff --git a/kde-apps/libkonq/libkonq-15.08.3.ebuild b/kde-apps/libkonq/libkonq-15.08.3.ebuild
index 3db097c3fba3..49cf498be095 100644
--- a/kde-apps/libkonq/libkonq-15.08.3.ebuild
+++ b/kde-apps/libkonq/libkonq-15.08.3.ebuild
@@ -10,7 +10,7 @@ CPPUNIT_REQUIRED="optional"
inherit kde4-meta
DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug minimal"
RESTRICT="test"
diff --git a/kde-apps/libksane/libksane-15.08.3.ebuild b/kde-apps/libksane/libksane-15.08.3.ebuild
index f483d3585a32..3d7fa77324d4 100644
--- a/kde-apps/libksane/libksane-15.08.3.ebuild
+++ b/kde-apps/libksane/libksane-15.08.3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit kde4-base
DESCRIPTION="SANE Library interface for KDE"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
LICENSE="LGPL-2"
diff --git a/kde-apps/lskat/lskat-15.08.3.ebuild b/kde-apps/lskat/lskat-15.08.3.ebuild
index b9a826b3a636..0dcfb1a36516 100644
--- a/kde-apps/lskat/lskat-15.08.3.ebuild
+++ b/kde-apps/lskat/lskat-15.08.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="
https://www.kde.org/applications/games/lskat/
https://games.kde.org/game.php?game=lskat
"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/mplayerthumbs/mplayerthumbs-15.08.3.ebuild b/kde-apps/mplayerthumbs/mplayerthumbs-15.08.3.ebuild
index df50a3c6fad1..8c384ab43d1b 100644
--- a/kde-apps/mplayerthumbs/mplayerthumbs-15.08.3.ebuild
+++ b/kde-apps/mplayerthumbs/mplayerthumbs-15.08.3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit kde4-base
DESCRIPTION="A Thumbnail Generator for Video Files on KDE filemanagers"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
RDEPEND="
diff --git a/kde-apps/nsplugins/nsplugins-15.08.3.ebuild b/kde-apps/nsplugins/nsplugins-15.08.3.ebuild
index 620738a583af..40d3c2f3370e 100644
--- a/kde-apps/nsplugins/nsplugins-15.08.3.ebuild
+++ b/kde-apps/nsplugins/nsplugins-15.08.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kde-baseapps"
inherit kde4-meta pax-utils
DESCRIPTION="Netscape plugins support for Konqueror"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/okular/okular-15.08.3-r1.ebuild b/kde-apps/okular/okular-15.08.3-r1.ebuild
index 83bf330ea084..49a9eab5255a 100644
--- a/kde-apps/okular/okular-15.08.3-r1.ebuild
+++ b/kde-apps/okular/okular-15.08.3-r1.ebuild
@@ -14,7 +14,7 @@ inherit kde4-base
DESCRIPTION="Okular is a universal document viewer based on KPDF for KDE 4"
HOMEPAGE="https://okular.kde.org https://www.kde.org/applications/graphics/okular"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="chm crypt debug djvu dpi ebook +jpeg kde mobi +postscript +pdf +tiff"
DEPEND="
diff --git a/kde-apps/pairs/pairs-15.04.3.ebuild b/kde-apps/pairs/pairs-15.04.3.ebuild
index 105c19c020bf..33fc5fef62bb 100644
--- a/kde-apps/pairs/pairs-15.04.3.ebuild
+++ b/kde-apps/pairs/pairs-15.04.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="KDE memory and pairs game"
HOMEPAGE="https://edu.kde.org/applications/miscellaneous/pairs"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND=""
diff --git a/kde-apps/palapeli/palapeli-15.08.3.ebuild b/kde-apps/palapeli/palapeli-15.08.3.ebuild
index 678ec4afad37..2b5e8ffaeff4 100644
--- a/kde-apps/palapeli/palapeli-15.08.3.ebuild
+++ b/kde-apps/palapeli/palapeli-15.08.3.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="KDE jigsaw puzzle game"
HOMEPAGE="https://www.kde.org/applications/games/palapeli/"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="$(add_kdeapps_dep libkdegames)"
diff --git a/kde-apps/phonon-kde/phonon-kde-15.08.3.ebuild b/kde-apps/phonon-kde/phonon-kde-15.08.3.ebuild
index 95842727d2a8..8e8a80568c47 100644
--- a/kde-apps/phonon-kde/phonon-kde-15.08.3.ebuild
+++ b/kde-apps/phonon-kde/phonon-kde-15.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
DESCRIPTION="Phonon KDE Integration"
HOMEPAGE="https://phonon.kde.org"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="alsa debug pulseaudio"
DEPEND="
diff --git a/kde-apps/plasma-apps/plasma-apps-15.08.3.ebuild b/kde-apps/plasma-apps/plasma-apps-15.08.3.ebuild
index 87f6d52a69a0..828adbf888d9 100644
--- a/kde-apps/plasma-apps/plasma-apps-15.08.3.ebuild
+++ b/kde-apps/plasma-apps/plasma-apps-15.08.3.ebuild
@@ -9,7 +9,7 @@ KMMODULE="plasma"
inherit kde4-meta
DESCRIPTION="Additional Applets for Plasma"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/plasma-runtime/plasma-runtime-15.08.3.ebuild b/kde-apps/plasma-runtime/plasma-runtime-15.08.3.ebuild
index 7e5b70ea0aaf..bad3e05058d5 100644
--- a/kde-apps/plasma-runtime/plasma-runtime-15.08.3.ebuild
+++ b/kde-apps/plasma-runtime/plasma-runtime-15.08.3.ebuild
@@ -10,7 +10,7 @@ DECLARATIVE_REQUIRED="always"
inherit kde4-meta
DESCRIPTION="Script engine and package tool for plasma"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/poxml/poxml-15.08.3.ebuild b/kde-apps/poxml/poxml-15.08.3.ebuild
index 10e8f240ab2c..f7fb9a2ad15a 100644
--- a/kde-apps/poxml/poxml-15.08.3.ebuild
+++ b/kde-apps/poxml/poxml-15.08.3.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit kde4-base
DESCRIPTION="KDE utility to translate DocBook XML files using gettext po files"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="sys-devel/gettext"
diff --git a/kde-apps/renamedlg-plugins/renamedlg-plugins-15.08.3.ebuild b/kde-apps/renamedlg-plugins/renamedlg-plugins-15.08.3.ebuild
index 3247c9455a18..2f1a9e37d4ae 100644
--- a/kde-apps/renamedlg-plugins/renamedlg-plugins-15.08.3.ebuild
+++ b/kde-apps/renamedlg-plugins/renamedlg-plugins-15.08.3.ebuild
@@ -9,5 +9,5 @@ KMMODULE="renamedlgplugins"
inherit kde4-meta
DESCRIPTION="KDE RenameDlg plugins"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/solid-runtime/solid-runtime-15.08.3.ebuild b/kde-apps/solid-runtime/solid-runtime-15.08.3.ebuild
index aee7d2444642..a3db8345593b 100644
--- a/kde-apps/solid-runtime/solid-runtime-15.08.3.ebuild
+++ b/kde-apps/solid-runtime/solid-runtime-15.08.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
DESCRIPTION="KDE SC solid runtime modules (autoeject, automounter and others)"
HOMEPAGE="https://solid.kde.org"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug bluetooth networkmanager"
KMEXTRA="
diff --git a/kde-apps/superkaramba/superkaramba-15.08.3.ebuild b/kde-apps/superkaramba/superkaramba-15.08.3.ebuild
index 56aebb2b42d0..7940335def5d 100644
--- a/kde-apps/superkaramba/superkaramba-15.08.3.ebuild
+++ b/kde-apps/superkaramba/superkaramba-15.08.3.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 kde4-base
DESCRIPTION="A tool to create interactive applets for the KDE desktop"
HOMEPAGE="https://www.kde.org/applications/utilities/superkaramba
https://utils.kde.org/projects/superkaramba"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-apps/svgpart/svgpart-15.08.3.ebuild b/kde-apps/svgpart/svgpart-15.08.3.ebuild
index 2bc58c02a5d4..4df0b089d8be 100644
--- a/kde-apps/svgpart/svgpart-15.08.3.ebuild
+++ b/kde-apps/svgpart/svgpart-15.08.3.ebuild
@@ -7,5 +7,5 @@ EAPI=5
inherit kde4-base
DESCRIPTION="Svgpart is a kpart for viewing SVGs"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/sweeper/sweeper-15.08.3.ebuild b/kde-apps/sweeper/sweeper-15.08.3.ebuild
index c3c2e3256d91..28f0a1302798 100644
--- a/kde-apps/sweeper/sweeper-15.08.3.ebuild
+++ b/kde-apps/sweeper/sweeper-15.08.3.ebuild
@@ -10,5 +10,5 @@ inherit kde4-base
DESCRIPTION="KDE Privacy Settings Widget"
HOMEPAGE="https://www.kde.org/applications/utilities/sweeper
https://utils.kde.org/projects/sweeper"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-apps/thumbnailers/thumbnailers-15.08.3.ebuild b/kde-apps/thumbnailers/thumbnailers-15.08.3.ebuild
index 052d9915a4b2..71553c693b02 100644
--- a/kde-apps/thumbnailers/thumbnailers-15.08.3.ebuild
+++ b/kde-apps/thumbnailers/thumbnailers-15.08.3.ebuild
@@ -8,7 +8,7 @@ KMNAME="kdegraphics-thumbnailers"
inherit kde4-base
DESCRIPTION="KDE 4 thumbnail generators for PDF/PS files"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
diff --git a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-15.08.3.ebuild b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-15.08.3.ebuild
index bb579e558a47..6d9d8ceab99b 100644
--- a/kde-apps/zeroconf-ioslave/zeroconf-ioslave-15.08.3.ebuild
+++ b/kde-apps/zeroconf-ioslave/zeroconf-ioslave-15.08.3.ebuild
@@ -7,5 +7,5 @@ EAPI=5
inherit kde4-base
DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS=" ~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug"
diff --git a/kde-base/freespacenotifier/freespacenotifier-4.11.22.ebuild b/kde-base/freespacenotifier/freespacenotifier-4.11.22.ebuild
index a921c93336b7..375ece5e1ad8 100644
--- a/kde-base/freespacenotifier/freespacenotifier-4.11.22.ebuild
+++ b/kde-base/freespacenotifier/freespacenotifier-4.11.22.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/kactivities/kactivities-4.13.3-r2.ebuild b/kde-base/kactivities/kactivities-4.13.3-r2.ebuild
index fe70ee206343..4782bc8d7890 100644
--- a/kde-base/kactivities/kactivities-4.13.3-r2.ebuild
+++ b/kde-base/kactivities/kactivities-4.13.3-r2.ebuild
@@ -10,7 +10,7 @@ inherit kde4-base
DESCRIPTION="KDE Activity Manager"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild b/kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild
index e5090026f250..ad9169267147 100644
--- a/kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild
+++ b/kde-base/kactivitymanagerd/kactivitymanagerd-4.13.3-r1.ebuild
@@ -8,7 +8,7 @@ KMNAME="kactivities"
inherit kde4-base
DESCRIPTION="KDE Activity Manager Daemon"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/kde-base/kcheckpass/kcheckpass-4.11.22-r1.ebuild b/kde-base/kcheckpass/kcheckpass-4.11.22-r1.ebuild
index bc4f592ce846..873b7989d4ad 100644
--- a/kde-base/kcheckpass/kcheckpass-4.11.22-r1.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-4.11.22-r1.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"
DEPEND="
diff --git a/kde-base/kcminit/kcminit-4.11.22.ebuild b/kde-base/kcminit/kcminit-4.11.22.ebuild
index 277a90ae0a5f..029ba6db8a48 100644
--- a/kde-base/kcminit/kcminit-4.11.22.ebuild
+++ b/kde-base/kcminit/kcminit-4.11.22.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/kdebase-cursors-4.11.22.ebuild b/kde-base/kdebase-cursors/kdebase-cursors-4.11.22.ebuild
index 1c9fe7493560..16e8849a03f2 100644
--- a/kde-base/kdebase-cursors/kdebase-cursors-4.11.22.ebuild
+++ b/kde-base/kdebase-cursors/kdebase-cursors-4.11.22.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/kdebase-startkde-4.11.22.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild
index 273f2f7eeb5f..db4cedc46e7d 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-4.11.22.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/kdelibs-4.14.16.ebuild b/kde-base/kdelibs/kdelibs-4.14.16.ebuild
index a8a717f5c5eb..ea0b993b1668 100644
--- a/kde-base/kdelibs/kdelibs-4.14.16.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.14.16.ebuild
@@ -15,7 +15,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 libressl lzma cpu_flags_x86_mmx nls openexr +policykit spell
diff --git a/kde-base/kdm/kdm-4.11.22.ebuild b/kde-base/kdm/kdm-4.11.22.ebuild
index fea98de64a6c..9ee1dc85a756 100644
--- a/kde-base/kdm/kdm-4.11.22.ebuild
+++ b/kde-base/kdm/kdm-4.11.22.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/kephal-4.11.22.ebuild b/kde-base/kephal/kephal-4.11.22.ebuild
index 0bb2f6cc6a3b..5d1d85cd08a3 100644
--- a/kde-base/kephal/kephal-4.11.22.ebuild
+++ b/kde-base/kephal/kephal-4.11.22.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/khotkeys-4.11.22.ebuild b/kde-base/khotkeys/khotkeys-4.11.22.ebuild
index 17caa00c23ad..3517f452a732 100644
--- a/kde-base/khotkeys/khotkeys-4.11.22.ebuild
+++ b/kde-base/khotkeys/khotkeys-4.11.22.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/kinfocenter-4.11.22.ebuild b/kde-base/kinfocenter/kinfocenter-4.11.22.ebuild
index 5969d69219c0..7cbeb857b9aa 100644
--- a/kde-base/kinfocenter/kinfocenter-4.11.22.ebuild
+++ b/kde-base/kinfocenter/kinfocenter-4.11.22.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/klipper/klipper-4.11.22.ebuild b/kde-base/klipper/klipper-4.11.22.ebuild
index 633f1fe6cef8..820cab6b397e 100644
--- a/kde-base/klipper/klipper-4.11.22.ebuild
+++ b/kde-base/klipper/klipper-4.11.22.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/kmenuedit/kmenuedit-4.11.22.ebuild b/kde-base/kmenuedit/kmenuedit-4.11.22.ebuild
index 472f545e252c..3ce993444c3a 100644
--- a/kde-base/kmenuedit/kmenuedit-4.11.22.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-4.11.22.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/krunner/krunner-4.11.22.ebuild b/kde-base/krunner/krunner-4.11.22.ebuild
index 67636c76b588..8f8898fb48ff 100644
--- a/kde-base/krunner/krunner-4.11.22.ebuild
+++ b/kde-base/krunner/krunner-4.11.22.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/kscreensaver-4.11.22.ebuild b/kde-base/kscreensaver/kscreensaver-4.11.22.ebuild
index d311ad828448..d0ce742845ff 100644
--- a/kde-base/kscreensaver/kscreensaver-4.11.22.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-4.11.22.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/ksmserver-4.11.22.ebuild b/kde-base/ksmserver/ksmserver-4.11.22.ebuild
index f1085e30b403..9e5ade45fa0d 100644
--- a/kde-base/ksmserver/ksmserver-4.11.22.ebuild
+++ b/kde-base/ksmserver/ksmserver-4.11.22.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/ksplash-4.11.22.ebuild b/kde-base/ksplash/ksplash-4.11.22.ebuild
index 1838622d58c8..0e11a5a4399b 100644
--- a/kde-base/ksplash/ksplash-4.11.22.ebuild
+++ b/kde-base/ksplash/ksplash-4.11.22.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/kstartupconfig-4.11.22.ebuild b/kde-base/kstartupconfig/kstartupconfig-4.11.22.ebuild
index 7f1f3a9fb6a2..65df430286fe 100644
--- a/kde-base/kstartupconfig/kstartupconfig-4.11.22.ebuild
+++ b/kde-base/kstartupconfig/kstartupconfig-4.11.22.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/kstyles-4.11.22.ebuild b/kde-base/kstyles/kstyles-4.11.22.ebuild
index a0facfd8f3d7..14138f9a4e1f 100644
--- a/kde-base/kstyles/kstyles-4.11.22.ebuild
+++ b/kde-base/kstyles/kstyles-4.11.22.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/ksysguard-4.11.22.ebuild b/kde-base/ksysguard/ksysguard-4.11.22.ebuild
index fa3849497291..ad3a5497f530 100644
--- a/kde-base/ksysguard/ksysguard-4.11.22.ebuild
+++ b/kde-base/ksysguard/ksysguard-4.11.22.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/ksystraycmd-4.11.22.ebuild b/kde-base/ksystraycmd/ksystraycmd-4.11.22.ebuild
index 99dac5e3d947..77ad6142f5c2 100644
--- a/kde-base/ksystraycmd/ksystraycmd-4.11.22.ebuild
+++ b/kde-base/ksystraycmd/ksystraycmd-4.11.22.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/kwin/kwin-4.11.22.ebuild b/kde-base/kwin/kwin-4.11.22.ebuild
index a2e269d4c803..edc8c8bc8e82 100644
--- a/kde-base/kwin/kwin-4.11.22.ebuild
+++ b/kde-base/kwin/kwin-4.11.22.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/kwrited-4.11.22.ebuild b/kde-base/kwrited/kwrited-4.11.22.ebuild
index 26b8fc3e68cb..f247109dcf7d 100644
--- a/kde-base/kwrited/kwrited-4.11.22.ebuild
+++ b/kde-base/kwrited/kwrited-4.11.22.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/legacy-icons/legacy-icons-4.11.22.ebuild b/kde-base/legacy-icons/legacy-icons-4.11.22.ebuild
index 947f30a17509..6b6c1092dff3 100644
--- a/kde-base/legacy-icons/legacy-icons-4.11.22.ebuild
+++ b/kde-base/legacy-icons/legacy-icons-4.11.22.ebuild
@@ -9,7 +9,7 @@ inherit kde4-base
DESCRIPTION="KDE legacy icons"
SRC_URI="mirror://kde/stable/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND=""
diff --git a/kde-base/libkgreeter/libkgreeter-4.11.22.ebuild b/kde-base/libkgreeter/libkgreeter-4.11.22.ebuild
index 46799920307f..8d9209b0ed93 100644
--- a/kde-base/libkgreeter/libkgreeter-4.11.22.ebuild
+++ b/kde-base/libkgreeter/libkgreeter-4.11.22.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/libkworkspace-4.11.22.ebuild b/kde-base/libkworkspace/libkworkspace-4.11.22.ebuild
index 3693deb9eb23..4be7fbf64bbb 100644
--- a/kde-base/libkworkspace/libkworkspace-4.11.22.ebuild
+++ b/kde-base/libkworkspace/libkworkspace-4.11.22.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/liboxygenstyle-4.11.22.ebuild b/kde-base/liboxygenstyle/liboxygenstyle-4.11.22.ebuild
index 9315b7b9f2c8..34be03f0d725 100644
--- a/kde-base/liboxygenstyle/liboxygenstyle-4.11.22.ebuild
+++ b/kde-base/liboxygenstyle/liboxygenstyle-4.11.22.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/libplasmaclock-4.11.22.ebuild b/kde-base/libplasmaclock/libplasmaclock-4.11.22.ebuild
index 024427b69939..d115ab655954 100644
--- a/kde-base/libplasmaclock/libplasmaclock-4.11.22.ebuild
+++ b/kde-base/libplasmaclock/libplasmaclock-4.11.22.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/libplasmagenericshell-4.11.22.ebuild b/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.22.ebuild
index bbd61fc5d842..90dbe2a4f04d 100644
--- a/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.22.ebuild
+++ b/kde-base/libplasmagenericshell/libplasmagenericshell-4.11.22.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/libtaskmanager-4.11.22.ebuild b/kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild
index a5a15943633f..55348a64ec49 100644
--- a/kde-base/libtaskmanager/libtaskmanager-4.11.22.ebuild
+++ b/kde-base/libtaskmanager/libtaskmanager-4.11.22.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/plasma-workspace-4.11.22.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild
index 656127ab67b8..7c4c330dcf6d 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.11.22.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.11.22.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/powerdevil-4.11.22.ebuild b/kde-base/powerdevil/powerdevil-4.11.22.ebuild
index 96ba396536a3..18cd159ca476 100644
--- a/kde-base/powerdevil/powerdevil-4.11.22.ebuild
+++ b/kde-base/powerdevil/powerdevil-4.11.22.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/qguiplatformplugin_kde-4.11.22.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild
index dfe09550d6a4..e6cc58aa56df 100644
--- a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.ebuild
+++ b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.22.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/solid-actions-kcm-4.11.22.ebuild b/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.22.ebuild
index 910705bcdd10..6a82ac773a36 100644
--- a/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.22.ebuild
+++ b/kde-base/solid-actions-kcm/solid-actions-kcm-4.11.22.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/systemsettings-4.11.22-r1.ebuild b/kde-base/systemsettings/systemsettings-4.11.22-r1.ebuild
index b322ed00f54f..c4c70a62dda2 100644
--- a/kde-base/systemsettings/systemsettings-4.11.22-r1.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.11.22-r1.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/extra-cmake-modules/extra-cmake-modules-5.17.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.17.0.ebuild
index c1375695b9ac..6a7af101d360 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.17.0.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.17.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Extra modules and scripts for CMake"
HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
LICENSE="BSD"
-KEYWORDS=" ~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
IUSE="doc"
DEPEND="
diff --git a/kde-frameworks/kapidox/kapidox-5.17.0.ebuild b/kde-frameworks/kapidox/kapidox-5.17.0.ebuild
index 9cc3c43fed88..699103420b61 100644
--- a/kde-frameworks/kapidox/kapidox-5.17.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.17.0.ebuild
@@ -13,7 +13,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"
+KEYWORDS=" amd64 ~arm ~arm64 ~x86"
IUSE=""
RDEPEND="
diff --git a/kde-frameworks/kf-env/kf-env-3.ebuild b/kde-frameworks/kf-env/kf-env-3.ebuild
index 7df0cfef9a99..a34d4eac6d50 100644
--- a/kde-frameworks/kf-env/kf-env-3.ebuild
+++ b/kde-frameworks/kf-env/kf-env-3.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE="GPL-2"
SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
IUSE=""
RDEPEND=">=x11-misc/xdg-utils-1.1.0_rc3_p20150119"
diff --git a/licenses/sun-concurrent-util b/licenses/sun-concurrent-util
deleted file mode 100644
index 331a350aa351..000000000000
--- a/licenses/sun-concurrent-util
+++ /dev/null
@@ -1,51 +0,0 @@
- TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC.
- TO DOUG LEA
-
-Whereas Doug Lea desires to utlized certain Java Software technologies
-in the util.concurrent technology; and
-
-Whereas Sun Microsystems, Inc. (“Sun”) desires that Doug Lea utilize
-certain Java Software technologies in the util.concurrent technology;
-
-Therefore the parties agree as follows, effective May 31, 2002:
-
-“Java Software technologies” means
-
- classes/java/util/ArrayList.java, and
- classes/java/util/HashMap.java.
-
-The Java Software technologies are Copyright (c) 1994-2000 Sun
-Microsystems, Inc. All rights reserved.
-
-Sun hereby grants Doug Lea a non-exclusive, worldwide,
-non-transferrable license to use, reproduce, create derivate works of,
-and distribute the Java Software and derivative works thereof in
-source and binary forms as part of a larger work, and to sublicense
-the right to use, reproduce and distribute the Java Software and Doug
-Lea's derivative works as the part of larger works through multiple
-tiers of sublicensees provided that the following conditions are met:
-
--Neither the name of or trademarks of Sun may be used to endorse or
-promote products including or derived from the Java Software
-technology without specific prior written permission; and
--Redistributions of source or binary code must contain the above
-copyright notice, this notice and and the following disclaimers:
-
-This software is provided "AS IS," without a warranty of any kind.
-ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
-INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
-MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY
-DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
-DISTRIBUTING THE SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN
-MICROSYSTEMS, INC. OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE,
-PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL,
-INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE
-THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE
-SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC. HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES. You acknowledge that Software is not
-designed,licensed or intended for use in the design, construction,
-operation or maintenance of any nuclear facility.
-
-
- signed [Doug Lea] dated
diff --git a/mail-client/evolution/evolution-3.18.5.1.ebuild b/mail-client/evolution/evolution-3.18.5.1.ebuild
index 5f4aa08c4e6b..0e5871b3a2d8 100644
--- a/mail-client/evolution/evolution-3.18.5.1.ebuild
+++ b/mail-client/evolution/evolution-3.18.5.1.ebuild
@@ -17,7 +17,7 @@ SLOT="2.0"
IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
# We need a graphical pinentry frontend to be able to ask for the GPG
# password from inside evolution, bug 160302
diff --git a/mail-client/trojita/trojita-0.5.ebuild b/mail-client/trojita/trojita-0.5.ebuild
index ecdcaa86cf63..447f6d061e4a 100644
--- a/mail-client/trojita/trojita-0.5.ebuild
+++ b/mail-client/trojita/trojita-0.5.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then
KEYWORDS=""
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
- KEYWORDS="amd64 ~x86"
+ KEYWORDS="amd64 x86"
MY_LANGS="ar bs ca cs da de el en_GB es et fi fr ga gl hu ia it ja lt mr nb nds nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
fi
diff --git a/mail-mta/exim/exim-4.86.2.ebuild b/mail-mta/exim/exim-4.86.2.ebuild
index 1e63f26ac6f6..414ea67efbe2 100644
--- a/mail-mta/exim/exim-4.86.2.ebuild
+++ b/mail-mta/exim/exim-4.86.2.ebuild
@@ -515,6 +515,11 @@ pkg_postinst() {
einfo "support prior to 4.83, make sure to remove all dsn_process"
einfo "switches from your routers, see https://bugs.gentoo.org/511818"
fi
+ if use perl ; then
+ einfo "For CVE-2016-1531, Exim introduced keep_environment and"
+ einfo "add_environment flags. You might want to set them, see:"
+ einfo "https://lists.exim.org/lurker/message/20160302.191005.a72d8433.en.html"
+ fi
einfo "Exim maintains some db files under its spool directory that need"
einfo "cleaning from time to time. (${EROOT}var/spool/exim/db)"
einfo "Please use the exim_tidydb tool as documented in the Exim manual:"
diff --git a/mate-base/caja/caja-1.8.2-r1.ebuild b/mate-base/caja/caja-1.8.2-r1.ebuild
index a9486c950a62..e478c87ffcfd 100644
--- a/mate-base/caja/caja-1.8.2-r1.ebuild
+++ b/mate-base/caja/caja-1.8.2-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
LICENSE="GPL-2 LGPL-2 FDL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+mate +introspection +unique xmp"
diff --git a/mate-base/mate-applets/mate-applets-1.8.1.ebuild b/mate-base/mate-applets/mate-applets-1.8.1.ebuild
index 256fb955506e..032edf09d568 100644
--- a/mate-base/mate-applets/mate-applets-1.8.1.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.8.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
LICENSE="GPL-2 FDL-1.1 LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="X ipv6 networkmanager policykit +upower"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/mate-base/mate-control-center/mate-control-center-1.8.3.ebuild b/mate-base/mate-control-center/mate-control-center-1.8.3.ebuild
index 7a4c487577d5..afc1d10535db 100644
--- a/mate-base/mate-control-center/mate-control-center-1.8.3.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-1.8.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="app-text/rarian:0
dev-libs/atk:0
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.8.2.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.8.2.ebuild
index 7b8a35c43181..fb7b7a3f159f 100644
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.8.2.ebuild
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.8.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="X debug libnotify policykit pulseaudio smartcard"
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild
index 343513ecc140..ec6e65077e46 100644
--- a/mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.8.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+applet gnome-keyring man policykit test unique"
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.8.1-r1.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.8.1-r1.ebuild
index 8a03d63bee3d..4337fd623e4a 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.8.1-r1.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.8.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://mate-desktop.org"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="X consolekit kernel_linux libnotify opengl pam systemd"
diff --git a/mate-extra/mate-user-share/mate-user-share-1.8.0-r1.ebuild b/mate-extra/mate-user-share/mate-user-share-1.8.0-r1.ebuild
index 3fe2309dc647..4151b628a5c9 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.8.0-r1.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.8.0-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.mate-desktop.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="X"
diff --git a/mate-extra/mate-utils/mate-utils-1.8.1.ebuild b/mate-extra/mate-utils/mate-utils-1.8.1.ebuild
index f0ddb2213045..216f24d1d164 100644
--- a/mate-extra/mate-utils/mate-utils-1.8.1.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.8.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="X applet ipv6 test"
diff --git a/media-fonts/cantarell/cantarell-0.0.24.ebuild b/media-fonts/cantarell/cantarell-0.0.24.ebuild
index 45f7fb71242d..82aba78f1df8 100644
--- a/media-fonts/cantarell/cantarell-0.0.24.ebuild
+++ b/media-fonts/cantarell/cantarell-0.0.24.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/CantarellFonts"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND="media-libs/fontconfig"
diff --git a/media-fonts/noto/Manifest b/media-fonts/noto/Manifest
index 203fe49660c8..58a0ed598e1a 100644
--- a/media-fonts/noto/Manifest
+++ b/media-fonts/noto/Manifest
@@ -1,2 +1,3 @@
DIST noto-2014.11.zip 381169520 SHA256 6f49663b4a40ed291ff459808a9d1fa6d41f6b3309b79cf7aeaf5fa884040e2c SHA512 36695b99daf870f76d00535513ae0e16170b8d7eb471f75ae016fb970cae236ce6fcf41da790567369dde0bbd87b4c023cac6aa197dd17f8f809d20a4cca3c5b WHIRLPOOL 21977fb0369975ac6ae66c950826478b17f5d5860fd88b2e45f5c016b046e6f17618c1477fb84021348266babecf4c7efa3ca939495cb392bfb4b897466c2218
DIST noto-2015.04.zip 380076754 SHA256 20a467d6664f5bd5d4604e903dd562ba3970dd29b17b09c7b591cb3c293287f6 SHA512 4ed6cb02007d2a96d46a96fba66639cce35019ce0490843d1d1ee3684dca4638227c6b6cb89b49cabe745b523d0e3b48f338555fcbe7168f120107d24d4d2ca7 WHIRLPOOL cc92fceb7e4b260acc936c224cca1cee89d8be3f8dae5b9cbe7426c0787d8ed64aae587f53f46f9fdd327732b7755f04870f69617585f005cb7a3b67434c6452
+DIST noto-20160305.zip 494039413 SHA256 a979d9837d4223bcbe55497e3b5c545e0e554a78584f60915f1e620d3fbe508e SHA512 bf20eaf075491d46c7c4d1ea3514f38d0515180879ea4ad0a3a77d72c54cdd4b043e06f4e6852f5f68b1ab2d5f512261ad25ceacdb3e19db2769f0c05c1a795c WHIRLPOOL 75c4bced2caa5990b8688e3c06214ed0dfc1dd85e00607b69c458a39c856835ea7ea9fd6d4f6710945c634991ed41cf3e3c69046e12194c22d73ecd8f46d4fc1
diff --git a/media-fonts/noto/noto-20160305.ebuild b/media-fonts/noto/noto-20160305.ebuild
new file mode 100644
index 000000000000..8326a17db86f
--- /dev/null
+++ b/media-fonts/noto/noto-20160305.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 font
+
+DESCRIPTION="Google's font family that aims to support all the world's languages"
+HOMEPAGE="https://www.google.com/get/noto/"
+SRC_URI="https://dev.gentoo.org/~pacho/${PN}/${P}.zip"
+# renamed from upstream's unversioned Noto-hinted.zip
+# version number based on the timestamp of most recently updated font in the zip
+
+LICENSE="OFL-1.1" # https://github.com/googlei18n/noto-fonts/blob/master/NEWS
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RESTRICT="binchecks strip"
+
+S=${WORKDIR}
+FONT_S="${S}"
+FONT_SUFFIX="otf ttf"
diff --git a/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild b/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild
index 85a2b19a67eb..ecc2561ac80c 100644
--- a/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild
+++ b/media-fonts/terminus-font/terminus-font-4.39-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
LICENSE="OFL-1.1 GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="a-like-o +center-tilde distinct-l +pcf +pcf-unicode-only +psf quote
raw-font-data ru-dv +ru-g ru-i ru-k"
diff --git a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83.ebuild b/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83.ebuild
index 854923f8fb93..6f2c001e30af 100644
--- a/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83.ebuild
+++ b/media-fonts/ubuntu-font-family/ubuntu-font-family-0.83.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ SRC_URI="http://font.ubuntu.com/download/${P}.zip"
LICENSE="UbuntuFontLicense-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE=""
DEPEND="app-arch/unzip"
diff --git a/media-fonts/unifont/unifont-8.0.01.ebuild b/media-fonts/unifont/unifont-8.0.01.ebuild
index 63d6ca099178..63576a734e7c 100644
--- a/media-fonts/unifont/unifont-8.0.01.ebuild
+++ b/media-fonts/unifont/unifont-8.0.01.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="fontforge utils"
DEPEND="
diff --git a/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild b/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild
index f9cf09ce38b3..13246537f320 100644
--- a/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild
+++ b/media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
# Tests need valgrind, that needs glibc with debugging symbols
diff --git a/media-gfx/cptutils/Manifest b/media-gfx/cptutils/Manifest
index ccfc9e1f9159..9bf33abe3657 100644
--- a/media-gfx/cptutils/Manifest
+++ b/media-gfx/cptutils/Manifest
@@ -1,3 +1,2 @@
-DIST cptutils-1.54.tar.gz 587268 SHA256 07848a1e76337595c1ee7619638f16b6c0818717b2460096093078866402cc22 SHA512 8bae9d5d9d5b2ae0e39eda6e157734fa17afe6225b4966c93db4072f31e7ec91c7c0a7b4b1cf0bfdd696444485a61e93da725c2d94854b4de5e1c9936bec3e37 WHIRLPOOL fb39ef953fd92a177f25a262b9122decad22713019a1821d8a8a048b12ddbbd125e860fec923148e1529b54883a6feb9b155b5b28c18be00ef763b0b6ae0137c
-DIST cptutils-1.59.tar.gz 599033 SHA256 d4f3adf55bc1643d64d513371c0948d37ad4f0bb614ea90557c23d7ebd860616 SHA512 b8e78eadb7353d6cbb8b01eb3eb2791e425697ccff6df50125392cb476e7b1bdb5c83b40e27d9c28899f4ed364e46e195febaa28374ffe5abca697665838f7fe WHIRLPOOL ad7c95a5be927199e83f24ff94950c2595738139c8fe84c489561d0d26c61509c493966b806213cd91d87c3efd87b5ec15fc1ec9dc2bb8fd74278f78cba0e35f
DIST cptutils-1.61.tar.gz 599266 SHA256 749fe0277c9483ccc93df820cb35baf898e491f1b307726c652fc3ab3d92be7f SHA512 d07996d151f863ad3f70c90f55f2b93b5969a673a67e0213a386bd47490a25bf13a27ea35cc6b70e4f23ffa87e4e4ce12d8a9357f8d84e331397b1e4b977ce31 WHIRLPOOL e03bb0223134cf5a42be61e67861779727b6ba5514e82f49934d024b8cb2617a91a0cf8900fd86f52d8a2d9e811f38ffd413207291990ad37d1d028efb970395
+DIST cptutils-1.62.tar.gz 606137 SHA256 26fdf0a1f59855a8b23646718c0a3e5060f2f923c208e06e45cb844a2cc006ac SHA512 48a8b4d5919a080124098fc2a774d870dc41b0fc076b550d2130d4bfb60df3c488393da3af60e34bef6b58437154bc3406b1cb06df3feee63957a36aeadf6125 WHIRLPOOL 507645f90ede10db33ac018f3f3fe1fb878265af2b0278479ba8d45a5973dd31b38c48eebafeceb207ac4d6e0ee058ffc2bec4c8ee5ec3569c6b879521778ae8
diff --git a/media-gfx/cptutils/cptutils-1.54.ebuild b/media-gfx/cptutils/cptutils-1.54.ebuild
deleted file mode 100644
index 4c5e7200184a..000000000000
--- a/media-gfx/cptutils/cptutils-1.54.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
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 eutils
-
-DESCRIPTION="A number of utilities for the manipulation of color gradient files"
-HOMEPAGE="http://soliton.vm.bytemark.co.uk/pub/jjg/en/code/cptutils.html"
-SRC_URI="http://soliton.vm.bytemark.co.uk/pub/jjg/code/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-CDEPEND="dev-libs/libxml2:2
- media-libs/libpng:0="
-RDEPEND="${CDEPEND}
- ${PYTHON_DEPS}"
-DEPEND="${CDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-parallel-make.patch
- python_fix_shebang src/gradient-convert/gradient-convert.py
-}
diff --git a/media-gfx/cptutils/cptutils-1.59.ebuild b/media-gfx/cptutils/cptutils-1.62.ebuild
index 4fd45152bd16..db936ad08bc9 100644
--- a/media-gfx/cptutils/cptutils-1.59.ebuild
+++ b/media-gfx/cptutils/cptutils-1.62.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/media-gfx/eog-plugins/eog-plugins-3.16.3.ebuild b/media-gfx/eog-plugins/eog-plugins-3.16.3.ebuild
index e48eea90c119..77ebdb829ba1 100644
--- a/media-gfx/eog-plugins/eog-plugins-3.16.3.ebuild
+++ b/media-gfx/eog-plugins/eog-plugins-3.16.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+exif +flickr map +picasa +python"
REQUIRED_USE="
diff --git a/media-gfx/eog/eog-3.18.2.ebuild b/media-gfx/eog/eog-3.18.2.ebuild
index 8c8aa2657dbc..be395af0372d 100644
--- a/media-gfx/eog/eog-3.18.2.ebuild
+++ b/media-gfx/eog/eog-3.18.2.ebuild
@@ -16,7 +16,7 @@ SLOT="1"
IUSE="+exif +introspection +jpeg lcms +svg tiff xmp"
REQUIRED_USE="exif? ( jpeg )"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
RDEPEND="
>=dev-libs/glib-2.38:2[dbus]
diff --git a/media-gfx/eom/eom-1.8.1.ebuild b/media-gfx/eom/eom-1.8.1.ebuild
index 9ca917f5542f..3efe1964cadd 100644
--- a/media-gfx/eom/eom-1.8.1.ebuild
+++ b/media-gfx/eom/eom-1.8.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://mate-desktop.org"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="X dbus exif jpeg lcms python svg tiff xmp"
diff --git a/media-gfx/fotowall/fotowall-0.9-r2.ebuild b/media-gfx/fotowall/fotowall-0.9-r2.ebuild
index 059e54875b05..c97e1e754a78 100644
--- a/media-gfx/fotowall/fotowall-0.9-r2.ebuild
+++ b/media-gfx/fotowall/fotowall-0.9-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://fotowall.googlecode.com/files/${MY_P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="opengl webcam"
RDEPEND="
diff --git a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
index e947a6dc9b61..116fea57a888 100644
--- a/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
+++ b/media-gfx/geeqie/geeqie-1.2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.geeqie.org/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="debug doc exif gtk3 jpeg lcms lirc lua tiff xmp"
RDEPEND="gtk3? ( x11-libs/gtk+:3 )
diff --git a/media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild b/media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild
index c52994cfde4c..333e68d47375 100644
--- a/media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild
+++ b/media-gfx/gnome-photos/gnome-photos-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="test"
RDEPEND="
diff --git a/media-gfx/gnome-screenshot/gnome-screenshot-3.18.0.ebuild b/media-gfx/gnome-screenshot/gnome-screenshot-3.18.0.ebuild
index 181254b8d638..62424ead7feb 100644
--- a/media-gfx/gnome-screenshot/gnome-screenshot-3.18.0.ebuild
+++ b/media-gfx/gnome-screenshot/gnome-screenshot-3.18.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-screenshot"
LICENSE="GPL-2+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
# libcanberra 0.26-r2 is needed for gtk+:3 fixes
COMMON_DEPEND="
diff --git a/media-gfx/gphoto2/gphoto2-2.5.9.ebuild b/media-gfx/gphoto2/gphoto2-2.5.9.ebuild
index b7103ddc8a86..83ed3d61c572 100644
--- a/media-gfx/gphoto2/gphoto2-2.5.9.ebuild
+++ b/media-gfx/gphoto2/gphoto2-2.5.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
IUSE="aalib exif ncurses nls readline"
# aalib -> needs libjpeg
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index c91e31d38f49..286fc45d7493 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -1,3 +1,4 @@
DIST GraphicsMagick-1.3.18.tar.xz 5124436 SHA256 fd48eebe200793e6f62a2b7d96413c94a8967ab56295605513898e2c8524b0ab SHA512 c04dbca467d2ac94d9c47818c7087954ceb54a736fdd062be6d499319037f4bbca3a779542d8acad262b59cb599521f895177574a21975f496ba57061b64b960 WHIRLPOOL d3b396d1cf3691f4aec1387066a55e4105e220cba22ef690234cb8724e955cc5dd4e39c269fddf610d61249850499facaaa54d2150660ed8f5126554a27c11dc
DIST GraphicsMagick-1.3.19.tar.xz 5153772 SHA256 de64372bb7bbff18cf14afd35c8239d9588592f053fd51a82f7239ad42174a54 SHA512 cdfbdc75356ade5037eab836739e7e59156d8b3555112d350f25e47072142e19d47ea9da718d93e40fd864c5bb88810737c078d6fbee9950b964f49519881f6e WHIRLPOOL d4cc6eba8472a5e25cbc9e6b49ec5e1449f1b44e2962936b35227c654d3712d65b4201938127e758be2a6f1818a099de04be4761fd115d3806749965f5c42282
DIST GraphicsMagick-1.3.20.tar.xz 5206616 SHA256 35fa21da4c1479e08da8351c5b1e363adaca803a0064cfc83084363adce387c9 SHA512 59f5eece3a38a98aea43bfc2aefd9c2df458c7f836c8ac05e908c29ea1de295e3f26b63f8daeadac4f40094e5d50aa860472c48e7a52e9f694471d0dcc5bbe37 WHIRLPOOL 13bc6154fbb2224eefdb6f437179a279f8959b4ccff9dc8eb6ef2cec205774a2a7cac4093ac81d36ba22a9879edaca15576ecc56e91da0318b7fffe029a6aecc
+DIST GraphicsMagick-1.3.23.tar.xz 5355200 SHA256 fd2535a529528ec6f0bd493fed4395e08082faf940d51d7c18c25586a0a0e60d SHA512 40f0a2d96ea568cc6e52ae0003c2ad393b2cffc6eabb85db78cb22af00eafec3fa1e64ebb26eed4a271f7a54c35c3b985e99a3d0b404fd025f4dba156856c99a WHIRLPOOL a1745035437981205543652e472f1f8a24402555657f79357d87402635f4e10026051ca7850ff6d655ab6321360702f2be80bf5443ca3e83cc471a84382f0107
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.23.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.23.ebuild
new file mode 100644
index 000000000000..f217ee82d706
--- /dev/null
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.23.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils toolchain-funcs
+
+MY_P=${P/graphicsm/GraphicsM}
+
+DESCRIPTION="Collection of tools and libraries for many image formats"
+HOMEPAGE="http://www.graphicsmagick.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp
+ perl png postscript q16 q32 static-libs svg threads tiff truetype webp wmf X zlib"
+
+RDEPEND=">=sys-devel/libtool-2.2.6b
+ bzip2? ( app-arch/bzip2 )
+ fpx? ( media-libs/libfpx )
+ imagemagick? ( !media-gfx/imagemagick )
+ jbig? ( media-libs/jbigkit )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/jasper )
+ lcms? ( media-libs/lcms:2 )
+ lzma? ( app-arch/xz-utils )
+ perl? ( dev-lang/perl )
+ png? ( media-libs/libpng:0 )
+ postscript? ( app-text/ghostscript-gpl )
+ svg? ( dev-libs/libxml2 )
+ tiff? ( media-libs/tiff:0 )
+ truetype? (
+ media-fonts/urw-fonts
+ >=media-libs/freetype-2
+ )
+ webp? ( media-libs/libwebp )
+ wmf? ( media-libs/libwmf )
+ X? (
+ x11-libs/libSM
+ x11-libs/libXext
+ )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.3.19-flags.patch
+ epatch "${FILESDIR}"/${PN}-1.3.19-perl.patch
+ epatch "${FILESDIR}"/${PN}-1.3.20-powerpc.patch
+
+ epatch_user #498942
+
+ eautoreconf
+}
+
+src_configure() {
+ local depth=8
+ use q16 && depth=16
+ use q32 && depth=32
+
+ local openmp=disable
+ if use openmp && tc-has-openmp; then
+ openmp=enable
+ fi
+
+ econf \
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} \
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ --${openmp}-openmp \
+ --enable-largefile \
+ --enable-shared \
+ $(use_enable static-libs static) \
+ $(use_enable debug prof) \
+ $(use_enable debug gcov) \
+ $(use_enable imagemagick magick-compat) \
+ $(use_with threads) \
+ $(use_with modules) \
+ --with-quantum-depth=${depth} \
+ --without-frozenpaths \
+ $(use_with cxx magick-plus-plus) \
+ $(use_with perl) \
+ --with-perl-options=INSTALLDIRS=vendor \
+ $(use_with bzip2 bzlib) \
+ $(use_with postscript dps) \
+ $(use_with fpx) \
+ --without-gslib \
+ $(use_with jbig) \
+ $(use_with webp) \
+ $(use_with jpeg) \
+ $(use_with jpeg2k jp2) \
+ $(use_with lcms lcms2) \
+ $(use_with lzma) \
+ $(use_with png) \
+ $(use_with tiff) \
+ $(use_with truetype ttf) \
+ $(use_with wmf) \
+ --with-fontpath="${EPREFIX}"/usr/share/fonts \
+ --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts \
+ --with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts \
+ $(use_with svg xml) \
+ $(use_with zlib) \
+ $(use_with X x)
+}
+
+src_compile() {
+ default
+ use perl && emake perl-build
+}
+
+src_test() {
+ unset DISPLAY # some perl tests fail when DISPLAY is set
+ default
+}
+
+src_install() {
+ default
+
+ if use perl; then
+ emake -C PerlMagick DESTDIR="${D}" install
+ find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+ find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+ fi
+
+ find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
diff --git a/media-gfx/graphite2/graphite2-1.3.5-r1.ebuild b/media-gfx/graphite2/graphite2-1.3.5-r1.ebuild
index 06f8303f46c2..b86741513f75 100644
--- a/media-gfx/graphite2/graphite2-1.3.5-r1.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="perl test"
RDEPEND="
diff --git a/media-gfx/graphite2/graphite2-1.3.5.ebuild b/media-gfx/graphite2/graphite2-1.3.5.ebuild
index aab2d52f810f..962f82bf7c61 100644
--- a/media-gfx/graphite2/graphite2-1.3.5.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="perl test"
RDEPEND="
diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest
index eae8bb3f3e0b..d2c564c42553 100644
--- a/media-gfx/mypaint/Manifest
+++ b/media-gfx/mypaint/Manifest
@@ -1,2 +1,3 @@
DIST mypaint-1.0.0.tar.bz2 36748957 SHA256 ced440ec0307e29bfe4f612604fe27ec9bfaea3f4f9c8019ffaa50ef12dc7131 SHA512 91434f6d352d4f5dde3d919772a678a17f15a6d2914fb2377b40e4a0fea042e3c96b5618e1864eacdbfa52f449be03062da2ecb8ec08bae168e3a12904047bf2 WHIRLPOOL a4693b6436485126a033dacb014586e85c448863bbb14acb30aff739a96d8d2abdd2c920ad3e9a5be7790d18e13e4a8e15ebcde85fafcaafe9d2a901b53d5f52
DIST mypaint-1.1.0.tar.bz2 37416388 SHA256 780d57e50dd90afd586873bc5120261930ea4c309d4d0958020916932122e838 SHA512 a3eef378ddcaa0a33f9afc49cc587489ecfff6f3e46e2238aab83f89d682f2407e2760e6029eaac3591f0a8955c95280c12839adcb42ec452cefbcdb142ab9b9 WHIRLPOOL bfd7356ad393dd85b91ccc010b5d0be23a6d82a33866edade0ef6eb739a1cbdb6823d7bffbdc943f96cdac9059abb7ac1edacf31d4ac2cd3871444594e23557a
+DIST mypaint-1.2.0.tar.xz 37895196 SHA256 cdab33dd0c146cf678c97bcdd44e561f97a0aec40421b8c6785a74b33b9728e2 SHA512 b4e75393cf6ed9b0c3c5a96979607c848d463987e3ac0f711738940ba97be6922e0cce735c56f91261bfce3e0730d69393dd57a45b3b04824c63c74cf1306790 WHIRLPOOL aee266e09258cbf23bf1fc8e78f0d717ecf5a2a1c03898193901b24e38266922d575744a01f4a31aa4fe6da566d05f246b16cad690d21f40a9ff90ad1596cc49
diff --git a/media-gfx/mypaint/mypaint-1.2.0.ebuild b/media-gfx/mypaint/mypaint-1.2.0.ebuild
new file mode 100644
index 000000000000..f0f0f976fb21
--- /dev/null
+++ b/media-gfx/mypaint/mypaint-1.2.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit fdo-mime gnome2-utils multilib scons-utils toolchain-funcs python-single-r1
+
+DESCRIPTION="fast and easy graphics application for digital painters"
+HOMEPAGE="http://mypaint.org/"
+SRC_URI="https://github.com/mypaint/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW"
+for x in ${LANGS}; do
+ IUSE+="linguas_${x} "
+done
+
+RDEPEND="
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ >=dev-python/pycairo-1.4[${PYTHON_USEDEP}]
+ dev-libs/protobuf[python,${PYTHON_USEDEP}]
+ >=dev-libs/json-c-0.11:=
+ media-libs/lcms:2
+ media-libs/libpng:0=
+ gnome-base/librsvg
+ ${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+ dev-lang/swig
+ virtual/pkgconfig"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # multilib support
+ sed -i -e "s:lib\/${PN}:$(get_libdir)\/${PN}:" \
+ SConstruct SConscript || die
+}
+
+src_compile() {
+ #workaround scons bug with locales. Bug #352700
+ export LANG="en_US.UTF-8"
+ tc-export CC CXX
+ escons
+}
+
+src_install () {
+ escons prefix="${D}/usr" install
+ newicon pixmaps/${PN}_logo.png ${PN}.png
+ for x in ${LANGS}; do
+ if ! has ${x} ${LINGUAS}; then
+ rm -rf "${ED}"/usr/share/locale/${x} || die
+ fi
+ done
+
+ python_optimize "${D}"usr/share/${PN}
+ # not used and broken
+ rm -rf "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index eabafb60fdbd..69aa532f45e7 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -1,4 +1,2 @@
-DIST nomacs-2.4.2-source.tar.bz2 1443270 SHA256 b0f52b919025a48a0e0300ea15c90b40d6ad892b055088fca02a8137e229bc3a SHA512 e3fae11ae8c385f9548bda32b2364967a457e9645fa4375da9d1cf85dc8fb150a56a19c3eab12ddef90d58f20a57d02a8720ddb8fef22c569ab6c28d54654f02 WHIRLPOOL ac21dd3afe3b45324daa6e07030203611c9f2de4ad1427ce4bb388d84ade5e38a686b42e0d757adbaa3a91fbb658d94f9f47de61e9ccf4ccc339af4ce1c4fd8d
-DIST nomacs-2.4.4-source.tar.bz2 1448716 SHA256 01b0cb48936ca0214c120a126069c50a9b8fe7ecbdb69bb4e5fe283d6b198257 SHA512 76cd5efaba09584757843e895b5b8293adcdab7df68a7d5bdcf38e9e5df04e38382944cf64293c9820815b9e6328793dd8e46afef5ffeaa80ddc4f7d43290fc2 WHIRLPOOL d858887f66cbbed858c1985313107839a8162052bfb825bc48f344516444a1e184e839c9a067283d7503b98a6993126ade3f39c0a85b50ca534f963335c85513
DIST nomacs-2.4.6-source.tar.bz2 1457529 SHA256 b846e335c768593e9f36cdee1a5c186e7794c76770ea3cadc87cf264153e8960 SHA512 9389df46635e619e198388e8b161a840d15227dd902cf04c250e71211098a10fd808d710ebab71f3e9a437bdca9451f966c46d22c2ce2379b94b678e79e92d71 WHIRLPOOL 97ccd02cbeabda62888ed25065cd24ce9a297b7bae3f9343e903d0223e8107cab601834fbc6dcf31a0b7f8d9e93052ba5a1a08e9c5e006027994c27bdb6f3940
DIST nomacs-3.0.0-source.tar.bz2 1465264 SHA256 a0e30cf2795dc18d1af29435145ea37f0cbb8dfb4013e01f5af267039560e476 SHA512 2a536012eed6ba59227aab9374fc22b7c9d49340d335c6c124cdc8f366f279a62edc37407dff47f1444b0d52f9df13e165ee76d44d453badefbffe5effbf8449 WHIRLPOOL 9a75bba86531b87025b8a01d96c9a12a2549d6d462cc0baeb37e06e37e419cb6e81d3be5c2b4894adb001210429f851dea4035aa281104566d1b168c9a81938d
diff --git a/media-gfx/nomacs/files/nomacs-2.4.2-include.patch b/media-gfx/nomacs/files/nomacs-2.4.2-include.patch
deleted file mode 100644
index abf3d406ce5e..000000000000
--- a/media-gfx/nomacs/files/nomacs-2.4.2-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/DkMath.h
-+++ src/DkMath.h
-@@ -29,6 +29,7 @@
-
- #pragma warning(push, 0) // no warnings from includes - begin
- #include <cmath>
-+#include <float.h>
- #include <QDebug>
- #include <QPointF>
- #include <QPolygonF>
diff --git a/media-gfx/nomacs/nomacs-2.4.2.ebuild b/media-gfx/nomacs/nomacs-2.4.2.ebuild
deleted file mode 100644
index f666011ebc78..000000000000
--- a/media-gfx/nomacs/nomacs-2.4.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils fdo-mime
-
-DESCRIPTION="Qt4-based image viewer"
-HOMEPAGE="http://www.nomacs.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~amd64-linux"
-IUSE="opencv raw tiff webp zip"
-
-REQUIRED_USE="raw? ( opencv ) tiff? ( opencv )"
-
-RDEPEND="
- >=media-gfx/exiv2-0.20[zlib]
- >=dev-qt/qtcore-4.7.0:4
- >=dev-qt/qtgui-4.7.0:4
- opencv? ( >=media-libs/opencv-2.4.0[qt4] )
- raw? ( >=media-libs/libraw-0.14 )
- tiff? ( media-libs/tiff:0= )
- webp? ( >=media-libs/libwebp-0.3.1:= )
- zip? ( dev-libs/quazip )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-include.patch"
- "${FILESDIR}/${PN}-3.0.0-opencv3.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_SYSTEM_WEBP=true
- -DUSE_SYSTEM_QUAZIP=true
- $(cmake-utils_use_enable opencv)
- $(cmake-utils_use_enable raw)
- $(cmake-utils_use_enable tiff)
- $(cmake-utils_use_enable webp)
- $(cmake-utils_use_enable zip QUAZIP)
- )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/nomacs/nomacs-2.4.4.ebuild b/media-gfx/nomacs/nomacs-2.4.4.ebuild
deleted file mode 100644
index d267681f4fc6..000000000000
--- a/media-gfx/nomacs/nomacs-2.4.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils fdo-mime
-
-DESCRIPTION="Qt4-based image viewer"
-HOMEPAGE="http://www.nomacs.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
-IUSE="opencv raw tiff webp zip"
-
-REQUIRED_USE="
- raw? ( opencv )
- tiff? ( opencv )
-"
-
-RDEPEND="
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- >=media-gfx/exiv2-0.20:=[zlib]
- opencv? ( >=media-libs/opencv-2.4:=[qt4] )
- raw? ( >=media-libs/libraw-0.14:= )
- tiff? ( media-libs/tiff:0 )
- webp? ( >=media-libs/libwebp-0.3.1:= )
- zip? ( dev-libs/quazip )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.0-opencv3.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_QT5=OFF
- $(cmake-utils_use_enable opencv)
- $(cmake-utils_use_enable raw)
- $(cmake-utils_use_enable tiff)
- $(cmake-utils_use_enable webp)
- $(cmake-utils_use_enable zip QUAZIP)
- -DUSE_SYSTEM_WEBP=ON
- -DUSE_SYSTEM_QUAZIP=ON
- )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/nomacs/nomacs-2.4.6.ebuild b/media-gfx/nomacs/nomacs-2.4.6.ebuild
index ecda8a17d14d..f650d1cf44dc 100644
--- a/media-gfx/nomacs/nomacs-2.4.6.ebuild
+++ b/media-gfx/nomacs/nomacs-2.4.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-source.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="amd64 ~amd64-linux"
IUSE="opencv qt5 raw tiff webp zip"
REQUIRED_USE="
diff --git a/media-gfx/simple-scan/simple-scan-3.18.2.ebuild b/media-gfx/simple-scan/simple-scan-3.18.2.ebuild
index 2f6865aa6902..2aff168f80b0 100644
--- a/media-gfx/simple-scan/simple-scan-3.18.2.ebuild
+++ b/media-gfx/simple-scan/simple-scan-3.18.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="colord"
COMMON_DEPEND="
diff --git a/media-libs/babl/babl-0.1.16.ebuild b/media-libs/babl/babl-0.1.16.ebuild
index 74f36162e658..97deb60aa7e5 100644
--- a/media-libs/babl/babl-0.1.16.ebuild
+++ b/media-libs/babl/babl-0.1.16.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.gegl.org/babl/"
LICENSE="LGPL-3"
SLOT="0"
-IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_mmx"
+IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_mmx cpu_flags_x86_f16c"
RDEPEND=""
DEPEND="${RDEPEND}
@@ -43,6 +43,7 @@ src_configure() {
--disable-static \
--disable-maintainer-mode \
$(use_enable altivec) \
+ $(use_enable cpu_flags_x86_f16c f16c) \
$(use_enable cpu_flags_x86_mmx mmx) \
$(use_enable cpu_flags_x86_sse sse) \
$(use_enable cpu_flags_x86_sse sse2)
diff --git a/media-libs/babl/metadata.xml b/media-libs/babl/metadata.xml
index 82b7b7953794..c86b23d9da68 100644
--- a/media-libs/babl/metadata.xml
+++ b/media-libs/babl/metadata.xml
@@ -4,4 +4,7 @@
<maintainer type="person">
<email>sping@gentoo.org</email>
</maintainer>
+ <use>
+ <flag name='cpu_flags_x86_f16c'>Take advantage of CPU feature f16c</flag>
+ </use>
</pkgmetadata>
diff --git a/media-libs/clutter-gst/clutter-gst-3.0.16.ebuild b/media-libs/clutter-gst/clutter-gst-3.0.16.ebuild
index aa46d6b126a6..f2172807479a 100644
--- a/media-libs/clutter-gst/clutter-gst-3.0.16.ebuild
+++ b/media-libs/clutter-gst/clutter-gst-3.0.16.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="GStreamer integration library for Clutter"
LICENSE="LGPL-2.1+"
SLOT="3.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="X examples +introspection udev"
# >=cogl-1.18 provides cogl-2.0-experimental
diff --git a/media-libs/clutter-gtk/clutter-gtk-1.6.6-r1.ebuild b/media-libs/clutter-gtk/clutter-gtk-1.6.6-r1.ebuild
index c6f7f8f779e4..d1b483f2b290 100644
--- a/media-libs/clutter-gtk/clutter-gtk-1.6.6-r1.ebuild
+++ b/media-libs/clutter-gtk/clutter-gtk-1.6.6-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Clutter"
LICENSE="LGPL-2.1+"
SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
IUSE="X examples gtk +introspection wayland"
RDEPEND="
diff --git a/media-libs/clutter/clutter-1.24.2.ebuild b/media-libs/clutter/clutter-1.24.2.ebuild
index c0478120dd3c..53662042f237 100644
--- a/media-libs/clutter/clutter-1.24.2.ebuild
+++ b/media-libs/clutter/clutter-1.24.2.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
|| ( aqua wayland X )
wayland? ( egl )
"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
# NOTE: glx flavour uses libdrm + >=mesa-7.3
# >=libX11-1.3.1 needed for X Generic Event support
diff --git a/media-libs/cogl/cogl-1.22.0-r2.ebuild b/media-libs/cogl/cogl-1.22.0-r2.ebuild
index c7028a034c40..6ec7562730a7 100644
--- a/media-libs/cogl/cogl-1.22.0-r2.ebuild
+++ b/media-libs/cogl/cogl-1.22.0-r2.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
wayland? ( gles2 )
|| ( gles2 opengl )
"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
COMMON_DEPEND="
>=dev-libs/glib-2.32:2
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 8abc2f38264b..5fb52efc1f2e 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,6 +1,3 @@
-DIST Image-ExifTool-10.00.tar.gz 4013694 SHA256 7b573331eba3921b56339018e95dd5e6f5a1e4634e4fc7bad91e5778da3571f4 SHA512 4ab96f830b48dbde4c9a5c00df57ff638d7d7c458f4c87ded1b6274d844af1dcf41dd1d0c88117be8189f8ae0d3926673095327d9f972235f38b83177e67867c WHIRLPOOL 4a44882b21e4e5878dc7a5a650f224cff08024fa8f315c2036758afb7d7ebcc10c33d3267541cc5f0c346bd636dd54cf6dcbe9bd7b59ba8592fcaa15b588bad6
-DIST Image-ExifTool-10.07.tar.gz 4035921 SHA256 012ac8bf1b48b78d3f09b17d172765956968423f0ded737f8e0a6cf3f3316218 SHA512 3a93902a6b1bcc72b425c76ad1b34ea8d8e681787421bdb37130825cd9222758196acdd453ac63858d228da019e70c738417088b5f0139704d0e299331f72c09 WHIRLPOOL a2904e08e156f331a1bb8249494c798c2d6cf16434974a341c73374303e7f1756753f435fd108e8104026c5a0f87e94629566d321b1d329132cee056ab9017d5
-DIST Image-ExifTool-10.09.tar.gz 4041349 SHA256 b6e621bfd2de6ea6c16bd7ee709f6c7ec47344c70de39b8c5c911e4ac930cad5 SHA512 cc814850ab01d1eaf00614355c689682d04dffa88f65f75308861954a9c4f1bf4a347624b1068b81050ecafa9043701941e6d53914b2a5892f2e336a18c24e5d WHIRLPOOL 2d7ad180004dadd7cced67f438e6d75f7697072770e2e4530131e31ca75e45acc0d28d6c4459681ee11eca5a0e86afe7dafd518c293a3fe9c0ababbd0e72bd61
DIST Image-ExifTool-10.10.tar.gz 4056189 SHA256 f9fcecf8954cfd6b1f5658e1fc82801e8b98f891c88a60adbd6bc5c716471e09 SHA512 c18963020f02f196c68d89d22126834dbde31b2e13da0b56509d1d25f9adb6248f8e4ea9ec7cba7f144a44d6c81e966e9aafd36d4e2d76d92e3b7a0c7e4fdacd WHIRLPOOL e5bd0791dfc7fa4b16d4ee770d866626a119cf68b8e2736cda1181a2fcb7a32e96ad885a706d25da0241bd9ba1c0637c23be49e5662fe813fa8fb48b4100768c
DIST Image-ExifTool-10.11.tar.gz 4060513 SHA256 8cf8b2ec192fdbec5e1946bcf1ed9c7c681e6d16896298bbf7adb8eb59356729 SHA512 c61f70782fbe9f7ce55fb1e0a66aaa0310be17b483b39505ba6255964798d46a8887254a9f635abfc5edc544b3c52cf180575ba7ccf72b4ed209608f78d4e427 WHIRLPOOL 5cbed0ea1516760339cfd93c6f3a73eda9b4413b58a7871c604da61bd0d484f6c6772ea1efa31d6b5d5a8da2d23fe1de4a81469bcc32eb28bb5122ff8134be98
-DIST Image-ExifTool-9.98.tar.gz 4002089 SHA256 cf7e89b40e942ff582b06b958edfce2e2c7ba2986a650212a96fa74cf5bbc74b SHA512 138bcf0aeab6fe893df3f051ca9d5d2e7fabbfb19e6b68ee0529515c1e6f6d89d75ca8aacabfb7edc2e380caa04f8bb97536ef284b0bf140edfcf9c8363a482c WHIRLPOOL edb5c4799079b27a008ebb95e2ae13ec2c37cb123f3664582f6ddc8a0b3cb351410d12b2c1d5352a10a4213c8e7fcc591f64fb514c83bbecdf582780f27a0237
+DIST Image-ExifTool-10.12.tar.gz 4061878 SHA256 be1d5a4f9d4992b95e2cc028d6f26f55fe19b99020589e68ff07c1a3fa32f14e SHA512 3149af438536825af2bfa4302103b530bc66f65fb84211daba145754fbc47aba8b626e8accbd8fb82c2825901943492d8492c54ec6e517646c71529788de5b02 WHIRLPOOL e78454d895f21e9e77da371b0e8209b96127baa511503a8d47649318b45af561d3ee3fc9f602f06a6d2cb66db9dde7b02d3248b57f05479d56f0758b6fe231d3
diff --git a/media-libs/exiftool/exiftool-10.00.ebuild b/media-libs/exiftool/exiftool-10.00.ebuild
deleted file mode 100644
index d1bc315f11a3..000000000000
--- a/media-libs/exiftool/exiftool-10.00.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN=Image-ExifTool
-MY_P=${MY_PN}-${PV}
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
- perl-module_src_install
- use doc && dohtml -r html/
-}
diff --git a/media-libs/exiftool/exiftool-10.07.ebuild b/media-libs/exiftool/exiftool-10.07.ebuild
deleted file mode 100644
index d1bc315f11a3..000000000000
--- a/media-libs/exiftool/exiftool-10.07.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN=Image-ExifTool
-MY_P=${MY_PN}-${PV}
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
- perl-module_src_install
- use doc && dohtml -r html/
-}
diff --git a/media-libs/exiftool/exiftool-10.10.ebuild b/media-libs/exiftool/exiftool-10.10.ebuild
index 0d48581c279e..1401cb447c0b 100644
--- a/media-libs/exiftool/exiftool-10.10.ebuild
+++ b/media-libs/exiftool/exiftool-10.10.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${MY_P}.tar.gz"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
IUSE="doc"
SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-10.09.ebuild b/media-libs/exiftool/exiftool-10.12.ebuild
index d1bc315f11a3..0d48581c279e 100644
--- a/media-libs/exiftool/exiftool-10.09.ebuild
+++ b/media-libs/exiftool/exiftool-10.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/media-libs/exiftool/exiftool-9.98.ebuild b/media-libs/exiftool/exiftool-9.98.ebuild
deleted file mode 100644
index f8a563f64f12..000000000000
--- a/media-libs/exiftool/exiftool-9.98.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN=Image-ExifTool
-MY_P=${MY_PN}-${PV}
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="http://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="http://www.sno.phy.queensu.ca/~phil/exiftool/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
- perl-module_src_install
- use doc && dohtml -r html/
-}
diff --git a/media-libs/ffmpegsource/metadata.xml b/media-libs/ffmpegsource/metadata.xml
index a844bb750f66..560f89cf58e4 100644
--- a/media-libs/ffmpegsource/metadata.xml
+++ b/media-libs/ffmpegsource/metadata.xml
@@ -14,6 +14,9 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
+ <slots>
+ <subslots>libffms2 soname version</subslots>
+ </slots>
<upstream>
<remote-id type="github">FFMS/ffms2</remote-id>
</upstream>
diff --git a/media-libs/glfw/glfw-3.1.2.ebuild b/media-libs/glfw/glfw-3.1.2.ebuild
index 1aa6935bcd78..95d24e35cf79 100644
--- a/media-libs/glfw/glfw-3.1.2.ebuild
+++ b/media-libs/glfw/glfw-3.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/glfw/${P}.tar.bz2"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="amd64 ~hppa ~x86"
IUSE="egl examples"
RDEPEND="x11-libs/libXrandr
diff --git a/media-libs/grilo/grilo-0.2.15.ebuild b/media-libs/grilo/grilo-0.2.15.ebuild
index 1b474bbe8715..2959ac8350f4 100644
--- a/media-libs/grilo/grilo-0.2.15.ebuild
+++ b/media-libs/grilo/grilo-0.2.15.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
LICENSE="LGPL-2.1+"
SLOT="0.2/1" # subslot is libgrilo-0.2 soname suffix
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="gtk examples +introspection +network playlist test vala"
REQUIRED_USE="test? ( introspection )"
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.3.ebuild
index 9874a7ac3b97..31081ec35f1f 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Less plugins for GStreamer"
HOMEPAGE="http://gstreamer.freedesktop.org/"
LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="X egl gles2 gtk +introspection opengl +orc vcd vnc wayland"
REQUIRED_USE="
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.6.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.6.3.ebuild
index 00acd6293af6..d0b13889e618 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.6.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
HOMEPAGE="http://gstreamer.freedesktop.org/"
LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X"
REQUIRED_USE="
ivorbis? ( ogg )
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.6.3.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.6.3.ebuild
index 548bd516b026..e0edac6ecc77 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.6.3.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Basepack of plugins for GStreamer"
HOMEPAGE="http://gstreamer.freedesktop.org/"
LICENSE="LGPL-2.1+"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+orc"
# dtmf plugin moved from bad to good in 1.2
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.3.ebuild
index 9de5a7078cfe..b13cf3035968 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
HOMEPAGE="http://gstreamer.freedesktop.org/"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+orc"
RDEPEND="
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild
index 3ebdd9a7cc7e..0a88b3754921 100644
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
LICENSE="LGPL-2+"
SLOT="1.0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+introspection"
# FIXME: There is something odd with pygobject check for >=4.22,
diff --git a/media-libs/gstreamer/gstreamer-1.6.3.ebuild b/media-libs/gstreamer/gstreamer-1.6.3.ebuild
index 50d8049cdcd6..b49a67849e3d 100644
--- a/media-libs/gstreamer/gstreamer-1.6.3.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
LICENSE="LGPL-2+"
SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+caps +introspection nls +orc test"
RDEPEND="
diff --git a/media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild b/media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild
index de13a357bc7a..c3fa46eaf926 100644
--- a/media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild
+++ b/media-libs/gupnp-dlna/gupnp-dlna-0.10.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
LICENSE="LGPL-2"
SLOT="2.0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="+introspection"
RDEPEND="
diff --git a/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild b/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild
index c4ee87920781..3c33e4faab7b 100644
--- a/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.1.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
LICENSE="Old-MIT ISC icu"
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
[[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/libchamplain/libchamplain-0.12.12.ebuild b/media-libs/libchamplain/libchamplain-0.12.12.ebuild
index 37f71c37ea9b..4a488a222c76 100644
--- a/media-libs/libchamplain/libchamplain-0.12.12.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.12.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
SLOT="0.12"
LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="debug +gtk +introspection vala"
REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.9.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.9.ebuild
index a0b67abb37c0..e2ba23a0e215 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.9.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.9.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
# FIXME: should we also bump for libgphoto2_port.so soname version?
SLOT="0/6" # libgphoto2.so soname version
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="doc examples exif gd jpeg nls serial"
# By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index e2ea7652d579..25adf53027f8 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -2,3 +2,4 @@ DIST libmediainfo_0.7.73.tar.bz2 1648742 SHA256 d350dbbdc25a52f79bcb3d5e91d0a61c
DIST libmediainfo_0.7.80.tar.xz 1517248 SHA256 e587b6aac746ea08ba2bb269446ba8ff54d253cb2172fc8ee9b3818ecfe8376d SHA512 49fb59c28acdc908e6629085d5a6136d57e689ded71312d286cf163597b11b617222ac5aee0c45142f352083b1fdca7caa23bff825726198c6406077b1d9f21c WHIRLPOOL a8f7029d9533eda7a64fc5a1c735b30a3b491a6ab4706622254c46ed17b447a634df38fcf6b88f551b354c18da8f62af2706d6b23ecbed6408909f8527e375ff
DIST libmediainfo_0.7.81.tar.xz 1522456 SHA256 9a01b5e9899ce10df5745553bef8381dcda0e367fd568804e696f263cfcbee43 SHA512 7fdc72df7ded6f463b89495e64ccb2da68c48471990d15e56cd197d82182332c1b64305cf5d77ddf67a36eab29074d11a26439fb386ee9ab149dfde0badf6fc3 WHIRLPOOL 0651164bc5dddf872e67d1591f70f00cfde0530005f96681d1d750386882c41fa1aa83bc8efd2cdf828a9e08121869ac446bb93148a72d7e20eb00da0e41755a
DIST libmediainfo_0.7.82.tar.xz 1535316 SHA256 0665d3b9699be504b38e2f7a6c49869052c91d4c4c923255e698c32b709815d7 SHA512 007c7a62b832c561119f1465e42a7d84cbfdca4b0a7cb79163ef671e2e9efeb3876b261b6c96a41e2af11d7338048e3722621db4d317e0ec668fefdaed13c7ed WHIRLPOOL b51a27e5f153134d2ece39435d8f10e70337e63437aff13716b674847f3973a72bacedac3c7a270fcb67ee3b2b6ff4270c9161aba081377433f1b54ca3e77c0e
+DIST libmediainfo_0.7.83.tar.xz 1534876 SHA256 2710e49aae638db7a9ea202b0e2dde8f5a2b14c06dcb0babade5ca210fe8854e SHA512 79cebf6a0c84c3d572e2e19eefd2f9d893ebf74a57fa7ccb04563097babd45e146990e65a8d720fb2f702b1148cf1e4c510daa181cd42fea26931a78bbc6f877 WHIRLPOOL bb590da2dbb2388a33f3e1ccb5d7aad2a315a52152f296a0c6c8d5649ec560826eaa2f0d600dd7f0cdd5ce2014652187f402149a5c9618721ca34f5f2ab5c9ae
diff --git a/media-libs/libmediainfo/libmediainfo-0.7.83.ebuild b/media-libs/libmediainfo/libmediainfo-0.7.83.ebuild
new file mode 100644
index 000000000000..667fa9ba633e
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-0.7.83.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib
+
+MY_PN="MediaInfo"
+DESCRIPTION="MediaInfo libraries"
+HOMEPAGE="http://mediaarea.net/mediainfo/"
+SRC_URI="http://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl doc mms static-libs"
+
+RDEPEND="sys-libs/zlib
+ dev-libs/tinyxml2:=
+ >=media-libs/libzen-0.4.28[static-libs=]
+ curl? ( net-misc/curl )
+ mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
+
+src_prepare() {
+ sed -i 's:-O2::' configure.ac || die
+ append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
+
+ epatch "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-shared \
+ --with-libtinyxml2 \
+ $(use_with curl libcurl) \
+ $(use_with mms libmms) \
+ $(use_enable static-libs static) \
+ $(use_enable static-libs staticlibs)
+}
+
+src_compile() {
+ default
+
+ if use doc; then
+ cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
+ doxygen Doxyfile || die
+ fi
+}
+
+src_install() {
+ default
+
+ edos2unix ${PN}.pc #414545
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins ${PN}.pc
+
+ for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
+ insinto /usr/include/${MY_PN}/${x}
+ doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
+ done
+
+ insinto /usr/include/${MY_PN}DLL
+ doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
+
+ dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
+ if use doc; then
+ dohtml -r "${WORKDIR}"/${MY_PN}Lib/Doc/*
+ fi
+
+ prune_libtool_files
+}
diff --git a/media-libs/libmp3splt/libmp3splt-0.9.2.ebuild b/media-libs/libmp3splt/libmp3splt-0.9.2.ebuild
index e092ba6b54bc..42871db21c1f 100644
--- a/media-libs/libmp3splt/libmp3splt-0.9.2.ebuild
+++ b/media-libs/libmp3splt/libmp3splt-0.9.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN:3}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc flac pcre"
RDEPEND="media-libs/libmad
diff --git a/media-libs/libvisio/libvisio-0.1.5.ebuild b/media-libs/libvisio/libvisio-0.1.5.ebuild
index c2ac25fe1375..f8ffa4fce71c 100644
--- a/media-libs/libvisio/libvisio-0.1.5.ebuild
+++ b/media-libs/libvisio/libvisio-0.1.5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
SLOT="0"
[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc64 ~x86"
IUSE="doc static-libs test tools"
RDEPEND="
diff --git a/media-libs/libzen/Manifest b/media-libs/libzen/Manifest
index d1388884d279..1720c4905122 100644
--- a/media-libs/libzen/Manifest
+++ b/media-libs/libzen/Manifest
@@ -1,3 +1,4 @@
DIST libzen_0.4.30.tar.bz2 105608 SHA256 c4f8bcbeb64b0587b51225e6ceed343f2f759d7c72562445b78953f1bfdf37e6 SHA512 6bd3b8354e19b02048f9c9dc890cad9d87e4c9fb2076ce27732428439790527745c9183c17c1a5a9f8667a47ba4922d073d1079d384085f140bbc6b525609bcf WHIRLPOOL 8dfaaf3ca81585d9363eb35bc7b52f415449240bdfdb3752efe6e2ae3aa490997f86f5f5b228d2c3403c1d7486587204cc1174396b36402222c2eeca9c29c2b2
DIST libzen_0.4.31.tar.bz2 107694 SHA256 9fd0ed1861986c59d00e9674efc3afab487172c16e85384d7037b6608a5da4b4 SHA512 ab881b0bf6932c6198649898b03634cdb0c133b4b8cbbb29fd6273b858f7b548cac70a7866622b5b3b5d67f28f9cf4856c95a1cca98bbecdf44291c59fe79765 WHIRLPOOL c77abe694e2d8e1bd5577994bea2df207f70266402f01af085e4722ce612e7b674e090398d01e61c26181efb225623cc3a1d125f531f2654fe23216c84de78b9
DIST libzen_0.4.32.tar.bz2 116842 SHA256 cd43483f975e845a059a34d9e5d29e81c520fcd984cd7d1a92d2c8c8bd8a0b66 SHA512 6e2912683799467ee993204673b268a5d95603217c7a82ada31948c6f7fe564205cf30a479a559d204cc96bb513793ce29ece2a86c2ab5d2f430f22354c9facc WHIRLPOOL 87decb176de053b2e9a191a029231f1ed0238fbb6d9d1196bafcd780a71b11f40ad315c437bbb2e26695e28dac20a2c12ea06fb316bb020fb35089b64a199015
+DIST libzen_0.4.33.tar.bz2 117892 SHA256 a289197a24ca94c506abab3113a1af2dcc82bc97736b23e02fd57ca99e8ac55f SHA512 c05773d2d8fb4ec095d442f384c21f87ca97a2d5ea58645d7af0b68210533c1a1bd1083d2d70dfdedb087acc776ac2f1158a617e5bd5f3611cd1be5504463a08 WHIRLPOOL 213301a278f8560700df8de65b0097cdc0c20575cb8b73949ffca696316957a634332bc2efbdd3a784226a7cfd18425992c26d8d4c98854cd8fa2c289e5a8c9b
diff --git a/media-libs/libzen/libzen-0.4.33.ebuild b/media-libs/libzen/libzen-0.4.33.ebuild
new file mode 100644
index 000000000000..8e85a90b0802
--- /dev/null
+++ b/media-libs/libzen/libzen-0.4.33.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools multilib eutils
+
+MY_PN="ZenLib"
+DESCRIPTION="Shared library for libmediainfo and mediainfo"
+HOMEPAGE="http://mediaarea.net/mediainfo/"
+SRC_URI="http://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+DEPEND="virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_PN}/Project/GNU/Library
+
+src_prepare() {
+ sed -i 's:-O2::' configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-unicode \
+ --enable-shared \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ default
+
+ if use doc ; then
+ cd "${WORKDIR}"/${MY_PN}/Source/Doc
+ doxygen Doxyfile || die
+ fi
+}
+
+src_install() {
+ default
+
+ # remove since the pkgconfig file should be used instead
+ rm "${D}"/usr/bin/libzen-config
+
+ insinto /usr/$(get_libdir)/pkgconfig
+ doins ${PN}.pc
+
+ for x in ./ Format/Html Format/Http HTTP_Client ; do
+ insinto /usr/include/${MY_PN}/${x}
+ doins "${WORKDIR}"/${MY_PN}/Source/${MY_PN}/${x}/*.h
+ done
+
+ dodoc "${WORKDIR}"/${MY_PN}/History.txt
+ if use doc ; then
+ dohtml "${WORKDIR}"/${MY_PN}/Doc/*
+ fi
+
+ prune_libtool_files
+}
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
index dbd8a01087e3..13dc1a291d27 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
if [[ ${PV} != *9999* ]]; then
SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
else
GIT_ECLASS="git-r3"
EGIT_REPO_URI=( "git://anongit.freedesktop.org/gstreamer/${PN}" )
diff --git a/media-libs/tiff/tiff-4.0.6.ebuild b/media-libs/tiff/tiff-4.0.6.ebuild
index 1b26bd4a3e7d..a3466bba8554 100644
--- a/media-libs/tiff/tiff-4.0.6.ebuild
+++ b/media-libs/tiff/tiff-4.0.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
LICENSE="libtiff"
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 ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx jbig jpeg lzma static-libs test zlib"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild
index 7895d1b32eff..7d4cb0c77163 100644
--- a/media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild
+++ b/media-plugins/grilo-plugins/grilo-plugins-0.2.17.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
LICENSE="LGPL-2.1+"
SLOT="0.2"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
IUSE="daap +dvd flickr freebox gnome-online-accounts lua subtitles thetvdb tracker upnp-av +vimeo +youtube"
# Bump gom requirement to avoid segfaults
diff --git a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.3.ebuild b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.3.ebuild
index b23a6da5460e..6e1a37ffdf9d 100644
--- a/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-a52dec/gst-plugins-a52dec-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+orc"
RDEPEND="
diff --git a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.3.ebuild b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.3.ebuild
index e3cc0192ab55..b4dd4cd8bd43 100644
--- a/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-amr/gst-plugins-amr-1.6.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="GStreamer plugin for AMRNB/AMRWB codec"
HOMEPAGE="http://gstreamer.freedesktop.org/"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.3.ebuild b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.3.ebuild
index bddd7da45f09..5398177e1b50 100644
--- a/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-assrender/gst-plugins-assrender-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="GStreamer plugin for ASS/SSA rendering with effects support"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND=">=media-libs/libass-0.10.2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.6.3.ebuild b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.6.3.ebuild
index 7f4037e6f9c1..232276493893 100644
--- a/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-bluez/gst-plugins-bluez-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="Bluetooth plugin for GStreamer."
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.3.ebuild b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.3.ebuild
index 7c0e5e5bc428..8bbff25db7f7 100644
--- a/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-cdio/gst-plugins-cdio-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=dev-libs/libcdio-0.90-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.3.ebuild b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.3.ebuild
index ba686f129497..fbd9e602400d 100644
--- a/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-cdparanoia/gst-plugins-cdparanoia-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
inherit gstreamer
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=media-sound/cdparanoia-3.10.2-r6[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.3.ebuild b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.3.ebuild
index e45d96cfc6f4..6a9ec3b608f2 100644
--- a/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dash/gst-plugins-dash-1.6.3.ebuild
@@ -9,7 +9,7 @@ inherit gstreamer
DESCRIPTION="MPEG-DASH plugin"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.3.ebuild b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.3.ebuild
index 335282e50466..153070bda990 100644
--- a/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dtls/gst-plugins-dtls-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="DTLS plugin for GStreamer."
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.3.ebuild b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.3.ebuild
index 5e82c19683eb..a246a882617b 100644
--- a/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dts/gst-plugins-dts-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
IUSE="+orc"
RDEPEND="
diff --git a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.3.ebuild b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.3.ebuild
index 3df701516526..2f2650d78c77 100644
--- a/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dv/gst-plugins-dv-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="GStreamer plugin to demux and decode DV"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND=">=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.3.ebuild b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.3.ebuild
index 5f59dd94b659..d2b140a35b98 100644
--- a/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dvb/gst-plugins-dvb-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPION="GStreamer plugin to allow capture from dvb devices"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 x86"
IUSE=""
RDEPEND=""
diff --git a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.3.ebuild b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.3.ebuild
index e93897a9c93e..5e9a8b3006b1 100644
--- a/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-dvdread/gst-plugins-dvdread-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=media-libs/libdvdread-4.2.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.3.ebuild b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.3.ebuild
index 44aacdb852aa..ed814fd99c03 100644
--- a/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-faac/gst-plugins-faac-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.3.ebuild b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.3.ebuild
index 34b6a8625dcb..d19219e05706 100644
--- a/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-faad/gst-plugins-faad-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=media-libs/faad2-2.7-r3[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.3.ebuild b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.3.ebuild
index 64abfb71c708..c5e9b98b2859 100644
--- a/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-flac/gst-plugins-flac-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE="gst-plugins-good"
inherit gstreamer
DESCRIPTION="GStreamer encoder/decoder/tagger for FLAC"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=media-libs/flac-1.2.1-r5[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.3.ebuild b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.3.ebuild
index c079e9ef0b3d..464c0dbe18c6 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-gdkpixbuf/gst-plugins-gdkpixbuf-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPION="GdkPixbuf-based image decoder, overlay and sink"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=x11-libs/gdk-pixbuf-2.30.7:2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.3.ebuild b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.3.ebuild
index c4f5b5814d8b..c9c9ae5b5a39 100644
--- a/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-hls/gst-plugins-hls-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="HTTP live streaming plugin"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
# FIXME: automagic fallback from nettle to libgcrypt to openssl
diff --git a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.3.ebuild b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.3.ebuild
index 168c37dae4f0..46b90eaed9fb 100644
--- a/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-jack/gst-plugins-jack-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPION="GStreamer source/sink to transfer audio data with JACK ports"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND=">=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.3.ebuild b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.3.ebuild
index 02355d8aeb72..01f62f43b8e5 100644
--- a/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-jpeg/gst-plugins-jpeg-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="GStreamer encoder/decoder for JPEG format"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.3.ebuild b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.3.ebuild
index c0ff0c52e17b..c67c3daffffd 100644
--- a/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-lame/gst-plugins-lame-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild
index 6d4818b7607c..51be1e2cab25 100644
--- a/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-libav/gst-plugins-libav-1.6.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${MY_PN}/${MY_PN}-${PV}.tar.xz"
LICENSE="GPL-2"
SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="libav +orc"
# XXX: bzip2/lzma are automagic
diff --git a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.3.ebuild b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.3.ebuild
index 60d1cba392c2..6afdcb9a8004 100644
--- a/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-libde265/gst-plugins-libde265-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="H.265 decoder plugin for GStreamer."
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.3.ebuild b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.3.ebuild
index a6ba75a15b05..c6b160ac84c3 100644
--- a/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-libmms/gst-plugins-libmms-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND=">=media-libs/libmms-0.6.2-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.3.ebuild b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.3.ebuild
index c5617e495905..e53041be9d53 100644
--- a/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-libpng/gst-plugins-libpng-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="GStreamer encoder/decoder for PNG images"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
IUSE=""
RDEPEND=">=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.3.ebuild b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.3.ebuild
index de9387ad20ef..e8ecb47d4c85 100644
--- a/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-libvisual/gst-plugins-libvisual-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-base
inherit gstreamer
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND=">=media-libs/libvisual-0.4.0-r3[${MULTILIB_USEDEP}]
diff --git a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.3.ebuild b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.3.ebuild
index 2ed0ea4b949e..4ce8d3616001 100644
--- a/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-mad/gst-plugins-mad-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=media-libs/libmad-0.15.1b-r8[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.3.ebuild b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.3.ebuild
index 2b01f6da901c..fda83521f74f 100644
--- a/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-meta/gst-plugins-meta-1.6.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org"
LICENSE="metapackage"
SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="aac a52 alsa cdda dts dv dvb dvd ffmpeg flac http jack lame libass libvisual mms mp3 modplug mpeg ogg opus oss pulseaudio taglib theora v4l vaapi vcd vorbis vpx wavpack X x264"
REQUIRED_USE="opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )"
diff --git a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.3.ebuild b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.3.ebuild
index 8f4c6d5b3990..00558209fe87 100644
--- a/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-modplug/gst-plugins-modplug-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 x86"
IUSE=""
RDEPEND=">=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.3.ebuild b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.3.ebuild
index 69a870e3ae63..22316435f38a 100644
--- a/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-mpeg2dec/gst-plugins-mpeg2dec-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
DESCRIPTION="Libmpeg2 based decoder plug-in for gstreamer"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=media-libs/libmpeg2-0.5.1-r2[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.3.ebuild b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.3.ebuild
index f39726e7afb9..c32641123f3d 100644
--- a/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-mpeg2enc/gst-plugins-mpeg2enc-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="GStreamer plugin for MPEG-1/2 video encoding"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.3.ebuild b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.3.ebuild
index cd0f2dd808e4..bdba1ba85403 100644
--- a/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-mplex/gst-plugins-mplex-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="GStreamer plugin for MPEG/DVD/SVCD/VCD video/audio multiplexing"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND=">=media-video/mjpegtools-2.1.0-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.3.ebuild b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.3.ebuild
index aaaf64a743a5..292105d025cf 100644
--- a/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-neon/gst-plugins-neon-1.6.3.ebuild
@@ -7,7 +7,7 @@ EAPI="5"
GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
IUSE=""
RDEPEND=">=net-libs/neon-0.30.0[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.3.ebuild b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.3.ebuild
index f319c911335e..35b456237644 100644
--- a/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-ofa/gst-plugins-ofa-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=">=media-libs/libofa-0.9.3-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.3.ebuild b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.3.ebuild
index a104a5815b11..2d198ee2cd03 100644
--- a/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-opus/gst-plugins-opus-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="GStreamer plugin for Opus audio codec support"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
COMMON_DEPEND=">=media-libs/opus-1.0.2-r2:=[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.3.ebuild b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.3.ebuild
index 09e003e742a4..dd4731422a3e 100644
--- a/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-oss/gst-plugins-oss-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="GStreamer plugin for OSS (Open Sound System) support"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd"
IUSE=""
RDEPEND=""
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-0.10.31-r2.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-0.10.31-r2.ebuild
index bb54b1b20ab2..8d8cfbeb2525 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-0.10.31-r2.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-0.10.31-r2.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="GStreamer plugin for the PulseAudio sound server"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.3.ebuild b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.3.ebuild
index 655cfd3269e0..464aac3703d6 100644
--- a/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-pulse/gst-plugins-pulse-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="GStreamer plugin for the PulseAudio sound server"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
IUSE=""
RDEPEND=">=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.3.ebuild b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.3.ebuild
index 72df8c715fc9..b9c209ce453a 100644
--- a/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-resindvd/gst-plugins-resindvd-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND="
diff --git a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.3.ebuild b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.3.ebuild
index 32084b86f1f9..e5cfca28bdb9 100644
--- a/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-soup/gst-plugins-soup-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="GStreamer plugin for HTTP client source/sink"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-macos"
IUSE=""
# Depend on >=net-libs/libsoup-2.47.0 once it is stable (see LIBSOUP_DOES_NOT_STEAL_OUR_CONTEXT in ext/soup)
diff --git a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.3.ebuild b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.3.ebuild
index 84340c000ce0..0047f0ea8b0a 100644
--- a/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-taglib/gst-plugins-taglib-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="GStreamer taglib based tag handler"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=media-libs/taglib-1.9.1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.3.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.3.ebuild
index 377966340b5a..da59d6eeed5b 100644
--- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPION="plugin to allow capture from video4linux2 devices"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="udev"
RDEPEND="
diff --git a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild
index e318f528dada..87d6c6a92c53 100644
--- a/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild
+++ b/media-plugins/gst-plugins-vaapi/gst-plugins-vaapi-0.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${MY_PN}/${MY_PN}-${
LICENSE="LGPL-2.1"
SLOT="1.0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+drm opengl wayland +X"
REQUIRED_USE="|| ( drm opengl wayland X )"
diff --git a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.3.ebuild b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.3.ebuild
index 1a35afa88a88..01d735884f5b 100644
--- a/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-vpx/gst-plugins-vpx-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="GStreamer decoder for vpx video format"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
# VP9 is under experimental, do not enable it now
diff --git a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.3.ebuild b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.3.ebuild
index c67c7aa77f5f..879aea0d739e 100644
--- a/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-wavpack/gst-plugins-wavpack-1.6.3.ebuild
@@ -8,7 +8,7 @@ GST_ORG_MODULE=gst-plugins-good
inherit gstreamer
DESCRIPTION="GStreamer encoder/decoder for wavpack audio format"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND=">=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}]"
diff --git a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.3.ebuild b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.3.ebuild
index 51e5e623003f..f049ece8457e 100644
--- a/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.3.ebuild
+++ b/media-plugins/gst-plugins-x264/gst-plugins-x264-1.6.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-ugly
inherit gstreamer
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
IUSE=""
# 20111220 ensures us X264_BUILD >= 120
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 104c2aec6ae0..0a21408ca475 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,2 +1,3 @@
DIST live.2013.02.11.tar.gz 570837 SHA256 2cd619e61b9293a094a2cbb8dd7a7505f8e74e6197b80989093425ac78a86d83 SHA512 c0f2efbf2af06d5e5f2bc58955ca37942022a439e3c48bec06a49b636e08d4d31855e884586448c698b0c90d35ef24f282570d0026c4454c9e58855ff36713be WHIRLPOOL 121fb4815c44db793a3c225faa5c16e68a8f975e45e8c4d492886aa82a57dd1571ad14076375767524cb848336b702cccc9ab17af79787ac489b6eb789fd9bd9
DIST live.2016.02.09.tar.gz 633063 SHA256 53eddc94c9d77688461085fbc50a7776b6ae292059bd9ba0950a78563e72e20b SHA512 818a4baa726939597642dab7e2a2a40418e86696cdab5724757425ad57d0a74543795075406509fc5b817f8ebfa5568868efd9a7f2845b9fe3f2caeb561a42ef WHIRLPOOL 63330b9e9a81a47d65ff15dc3f58046f8fe228d56db2f39782ff76c0b9bd907b8124e6555a649e0aad519493df89bb7fcceb7c81b50da3a0322013d87ab869a3
+DIST live.2016.02.22.tar.gz 632490 SHA256 e4571b466547e3ad153e4bd9bbb81b24d838815e9d97176157ecfb18c5414cd5 SHA512 813a38d3d2068658e377d8b4ad4431d34bce1126ec590ef5a65c4add44605ca0316397edb407d78be63ebd0e40fac149aec8f992e0ef721d95ba9c6fe2638ddd WHIRLPOOL 89efd1bd1a257c727909c0253e2e005642e0acde7fac6941b431a310e202fb0dd43fe064a7e3c352101c53344ed57f62240f8c30bd3ee162ef7f00f3cd483d23
diff --git a/media-plugins/live/live-2016.02.22.ebuild b/media-plugins/live/live-2016.02.22.ebuild
new file mode 100644
index 000000000000..a787b3130fd0
--- /dev/null
+++ b/media-plugins/live/live-2016.02.22.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic eutils toolchain-funcs multilib multilib-minimal
+
+DESCRIPTION="Libraries for standards-based RTP/RTCP/RTSP multimedia streaming"
+HOMEPAGE="http://www.live555.com/"
+SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
+ mirror://gentoo/${P/-/.}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="examples static-libs"
+DOCS=( "live-shared/README" )
+
+# Alexis Ballier <aballier@gentoo.org>
+# Be careful, bump this everytime you bump the package and the ABI has changed.
+# If you don't know, ask someone.
+LIVE_ABI_VERSION=7
+SLOT="0/${LIVE_ABI_VERSION}"
+
+src_unpack() {
+ unpack ${A}
+ mkdir -p "${S}"
+ mv "${WORKDIR}/live" "${S}/" || die
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-recursive2.patch"
+
+ if use static-libs ; then
+ cp -pPR live live-shared
+ mv live live-static
+ else
+ mv live live-shared
+ fi
+
+ use static-libs && cp "${FILESDIR}/config.gentoo" live-static
+ cp "${FILESDIR}/config.gentoo-so-r1" live-shared
+
+ case ${CHOST} in
+ *-solaris*)
+ use static-libs && { sed -i \
+ -e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+ -e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+ live-static/config.gentoo \
+ || die ; }
+ sed -i \
+ -e '/^COMPILE_OPTS /s/$/ -DSOLARIS -DXLOCALE_NOT_USED/' \
+ -e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
+ live-shared/config.gentoo-so-r1 \
+ || die
+ ;;
+ *-darwin*)
+ use static-libs && { sed -i \
+ -e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+ -e '/^LINK /s/$/ /' \
+ -e '/^LIBRARY_LINK /s/$/ /' \
+ -e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
+ live-static/config.gentoo \
+ || die static ; }
+ sed -i \
+ -e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
+ -e '/^LINK /s/$/ /' \
+ -e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
+ -e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
+ -e '/^LIB_SUFFIX /s/so/dylib/' \
+ live-shared/config.gentoo-so-r1 \
+ || die shared
+ ;;
+ esac
+ multilib_copy_sources
+}
+
+src_configure() { :; }
+
+multilib_src_compile() {
+ tc-export CC CXX LD
+
+ if use static-libs ; then
+ cd "${BUILD_DIR}/live-static"
+
+ einfo "Beginning static library build"
+ ./genMakefiles gentoo
+ emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
+ fi
+
+ cd "${BUILD_DIR}/live-shared"
+ einfo "Beginning shared library build"
+ ./genMakefiles gentoo-so-r1
+ local suffix=$(get_libname ${LIVE_ABI_VERSION})
+ emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
+
+ for i in liveMedia groupsock UsageEnvironment BasicUsageEnvironment ; do
+ pushd "${BUILD_DIR}/live-shared/${i}" > /dev/null
+ ln -s lib${i}.${suffix#.} lib${i}$(get_libname) || die
+ popd > /dev/null
+ done
+
+ if multilib_is_native_abi; then
+ einfo "Beginning programs build"
+ for i in $(use examples && echo "testProgs") proxyServer mediaServer ; do
+ cd "${BUILD_DIR}/live-shared/${i}"
+ emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
+ done
+ fi
+}
+
+multilib_src_install() {
+ for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
+ use static-libs && dolib.a live-static/${library}/lib${library}.a
+ dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
+ dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
+
+ insinto /usr/include/${library}
+ doins live-shared/${library}/include/*h
+ done
+
+ if multilib_is_native_abi; then
+ # Should we really install these?
+ use examples && find live-shared/testProgs -type f -perm 755 -print0 | \
+ xargs -0 dobin
+
+ dobin live-shared/mediaServer/live555MediaServer
+ dobin live-shared/proxyServer/live555ProxyServer
+ fi
+}
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index eb3d021acb31..8b2dfb2ed911 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -1,3 +1,2 @@
-DIST apulse-0.1.4.tar.gz 99976 SHA256 717bc537c389af546b4db2ed7622a8896f7f0f306612c9eb6c693a70c104c86f SHA512 500abca0f6b4df35acb417744a5967e58ceff8cc2a0d640db03847d79b077295abe8888ee5d0008383349bd964345a340334f39e1f55286713db94a86c6596dc WHIRLPOOL 7fe604ed3128cb24d375f4f84ee77317fd499202d8bf46f9c68735501b35a55050852d08260b2c4ad0419ac32a3d330946c65aa402b9b66dbf6d25c3a92966bb
DIST apulse-0.1.6.tar.gz 101938 SHA256 f9ffbf7aff96680beff3243758e5c1e0d4ac9043d4bd6cbfb219890b4b91c9f3 SHA512 0bcc3966a1455bac64e7b9731a988c5d10d893544354453b70f36121e92854a632f33a2ec84fa2ee4d2010221f82fb83cea872d66c4b053b0cd9014215014dc2 WHIRLPOOL 114d7e5d2f344ee4bdb96df01db8f10b10798ef2b332542f45e0e2957462c8255963a7d00628c01fcf58c19703c207aa967fdb258efcd28922ef05687517a8d3
DIST apulse-0.1.7.tar.gz 103311 SHA256 fc0e4853684ca5145950690405b0d4f89bf3a5aef7a86addec451561fb5f3e1b SHA512 05b73b6151ba76c1a0a05e065cc41ddf2239135920d94ba6e8b3c0228faa3d49ad8f008a4bcad37500c5e545c03f9f88327504a06e99718abab491b3e35925dc WHIRLPOOL e96e48bfa3cdaf983e5d46ea3431ccf8818ce5a8cb78b5f7df8d559227ab4f4c8e9bc828d5f255f0fb2a8c7c9cc01ba07041cc0150a9577a9359c41ee4607089
diff --git a/media-sound/apulse/apulse-0.1.4.ebuild b/media-sound/apulse/apulse-0.1.4.ebuild
deleted file mode 100644
index e3d67682ac95..000000000000
--- a/media-sound/apulse/apulse-0.1.4.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
-
-inherit cmake-multilib
-
-DESCRIPTION="PulseAudio emulation for ALSA"
-HOMEPAGE="https://github.com/i-rinat/apulse"
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
- media-libs/alsa-lib[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}
- !!media-plugins/alsa-plugins[pulseaudio]"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/apulse )
-
-multilib_src_configure() {
- local mycmakeargs="-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)/apulse"
-
- cmake-utils_src_configure
-}
diff --git a/media-sound/apulse/apulse-0.1.6.ebuild b/media-sound/apulse/apulse-0.1.6.ebuild
deleted file mode 100644
index e3d67682ac95..000000000000
--- a/media-sound/apulse/apulse-0.1.6.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
-
-inherit cmake-multilib
-
-DESCRIPTION="PulseAudio emulation for ALSA"
-HOMEPAGE="https://github.com/i-rinat/apulse"
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
- media-libs/alsa-lib[${MULTILIB_USEDEP}]"
-RDEPEND="${DEPEND}
- !!media-plugins/alsa-plugins[pulseaudio]"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/apulse )
-
-multilib_src_configure() {
- local mycmakeargs="-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)/apulse"
-
- cmake-utils_src_configure
-}
diff --git a/media-sound/banshee/banshee-2.6.2.ebuild b/media-sound/banshee/banshee-2.6.2.ebuild
index c830b9908f6e..613239a4e02a 100644
--- a/media-sound/banshee/banshee-2.6.2.ebuild
+++ b/media-sound/banshee/banshee-2.6.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://banshee.fm/"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+aac +cdda +bpm daap doc +encode ipod karma mtp test udev +web youtube"
RDEPEND="
diff --git a/media-sound/flacon/flacon-2.0.1.ebuild b/media-sound/flacon/flacon-2.0.1.ebuild
index a070f628ea0c..faaccb59881a 100644
--- a/media-sound/flacon/flacon-2.0.1.ebuild
+++ b/media-sound/flacon/flacon-2.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="aac flac mac mp3 opus qt4 qt5 replaygain test tta vorbis wavpack"
COMMON_DEPEND="
diff --git a/media-sound/flacon/metadata.xml b/media-sound/flacon/metadata.xml
index 5e0dbdfc00ed..d5583ecbacba 100644
--- a/media-sound/flacon/metadata.xml
+++ b/media-sound/flacon/metadata.xml
@@ -2,14 +2,14 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>maksbotan@gentoo.org</email>
- <name>Maxim Koltsov</name>
- </maintainer>
- <maintainer type="person">
<email>itumaykin+gentoo@gmail.com</email>
<name>Coacher</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
+ <maintainer type="person">
+ <email>maksbotan@gentoo.org</email>
+ <name>Maxim Koltsov</name>
+ </maintainer>
<maintainer type="project">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
diff --git a/media-sound/gnome-music/gnome-music-3.18.2.ebuild b/media-sound/gnome-music/gnome-music-3.18.2.ebuild
index 5f321560acd7..faa643467b18 100644
--- a/media-sound/gnome-music/gnome-music-3.18.2.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.18.2.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
COMMON_DEPEND="
${PYTHON_DEPS}
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2-r1.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2-r1.ebuild
index 7d0295b7603f..adf5c2fce989 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2-r1.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.18.2-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
# For the list of plugins, see src/audioProfile.js
diff --git a/media-sound/kid3/kid3-3.3.1.ebuild b/media-sound/kid3/kid3-3.3.1.ebuild
index 72088708640c..00baefa89275 100644
--- a/media-sound/kid3/kid3-3.3.1.ebuild
+++ b/media-sound/kid3/kid3-3.3.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="acoustid flac kde mp3 mp4 +phonon +taglib vorbis"
REQUIRED_USE="flac? ( vorbis )"
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2.ebuild
index 798d63469b34..703d90634660 100644
--- a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2.ebuild
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mp3splt/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="audacious doc gnome gstreamer nls"
RDEPEND="~media-libs/libmp3splt-0.9.2
diff --git a/media-sound/pulseaudio/pulseaudio-8.0.ebuild b/media-sound/pulseaudio/pulseaudio-8.0.ebuild
index ba399b312c9a..3a6cf96a73a1 100644
--- a/media-sound/pulseaudio/pulseaudio-8.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-8.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
# +alsa-plugin as discussed in bug #519530
IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 9d21b9b1138c..62e0bd1eaa6c 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,5 +1,3 @@
DIST qmmp-0.9.2.tar.bz2 1112974 SHA256 90ac69a21779df5073efe71b25f28a7461d6a928deb1afbaa1ef8268f62ae9c5 SHA512 fc6cb0ec4bbf52e2ceb9e87a3585f25bd58b3a323ef07ddb9fd9f21a065ef0f5deb0b014f29b9648fe9e0a8b412f3b04643f8128638558089a25d867577690ad WHIRLPOOL 47a596b0f7d9e516737bfeb10a962f79edb74f61e2985b01f2cee80c8ff252a1709459f5712700784faef824e24ff3567d73f0d5759e2cd2c0c53c267cc6a026
-DIST qmmp-0.9.6.tar.bz2 1124762 SHA256 8d0ab2a8d3de49e34e8f7208ab3832aeea23a36307b271262ee1c0d637dec50b SHA512 92c240b163def08c9d68276384e34f916edfd7a9d0d2bdf0478f76c2da524119cfd20c5379329c75395f9930586b05f3c381f93328f6c50a4ea43ce106928578 WHIRLPOOL fb8db9d684e7a93923b34a8e6f2b34e4ad0716fe4b23d821440da80a5dfa06845be0808d61e541dc92751ebe58a631456369ff60db5f7e77fa9fe668521204b5
DIST qmmp-0.9.7.tar.bz2 1125295 SHA256 339f260c8fac0c1ddcf4205b852724c0633e63a39d83ee1906b9661ef821bcdc SHA512 9a64043c94eeaed62af10f93e223aff7a9e4b09b79949b864f0092f7b64a458cf98883e983e3b9f24c8af277f7382b30a139666f5c1b1c9398b7feb125e7c844 WHIRLPOOL 7a082d38e3c6997515d8132a6207d456c9a052e27671daf3fab31def325279a092c1b3cc423ef835f4d6e28e88d7f5d90f57e4aa0a9a01bcaa072d6a82baaf39
-DIST qmmp-1.0.5.tar.bz2 1105704 SHA256 64952bfbe8b4bc6b74e04c4384fb923d0495f8380773ad7170b5a87fd2661ce1 SHA512 b4546457d3a4127a1911572233c367255fbbc6c08470bfb38b821062e516890186b6bd31960796bcb540b9c08610c9b9fcd193362d465dee9f722d431f70e699 WHIRLPOOL 28039c4b3cb16b3a7139534f37773081f96499eeb9b9f44b5f95bc010d290718d9f0a5cc7eb5b32565d16f7736e484053b4bd0ecb9d8eeeeb9734aeae8efea49
DIST qmmp-1.0.6.tar.bz2 1107187 SHA256 e97965cb41426f0e2fc418a625b0f3097227a1414c81665a65bbd33802e77e7f SHA512 5faa68cddef230d03c5f208b46ed26abb6b88ed8d718aaeaefec368b54538f5e708827c8eef4233e69e494f1755c810da565da18fbca9a55284b7c36d74e7875 WHIRLPOOL a60fd777b72835bd630dbc082baedbb79448958eb5c3af1ce306dfa663869448548c087c81fe03c70be5d3334cb7551f0bedee3689a0cf6cbc936dd3a9123ca8
diff --git a/media-sound/qmmp/qmmp-0.9.6.ebuild b/media-sound/qmmp/qmmp-0.9.6.ebuild
deleted file mode 100644
index d90953185b45..000000000000
--- a/media-sound/qmmp/qmmp-0.9.6.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 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-0.9.7.ebuild b/media-sound/qmmp/qmmp-0.9.7-r1.ebuild
index 05b479f6dd50..9e3e826bfea3 100644
--- a/media-sound/qmmp/qmmp-0.9.7.ebuild
+++ b/media-sound/qmmp/qmmp-0.9.7-r1.ebuild
@@ -27,6 +27,7 @@ projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
RDEPEND="media-libs/taglib
dev-qt/qtgui:4
+ dev-qt/qdbusviewer:4
alsa? ( media-libs/alsa-lib )
bs2b? ( media-libs/libbs2b )
cdda? ( dev-libs/libcdio-paranoia )
diff --git a/media-sound/qmmp/qmmp-1.0.5.ebuild b/media-sound/qmmp/qmmp-1.0.6-r1.ebuild
index 9eb2da36a388..ab3081cfff01 100644
--- a/media-sound/qmmp/qmmp-1.0.5.ebuild
+++ b/media-sound/qmmp/qmmp-1.0.6-r1.ebuild
@@ -2,12 +2,12 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI="5"
+EAPI=6
inherit cmake-utils
[ "$PV" == "9999" ] && inherit subversion
-DESCRIPTION="Qt4-based audio player with winamp/xmms skins support"
+DESCRIPTION="Qt5-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"
@@ -27,6 +27,7 @@ libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus
projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
RDEPEND="media-libs/taglib
+ dev-qt/qdbusviewer:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtgui:5
@@ -87,48 +88,47 @@ 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_alsa="$(usex alsa)"
+ -DUSE_aac="$(usex aac)"
+ -DUSE_analyzer="$(usex analyzer)"
+ -DUSE_bs2b="$(usex bs2b)"
+ -DUSE_CDA="$(usex cdda)"
+ -DUSE_crossfade="$(usex crossfade)"
+ -DUSE_cover="$(usex cover)"
+ -DUSE_cue="$(usex cue)"
+ -DUSE_curl="$(usex curl)"
+ -DUSE_dbus="$(usex dbus)"
+ -DUSE_enca="$(usex enca)"
+ -DUSE_ffmpeg="$(usex ffmpeg)"
+ -DUSE_flac="$(usex flac)"
+ -DUSE_GME="$(usex game)"
-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)
- )
+ -DUSE_jack="$(usex jack)"
+ -DUSE_KDENOTIFY="$(usex kde)"
+ -DUSE_ladspa="$(usex ladspa)"
+ -DUSE_lyrics="$(usex lyrics)"
+ -DUSE_mad="$(usex mad)"
+ -DUSE_MIDI_WILDMIDI="$(usex midi)"
+ -DUSE_mplayer="$(usex mplayer)"
+ -DUSE_mms="$(usex mms)"
+ -DUSE_modplug="$(usex modplug)"
+ -DUSE_mpris="$(usex mpris)"
+ -DUSE_MPC="$(usex musepack)"
+ -DUSE_notifier="$(usex notifier)"
+ -DUSE_opus="$(usex opus)"
+ -DUSE_oss="$(usex oss)"
+ -DUSE_projectm="$(usex projectm)"
+ -DUSE_PULSE="$(usex pulseaudio)"
+ -DUSE_qsui="$(usex qsui)"
+ -DUSE_scrobbler="$(usex scrobbler)"
+ -DUSE_sndfile="$(usex sndfile)"
+ -DUSE_stereo="$(usex stereo)"
+ -DUSE_STATICON="$(usex tray)"
+ -DUSE_UDISKS2="$(usex udisks)"
+ -DUSE_SRC="$(usex libsamplerate)"
+ -DUSE_vorbis="$(usex vorbis)"
+ -DUSE_wavpack="$(usex wavpack)"
+ )
cmake-utils_src_configure
}
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 4cba7f4c13a9..f048e0ad5621 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -27,6 +27,7 @@ libsamplerate lyrics +mad midi mms modplug mplayer mpris musepack notifier opus
projectm pulseaudio qsui scrobbler sndfile stereo tray udisks +vorbis wavpack"
RDEPEND="media-libs/taglib
+ dev-qt/qdbusviewer:5
dev-qt/qtcore:5
dev-qt/qtdbus:5
dev-qt/qtgui:5
diff --git a/media-sound/rhythmbox/rhythmbox-3.3.ebuild b/media-sound/rhythmbox/rhythmbox-3.3.ebuild
index 8bda694a5356..f3a344ef0f0d 100644
--- a/media-sound/rhythmbox/rhythmbox-3.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.3.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
"
# webkit? ( python )
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
# Tests failing for years without upstream caring at all
# upstream bug #688745
diff --git a/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild b/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild
index d0ca56598b58..c7add3de6d63 100644
--- a/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="flac test vorbis"
COMMON_DEPEND="
diff --git a/media-sound/soundconverter/soundconverter-2.1.6.ebuild b/media-sound/soundconverter/soundconverter-2.1.6.ebuild
index 230ed9acf179..a7238f5bb01c 100644
--- a/media-sound/soundconverter/soundconverter-2.1.6.ebuild
+++ b/media-sound/soundconverter/soundconverter-2.1.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="aac flac mp3 opus vorbis"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-video/aegisub/metadata.xml b/media-video/aegisub/metadata.xml
index 6c63e45b7444..7a15cc0c7d92 100644
--- a/media-video/aegisub/metadata.xml
+++ b/media-video/aegisub/metadata.xml
@@ -4,6 +4,7 @@
<maintainer type="person">
<email>itumaykin+gentoo@gmail.com</email>
<name>Coacher</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
<maintainer type="person">
<email>maksbotan@gentoo.org</email>
@@ -17,6 +18,7 @@
<flag name="uchardet">Enable charset discovery via <pkg>dev-libs/uchardet</pkg></flag>
</use>
<upstream>
+ <bugs-to>http://devel.aegisub.org/wiki/NewTicket</bugs-to>
<remote-id type="github">Aegisub/Aegisub</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-video/cheese/cheese-3.18.1-r1.ebuild b/media-video/cheese/cheese-3.18.1-r1.ebuild
index 56c282d2767b..0f98c7f2562e 100644
--- a/media-video/cheese/cheese-3.18.1-r1.ebuild
+++ b/media-video/cheese/cheese-3.18.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese"
LICENSE="GPL-2+"
SLOT="0/8" # subslot = libcheese soname version
IUSE="+introspection test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
# using clutter-gst-2.0.0 results in GLSL errors; bug #478702
COMMON_DEPEND="
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index 51b8cf5fa5cf..ada8c2928910 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -2,3 +2,4 @@ DIST mediainfo_0.7.73.tar.bz2 1467006 SHA256 a7cae29ac45a642c6747746db150382ed88
DIST mediainfo_0.7.80.tar.xz 1293796 SHA256 2030a3075111c78282579c15eea8e5215717f19a8014490045d157b6098f3c8a SHA512 1ffaf931a21fa8cbd15a67d033d60a22b2ecba24870740d7a241f130303cca883c9df7b333b860a0a4a6ff6647418b4eb142cfbb97d4aad7725f5ad2ebbf7384 WHIRLPOOL b072a42564387860c5179f43e1233abb2406e0e21446f1a9391bdc5ca21fc8ab534cc15b38ddb4aa79ccdb79c976256db2edbad2852433aa64c9959fbc7e1003
DIST mediainfo_0.7.81.tar.xz 1295940 SHA256 077c9eb3471ec8a8160d154047692b001b09877bcd9bea18c4f0413c894750a9 SHA512 7ca2fccd62096ed4924ccc9bdac799a33252121ef8c634dfbbf6e547da151a4549aadf82335091d471c911c026b65ceb9bfc9d4c75dafff12c91e1fd0c41e107 WHIRLPOOL 08c87a80ce6bbd14b1060c3087834ac278ad7ff53cfb8510b313e91c16657c49c399a8f3891b692c502bdb1151fff840a502a7e948d2d249fbb8c320a5b4be37
DIST mediainfo_0.7.82.tar.xz 1297504 SHA256 62882c977f209c0a4e2cb47f2109180fbe6b5337e471a3eb728daa917aaf7b47 SHA512 d07bd35d2b6fdff5ebb6546d294362d597001625f5a6c74d987629304b58d3f20e7c750d586ca6bfb1e05f8fb1b93dbadf4799721ec777a6c03f35232a4bdc80 WHIRLPOOL 59da6119a4f610fc1416da0d443a8242dcb316b6360e120f797b1efac34587e1819b22fa39531debe257f74d0ccb8f2b2f1fb803037a485b3525ddf1a88b37a4
+DIST mediainfo_0.7.83.tar.xz 1298048 SHA256 e7f95f54640532666949c1fe9c305259c705f1048a86c718e054bc4513bc1535 SHA512 b453d9312fd09b650d704120e18b7c379b8cb2ad58995f89381da3a3ca9e1885a5d4286658595ff1828ccee9c3c72b5e20486bcba9ec17d760cd8eb8144c2c66 WHIRLPOOL 4f06b90e191e5ed6247a7db46ebd69ebedf4e7a648a3268ee2ee2ef9f473b52fa88293efc8de110671f8e418961a8812aca2c6317c470f6e201d763a37b612a2
diff --git a/media-video/mediainfo/mediainfo-0.7.83.ebuild b/media-video/mediainfo/mediainfo-0.7.83.ebuild
new file mode 100644
index 000000000000..912125691e30
--- /dev/null
+++ b/media-video/mediainfo/mediainfo-0.7.83.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WX_GTK_VER="3.0"
+
+inherit eutils autotools wxwidgets multilib
+
+DESCRIPTION="MediaInfo supplies technical and tag information about media files"
+HOMEPAGE="http://mediaarea.net/mediainfo/"
+SRC_URI="http://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl mms wxwidgets"
+
+RDEPEND="sys-libs/zlib
+ media-libs/libzen
+ ~media-libs/lib${P}[curl=,mms=]
+ wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/MediaInfo
+
+pkg_setup() {
+ TARGETS="CLI"
+ use wxwidgets && TARGETS+=" GUI"
+}
+
+src_prepare() {
+ epatch_user
+
+ local target
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target}
+ sed -i -e "s:-O2::" configure.ac
+ eautoreconf
+ done
+}
+
+src_configure() {
+ local target
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target}
+ local args=""
+ [[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
+ econf ${args}
+ done
+}
+
+src_compile() {
+ local target
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target}
+ default
+ done
+}
+src_install() {
+ local target
+ for target in ${TARGETS}; do
+ cd "${S}"/Project/GNU/${target}
+ default
+ dodoc "${S}"/History_${target}.txt
+ if [[ ${target} == "GUI" ]]; then
+ newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png
+ make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
+ fi
+ done
+}
diff --git a/media-video/mplayer/mplayer-1.2.1.ebuild b/media-video/mplayer/mplayer-1.2.1.ebuild
index c2a89edb32fa..c0951c3c986c 100644
--- a/media-video/mplayer/mplayer-1.2.1.ebuild
+++ b/media-video/mplayer/mplayer-1.2.1.ebuild
@@ -159,7 +159,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
KEYWORDS=""
fi
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 1e5ed15477c1..6042696ef88c 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -3,7 +3,7 @@
<pkgmetadata>
<maintainer type="person">
<email>yngwin@gentoo.org</email>
- <description>primary maintainer</description>
+ <description>Primary maintainer</description>
</maintainer>
<maintainer type="person">
<email>maksbotan@gentoo.org</email>
diff --git a/media-video/pitivi/pitivi-0.95.ebuild b/media-video/pitivi/pitivi-0.95.ebuild
index 2c48c932e085..63059a6dce9a 100644
--- a/media-video/pitivi/pitivi-0.95.ebuild
+++ b/media-video/pitivi/pitivi-0.95.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.pitivi.org"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="v4l test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-video/snappy/snappy-1.0-r1.ebuild b/media-video/snappy/snappy-1.0-r1.ebuild
index 6bee87a6d518..e2e0d913ded1 100644
--- a/media-video/snappy/snappy-1.0-r1.ebuild
+++ b/media-video/snappy/snappy-1.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit autotools eutils gnome2
DESCRIPTION="A simple media player written using GStreamer and Clutter"
HOMEPAGE="https://wiki.gnome.org/Apps/Snappy"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
diff --git a/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild b/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
index 6cbf88731d79..36df4d670b83 100644
--- a/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
+++ b/media-video/subtitleeditor/subtitleeditor-0.52.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.gna.org/${PN}/$(get_version_component_range 1-2)/${P}.t
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug nls"
# opengl would mix gtk+:2 and :3 which is not possible
diff --git a/media-video/totem/totem-3.18.1.ebuild b/media-video/totem/totem-3.18.1.ebuild
index 31e0b776dd16..c5d9123d85b4 100644
--- a/media-video/totem/totem-3.18.1.ebuild
+++ b/media-video/totem/totem-3.18.1.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="
zeitgeist? ( introspection )
"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
# FIXME:
# Runtime dependency on gnome-session-2.91
diff --git a/media-video/ushare/files/08_all_gcc5.patch b/media-video/ushare/files/08_all_gcc5.patch
new file mode 100644
index 000000000000..d76f8771f5d9
--- /dev/null
+++ b/media-video/ushare/files/08_all_gcc5.patch
@@ -0,0 +1,45 @@
+Various gcc-5 fixes
+
+https://gcc.gnu.org/gcc-5/porting_to.html
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+Index: ushare-1.1a/src/trace.h
+===================================================================
+--- ushare-1.1a.orig/src/trace.h
++++ ushare-1.1a/src/trace.h
+@@ -29,7 +29,7 @@ typedef enum {
+
+ void print_log (log_level level, const char *format, ...)
+ __attribute__ ((format (printf, 2, 3)));
+-inline void start_log (void);
++extern inline void start_log (void);
+
+ /* log_info
+ * Normal print, to replace printf
+Index: ushare-1.1a/src/ushare.h
+===================================================================
+--- ushare-1.1a.orig/src/ushare.h
++++ ushare-1.1a/src/ushare.h
+@@ -127,6 +127,6 @@ struct action_event_t {
+ struct service_t *service;
+ };
+
+-inline void display_headers (void);
++extern inline void display_headers (void);
+
+ #endif /* _USHARE_H_ */
+Index: ushare-1.1a/src/ushare.c
+===================================================================
+--- ushare-1.1a.orig/src/ushare.c
++++ ushare-1.1a/src/ushare.c
+@@ -49,6 +49,10 @@
+ #include <ifaddrs.h>
+ #endif
+
++#ifdef HAVE_LOCALE_H
++#include <locale.h>
++#endif
++
+ #if (defined(__unix__) || defined(unix)) && !defined(USG)
+ #include <sys/param.h>
+ #endif
diff --git a/media-video/ushare/ushare-1.1a-r8.ebuild b/media-video/ushare/ushare-1.1a-r8.ebuild
new file mode 100644
index 000000000000..4347a791c1d0
--- /dev/null
+++ b/media-video/ushare/ushare-1.1a-r8.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils multilib readme.gentoo toolchain-funcs user systemd
+
+DESCRIPTION="uShare is a UPnP (TM) A/V & DLNA Media Server"
+HOMEPAGE="http://ushare.geexbox.org/"
+SRC_URI="http://ushare.geexbox.org/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=net-libs/libupnp-1.6.14"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ EPATCH_EXCLUDE="06_all_ushare_disable_sysconf.patch"
+ EPATCH_SOURCE="${FILESDIR}" EPATCH_SUFFIX="patch" \
+ EPATCH_OPTS="-p1" epatch
+
+ DOC_CONTENTS="Please edit /etc/ushare.conf to set the shared directories
+ and other important settings. Check system log if ushare is
+ not booting."
+}
+
+src_configure() {
+ local myconf
+ myconf="--prefix=/usr --sysconfdir=/etc --disable-strip --disable-dlna"
+ # nls can only be disabled, on by default.
+ use nls || myconf="${myconf} --disable-nls"
+
+ # I can't use econf
+ # --host is not implemented in ./configure file
+ tc-export CC CXX
+
+ ./configure ${myconf} || die "./configure failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ doman src/ushare.1
+ newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
+ newinitd "${FILESDIR}"/${PN}.init.d.ng ${PN}
+ dodoc NEWS README TODO THANKS AUTHORS
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ enewuser ushare
+ readme.gentoo_print_elog
+ elog
+ elog "The config file has been moved to /etc/ushare.conf"
+ elog "Please migrate your settings from /etc/conf.d/ushare"
+ elog "to /etc/ushare.conf in order to use the ushare init script"
+ elog "and systemd unit service."
+ elog
+}
diff --git a/net-analyzer/sslscan/sslscan-1.11.3.ebuild b/net-analyzer/sslscan/sslscan-1.11.3.ebuild
index b44f1830c7a3..61e15a6dbd06 100644
--- a/net-analyzer/sslscan/sslscan-1.11.3.ebuild
+++ b/net-analyzer/sslscan/sslscan-1.11.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${MY_FORK}/${PN}/archive/${PV}-${MY_FORK}.tar.gz ->
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="libressl"
# Depend on -bindist since sslscan unconditionally requires elliptic
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.1.1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.1.1.ebuild
index 1136474257e4..d483b1a7fe16 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.1.1.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.1.1.ebuild
@@ -11,7 +11,7 @@ LICENSE="BSD GPL-3"
SRC_URI="https://github.com/appneta/${PN}/releases/download/v${PV}/${P}.tar.gz"
SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc ~x86"
IUSE="debug pcapnav +tcpdump"
DEPEND="
diff --git a/net-dialup/moserial/Manifest b/net-dialup/moserial/Manifest
index 87799ee21baa..b7f9bd0d4d59 100644
--- a/net-dialup/moserial/Manifest
+++ b/net-dialup/moserial/Manifest
@@ -1,2 +1 @@
DIST moserial-3.0.10.tar.xz 1093544 SHA256 3d7107a0fc69a58ee139241214351373d35ead5ac07c751854479d2c30442980 SHA512 a21f10fea7cfbbbf5f484f298d7a1bcb6f74450c1a715c79594e0cf85035291dd5bd2e27f1050fd0e38b5449d696da03a1ee6e50737f11f7ddc2140f49d6cdb9 WHIRLPOOL 2f6d11ad0a19578f86001152e3c3141a9ab4f6d65bce0548c1800c40187890b7eb3697831e9f57461a0bedbbc1538907938008cabdd23036b820a8fa938f82f3
-DIST moserial-3.0.9.tar.xz 1079512 SHA256 6bba85ae6367d9ecfe6a72af9fc354b3ce840ac42ad6e4dcb18b01088fc874cd SHA512 0f405303a060d33f7479a6b690bc57517af981f981139da70a353358c5a927d5fb9b3c38002f0a447e1206eb4d7fb818509ab71b0926fe644a86a8999be4772f WHIRLPOOL fe87a154160b0866bf3b4663e6f321c20f220dbf1dcf5bad04b1d2fbc431871685555ea0804a1df75fef5488f46a18744fd59149bbd84a47bb46da39591d925e
diff --git a/net-dialup/moserial/moserial-3.0.10.ebuild b/net-dialup/moserial/moserial-3.0.10.ebuild
index 9c32ced20df2..43af9f3f30a1 100644
--- a/net-dialup/moserial/moserial-3.0.10.ebuild
+++ b/net-dialup/moserial/moserial-3.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/moserial"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE=""
RDEPEND="
@@ -24,5 +24,6 @@ DEPEND="${RDEPEND}
app-text/scrollkeeper
>=app-text/gnome-doc-utils-0.3.2
>=dev-util/intltool-0.35
+ dev-util/itstool
virtual/pkgconfig
"
diff --git a/net-dialup/moserial/moserial-3.0.9.ebuild b/net-dialup/moserial/moserial-3.0.9.ebuild
deleted file mode 100644
index 0adcbe5427cc..000000000000
--- a/net-dialup/moserial/moserial-3.0.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A clean and friendly gtk-based serial terminal"
-HOMEPAGE="https://wiki.gnome.org/moserial"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/glib-2.16:2
- gnome-base/gsettings-desktop-schemas
- >=x11-libs/gtk+-3.0.0:3
-"
-DEPEND="${RDEPEND}
- app-text/scrollkeeper
- >=app-text/gnome-doc-utils-0.3.2
- >=dev-util/intltool-0.35
- virtual/pkgconfig
-"
diff --git a/net-dns/dnsmasq/dnsmasq-2.75.ebuild b/net-dns/dnsmasq/dnsmasq-2.75.ebuild
index ecc0a1b9d741..4d58b8537d4e 100644
--- a/net-dns/dnsmasq/dnsmasq-2.75.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.75.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec idn +inotify ipv6 lua nls script selinux static tftp"
DM_LINGUAS="de es fi fr id it no pl pt_BR ro"
for dm_lingua in ${DM_LINGUAS}; do
diff --git a/net-dns/dnstop/dnstop-20140915.ebuild b/net-dns/dnstop/dnstop-20140915.ebuild
index 9bea45bcb38e..dfda70e2074e 100644
--- a/net-dns/dnstop/dnstop-20140915.ebuild
+++ b/net-dns/dnstop/dnstop-20140915.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://dnstop.measurement-factory.com/src/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86"
IUSE="ipv6"
RDEPEND="sys-libs/ncurses
diff --git a/net-dns/rbldnsd/rbldnsd-0.998.ebuild b/net-dns/rbldnsd/rbldnsd-0.998.ebuild
index 63befe962a46..329228714052 100644
--- a/net-dns/rbldnsd/rbldnsd-0.998.ebuild
+++ b/net-dns/rbldnsd/rbldnsd-0.998.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.corpit.ru/mjt/rbldnsd/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~hppa ~sparc ~x86 ~x86-fbsd"
IUSE="ipv6 test zlib"
REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-im/bitlbee/bitlbee-3.4.1.ebuild b/net-im/bitlbee/bitlbee-3.4.1.ebuild
index 2390ec6e512b..c3a8047f86b5 100644
--- a/net-im/bitlbee/bitlbee-3.4.1.ebuild
+++ b/net-im/bitlbee/bitlbee-3.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="debug gnutls ipv6 +xmpp libevent msn nss +oscar otr +plugins purple selinux
skype ssl test twitter +yahoo xinetd libressl"
diff --git a/net-im/skypetab-ng/Manifest b/net-im/skypetab-ng/Manifest
index 3be0c28de8af..599e679d891d 100644
--- a/net-im/skypetab-ng/Manifest
+++ b/net-im/skypetab-ng/Manifest
@@ -1 +1,2 @@
DIST skypetab-ng-0.5.2.tar.gz 54244 SHA256 cb47961ddb9d5754141c10c862d991704ae065abf2cba1e4763a78a5dcbf0805 SHA512 28a19ea983a81c069bb6ad24c337561293f7ec53ca9a315fb872c9341dccecf4eb30e1652b1f012f7be34060fb955a8c085327ae03017264ccc4510976d3f6ea WHIRLPOOL 48b1a86a588dd60c3ee7b9185625027bbaef69b0a6dce237c1e38d3c7dc5b762675d7d21efb88bef7e3840ac1464cdfa3ca4a531756ab3f3f155c2a681aec0e7
+DIST skypetab-ng-0.5.2_p20150201.tar.bz2 53527 SHA256 c2ec5b1b206b9dd6c285daea58fc68966237a1a29fdc67c3feec2030a78d8487 SHA512 cb423d83a1ea6979bf8732b2f546860778f0a5b4dddf3e7704c5fc71d15c25b191dcf510ede2315350aa26cf8c0580cd7fae5cd79ff035e5053857849bd0427c WHIRLPOOL c5bcaf70547305eb6c5f3fb74d516b3d7083eb3ccc569c8d7c08ee33b41c5196e2688d4ec9a5cab7bc8dad3491b3b17ac7d5cd7dbda37757619ae98b532eeb32
diff --git a/net-im/skypetab-ng/files/skypetab-ng-0.5.2_p20150201-isdigit.patch b/net-im/skypetab-ng/files/skypetab-ng-0.5.2_p20150201-isdigit.patch
new file mode 100644
index 000000000000..9b199e5361c8
--- /dev/null
+++ b/net-im/skypetab-ng/files/skypetab-ng-0.5.2_p20150201-isdigit.patch
@@ -0,0 +1,14 @@
+Missing header noticed by gcc:
+ * skype-poll-fix.c:38:9: warning: implicit declaration of function ‘isdigit’ [-Wimplicit-function-declaration]
+diff --git a/skype-poll-fix.c b/skype-poll-fix.c
+index ccc88a1..fd21ba8 100644
+--- a/skype-poll-fix.c
++++ b/skype-poll-fix.c
+@@ -2,2 +2,3 @@
+ #define _GNU_SOURCE
++#include <ctype.h>
+ #include <stdio.h>
+@@ -13,3 +14,2 @@
+ #include <sys/time.h>
+-#include <ctype.h>
+ #endif
diff --git a/net-im/skypetab-ng/skypetab-ng-0.5.2_p20150201.ebuild b/net-im/skypetab-ng/skypetab-ng-0.5.2_p20150201.ebuild
new file mode 100644
index 000000000000..86b11c4b2c0c
--- /dev/null
+++ b/net-im/skypetab-ng/skypetab-ng-0.5.2_p20150201.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="git://github.com/kekekeks/skypetab-ng.git"
+ UNPACKER_ECLASS="git-2"
+ LIVE_EBUILD=yes
+else
+ UNPACKER_ECLASS="vcs-snapshot"
+fi
+
+inherit eutils qt4-r2 multilib ${UNPACKER_ECLASS}
+
+if [[ -z ${LIVE_EBUILD} ]]; then
+ KEYWORDS="-* ~x86 ~amd64"
+ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
+fi
+
+DESCRIPTION="An LD_PRELOAD wrapper that adds tabs to Skype for Linux"
+HOMEPAGE="https://github.com/kekekeks/skypetab-ng"
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ dev-qt/qtcore:4[abi_x86_32(-)]
+ dev-qt/qtgui:4[abi_x86_32(-)]
+"
+RDEPEND="${DEPEND}
+ || ( >=net-im/skype-4.1 <net-im/skype-4.1[-qt-static] )
+"
+
+pkg_setup() {
+ use amd64 && multilib_toolchain_setup x86
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-isdigit.patch
+}
diff --git a/net-im/skypetab-ng/skypetab-ng-9999.ebuild b/net-im/skypetab-ng/skypetab-ng-9999.ebuild
index 5e2a1f9155fa..bc5f94102282 100644
--- a/net-im/skypetab-ng/skypetab-ng-9999.ebuild
+++ b/net-im/skypetab-ng/skypetab-ng-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=5
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="git://github.com/kekekeks/skypetab-ng.git"
@@ -12,7 +12,7 @@ else
UNPACKER_ECLASS="vcs-snapshot"
fi
-inherit qt4-r2 multilib ${UNPACKER_ECLASS}
+inherit eutils qt4-r2 multilib ${UNPACKER_ECLASS}
if [[ -z ${LIVE_EBUILD} ]]; then
KEYWORDS="-* ~x86 ~amd64"
@@ -36,3 +36,7 @@ RDEPEND="${DEPEND}
pkg_setup() {
use amd64 && multilib_toolchain_setup x86
}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.5.2_p20150201-isdigit.patch
+}
diff --git a/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild
index 22df039dcd96..5b6cf6b8df3a 100644
--- a/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.6.21-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=6
inherit eutils
@@ -27,14 +27,17 @@ DEPEND="
sys-apps/gentoo-functions
!vanilla? (
mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql[server] )
- ssl? ( dev-libs/openssl )
+ postgres? ( dev-db/postgresql:*[server] )
+ ssl? ( dev-libs/openssl:0= )
)"
RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
src_prepare() {
+ # fix bug 571004 and a QA warning
+ epatch "${FILESDIR}/${P}-fix-gcc5-remove-inline.patch" \
+ "${FILESDIR}/${P}-fix-memset.patch"
if use vanilla; then
rm -f "${WORKDIR}"/patch/[1-6]*.patch || die
fi
@@ -45,6 +48,7 @@ src_prepare() {
sed -i \
-e '/\$(LD)/s/-o/$(CFLAGS) $(LDFLAGS) &/' \
src/mod/*.mod/Makefile* src/Makefile.in || die
+ default
}
src_configure() {
@@ -68,7 +72,7 @@ src_compile() {
target="debug"
fi
- emake ${target}
+ emake -j1 ${target} # fixes #533490
}
src_install() {
@@ -97,7 +101,7 @@ src_install() {
src/mod/mystats.mod/tools/mystats.{conf,sql} \
src/mod/pgstats.mod/tools/{pgstats.conf,setup.sql}
- dohtml doc/html/*.html
+ dodoc -r doc/html
dobin "${FILESDIR}"/eggdrop-installer
doman doc/man1/eggdrop.1
diff --git a/net-irc/eggdrop/files/eggdrop-1.6.21-fix-gcc5-remove-inline.patch b/net-irc/eggdrop/files/eggdrop-1.6.21-fix-gcc5-remove-inline.patch
new file mode 100644
index 000000000000..f7bcd8b80bca
--- /dev/null
+++ b/net-irc/eggdrop/files/eggdrop-1.6.21-fix-gcc5-remove-inline.patch
@@ -0,0 +1,52 @@
+diff --git a/src/net.c b/src/net.c
+index 68c245c..e48fb76 100644
+--- a/src/net.c
++++ b/src/net.c
+@@ -564,7 +564,7 @@ int open_address_listen(IP addr, int *port)
+ /* Returns a socket number for a listening socket that will accept any
+ * connection -- port # is returned in port
+ */
+-inline int open_listen(int *port)
++int open_listen(int *port)
+ {
+ return open_address_listen(myip[0] ? getmyip() : INADDR_ANY, port);
+ }
+diff --git a/src/proto.h b/src/proto.h
+index 117347e..e80e30b 100644
+--- a/src/proto.h
++++ b/src/proto.h
+@@ -271,7 +271,7 @@ int getsock(int);
+ void killsock(int);
+ void killtclsock(int);
+ int answer(int, char *, unsigned long *, unsigned short *, int);
+-inline int open_listen(int *);
++int open_listen(int *);
+ int open_address_listen(IP addr, int *);
+ int open_telnet(char *, int);
+ int open_telnet_dcc(int, char *, char *);
+diff --git a/src/tclhash.c b/src/tclhash.c
+index 822f920..7281ceb 100644
+--- a/src/tclhash.c
++++ b/src/tclhash.c
+@@ -109,7 +109,7 @@ static inline void tcl_bind_list_delete(tcl_bind_list_t *tl)
+ nfree(tl);
+ }
+
+-inline void garbage_collect_tclhash(void)
++void garbage_collect_tclhash(void)
+ {
+ tcl_bind_list_t *tl, *tl_next, *tl_prev;
+ tcl_bind_mask_t *tm, *tm_next, *tm_prev;
+diff --git a/src/tclhash.h b/src/tclhash.h
+index 4069014..3bd85a7 100644
+--- a/src/tclhash.h
++++ b/src/tclhash.h
+@@ -75,7 +75,7 @@ typedef struct tcl_bind_list_b {
+
+ #ifndef MAKING_MODS
+
+-inline void garbage_collect_tclhash(void);
++void garbage_collect_tclhash(void);
+
+ void init_bind(void);
+ void kill_bind(void);
diff --git a/net-irc/eggdrop/files/eggdrop-1.6.21-fix-memset.patch b/net-irc/eggdrop/files/eggdrop-1.6.21-fix-memset.patch
new file mode 100644
index 000000000000..f4d60f322dac
--- /dev/null
+++ b/net-irc/eggdrop/files/eggdrop-1.6.21-fix-memset.patch
@@ -0,0 +1,11 @@
+diff --git a/src/md5/md5c.c b/src/md5/md5c.c
+index 4dce058..cfdf97c 100644
+--- a/src/md5/md5c.c
++++ b/src/md5/md5c.c
+@@ -267,5 +267,5 @@ void MD5_Final(unsigned char *result, MD5_CTX *ctx)
+ result[14] = ctx->d >> 16;
+ result[15] = ctx->d >> 24;
+
+- egg_memset(ctx, 0, sizeof(ctx));
++ egg_memset(ctx, 0, sizeof(*ctx));
+ }
diff --git a/net-irc/eggdrop/metadata.xml b/net-irc/eggdrop/metadata.xml
index 6f49eba8f496..ec93e5973015 100644
--- a/net-irc/eggdrop/metadata.xml
+++ b/net-irc/eggdrop/metadata.xml
@@ -1,5 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>sautier.louis@gmail.com</email>
+ <name>Louis Sautier</name>
+ <description>Proxied maintainer; set to assignee in all bugs</description>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">eggheads/eggdrop</remote-id>
+ <bugs-to>https://github.com/eggheads/eggdrop/issues</bugs-to>
+ </upstream>
</pkgmetadata>
diff --git a/net-irc/polari/polari-3.18.1-r1.ebuild b/net-irc/polari/polari-3.18.1-r1.ebuild
new file mode 100644
index 000000000000..1ecafa93dde9
--- /dev/null
+++ b/net-irc/polari/polari-3.18.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="An IRC client for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+ dev-libs/gjs
+ >=dev-libs/glib-2.43.4:2
+ >=dev-libs/gobject-introspection-0.9.6
+ net-libs/telepathy-glib[introspection]
+ >=x11-libs/gtk+-3.15.6:3[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+ >=net-irc/telepathy-idle-0.2
+ net-im/telepathy-logger[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/appstream-glib
+ >=dev-util/intltool-0.50
+ virtual/pkgconfig
+"
diff --git a/net-irc/polari/polari-3.18.1.ebuild b/net-irc/polari/polari-3.18.1.ebuild
index 5e5219230e44..7aeb89f426a9 100644
--- a/net-irc/polari/polari-3.18.1.ebuild
+++ b/net-irc/polari/polari-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Polari"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
COMMON_DEPEND="
diff --git a/net-libs/glib-networking/glib-networking-2.46.1.ebuild b/net-libs/glib-networking/glib-networking-2.46.1.ebuild
index 241ca65d4530..d4b0eb32ad86 100644
--- a/net-libs/glib-networking/glib-networking-2.46.1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.46.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
LICENSE="LGPL-2+"
SLOT="0"
IUSE="+gnome +libproxy smartcard +ssl test"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.46.0:2[${MULTILIB_USEDEP}]
diff --git a/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.4.ebuild b/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.4.ebuild
index 8618e7745d99..483578c40710 100644
--- a/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.4.ebuild
+++ b/net-libs/gnome-online-accounts/gnome-online-accounts-3.18.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineAccounts"
LICENSE="LGPL-2+"
SLOT="0/1"
IUSE="gnome +introspection kerberos" # telepathy"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
# pango used in goaeditablelabel
# libsoup used in goaoauthprovider
diff --git a/net-libs/gssdp/gssdp-0.14.14.ebuild b/net-libs/gssdp/gssdp-0.14.14.ebuild
index 4259c9010702..4df14ebf0d2a 100644
--- a/net-libs/gssdp/gssdp-0.14.14.ebuild
+++ b/net-libs/gssdp/gssdp-0.14.14.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
LICENSE="LGPL-2"
SLOT="0/3"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="+introspection +gtk"
RDEPEND="
diff --git a/net-libs/gupnp-av/gupnp-av-0.12.8.ebuild b/net-libs/gupnp-av/gupnp-av-0.12.8.ebuild
index 3c8994d8c4e1..15927a6925ea 100644
--- a/net-libs/gupnp-av/gupnp-av-0.12.8.ebuild
+++ b/net-libs/gupnp-av/gupnp-av-0.12.8.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
LICENSE="LGPL-2"
SLOT="0/2" # subslot: soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="+introspection"
RDEPEND="
diff --git a/net-libs/gupnp/gupnp-0.20.16.ebuild b/net-libs/gupnp/gupnp-0.20.16.ebuild
index 314f2612ae2c..03cb0efceac1 100644
--- a/net-libs/gupnp/gupnp-0.20.16.ebuild
+++ b/net-libs/gupnp/gupnp-0.20.16.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GUPnP"
LICENSE="LGPL-2"
SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="connman +introspection kernel_linux networkmanager"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild b/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild
index 9adfcf564dfd..88c8173ec75b 100644
--- a/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild
+++ b/net-libs/libsoup-gnome/libsoup-gnome-2.52.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="${SRC_URI//-gnome}"
LICENSE="LGPL-2+"
SLOT="2.4"
IUSE="+introspection"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x86-solaris"
RDEPEND="
~net-libs/libsoup-${PV}[introspection?,${MULTILIB_USEDEP}]
diff --git a/net-libs/libsoup/libsoup-2.52.2.ebuild b/net-libs/libsoup/libsoup-2.52.2.ebuild
index 8fe0dcd1d5af..c295c7338997 100644
--- a/net-libs/libsoup/libsoup-2.52.2.ebuild
+++ b/net-libs/libsoup/libsoup-2.52.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libsoup"
LICENSE="LGPL-2+"
SLOT="2.4"
IUSE="+introspection samba ssl test vala"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
REQUIRED_IUSE="vala? ( introspection )"
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index b6bcc6553df1..69054fce2a68 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,3 +1,4 @@
DIST nghttp2-1.6.0.tar.gz 1983953 SHA256 c88012e87b80c055ddd2412efd7e96b9e8cfe0652c4b21083f2cb89b2f0d3a26 SHA512 32d5227a5ff037d50d93d43b1fdb0be51d9cca1e09dcc85320b8e09f82fdc658397ca58ca400595f138ca7b77f389d945e3562ab4074afd05e1c74eca4de2744 WHIRLPOOL 31102e596a9e93ca993cd9b8b04da6f51acb247803de16958501bdb6fe06e5bbc951430d2c2be1bd7fd1d9216d087d711de83bad6bb93eb70f4e4b8b0f864efb
DIST nghttp2-1.7.0.tar.gz 2001726 SHA256 f0be9560baa30fc56bcce0151d88126d71b91815bb47076a8dd9ad2b9023ff49 SHA512 556a81ef9bad8a75a23b13532e6066af4412d79fa8dbde508ea893780bc9b19e0525674dc1cfb04b25cc48d62ae704737d6c4b1aa2b442a2be514b72490f6c1b WHIRLPOOL 138bb50c85ef7838be919989c032157ecedbfe1d5bf28633d5ee0c3d6f18dc7fa7525e185d476d146788466b58db0a2104054a1a28cb5152a8c4e9652fcb22ba
DIST nghttp2-1.7.1.tar.gz 1993320 SHA256 d83858464c03555828bb603288b66a48680bf164b376d2459a5407c102098a14 SHA512 3a71153d2b30a69e79115402b7db9a04bc812025ccb67b918079f33690f18eb5b286095b8bc161df91abf6466b6bb822ecc13c49bee54265a06ba9ab7c289b54 WHIRLPOOL 41d0afd43878029069d2c339e22b8aec77fedbd1b0fb45da96b9592525c760731e2eec567999af704d63cf94c913b1d0c52063380e69170e1f2d2b928c1d70f3
+DIST nghttp2-1.8.0.tar.gz 2021815 SHA256 3ac8cdf47c744cb387e6c867fe8c9a449254e9fab7fdf96782f9eaf7f635320a SHA512 447ee232abb9ea4105044567baabedc471089af7dfe72219f7c830898d3cd9bc63351d187129e43331cc775702f8dbe2afd21a2c88dc5191b858539dcb7c61d2 WHIRLPOOL b3ec7eae828c240dcd2c972d8148ceb6f2476fe8b6b8636c38b68b236e91915f07851a19a1e9daae27c636eb68898b8675e33b9e13d75c51ef99f56d992908dd
diff --git a/net-libs/nghttp2/nghttp2-1.8.0.ebuild b/net-libs/nghttp2/nghttp2-1.8.0.ebuild
new file mode 100644
index 000000000000..f035e7eafded
--- /dev/null
+++ b/net-libs/nghttp2/nghttp2-1.8.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# TODO: Add python support.
+
+EAPI="5"
+
+inherit multilib-minimal
+
+if [[ ${PV} == 9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
+ inherit git-2
+else
+ SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="HTTP/2 C Library"
+HOMEPAGE="https://nghttp2.org/"
+
+LICENSE="MIT"
+SLOT="0/1.14" # <C++>.<C> SONAMEs
+IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
+
+RDEPEND="
+ cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] )
+ hpack-tools? ( >=dev-libs/jansson-2.5 )
+ jemalloc? ( dev-libs/jemalloc )
+ utils? (
+ >=dev-libs/libev-4.15
+ !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist] )
+ libressl? ( dev-libs/libressl )
+ >=sys-libs/zlib-1.2.3
+ )
+ xml? ( >=dev-libs/libxml2-2.7.7:2 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ --disable-examples \
+ --disable-failmalloc \
+ --disable-werror \
+ --without-cython \
+ --disable-python-bindings \
+ --without-spdylay \
+ $(use_enable cxx asio-lib) \
+ $(use_enable debug) \
+ $(multilib_native_use_enable hpack-tools) \
+ $(use_enable static-libs static) \
+ $(use_enable threads) \
+ $(multilib_native_use_enable utils app) \
+ $(multilib_native_use_with jemalloc) \
+ $(multilib_native_use_with xml libxml2)
+}
+
+multilib_src_install_all() {
+ use static-libs || find "${ED}"/usr -name '*.la' -delete
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
index 3a80ece829e8..f0e85980f9d5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.10.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
LICENSE="LGPL-2+ BSD"
SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
IUSE="aqua coverage doc +egl +geoloc gles2 gnome-keyring +gstreamer +introspection +jit nsplugin +opengl spell wayland +webgl X"
# seccomp
diff --git a/net-misc/gsutil/gsutil-3.42.ebuild b/net-misc/gsutil/gsutil-3.42.ebuild
index 19674d0f6dc8..9becc0596906 100644
--- a/net-misc/gsutil/gsutil-3.42.ebuild
+++ b/net-misc/gsutil/gsutil-3.42.ebuild
@@ -40,11 +40,10 @@ PATCHES=(
)
python_prepare_all() {
+ distutils-r1_python_prepare_all
sed \
-e '/SocksiPy-branch/d' \
-i setup.py || die
-
- distutils-r1_python_prepare_all
}
python_test() {
diff --git a/net-misc/gsutil/gsutil-4.15.ebuild b/net-misc/gsutil/gsutil-4.15.ebuild
index 8a26913e2331..94a590274092 100644
--- a/net-misc/gsutil/gsutil-4.15.ebuild
+++ b/net-misc/gsutil/gsutil-4.15.ebuild
@@ -42,11 +42,10 @@ PATCHES=(
)
python_prepare_all() {
+ distutils-r1_python_prepare_all
sed \
-e '/SocksiPy-branch/d' \
-i setup.py || die
-
- distutils-r1_python_prepare_all
}
python_test() {
diff --git a/net-misc/gsutil/gsutil-4.16.ebuild b/net-misc/gsutil/gsutil-4.16.ebuild
index b2ee088b544a..687b8c9e943f 100644
--- a/net-misc/gsutil/gsutil-4.16.ebuild
+++ b/net-misc/gsutil/gsutil-4.16.ebuild
@@ -41,11 +41,10 @@ PATCHES=(
)
python_prepare_all() {
+ distutils-r1_python_prepare_all
sed \
-e '/SocksiPy-branch/d' \
-i setup.py || die
-
- distutils-r1_python_prepare_all
}
python_test() {
diff --git a/net-misc/gsutil/gsutil-4.17.ebuild b/net-misc/gsutil/gsutil-4.17.ebuild
index b2ee088b544a..687b8c9e943f 100644
--- a/net-misc/gsutil/gsutil-4.17.ebuild
+++ b/net-misc/gsutil/gsutil-4.17.ebuild
@@ -41,11 +41,10 @@ PATCHES=(
)
python_prepare_all() {
+ distutils-r1_python_prepare_all
sed \
-e '/SocksiPy-branch/d' \
-i setup.py || die
-
- distutils-r1_python_prepare_all
}
python_test() {
diff --git a/net-misc/i2pd/Manifest b/net-misc/i2pd/Manifest
index cdad1622733e..00b2bedf4f4c 100644
--- a/net-misc/i2pd/Manifest
+++ b/net-misc/i2pd/Manifest
@@ -1,2 +1,3 @@
DIST i2pd-0.10.0.tar.gz 391777 SHA256 5195e01a2e5ebad580631fbf3e5f17cf158f4ee323cbc4b0200ae046fbefc733 SHA512 ab0d32108f8ca1093ae3fcd752deeb8bed018074a8dd04fbcbffe49f1a2a78c3f2cf00341ddad18e8c8007edba6b75e45bce4357a621540fcdf7c2b74a26e726 WHIRLPOOL 19e8a92e20ae6fe1500a3f5462580d4896d5906be6ef307e48ea465712f5266b5251d75ad8b5636a3b894da3b3100dde329ddc733f7cd394499810d1bc65a083
DIST i2pd-2.4.0.tar.gz 379197 SHA256 a77ce5f48796229ab7e1fd98ca0168d336efa65eb3ff6e70ece056564c943094 SHA512 37a896c4ea6cfa118edcbed279e9ff886625f72289bf919ea0f8f801e82dbac959e4754e3729c6ef4cdc593c7fcb412685d30375f484cd0285e9f70f1a3702d8 WHIRLPOOL cd624db15e290c3d4b2090538e9872db3c5d90ce3fdd33bc871842c29a25515f474f55e2daac95a2fd32a052593bb5ef2fb18ce328ff282a3669aa19046b2e65
+DIST i2pd-2.5.0.tar.gz 391637 SHA256 ea01cc99c443f838ab8faf3440da45dd2ca666ab627aa54b17c565c37782b01d SHA512 77be4f2b3baf86bcf0c8f4aebd7c5fbef80654d99ff332aafcf1cd717271d80fcfe717047ac47599cb0ecfdf32347cf1c0e0be2b79759f5194c1a7e7910a42ca WHIRLPOOL 929cb33849a51c5c214c64bef0e431c62738a6584fe63aa6ebcbd2febeb854135e5e16ed0f95c64bdfc241b15faaf45226347d3851a64421dd53e53932e03456
diff --git a/net-misc/i2pd/i2pd-2.5.0.ebuild b/net-misc/i2pd/i2pd-2.5.0.ebuild
new file mode 100644
index 000000000000..1d1fa0e315cc
--- /dev/null
+++ b/net-misc/i2pd/i2pd-2.5.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils systemd user cmake-utils
+
+DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
+HOMEPAGE="https://github.com/PurpleI2P/i2pd"
+SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
+
+RDEPEND="!static? ( >=dev-libs/boost-1.46[threads]
+ dev-libs/crypto++
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ upnp? ( net-libs/miniupnpc )
+ )"
+DEPEND="${RDEPEND}
+ static? ( >=dev-libs/boost-1.46[static-libs,threads]
+ dev-libs/crypto++[static-libs]
+ !libressl? ( dev-libs/openssl:0[static-libs] )
+ libressl? ( dev-libs/libressl[static-libs] )
+ upnp? ( net-libs/miniupnpc[static-libs] ) )
+ i2p-hardening? ( >=sys-devel/gcc-4.7 )
+ || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
+
+I2PD_USER="${I2PD_USER:-i2pd}"
+I2PD_GROUP="${I2PD_GROUP:-i2pd}"
+
+CMAKE_USE_DIR="${S}/build"
+
+src_prepare() {
+ epatch "${FILESDIR}/i2pd-2.4.0-fix_installed_components.patch"
+}
+
+src_configure() {
+ mycmakeargs=(
+ -DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
+ -DWITH_HARDENING=$(usex i2p-hardening ON OFF)
+ -DWITH_PCH=$(usex pch ON OFF)
+ -DWITH_STATIC=$(usex static ON OFF)
+ -DWITH_UPNP=$(usex upnp ON OFF)
+ -DWITH_LIBRARY=ON
+ -DWITH_BINARY=ON
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ dodoc README.md
+ doman "${FILESDIR}/${PN}.1"
+ keepdir /var/lib/i2pd/
+ insinto "/var/lib/i2pd"
+ doins -r "${S}/contrib/certificates"
+ fowners "${I2PD_USER}:${I2PD_GROUP}" /var/lib/i2pd/
+ fperms 700 /var/lib/i2pd/
+ dodir "/etc/${PN}"
+ insinto "/etc/${PN}"
+ doins "${FILESDIR}/${PN}.conf"
+ doins "${FILESDIR}/tunnels.cfg"
+ fowners "${I2PD_USER}:${I2PD_GROUP}" "/etc/${PN}/${PN}.conf"
+ fperms 600 "/etc/${PN}/${PN}.conf"
+ dodir /usr/share/i2pd
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ systemd_newunit "${FILESDIR}/${PN}-2.4.0.service" "${PN}.service"
+ doenvd "${FILESDIR}/99${PN}"
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+}
+
+pkg_setup() {
+ enewgroup "${I2PD_GROUP}"
+ enewuser "${I2PD_USER}" -1 -1 "/var/lib/run/${PN}" "${I2PD_GROUP}"
+}
diff --git a/net-misc/iputils/iputils-20121221-r2.ebuild b/net-misc/iputils/iputils-20121221-r2.ebuild
index 965b833c24c2..0379a1d7b135 100644
--- a/net-misc/iputils/iputils-20121221-r2.ebuild
+++ b/net-misc/iputils/iputils-20121221-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputi
LICENSE="BSD-4"
SLOT="0"
-IUSE="arping caps clockdiff doc gnutls idn ipv6 rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+IUSE="arping caps clockdiff doc gnutls idn ipv6 libressl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
idn? ( net-dns/libidn[static-libs(+)] )
@@ -33,7 +33,10 @@ LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
net-libs/gnutls[openssl(+)]
net-libs/gnutls[static-libs(+)]
)
- !gnutls? ( dev-libs/openssl:0[static-libs(+)] )
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0[static-libs(+)] )
+ libressl? ( dev-libs/libressl[static-libs(+)] )
+ )
) )"
RDEPEND="arping? ( !net-misc/arping )
rarpd? ( !net-misc/rarpd )
diff --git a/net-misc/iputils/iputils-20150815.ebuild b/net-misc/iputils/iputils-20150815.ebuild
deleted file mode 100644
index d69470ef153c..000000000000
--- a/net-misc/iputils/iputils-20150815.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# For released versions, we precompile the man/html pages and store
-# them in a tarball on our mirrors. This avoids ugly issues while
-# building stages, and when the jade/sgml packages are broken (which
-# seems to be more common than would be nice).
-
-EAPI="4"
-
-inherit flag-o-matic eutils toolchain-funcs fcaps
-if [[ ${PV} == "99999999" ]] ; then
- EGIT_REPO_URI="https://github.com/iputils/iputils.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Network monitoring tools including ping and ping6"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iputils"
-
-LICENSE="BSD-4"
-SLOT="0"
-IUSE="arping caps clockdiff doc gcrypt idn ipv6 nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
-
-LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
- idn? ( net-dns/libidn[static-libs(+)] )
- ipv6? ( ssl? (
- gcrypt? ( dev-libs/libgcrypt[static-libs(+)] )
- nettle? ( dev-libs/nettle[static-libs(+)] )
- openssl? ( dev-libs/openssl:0[static-libs(+)] )
- ) )"
-RDEPEND="arping? ( !net-misc/arping )
- rarpd? ( !net-misc/rarpd )
- traceroute? ( !net-misc/traceroute )
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )
- virtual/os-headers"
-if [[ ${PV} == "99999999" ]] ; then
- DEPEND+="
- app-text/openjade
- dev-perl/SGMLSpm
- app-text/docbook-sgml-dtd
- app-text/docbook-sgml-utils
- "
-fi
-
-REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
-
-S=${WORKDIR}/${PN}-s${PV}
-
-PATCHES=(
- "${FILESDIR}/021109-uclibc-no-ether_ntohost.patch"
- "${FILESDIR}/${PN}-20150815-ping_default_ipv4.patch"
- "${FILESDIR}/${PN}-20150815-ping6_crypto.patch"
-)
-
-src_prepare() {
- epatch ${PATCHES[@]}
- use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch
-}
-
-src_configure() {
- use static && append-ldflags -static
-
- TARGETS=(
- ping
- $(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
- )
- if use ipv6 ; then
- TARGETS+=(
- $(usex tracepath 'tracepath6' '')
- $(usex traceroute 'traceroute6' '')
- )
- fi
-
- myconf=(
- USE_CRYPTO=no
- USE_GCRYPT=no
- USE_NETTLE=no
- )
-
- if use ipv6 && use ssl ; then
- myconf=(
- USE_CRYPTO=$(usex openssl)
- USE_GCRYPT=$(usex gcrypt)
- USE_NETTLE=$(usex nettle)
- )
- fi
-}
-
-src_compile() {
- tc-export CC
- emake \
- USE_CAP=$(usex caps) \
- USE_IDN=$(usex idn) \
- IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \
- TARGETS="${TARGETS[*]}" \
- ${myconf[@]}
-
- if [[ ${PV} == "99999999" ]] ; then
- emake html man
- fi
-}
-
-src_install() {
- into /
- dobin ping
- dosym ping "${EPREFIX}"/bin/ping4
- if use ipv6 ; then
- dosym ping "${EPREFIX}"/bin/ping6
- dosym ping.8 "${EPREFIX}"/usr/share/man/man8/ping6.8
- fi
- doman doc/ping.8
-
- if use arping ; then
- dobin arping
- doman doc/arping.8
- fi
-
- into /usr
-
- local u
- for u in clockdiff rarpd rdisc tftpd tracepath ; do
- if use ${u} ; then
- case ${u} in
- clockdiff) dobin ${u};;
- *) dosbin ${u};;
- esac
- doman doc/${u}.8
- fi
- done
-
- if use tracepath && use ipv6 ; then
- dosbin tracepath6
- dosym tracepath.8 "${EPREFIX}"/usr/share/man/man8/tracepath6.8
- fi
-
- if use traceroute && use ipv6 ; then
- dosbin traceroute6
- doman doc/traceroute6.8
- fi
-
- if use rarpd ; then
- newinitd "${FILESDIR}"/rarpd.init.d rarpd
- newconfd "${FILESDIR}"/rarpd.conf.d rarpd
- fi
-
- dodoc INSTALL RELNOTES
-
- use doc && dohtml doc/*.html
-}
-
-pkg_postinst() {
- fcaps cap_net_raw \
- bin/ping \
- $(usex arping 'bin/arping' '') \
- $(usex clockdiff 'usr/bin/clockdiff' '')
-}
diff --git a/net-misc/openssh/metadata.xml b/net-misc/openssh/metadata.xml
index 1d275bddd6df..a809b9d8f65f 100644
--- a/net-misc/openssh/metadata.xml
+++ b/net-misc/openssh/metadata.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer restrict="net-misc/openssh[ldap]" type="person">
- <email>robbat2@gentoo.org</email>
- <description>LPK issues. Only assign if it's a direct LPK issue. Do not directly assign for anything else.</description>
- </maintainer>
<maintainer type="project">
<email>base-system@gentoo.org</email>
<name>Gentoo Base System</name>
</maintainer>
+ <maintainer restrict="net-misc/openssh[ldap]" type="person">
+ <email>robbat2@gentoo.org</email>
+ <description>LPK issues. Only assign if it's a direct LPK issue. Do not directly assign for anything else.</description>
+ </maintainer>
<longdescription>
OpenSSH is a FREE version of the SSH protocol suite of network connectivity tools that
increasing numbers of people on the Internet are coming to rely on. Many users of telnet,
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 21992de84f17..30f5c1766632 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,2 +1,3 @@
DIST putty-0.66.tar.gz 1948323 SHA256 fe7312f66c54865868b362f4b79bd1fbe7ce9e8b1fd504b04034182db1f32993 SHA512 796fdb104fbdcad22d93274ea7c3599a34a94b35c849eafd1398f9a71721fbf2b6e4cec4abb64bb7fffe8ac45faefd8995339547fdc9b0beca5d7a76e0cb6bd3 WHIRLPOOL 61a17937f7d8e7dbb5c18b98109b3da6c5309ba701549c052dca0a7fa6cd63386a26743f2c40458503f123007a42cc08e502d183efd27f9840fc452edf05bae6
+DIST putty-0.67.tar.gz 1955547 SHA256 80192458e8a46229de512afeca5c757dd8fce09606b3c992fbaeeee29b994a47 SHA512 c2b17da46b8db3fe3837a10cb9cf5dd4b3ef6bfa15cadab83f3b87cf1479ed31fced90b774297ae53bdcbbdf230fc80d5c73d5ff3be6916fb591fd7ce3d35eca WHIRLPOOL c1410a655cecfdbf49153f2fa12f39e4e1e0b1c1078293be2ce21f147baba404bcfed285d8da3cba460ae52b1bdbd526e4110d2a3c68dc4bb8dbb859751656fe
DIST putty-icons.tar.bz2 4878 SHA256 960b189069dbfb20a1f49e378ab88bed716c6457593815e414d51ad7a3fa93a7 SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71 WHIRLPOOL ec96fe682582bfa58ce73c3e5cb7bb61d2363b7a5e9d3259dfd11cd6396512b5b9ed954f6a431baab36b1f17963714b30c239cdf4c08191d27b5abb858f54a57
diff --git a/net-misc/putty/putty-0.67.ebuild b/net-misc/putty/putty-0.67.ebuild
new file mode 100644
index 000000000000..25bd498bf853
--- /dev/null
+++ b/net-misc/putty/putty-0.67.ebuild
@@ -0,0 +1,88 @@
+# 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/socat/files/socat-1.7.3.1-stddef_h.patch b/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch
new file mode 100644
index 000000000000..c914a817ceca
--- /dev/null
+++ b/net-misc/socat/files/socat-1.7.3.1-stddef_h.patch
@@ -0,0 +1,38 @@
+When disabling OpenSSL support, nestlex.c still needs stddef.h which is
+magically included through the OpenSSL headers otherwise.
+
+--- a/configure.in
++++ b/configure.in
+@@ -61,7 +61,7 @@
+ AC_CHECK_HEADERS(inttypes.h)
+ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/param.h sys/ioctl.h sys/time.h syslog.h unistd.h)
+-AC_CHECK_HEADERS(pwd.h grp.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
++AC_CHECK_HEADERS(pwd.h grp.h stddef.h stdint.h sys/types.h poll.h sys/poll.h sys/socket.h sys/uio.h sys/stat.h netdb.h sys/un.h)
+ AC_CHECK_HEADERS(pty.h)
+ AC_CHECK_HEADERS(netinet/in.h netinet/in_systm.h)
+ AC_CHECK_HEADERS(netinet/ip.h, [], [], [AC_INCLUDES_DEFAULT
+--- a/config.h.in
++++ b/config.h.in
+@@ -189,6 +189,9 @@
+ /* Define if you have the <grp.h> header file. */
+ #undef HAVE_GRP_H
+
++/* Define if you have the <stddef.h> header file. */
++#undef HAVE_STDDEF_H
++
+ /* Define if you have the <stdint.h> header file. */
+ #undef HAVE_STDINT_H
+
+--- a/sysincludes.h
++++ b/sysincludes.h
+@@ -51,6 +51,9 @@
+ #if HAVE_SYS_TIME_H
+ #include <sys/time.h> /* select(); OpenBSD: struct timespec */
+ #endif
++#if HAVE_STDDEF_H
++#include <stddef.h>
++#endif
+ #if HAVE_STDINT_H
+ #include <stdint.h> /* uint8_t */
+ #endif
diff --git a/net-misc/socat/socat-1.7.3.1.ebuild b/net-misc/socat/socat-1.7.3.1.ebuild
index 998dc35f1929..e46c58a43438 100644
--- a/net-misc/socat/socat-1.7.3.1.ebuild
+++ b/net-misc/socat/socat-1.7.3.1.ebuild
@@ -3,7 +3,7 @@
# $Id$
EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs
DESCRIPTION="Multipurpose relay (SOcket CAT)"
HOMEPAGE="http://www.dest-unreach.org/socat/"
@@ -31,6 +31,9 @@ DOCS=(
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
+ epatch "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
+
+ eautoreconf
}
src_configure() {
diff --git a/net-misc/socat/socat-2.0.0_beta9.ebuild b/net-misc/socat/socat-2.0.0_beta9.ebuild
index 1a833198cc0c..07429defa383 100644
--- a/net-misc/socat/socat-2.0.0_beta9.ebuild
+++ b/net-misc/socat/socat-2.0.0_beta9.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit eutils flag-o-matic toolchain-funcs
+inherit autotools eutils flag-o-matic toolchain-funcs
DESCRIPTION="Multipurpose relay (SOcket CAT)"
HOMEPAGE="http://www.dest-unreach.org/socat/"
@@ -32,7 +32,11 @@ DOCS=(
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
+ epatch "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
+
touch doc/${PN}.1 || die
+
+ eautoreconf
}
src_configure() {
diff --git a/net-misc/socat/socat-9999.ebuild b/net-misc/socat/socat-9999.ebuild
index 9ebf68b4de9d..076b3a140a36 100644
--- a/net-misc/socat/socat-9999.ebuild
+++ b/net-misc/socat/socat-9999.ebuild
@@ -33,6 +33,9 @@ DOCS=(
)
src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.7.3.0-filan-build.patch
+ epatch "${FILESDIR}"/${PN}-1.7.3.1-stddef_h.patch
+
eautoreconf
}
diff --git a/net-misc/strongswan/strongswan-5.3.4-r1.ebuild b/net-misc/strongswan/strongswan-5.3.4-r1.ebuild
index cba090129ab5..165f0cfb71a8 100644
--- a/net-misc/strongswan/strongswan-5.3.4-r1.ebuild
+++ b/net-misc/strongswan/strongswan-5.3.4-r1.ebuild
@@ -35,7 +35,7 @@ COMMON_DEPEND="!net-misc/openswan
sqlite? ( >=dev-db/sqlite-3.3.1 )
networkmanager? ( net-misc/networkmanager )
pam? ( sys-libs/pam )
- strongswan_plugins_unbound? ( net-dns/unbound )"
+ strongswan_plugins_unbound? ( net-dns/unbound net-libs/ldns )"
DEPEND="${COMMON_DEPEND}
virtual/linux-sources
sys-kernel/linux-headers"
diff --git a/net-misc/taylor-uucp/files/taylor-uucp-1.07-fprintf.patch b/net-misc/taylor-uucp/files/taylor-uucp-1.07-fprintf.patch
new file mode 100644
index 000000000000..5ac0304bf20f
--- /dev/null
+++ b/net-misc/taylor-uucp/files/taylor-uucp-1.07-fprintf.patch
@@ -0,0 +1,11 @@
+--- a/uuconv.c
++++ b/uuconv.c
+@@ -676,7 +676,7 @@
+ {
+ if ((*pz)[0] != '-' && pz != pzarg)
+ fprintf (e, " ");
+- fprintf (e, *pz);
++ fprintf (e, "%s", *pz);
+ }
+ }
+
diff --git a/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
new file mode 100644
index 000000000000..4e66a438be94
--- /dev/null
+++ b/net-misc/taylor-uucp/taylor-uucp-1.07-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic autotools
+
+DESCRIPTION="Taylor UUCP"
+HOMEPAGE="http://www.airs.com/ian/uucp.html"
+SRC_URI="mirror://gnu/uucp/uucp-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+
+S="${WORKDIR}/uucp-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+ epatch "${FILESDIR}"/${P}-fprintf.patch
+ mv configure.{in,ac} || die
+ sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags -D_GNU_SOURCE -fno-strict-aliasing
+ econf --with-newconfigdir=/etc/uucp
+}
+
+src_install() {
+ dodir /usr/share/man/man{1,8}
+ dodir /usr/share/info
+ dodir /etc/uucp
+ dodir /usr/bin /usr/sbin
+ diropts -o uucp -g uucp -m 0750
+ keepdir /var/log/uucp /var/spool/uucp
+ diropts -o uucp -g uucp -m 0775
+ keepdir /var/spool/uucppublic
+
+ emake \
+ "prefix=${D}/usr" \
+ "sbindir=${D}/usr/sbin" \
+ "bindir=${D}/usr/bin" \
+ "man1dir=${D}/usr/share/man/man1" \
+ "man8dir=${D}/usr/share/man/man8" \
+ "newconfigdir=${D}/etc/uucp" \
+ "infodir=${D}/usr/share/info" \
+ install install-info
+ sed -i -e 's:/usr/spool:/var/spool:g' sample/config
+ cp sample/* "${ED}/etc/uucp" || die
+ dodoc ChangeLog NEWS README TODO
+}
+
+pkg_preinst() {
+ usermod -s /bin/bash uucp
+}
diff --git a/net-misc/vinagre/vinagre-3.18.2.ebuild b/net-misc/vinagre/vinagre-3.18.2.ebuild
index 98a20b69536f..5ed9a28e8404 100644
--- a/net-misc/vinagre/vinagre-3.18.2.ebuild
+++ b/net-misc/vinagre/vinagre-3.18.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
IUSE="rdp +ssh spice +telepathy zeroconf"
# cairo used in vinagre-tab
diff --git a/net-misc/vino/vino-3.18.1.ebuild b/net-misc/vino/vino-3.18.1.ebuild
index 0d88f3691d0f..b5266506a12f 100644
--- a/net-misc/vino/vino-3.18.1.ebuild
+++ b/net-misc/vino/vino-3.18.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="crypt gnome-keyring ipv6 jpeg ssl +telepathy zeroconf +zlib"
# bug #394611; tight encoding requires zlib encoding
REQUIRED_USE="jpeg? ( zlib )"
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index 04dacb8544f2..67de31f5d46a 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -1,3 +1,2 @@
-DIST youtube-viewer-3.1.1.tar.gz 210183 SHA256 416289dac7c4bb29ad046e41bbf49faaca31f1827379e9e0082f5b282186531d SHA512 1c7236cde68f21a80bb1f3ac29e19f86f52732c784adb70f6fc07177d74ada3a6ae1652e604fc12f62ce8ddf0c172593dd85a419a6d7d804f980fc09afda90f0 WHIRLPOOL 9045cc344bd627806526594daafbd8e17cfefa0e7aaf456c5c3a0c7ebec4bdd53f8ec708e051b37706ac3e1e29af3379e1df8ea21bfd370ca367950e6accf886
DIST youtube-viewer-3.1.9.tar.gz 222276 SHA256 9b7ba2b50cea054898024bc871e231673269ab50db0526ee3f1a7ae62a51e8d2 SHA512 60ff81defd4d8d1bc1f6b5bceaa03c9bbe64e8fea2083ce60b04b6c14d8b13ded6da255b9aa46bfcb1b76cf33121ddb738d0f0c159e4bd207999ca558a43e86e WHIRLPOOL 2e6a79992c7760d93c2e28f1e4f5c14861b6fefed8e0bebb9a7d88c6cf27000904971b12274a972ca66471ffee7c3bfee8c90218c16ddd0ec96cc8f46779bffd
DIST youtube-viewer-3.2.0.tar.gz 222528 SHA256 60a4ded8798da3cdadadf816b1c4e87c6feb697f01db70630f014584e5a2392e SHA512 bda3592874ded71e6a60d87b669d2c80999425ef2f2061e942a8db5755d9d6f2dabf038b8b7984efb1cccc3a5f9f12b2fa56290be9db871b2784b2c464367c3b WHIRLPOOL 73ec965bf4cf65d545b99d73e003ce7d74d92dcdc1f5d29c8b925e4d96e93d5924b66e06ec40e22f16119b6df6445344d650d5ca086e52aeb60a350c7ca8ce0d
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.1.1.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.1.1.ebuild
deleted file mode 100644
index fb6901464458..000000000000
--- a/net-misc/youtube-viewer/youtube-viewer-3.1.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit gnome2-utils eutils perl-module vcs-snapshot
-
-DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
-HOMEPAGE="https://trizen.googlecode.com"
-SRC_URI="https://github.com/trizen/youtube-viewer/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="
- >=dev-lang/perl-5.16.0
- dev-perl/Data-Dump
- dev-perl/libwww-perl
- || ( media-video/mplayer[X,network]
- media-video/mplayer2[X,network]
- media-video/mpv[X] )
- virtual/perl-File-Spec
- virtual/perl-Getopt-Long
- virtual/perl-Term-ANSIColor
- virtual/perl-Text-ParseWords
- virtual/perl-Text-Tabs+Wrap
- gtk? (
- dev-perl/File-ShareDir
- >=dev-perl/gtk2-perl-1.244.0
- virtual/freedesktop-icon-theme
- x11-libs/gdk-pixbuf:2[X,jpeg]
- )"
-DEPEND="dev-perl/Module-Build"
-
-SRC_TEST="do"
-
-S=${WORKDIR}/${P}/WWW-YoutubeViewer
-
-src_prepare() {
- perl-module_src_prepare
-}
-
-# build system installs files on "perl Build.PL" too
-# do all the work in src_install
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
- local myconf
- if use gtk ; then
- myconf="--gtk-youtube-viewer"
- fi
- perl-module_src_configure
- perl-module_src_install
-
- if use gtk ; then
- domenu share/gtk-youtube-viewer.desktop
- doicon share/icons/gtk-youtube-viewer.png
- fi
-}
-
-pkg_preinst() {
- use gtk && gnome2_icon_savelist
- perl_set_version
-}
-
-pkg_postinst() {
- use gtk && gnome2_icon_cache_update
- einfo
- elog "optional dependencies:"
- elog " dev-perl/LWP-Protocol-https or dev-perl/libwww-perl[ssl]"
- elog " and virtual/perl-MIME-Base64"
- elog " (for HTTPS protocol and login support)"
- elog " dev-perl/Term-ReadLine-Gnu (for a better STDIN support)"
- elog " dev-perl/Text-CharWidth (print the results in a fixed-width"
- elog " format (--fixed-width, -W))"
- elog " dev-perl/XML-Fast (faster XML to HASH conversion)"
- elog " net-misc/gcap (for retrieving Youtube closed captions)"
- elog " virtual/perl-File-Temp (for posting comments)"
- elog " virtual/perl-Scalar-List-Utils (to shuffle the playlists"
- elog " (--shuffle, -s))"
- elog " virtual/perl-threads (threads support)"
- einfo
-}
-
-pkg_postrm() {
- use gtk && gnome2_icon_cache_update
-}
diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 313ff2353cc8..36d26a323574 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,2 +1,3 @@
DIST gtk-gnutella-1.1.6.tar.bz2 19571757 SHA256 b755250f6b8af65b449f20e4dac77a677c1c3fd52f603dc9cd82b035740974c3 SHA512 ade3c8e8a776b4ff9351ad60b307f421f804c423811ea2bc7639656e3623fb95c1041c235578e07009c07f7c85911db72b9c17e04fca65a1661c8492c396069f WHIRLPOOL 857578452335885de3f918d54c663cd4d7beb1a3cad7970bf74f796866f3754c66d7a59e64bb2b1400eacb9413c47de51f29d41ef2178916a3cfd6d9e57294fe
DIST gtk-gnutella-1.1.8.tar.bz2 19690815 SHA256 271aadb6da4a807dd98094d7f2fa42a2215e273cdc799c188e68594896586079 SHA512 f1b0130a660d41690fb0555eae157c35c73bdd541ab7cce43acd3a0cc4fcb0fb00dc51947065c227df516062af944cc7267437c09f67bfb0dfa9b3dbf96bce2f WHIRLPOOL 568651daa74fb9b71f228a25d6f8086ec26646c521f8161ae85e5524d22c42d618017252dabe77d87468a4c3280754c1279a6d2c526cd7f805177e18e8614f16
+DIST gtk-gnutella-1.1.9.tar.bz2 19766381 SHA256 3b2e913969834a57edd93d22733646037b2a141172d5d4a240f5d6a9f56b6aff SHA512 45ea6a5d51592879e19c61e728a60c77352e7d9b0c92ef1ac5c4fa52db122d70fdcc3f724b8da36f5dab3cea3170ba214db2552c31a156ea71e45e3a0048940c WHIRLPOOL e528c00bff42642fe3e949a3a4d1b2dfb70fbc8e408a2e90926689d30b185ec6042807841921aa013d07064a9c5fe7a3f027d67f0ccac40bf4c2588175af2192
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.9.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.9.ebuild
new file mode 100644
index 000000000000..154b509fd546
--- /dev/null
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.9.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+IUSE="nls dbus ssl +gtk"
+
+DESCRIPTION="A GTK+ Gnutella client"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://gtk-gnutella.sourceforge.net/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+RDEPEND="
+ dev-libs/glib:2
+ sys-libs/zlib
+ gtk? ( >=x11-libs/gtk+-2.2.1:2 )
+ dbus? ( >=sys-apps/dbus-0.35.2 )
+ ssl? ( >=net-libs/gnutls-2.2.5 )
+ nls? ( >=sys-devel/gettext-0.11.5 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ strip-linguas -i po
+
+ echo "# Gentoo-selected LINGUAS" > po/LINGUAS
+ for ling in ${LINGUAS}; do
+ echo $ling >> po/LINGUAS
+ done
+}
+
+src_configure() {
+ # There is no option to turn off optimization through the build.sh
+ # script.
+ sed -i -e "s/Configure -Oder/Configure -Oder -Doptimize=none/" build.sh || die
+
+ # The build script does not support the equivalent --enable
+ # options so we must construct the configuration by hand.
+
+ local myconf
+
+ if ! use nls; then
+ myconf="${myconf} --disable-nls"
+ fi
+
+ if ! use dbus; then
+ myconf="${myconf} --disable-dbus"
+ fi
+
+ if ! use ssl; then
+ myconf="${myconf} --disable-gnutls"
+ fi
+
+ if use gtk; then
+ myconf="${myconf} --gtk2"
+ else
+ myconf="${myconf} --topless"
+ fi
+
+ ./build.sh \
+ --configure-only \
+ --prefix="/usr" \
+ --cc=$(tc-getCC) \
+ ${myconf}
+}
+
+src_compile() {
+ # Build system is not parallel-safe, bug 500760
+ emake -j1
+}
+
+src_install() {
+ dodir /usr/bin
+ emake INSTALL_PREFIX="${D}" install || die "Install failed"
+ dodoc AUTHORS ChangeLog README TODO
+
+ # Touch the symbols file into the future to avoid warnings from
+ # gtk-gnutella later on, since we will most likely strip the binary.
+ touch --date="next minute" "${D}/usr/lib/gtk-gnutella/gtk-gnutella.nm" || die
+}
diff --git a/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild b/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
index 945eba2db014..e64d2f37c684 100644
--- a/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/retroshare/${PN}_${MY_PV}_src.tgz"
# pegmarkdown can also be used with MIT
LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="cli feedreader +qt5 voip"
REQUIRED_USE="|| ( cli qt5 )
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 68a84f5d126c..f8712fb5ef79 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1,2 +1,2 @@
-DIST syncthing-0.12.18.tar.gz 4046127 SHA256 e0d1af4f29c9e2325507a7daf4bf97098c87c321a7e075125b66ddaa34b37eb4 SHA512 2f2351a983b3d384e9fe65c87d67b81f20fc20b7b43b8d2fab882131bd4e4119f0cf099571d617f22f0125c43224c653e93329392204f3e0ff6c6a3bba7d8263 WHIRLPOOL cfe491241e9ef4ebd19042a3cc3188771cf64d67c0faa29feda7da5980f86a38c1e284938074271e25bbfb881eca1ca56f237bf81a61be4d836287cbfab27eb2
DIST syncthing-0.12.19.tar.gz 4047476 SHA256 5a7035029974fe0fb496d9f8af880a50bcc8499ff5eef7ee4ef48f08df37820e SHA512 89d2b34c5bb9772bcaad84caa03794cdcfeade8fef0b8abaeea6a1cccdc09167a690aa8b1dfadac81d9ac0e8a07c9be112af7f2e56f12f589b906c518c49a686 WHIRLPOOL c0589a5e6a4f090dee9f79bb199c901b3f0e75cf0f92c12851a9713cdf7e813c8a5564ce475000529d2a5edafb9861d1b820858cb6fa3bb5bf082ff5586da9b3
+DIST syncthing-0.12.20.tar.gz 4047350 SHA256 89dc46ebbe8b114467abe0171fd03a76408a9cf4fe44308db2b6d60eee233006 SHA512 1df45f4f778b1f2784f0787695bf5f94796747bc103d032b07e4cdb1108211a5debcfb5a10c0284bee43f896e011e29264e49216216570efe563822efce4907c WHIRLPOOL 8614a87d4b03737dc69e966933314925efa4f2ccd9966af4d44930244a87d2819397c059cec2af2544161c9ab0df41ce7e578d156c4ca0cb911975e10a230aad
diff --git a/net-p2p/syncthing/syncthing-0.12.18.ebuild b/net-p2p/syncthing/syncthing-0.12.18.ebuild
deleted file mode 100644
index 1aef4d572fa8..000000000000
--- a/net-p2p/syncthing/syncthing-0.12.18.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGO_PN="github.com/syncthing/syncthing"
-EGIT_COMMIT=v${PV}
-
-inherit golang-vcs-snapshot systemd
-
-DESCRIPTION="Syncthing is an open, trustworthy and decentralized cloud storage system"
-HOMEPAGE="http://syncthing.net"
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
- export GOPATH="${S}:$(get_golibdir_gopath)"
- cd src/${EGO_PN}
- go run build.go -version "v${PV}" -no-upgrade || die "build failed"
-}
-
-#go test: -race is only supported on amd64 platforms
-#src_test() {
-# cd src/${EGO_PN}
-# go run build.go test || die "test failed"
-#}
-
-src_install() {
- cd src/${EGO_PN}
- dobin bin/*
- dodoc README.md AUTHORS CONTRIBUTING.md
- systemd_dounit "${S}"/src/${EGO_PN}/etc/linux-systemd/system/${PN}@.service
- systemd_douserunit "${S}"/src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
-}
diff --git a/net-p2p/syncthing/syncthing-0.12.20.ebuild b/net-p2p/syncthing/syncthing-0.12.20.ebuild
new file mode 100644
index 000000000000..761b96c6fbe9
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-0.12.20.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+EGO_PN="github.com/syncthing/syncthing"
+EGIT_COMMIT=v${PV}
+
+inherit golang-vcs-snapshot systemd user
+
+DESCRIPTION="Open Source Continuous File Synchronization"
+HOMEPAGE="https://syncthing.net"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_compile() {
+ export GOPATH="${S}:$(get_golibdir_gopath)"
+ cd src/${EGO_PN}
+ go run build.go -version "v${PV}" -no-upgrade || die "build failed"
+}
+
+src_test() {
+ cd src/${EGO_PN}
+ go run build.go test || die "test failed"
+}
+
+src_install() {
+ cd src/${EGO_PN}
+ doman man/*.[157] || die
+ dobin bin/*
+ dodoc README.md AUTHORS CONTRIBUTING.md
+ systemd_dounit "${S}"/src/${EGO_PN}/etc/linux-systemd/system/${PN}@.service \
+ "${S}"/src/${EGO_PN}/etc/linux-systemd/system/${PN}-resume.service
+ systemd_douserunit "${S}"/src/${EGO_PN}/etc/linux-systemd/user/${PN}.service
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+ newinitd "${FILESDIR}/${PN}.initd" ${PN}
+ keepdir /var/{lib,log}/${PN}
+ fowners ${PN}:${PN} /var/{lib,log}/${PN}
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+}
diff --git a/net-p2p/transmission/files/transmission-daemon.initd.10 b/net-p2p/transmission/files/transmission-daemon.initd.10
index 7acb22286a6d..e1a7150cf026 100644
--- a/net-p2p/transmission/files/transmission-daemon.initd.10
+++ b/net-p2p/transmission/files/transmission-daemon.initd.10
@@ -20,20 +20,27 @@ runas_user=${runas_user:-transmission:transmission}
retry="TERM/45/QUIT/15"
start_pre() {
- command_args="
- --config-dir ${config_dir}
- --download-dir ${download_dir}
- --pid-file ${pidfile}
- ${TRANSMISSION_OPTIONS}
- "
+ command_args="--config-dir ${config_dir} --pid-file ${pidfile}"
command_user="${runas_user}"
- checkpath -d -o ${runas_user} "${rundir}" /var/lib/transmission "${config_dir}" "${download_dir}" || return
+ # Call mkdir -p in case parent dirs are missing
+ mkdir -p "${rundir}" "${config_dir}" "${download_dir}"
+
+ # Call checkpath to fixup permissions
+ checkpath -d -o "${runas_user}" "${rundir}" "${config_dir}" "${download_dir}" || return
+
+ if [ ! -e "${config_dir}/settings.json" ]; then
+ # Only set download dir if settings don't exist
+ # https://bugs.gentoo.org/576640
+ command_args="${command_args} --download-dir ${download_dir}"
+ fi
if [ "${logfile}" != syslog ]; then
- checkpath -d -o ${runas_user} /var/log/transmission || return
+ checkpath -d -o "${runas_user}" /var/log/transmission || return
command_args="${command_args} --logfile ${logfile}"
fi
+
+ command_args="${command_args} ${TRANSMISSION_OPTIONS}"
}
reload() {
diff --git a/net-p2p/transmission/transmission-2.90.ebuild b/net-p2p/transmission/transmission-2.90-r1.ebuild
index 96c12efa4813..96c12efa4813 100644
--- a/net-p2p/transmission/transmission-2.90.ebuild
+++ b/net-p2p/transmission/transmission-2.90-r1.ebuild
diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild
index beaa57180cc2..63841edf3284 100644
--- a/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild
+++ b/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE=""
# Require {glib,gdbus-codegen}-2.30.0 due to GDBus changes between 2.29.92
diff --git a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.2.ebuild b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.2.ebuild
index 1e38413c5954..855f874f31ac 100644
--- a/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.2.ebuild
+++ b/net-wireless/gnome-bluetooth/gnome-bluetooth-3.18.2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeBluetooth"
LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
SLOT="2/13" # subslot = libgnome-bluetooth soname version
IUSE="+introspection"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
COMMON_DEPEND="
>=dev-libs/glib-2.38:2
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 120b9ca9eabb..1695f990ff00 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -2,6 +2,10 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# Steev Klimaszewski <steev@gentoo.org> (04 March 2016)
+# Chromium uses an internal tcmalloc that doesn't support this arch yet.
+www-client/chromium tcmalloc
+
# Mike Frysinger <vapier@gentoo.org> (17 Dec 2015)
# The tlsdate seccomp logic is open-coded and doesn't support this arch yet.
net-misc/tlsdate seccomp
diff --git a/profiles/default/linux/x86/13.0/systemd/eapi b/profiles/default/linux/x86/13.0/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/13.0/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/13.0/systemd/parent b/profiles/default/linux/x86/13.0/systemd/parent
new file mode 100644
index 000000000000..ced72403bde9
--- /dev/null
+++ b/profiles/default/linux/x86/13.0/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../targets/systemd
diff --git a/profiles/license_groups b/profiles/license_groups
index cc088c1a9652..b49b29f29165 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -70,7 +70,7 @@ FREE @FREE-SOFTWARE @FREE-DOCUMENTS
# - IF (and only if) there is an explicit inclusion requirement,
# USE=bindist MUST cause a copy of the license to be installed
# in a file location compliant with the license
-BINARY-REDISTRIBUTABLE @FREE atheros-hal bh-luxi Broadcom Dina hashcat intel-ucode ipw2100-fw ipw2200-fw ipw3945 MicroChip-SDCC no-source-code NVIDIA-r1 qlogic-fibre-channel-firmware radeon-ucode shmux SmartLabs sun-concurrent-util sun-jlfgr
+BINARY-REDISTRIBUTABLE @FREE atheros-hal bh-luxi Broadcom Dina hashcat intel-ucode ipw2100-fw ipw2200-fw ipw3945 MicroChip-SDCC no-source-code NVIDIA-r1 qlogic-fibre-channel-firmware radeon-ucode shmux SmartLabs sun-jlfgr
######################################################################
diff --git a/profiles/package.mask b/profiles/package.mask
index 38be43b228df..bf08eb37a832 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,6 +30,39 @@
#--- END OF EXAMPLES ---
+# Ian Stakenvicius <axs@gentoo.org> (06 Mar 2016)
+# Mask old versions of thunderbird as they are no longer supported,
+# but we keep them in the repo for now in case there is a need
+# for them for upgrading old user profiles, etc.
+~mail-client/thunderbird-24.8.0
+~mail-client/thunderbird-31.8.0
+
+# Aaron Bauman <bman@gentoo.org> (05 Mar 2016)
+# Per security bug #491372 this package is vulnerable
+# and unmaintained. Removal in 30 days.
+net-mail/perdition
+
+# Aaron Bauman <bman@gentoo.org> (05 Mar 2016)
+# Per security bug #448826 this package is vulnerable
+# and unmaintained. Removal in 30 days.
+www-apps/dragonflycms
+
+# Aaron Bauman <bman@gentoo.org> (05 Mar 2016)
+# Per security bug #392325 this package is vulnerable
+# and unmaintained. Removal in 30 days.
+dev-libs/clearsilver
+
+# Aaron Bauman <bman@gentoo.org> (05 Mar 2016)
+# Per security bug #466782 this package is vulnerable
+# and unmaintained. Removal in 30 days.
+media-sound/xmp
+
+# Aaron Bauman <bman@gentoo.org> (05 Mar 2016)
+# Per security bug #399563 these packages are vulnerable
+# and unmaintained. Removal in 30 days.
+www-apps/horde-imp
+www-apps/horde-dimp
+
# Mike Gilbert <floppym@gentoo.org> (03 Mar 2016)
# Dev channel releases are only for people who are developers or want more
# experimental features and accept a more unstable release.
@@ -142,11 +175,6 @@ media-libs/gluon
# Masked for removal in 30 days. See bug 573326
dev-python/simplegui
-# Ian Stakenviciuus <axs@gentoo.org> (09 Feb 2016)
-# Mask until members of the project can test and unmask
-=net-fs/samba-4.4*
-=sys-libs/ldb-1.1.25
-
# Patrice Clement <monsieurp@gentoo.org> (09 Feb 2016)
# Old, ancient, deprecated, obsolete.. so many adjectives could describe these
# ebuilds. Let's just say it's about time to kiss them goodbye.
@@ -167,17 +195,6 @@ dev-java/jsr93
net-libs/iojs
# James Le Cuirot <chewi@gentoo.org> (07 Feb 2016)
-# BioJava depends on commons-dbcp:0, which requires Java 6. Even the
-# latest "legacy" version 1.9.1 does so and no one wants to do the
-# difficult bump to 4.1.0. Mauve depends on BioJava but being a very
-# outdated live SVN ebuild, it probably doesn't work anyway. This goes
-# for Mauve Aligner too. Removal in 30 days. See bug #556470.
-sci-biology/biojava
-sci-biology/mauve
-sci-biology/mauvealigner
-dev-java/bytecode
-
-# James Le Cuirot <chewi@gentoo.org> (07 Feb 2016)
# Masked until 2.0 final arrives, which hopefully won't depend on
# commons-dbcp:0 as that requires Java 6. Note that the 2.0 in the
# tree should have actually been 2.0_beta1. There are no revdeps.
@@ -329,9 +346,9 @@ www-apache/mod_h2
>=net-fs/samba-4.3.0
# Lars Wendler <polynomial-c@gentoo.org> (20 Aug 2015)
-# Masked for testing
-=net-misc/iputils-20150815
-=net-misc/iputils-20150815-r1
+# Release is not from original upstream but from a fork. Masked as requested by
+# vapier
+~net-misc/iputils-20150815
# Sebastian Pipping <sping@gentoo.org> (8 Aug 2015)
# Upcoming, too young to go into testing unmasked
@@ -352,12 +369,6 @@ dev-libs/iniparser:4
# It works (except USE=vamp) but is not up to Gentoo standards yet
=media-sound/audacity-2.1.1
-# Ian Stakenvicius <axs@gentoo.org> (16 Jul 2015)
-# Mask thunerbird-24.x as it is no longer supported, but
-# it remains in the tree for now in case there is a need
-# for it for upgrading old user profiles, etc.
-~mail-client/thunderbird-24.8.0
-
# Patrick Lauer <patrick@gentoo.org> (1 Jul 2015)
# Wrong version #553670
=sys-kernel/gentoo-sources-4.1.1
diff --git a/profiles/prefix/parent b/profiles/prefix/parent
index 4085e5ad378d..a88ecf69d275 100644
--- a/profiles/prefix/parent
+++ b/profiles/prefix/parent
@@ -1,2 +1,2 @@
-../features/prefix/rpath
../base
+../features/prefix/rpath
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 0940414943ac..49add2793c64 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -167,6 +167,7 @@ x86 default/linux/x86/13.0/desktop/kde/systemd stable
x86 default/linux/x86/13.0/desktop/plasma stable
x86 default/linux/x86/13.0/desktop/plasma/systemd stable
x86 default/linux/x86/13.0/developer stable
+x86 default/linux/x86/13.0/systemd stable
# Gentoo/FreeBSD Profiles
amd64-fbsd default/bsd/fbsd/amd64/9.1 dev
@@ -258,15 +259,21 @@ x86-macos prefix/darwin/macos/10.7/x86 exp
x64-macos prefix/darwin/macos/10.7/x64 exp
x86-macos prefix/darwin/macos/10.8/x86 exp
x64-macos prefix/darwin/macos/10.8/x64 exp
+x86-macos prefix/darwin/macos/10.9/x86 exp
+x64-macos prefix/darwin/macos/10.9/x64 exp
+x86-macos prefix/darwin/macos/10.10/x86 exp
+x64-macos prefix/darwin/macos/10.10/x64 exp
+x86-macos prefix/darwin/macos/10.11/x86 exp
+x64-macos prefix/darwin/macos/10.11/x64 exp
# Solaris Profiles
sparc-solaris prefix/sunos/solaris/5.9/sparc exp
sparc-solaris prefix/sunos/solaris/5.10/sparc exp
-sparc64-solaris prefix/sunos/solaris/5.10/sparc64 exp
+sparc64-solaris prefix/sunos/solaris/5.10/sparc64 exp
x86-solaris prefix/sunos/solaris/5.10/x86 exp
x64-solaris prefix/sunos/solaris/5.10/x64 exp
sparc-solaris prefix/sunos/solaris/5.11/sparc exp
-sparc64-solaris prefix/sunos/solaris/5.11/sparc64 exp
+sparc64-solaris prefix/sunos/solaris/5.11/sparc64 exp
x86-solaris prefix/sunos/solaris/5.11/x86 exp
x64-solaris prefix/sunos/solaris/5.11/x64 exp
@@ -282,7 +289,7 @@ x86-interix prefix/windows/interix/6.0/x86 exp
x86-interix prefix/windows/interix/6.1/x86 exp
# Windows Profiles
-x86-winnt prefix/windows/winnt/3.5/x86 exp
+x86-winnt prefix/windows/winnt/3.5/x86 exp
x86-winnt prefix/windows/winnt/5.2/x86 exp
x86-winnt prefix/windows/winnt/6.0/x86 exp
x86-winnt prefix/windows/winnt/6.1/x86 exp
diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016
index 4a1817727f8a..f0803256f195 100644
--- a/profiles/updates/1Q-2016
+++ b/profiles/updates/1Q-2016
@@ -16,3 +16,11 @@ move dev-perl/ImageInfo dev-perl/Image-Info
move dev-perl/ImageSize dev-perl/Image-Size
move media-tv/xbmc media-tv/kodi
move dev-perl/locale-maketext-fuzzy dev-perl/Locale-Maketext-Fuzzy
+move dev-perl/crypt-cbc dev-perl/Crypt-CBC
+move dev-perl/crypt-des-ede3 dev-perl/Crypt-DES_EDE3
+move dev-perl/crypt-dh dev-perl/Crypt-DH
+move dev-perl/crypt-dsa dev-perl/Crypt-DSA
+move dev-perl/crypt-idea dev-perl/Crypt-IDEA
+move dev-perl/crypt-random dev-perl/Crypt-Random
+move dev-perl/crypt-primes dev-perl/Crypt-Primes
+move dev-perl/crypt-rsa dev-perl/Crypt-RSA
diff --git a/ros-meta/audio_common/Manifest b/ros-meta/audio_common/Manifest
index 6ae18ef87063..fc10bbbe99d5 100644
--- a/ros-meta/audio_common/Manifest
+++ b/ros-meta/audio_common/Manifest
@@ -1,5 +1,6 @@
DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4
DIST audio_common-0.2.11.tar.gz 182449 SHA256 8ba3d3747cc7fcb45062368fbcd2d220b8d46d184c54247afefcb5be657cafbe SHA512 01ff1aaca6568ef0683501f0bf9ed6b451beddec5c2fc01362f91ba466bcea318fe1e998bde1424d824fa1f39922a2a397d5990d774478e355b6781cbbd7ea72 WHIRLPOOL 651e4bb9142a29dabd637b42f6db75e3b235632d9b2641c756fbd429fb12f3022edbc4cbea56c83d5f428a4265ea9f86e90905348e8797543a20d274256a6ce1
+DIST audio_common-0.2.12.tar.gz 182493 SHA256 c1cdb8cbf999020fb6c97f45de1ddb39fc4712dd7cf48e6a296e5b3a8695d336 SHA512 0d0b4814ad58e34ed0c605425f648c7bc2bc43e57ff2b44b23862bfc6f8ad3381b7aac2fb365b5c8194248ce769a33d5dd01ddd0add87303ce3fd6fcfd63f267 WHIRLPOOL cbdaba77dd6a765ebb99bd51c15ffd5baca253cf1a243200c6985dd602e58afd311c6af17f001f6da35346e51275a49388e23a89759448ae5e03bd1db5ade4c3
DIST audio_common-0.2.7.tar.gz 173982 SHA256 bdffab26cd837b6db65d275dd14de143d1cf056167fc121b213b7403142195c4 SHA512 f765422bdb641e87132e1c9c56ca742d6830fed1d7414b337b61aa242f9955e4138ab13ee4a7786c78ff73f5824748ceb38f98612a7f12dab4dcdc97efa289e3 WHIRLPOOL d1bf17f8bd0e8346d2fff48982c402b0eaa2ea4365b3195e3dd0c4943c93cf1935fdff85a0d2018e43e5074640692c3d72dc72887c86d955dc02c60800e3725b
DIST audio_common-0.2.8.tar.gz 175497 SHA256 459ce6d834026969b3bec3fc9d59c446d8bd433661138464b90b9f2df38e6f1c SHA512 9a676be8c3c2240c3580facc9cf0e97080e42bfc53651af1308584b6aed32e33d0a4e7457c303290446fe200b2ff366a6136be2b9021e791bd54d81c0a739706 WHIRLPOOL 998e3bd28e18cdbde96693c3715a4eeea80c3d9b0aa4fbaaebaa6ddd926569e800e3e436153aa0854753da00c9bd7c1262d4cd3a04f1298aac05329dd1c6df0d
DIST audio_common-0.2.9.tar.gz 182112 SHA256 7b0ee18352a251aea212a701881f59841741272cd9bb62970a32c726dd69d54f SHA512 53eae3df9ccc6714ccdff92cc14f7833b6a7cc133dee0550a27c5570ca58cf805de223febae1922f4a66f89867e6712c52a57ef397abf6f8ce6627f2bc4aee5a WHIRLPOOL aa084a784a9b6ef314426d08b38d980ebc87d139a9d243a164ee621d3c08a557a4d0196935766c900f98db4d13cd4335366c466ce75bf9d1342e0cc216262a42
diff --git a/ros-meta/audio_common/audio_common-0.2.12.ebuild b/ros-meta/audio_common/audio_common-0.2.12.ebuild
new file mode 100644
index 000000000000..618c77ecf99b
--- /dev/null
+++ b/ros-meta/audio_common/audio_common-0.2.12.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/audio_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common code for working with audio in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/audio_capture
+ dev-ros/audio_common_msgs
+ dev-ros/audio_play
+ dev-ros/sound_play
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/diagnostics/Manifest b/ros-meta/diagnostics/Manifest
index b6953773385b..13e70dd314c2 100644
--- a/ros-meta/diagnostics/Manifest
+++ b/ros-meta/diagnostics/Manifest
@@ -1 +1,2 @@
DIST diagnostics-1.8.8.tar.gz 508404 SHA256 e50eb7d49fd2ce13ce8bccb81cb67c198119d7524b3aada37035c8ab9fe2d3ec SHA512 f0e59442cf4cd277c1ef77e7bceec973a15519c9d81bbde21851592ba52c4c7d55a6358c6a65004490b3e3822a6edc772f20e41992a2b3604d9e64e9fd7124ef WHIRLPOOL 32c8fbdc6591abfd270c1c38aebc5dc8f5d7381e5675f6f50f07be0f433bc5a8b81ac33c438d56e753cb75c6914c8fd4c38d9cc82c720fb04b170b4afef597cb
+DIST diagnostics-1.8.9.tar.gz 525881 SHA256 d6102e9b1b98b5f3909a00694b1e3b856d69cdb9fd6b332f4320adf574e3a4a8 SHA512 2d9e2bcccf474ae8d30adbf0c5571d491cf3d8757732be5fcf1139ceb5fe40a4e83542e7e248cc94ca963056cd18f55c71df7108e26fc4d4e07efbf3611c3d80 WHIRLPOOL 914941b8c688ffaf22268832355d7d9d262d572b5fd1b3b48bbfbefb21240572830d81fb9aebcf252b8be99461cc404f106f3918210de7af49471ca1f244c568
diff --git a/ros-meta/diagnostics/diagnostics-1.8.9.ebuild b/ros-meta/diagnostics/diagnostics-1.8.9.ebuild
new file mode 100644
index 000000000000..74073e3f2af2
--- /dev/null
+++ b/ros-meta/diagnostics/diagnostics-1.8.9.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/diagnostics"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Packages related to gathering, viewing, and analyzing diagnostics data from robots"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/diagnostic_aggregator
+ dev-ros/diagnostic_analysis
+ dev-ros/diagnostic_common_diagnostics
+ dev-ros/diagnostic_updater
+ dev-ros/self_test
+ dev-ros/test_diagnostic_aggregator
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/geometry/Manifest b/ros-meta/geometry/Manifest
index 5129c8c218c8..8a840c952071 100644
--- a/ros-meta/geometry/Manifest
+++ b/ros-meta/geometry/Manifest
@@ -1 +1,2 @@
DIST geometry-1.11.7.tar.gz 185886 SHA256 fbfbc707d239a76f7258372cb73a78341c0433d990d6f053340417c5ecb84231 SHA512 f5cf1ffdde96fc5fd375b3363192b355a2b423256bcbb9e1a7929a715b648a41919734653f9db9210fcd62a19a50c08b3c48c853dbaa4d370599732753a906e0 WHIRLPOOL 4958ca10d33d96d1d213ee778687d6d66e20bbf0b527d23bcdb4949fa8c3371831d9fe70ace862128c7018cf41f00c0280a64d9dd0eb6699dace50cf3f560b03
+DIST geometry-1.11.8.tar.gz 186749 SHA256 a372f2225d6d9625dadc9dee817281a22dfb4b4dc8fd129ee1fb9375993bfd88 SHA512 a7d1383635d96b8a95486cbb9d1fdfc762846cb6ecc41c0deef76cea4d9f9cde99c4b079527a25bc5ac559d4987fe7a4c3159e2435942bb3d4fb992da68e0e04 WHIRLPOOL e527970486796a67e1a8edfec0a8abfd562e36bbc9f38cf5a335bbd178f4dd68b067e526e4d308389e61852af8b17a59b0bb82a4faa3a45856c553ddd228fe3b
diff --git a/ros-meta/geometry/geometry-1.11.8.ebuild b/ros-meta/geometry/geometry-1.11.8.ebuild
new file mode 100644
index 000000000000..4d90ccfa861b
--- /dev/null
+++ b/ros-meta/geometry/geometry-1.11.8.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/geometry"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common geometric calculations"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/eigen_conversions
+ dev-ros/kdl_conversions
+ dev-ros/tf
+ dev-ros/tf_conversions
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/geometry_experimental/Manifest b/ros-meta/geometry_experimental/Manifest
index ec008bbcd231..e6ba39e1c4eb 100644
--- a/ros-meta/geometry_experimental/Manifest
+++ b/ros-meta/geometry_experimental/Manifest
@@ -1 +1,2 @@
DIST geometry_experimental-0.5.12.tar.gz 131234 SHA256 430115ef4a3352e8b00596ff7406e6cb14fc1720250cf164754cf724c7f371c3 SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711 WHIRLPOOL fd894a43e0110eeab1f085faa32a339a72d922d57ae68ee82c2b54f73c246090f3537483f1ca68147f5b7b7a5c7502f9fd4ab733da150c68af94ea2d87859ab1
+DIST geometry_experimental-0.5.13.tar.gz 134107 SHA256 20ad7d3b610c70e8c666937d6a29ef53dac9181025427ee6d0664c67ff94b43f SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d WHIRLPOOL 06da030383725aaeda8626f36b56911cc05c025b538904f33cdc69975027f610113945a3479d85fe83df841fcb1f4902b8927cae2a2272e44f59b86c97d844fc
diff --git a/ros-meta/geometry_experimental/geometry_experimental-0.5.13.ebuild b/ros-meta/geometry_experimental/geometry_experimental-0.5.13.ebuild
new file mode 100644
index 000000000000..63b9427501ab
--- /dev/null
+++ b/ros-meta/geometry_experimental/geometry_experimental-0.5.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/geometry_experimental"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ros"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/test_tf2
+ dev-ros/tf2
+ dev-ros/tf2_bullet
+ dev-ros/tf2_geometry_msgs
+ dev-ros/tf2_kdl
+ dev-ros/tf2_msgs
+ dev-ros/tf2_py
+ dev-ros/tf2_ros
+ dev-ros/tf2_sensor_msgs
+ dev-ros/tf2_tools
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-astronomy/stellarium/stellarium-0.14.2.ebuild b/sci-astronomy/stellarium/stellarium-0.14.2.ebuild
index da0458bca99d..00e771424a7a 100644
--- a/sci-astronomy/stellarium/stellarium-0.14.2.ebuild
+++ b/sci-astronomy/stellarium/stellarium-0.14.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug nls sound stars"
RESTRICT="test"
diff --git a/sci-biology/biojava/Manifest b/sci-biology/biojava/Manifest
deleted file mode 100644
index 3a20f1c431f2..000000000000
--- a/sci-biology/biojava/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST biojava-1.6-all.jar 24571007 SHA256 2d10334fe6022d1b64219505ba4d2a32027ab7218d775878506d3e7c00f6ce7e SHA512 300bd6e02fe052c810c52cb2cc4255628bee704af187ad746b97e57941778dc3a1996b3917db021d74db8c716f94c90c94c5a5e2d4bc212c06259381045f3034 WHIRLPOOL e5a52aaa6e9a9d6780d5f55b6d164db07388e9c595296d4e4a11dc241aa0745fa726279d19a0c97d1966b0a14c06af2b9b588873ad522aeeff881534f0871f10
-DIST biojava-1.7-all.jar 28062592 SHA256 5c5e7fc66bc79a07494fb7d935164ec2aab50dc2effb7644f89bfa4fc907bb3f SHA512 867862b45f014bcd1afd37691e91b948ede05e96f84c7051953d32dad49908781235aad80301e22a15fa8b4145e80c78cf3935d6e581a2e60b56c9308f8adaa8 WHIRLPOOL 5669293ce362e82562454c5902d523e69f64d90e117e75b5de844e0ef5866d250507b86f78245ac82f19932ad9aa196ad17d96a3f703187a3ab2daf00893af9b
diff --git a/sci-biology/biojava/biojava-1.6.ebuild b/sci-biology/biojava/biojava-1.6.ebuild
deleted file mode 100644
index edfadace1dcc..000000000000
--- a/sci-biology/biojava/biojava-1.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# TODO:
-# -Fix javadoc generation OutOfMemoryError
-# -Add launchers for 2 apps in biojava-apps.jar
-# -Decide on demo packaging. (Whether to install its jar as done or sources by examples USE flag)
-
-EAPI=2
-
-#JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_IUSE="source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java framework for processing biological data"
-HOMEPAGE="http://biojava.org"
-SRC_URI="http://www.biojava.org/download/bj16/all/${P}-all.jar"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-COMMON_DEPEND="dev-java/jgrapht:0
- dev-java/commons-cli:1
- dev-java/commons-dbcp:0
- dev-java/commons-pool:0
- dev-java/bytecode:0"
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEPEND}
- test?
- (
- dev-java/junit:4
- dev-java/ant-junit4
- )"
-
-S="${WORKDIR}/biojava-live_${PV}"
-
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-
-src_prepare() {
- einfo "Removing budled jars."
- find . -name "*.jar" -print -delete
- rm -r doc/*
- java-pkg_jar-from jgrapht jgrapht.jar jgrapht-jdk1.5.jar
- java-pkg_jar-from commons-cli-1
- java-pkg_jar-from commons-dbcp commons-dbcp.jar commons-dbcp-1.1.jar
- java-pkg_jar-from commons-pool commons-pool.jar commons-pool-1.1.jar
- java-pkg_jar-from bytecode
-}
-
-src_compile() {
- #ANT_OPTS="${ANT_OPTS} -Xmx512m"
- eant package-biojava package-biojava package-demos package-apps #$(use_doc javadocs-all)
-}
-
-src_install() {
- java-pkg_newjar ant-build/biojava.jar ${PN}.jar
- java-pkg_newjar ant-build/apps.jar ${PN}-apps.jar
- java-pkg_newjar ant-build/demos.jar ${PN}-demos.jar
- #use doc && java-pkg_dojavadoc ant-build/doc/{biojava,apps,demos}
- use source && java-pkg_dosrc {src,apps,demos}/org
-}
-
-src_test() {
- java-pkg_jar-from junit-4 junit.jar junit-4.4.jar
- ANT_TASKS="ant-junit4" eant runtests
-}
diff --git a/sci-biology/biojava/biojava-1.7.ebuild b/sci-biology/biojava/biojava-1.7.ebuild
deleted file mode 100644
index 77ff74c2d159..000000000000
--- a/sci-biology/biojava/biojava-1.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$
-
-# TODO:
-# -Fix javadoc generation OutOfMemoryError
-# -Add launchers for 2 apps in biojava-apps.jar
-# -Decide on demo packaging. (Whether to install its jar as done or sources by examples USE flag)
-
-EAPI=2
-
-#JAVA_PKG_IUSE="doc source test"
-JAVA_PKG_IUSE="source test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java framework for processing biological data"
-HOMEPAGE="http://biojava.org"
-SRC_URI="http://www.biojava.org/download/bj17/all/${P}-all.jar"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="dev-java/jgrapht:0
- dev-java/commons-cli:1
- dev-java/commons-dbcp:0
- dev-java/commons-pool:0
- dev-java/commons-collections:0
- dev-java/bytecode:0"
-
-RDEPEND=">=virtual/jre-1.5
- ${COMMON_DEPEND}"
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${COMMON_DEPEND}
- test?
- (
- dev-java/junit:4
- dev-java/ant-junit4
- )"
-
-S="${WORKDIR}/biojava-${PV}"
-
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-
-src_prepare() {
- einfo "Removing bundled jars..."
- find . -name "*.jar" -print -delete
- java-pkg_jar-from jgrapht jgrapht.jar jgrapht-jdk1.5.jar
- java-pkg_jar-from commons-cli-1
- java-pkg_jar-from commons-dbcp commons-dbcp.jar commons-dbcp-1.1.jar
- java-pkg_jar-from commons-pool commons-pool.jar commons-pool-1.1.jar
- java-pkg_jar-from bytecode
-}
-
-src_compile() {
- #ANT_OPTS="${ANT_OPTS} -Xmx512m"
- eant package-biojava package-biojava package-demos package-apps #$(use_doc javadocs-all)
-}
-
-src_install() {
- java-pkg_newjar ant-build/biojava.jar ${PN}.jar
- java-pkg_newjar ant-build/apps.jar ${PN}-apps.jar
- java-pkg_newjar ant-build/demos.jar ${PN}-demos.jar
- #use doc && java-pkg_dojavadoc ant-build/doc/{biojava,apps,demos}
- use source && java-pkg_dosrc {src,apps,demos}/org
-}
-
-src_test() {
- java-pkg_jar-from junit-4 junit.jar junit-4.4.jar
- ANT_TASKS="ant-junit4" eant runtests
-}
diff --git a/sci-biology/biojava/metadata.xml b/sci-biology/biojava/metadata.xml
deleted file mode 100644
index 15eb93414520..000000000000
--- a/sci-biology/biojava/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sci-biology@gentoo.org</email>
- <name>Gentoo Biology Project</name>
- </maintainer>
-<maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sci-biology/mauve/mauve-9999.ebuild b/sci-biology/mauve/mauve-9999.ebuild
deleted file mode 100644
index 1c3446707e4d..000000000000
--- a/sci-biology/mauve/mauve-9999.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-ESVN_REPO_URI="https://mauve.svn.sourceforge.net/svnroot/mauve/mauve/trunk"
-
-WANT_ANT_TASKS="ant-nodeps"
-EANT_GENTOO_CLASSPATH="biojava,zeus-jscl,dbus-java"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_PKG_BSFIX_NAME="build.xml"
-
-inherit subversion java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Multiple genome alignment with large-scale evolutionary events (GUI component)"
-HOMEPAGE="http://gel.ahabs.wisc.edu/mauve/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-KEYWORDS=""
-
-CDEPEND="~sci-biology/biojava-1.6
- >=dev-java/dbus-java-2.5.1
- ~dev-java/zeus-jscl-1.08
- dev-java/ant-nodeps"
-RDEPEND=">=virtual/jre-1.5
- sci-biology/mauvealigner
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
- media-gfx/icoutils
- ${CDEPEND}"
-
-S="${WORKDIR}"
-
-java_prepare() {
- find -name '*.jar' -not -name 'jarbundler*' -print -delete
- perl -i -ne 'print unless /<dmg/ or /<taskdef.+name="dmg"/../<\/taskdef>/' build.xml
- perl -i -ne 'print unless /<ssh/../<\/ssh/ or /<taskdef.+name="ssh"/../<\/taskdef>/' build.xml
- perl -i -ne 'print unless /<retroweaver/ or /<taskdef.+name="retroweaver"/../<\/taskdef>/' build.xml
-}
-
-src_install() {
- java-pkg_dojar Mauve.jar
-
- java-pkg_dolauncher Mauve --main org.gel.mauve.gui.Mauve
-
- icotool -x win32/mauve.ico
- insinto /usr/share/pixmaps
- newins mauve_4_48x48x32.png Mauve.png
- make_desktop_entry Mauve Mauve Mauve
-}
diff --git a/sci-biology/mauve/metadata.xml b/sci-biology/mauve/metadata.xml
deleted file mode 100644
index 959160fe46b1..000000000000
--- a/sci-biology/mauve/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sci-biology@gentoo.org</email>
- <name>Gentoo Biology Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sci-biology/mauvealigner/mauvealigner-9999.ebuild b/sci-biology/mauvealigner/mauvealigner-9999.ebuild
deleted file mode 100644
index cee185340513..000000000000
--- a/sci-biology/mauvealigner/mauvealigner-9999.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-ESVN_REPO_URI="https://mauve.svn.sourceforge.net/svnroot/mauve/mauveAligner/trunk"
-
-inherit subversion autotools
-
-DESCRIPTION="Multiple genome alignment with large-scale evolutionary events (aligner component)"
-HOMEPAGE="http://gel.ahabs.wisc.edu/mauve/"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc"
-KEYWORDS=""
-
-CDEPEND="sci-libs/libgenome
- sci-libs/libmuscle
- sci-libs/libmems"
-DEPEND="${CDEPEND}
- doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"
-
-src_prepare() {
- eautoreconf
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
-}
diff --git a/sci-biology/mauvealigner/metadata.xml b/sci-biology/mauvealigner/metadata.xml
deleted file mode 100644
index 959160fe46b1..000000000000
--- a/sci-biology/mauvealigner/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sci-biology@gentoo.org</email>
- <name>Gentoo Biology Project</name>
- </maintainer>
-</pkgmetadata>
diff --git a/sci-biology/primer3/primer3-2.3.6.ebuild b/sci-biology/primer3/primer3-2.3.6.ebuild
index 9ba9ff0796c3..079c4e5686fb 100644
--- a/sci-biology/primer3/primer3-2.3.6.ebuild
+++ b/sci-biology/primer3/primer3-2.3.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${PN}-src-${PV}.tar.gz"
SLOT="0"
LICENSE="GPL-2"
IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
DEPEND="dev-lang/perl"
RDEPEND=""
diff --git a/sci-biology/seaview/seaview-4.5.4.ebuild b/sci-biology/seaview/seaview-4.5.4.ebuild
index 16459f31e3a8..44d0f40f1709 100644
--- a/sci-biology/seaview/seaview-4.5.4.ebuild
+++ b/sci-biology/seaview/seaview-4.5.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/${PN}_${PV}.
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="+xft"
CDEPEND="
diff --git a/sci-electronics/magic/metadata.xml b/sci-electronics/magic/metadata.xml
index dc83bb823ea3..1b0b93fba2b0 100644
--- a/sci-electronics/magic/metadata.xml
+++ b/sci-electronics/magic/metadata.xml
@@ -23,6 +23,6 @@
</maintainer>
<changelog>http://www.opencircuitdesign.com/magic/release.html</changelog>
<doc lang="en">http://www.opencircuitdesign.com/magic/magic_docs.html</doc>
- <bugs-to>tim@opencircuitdesign.com</bugs-to>
+ <bugs-to>mailto:tim@opencircuitdesign.com</bugs-to>
</upstream>
</pkgmetadata>
diff --git a/sci-electronics/netgen/metadata.xml b/sci-electronics/netgen/metadata.xml
index b68643543e21..c15c8e2e96e7 100644
--- a/sci-electronics/netgen/metadata.xml
+++ b/sci-electronics/netgen/metadata.xml
@@ -16,6 +16,6 @@
</maintainer>
<changelog>http://www.opencircuitdesign.com/netgen/history.html</changelog>
<doc lang="en">http://www.opencircuitdesign.com/netgen/reference.html</doc>
- <bugs-to>tim@opencircuitdesign.com</bugs-to>
+ <bugs-to>mailto:tim@opencircuitdesign.com</bugs-to>
</upstream>
</pkgmetadata>
diff --git a/sci-electronics/xcircuit/metadata.xml b/sci-electronics/xcircuit/metadata.xml
index 5bb97f711199..4eb555135824 100644
--- a/sci-electronics/xcircuit/metadata.xml
+++ b/sci-electronics/xcircuit/metadata.xml
@@ -22,6 +22,6 @@
</maintainer>
<changelog>http://www.opencircuitdesign.com/xcircuit/changes.html</changelog>
<doc lang="en">http://www.opencircuitdesign.com/xcircuit/reference.html</doc>
- <bugs-to>tim@opencircuitdesign.com</bugs-to>
+ <bugs-to>mailto:tim@opencircuitdesign.com</bugs-to>
</upstream>
</pkgmetadata>
diff --git a/sci-geosciences/josm/Manifest b/sci-geosciences/josm/Manifest
index e202366ad2b8..5cbb181d756a 100644
--- a/sci-geosciences/josm/Manifest
+++ b/sci-geosciences/josm/Manifest
@@ -1,2 +1,3 @@
DIST josm-8800.tar.gz 39442264 SHA256 50859314c18118e93788b511660012eb9eefc9e90653e72be999bc6aa0e24ea3 SHA512 3a002d49508386daaad656feff9e305734f3fdedfc7da29fd3f821a623c875f25f3855e1cc0a073cee119e66e7dc05f732b4eccf23a2cb1ae0a0eda9d5fc5f86 WHIRLPOOL 2ad4397d34d15efff1233aad593042a90a552574ecd1f89c6b7953133fd9803de348de9a27f89bdc509b3b691e9ce618e6b32a8aba669ed032768873a4a23a54
DIST josm-9060.tar.gz 39757613 SHA256 a6be6ce30f48b9dde83b2a8489fa2b406394c7168763d66bc8d0f6110a3df6e6 SHA512 e5506cd38ba5dec88f66becfd7cdc33741ddebe8fc8cc31c0af20c818c2201a39936f27cad6cd6be9a5bbdbc69c52ccf0fd58f771477f537430dea68d89384bf WHIRLPOOL 13daab7bfa2f0c4b334e821a940f51ecba246c23bd4fe8f3fde3106f7048662ab94a2319117d4faa2b49c4341683ea036a9f69027b345653ae63735776268f8d
+DIST josm-9900.tar.gz 51719690 SHA256 39bd285ec5c461a73b864b26f30c659b15d296c80f503e0073bde3fbfad0998d SHA512 b32c63abd9b57c244de9f30f4f43cf1ef095f0bc4a21aa8e30d56e226f4e5efb97800be721c8331f6ad9bc780b63572a2801101afb7c252386e36c5ef2caff3b WHIRLPOOL f0b2595205e522b0e492ebd2680316e20baf529009dd497aa8b3dfb33a83c7e59de870cdfa923e58c109e0bd3a08a1ee043082293a194e2b93a589b8f12d1c85
diff --git a/sci-geosciences/josm/josm-8800.ebuild b/sci-geosciences/josm/josm-8800.ebuild
index 167d07c56007..967420b20413 100644
--- a/sci-geosciences/josm/josm-8800.ebuild
+++ b/sci-geosciences/josm/josm-8800.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,7 +6,7 @@ EAPI=5
JAVA_ANT_ENCODING=UTF-8
-[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+[[ ${PV} == "99999" ]] && SUBVERSION_ECLASS="subversion"
ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
unset SUBVERSION_ECLASS
@@ -19,13 +19,13 @@ HOMEPAGE="http://josm.openstreetmap.de/"
# svn co -r ${REVISION} http://josm.openstreetmap.de/svn/trunk/ josm-${REVISION}
# cd josm-${REVISION} && ant init-svn-revision-xml && cd -
# tar -cz --exclude=.svn -f /usr/portage/distfiles/josm-${REVISION}.tar.gz josm-${REVISION}
-[[ ${PV} == "9999" ]] || SRC_URI="mirror://gentoo/${P}.tar.gz"
+[[ ${PV} == "99999" ]] || SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == "9999" ]] || \
+[[ ${PV} == "99999" ]] || \
KEYWORDS="~amd64 ~x86"
DEPEND=">=virtual/jdk-1.7"
@@ -35,7 +35,7 @@ IUSE=""
src_prepare() {
- if [[ ${PV} == "9999" ]]; then
+ if [[ ${PV} == "99999" ]]; then
# create-revision needs the compile directory to be a svn directory
# see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
diff --git a/sci-geosciences/josm/josm-9060.ebuild b/sci-geosciences/josm/josm-9060.ebuild
index 167d07c56007..967420b20413 100644
--- a/sci-geosciences/josm/josm-9060.ebuild
+++ b/sci-geosciences/josm/josm-9060.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,7 +6,7 @@ EAPI=5
JAVA_ANT_ENCODING=UTF-8
-[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+[[ ${PV} == "99999" ]] && SUBVERSION_ECLASS="subversion"
ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
unset SUBVERSION_ECLASS
@@ -19,13 +19,13 @@ HOMEPAGE="http://josm.openstreetmap.de/"
# svn co -r ${REVISION} http://josm.openstreetmap.de/svn/trunk/ josm-${REVISION}
# cd josm-${REVISION} && ant init-svn-revision-xml && cd -
# tar -cz --exclude=.svn -f /usr/portage/distfiles/josm-${REVISION}.tar.gz josm-${REVISION}
-[[ ${PV} == "9999" ]] || SRC_URI="mirror://gentoo/${P}.tar.gz"
+[[ ${PV} == "99999" ]] || SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == "9999" ]] || \
+[[ ${PV} == "99999" ]] || \
KEYWORDS="~amd64 ~x86"
DEPEND=">=virtual/jdk-1.7"
@@ -35,7 +35,7 @@ IUSE=""
src_prepare() {
- if [[ ${PV} == "9999" ]]; then
+ if [[ ${PV} == "99999" ]]; then
# create-revision needs the compile directory to be a svn directory
# see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
diff --git a/sci-geosciences/josm/josm-9900.ebuild b/sci-geosciences/josm/josm-9900.ebuild
new file mode 100644
index 000000000000..967420b20413
--- /dev/null
+++ b/sci-geosciences/josm/josm-9900.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_ANT_ENCODING=UTF-8
+
+[[ ${PV} == "99999" ]] && SUBVERSION_ECLASS="subversion"
+ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
+inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
+unset SUBVERSION_ECLASS
+
+DESCRIPTION="Java-based editor for the OpenStreetMap project"
+HOMEPAGE="http://josm.openstreetmap.de/"
+# Upstream doesn't provide versioned tarballs, so we'll have to create one on our own:
+# REVISION=${PV}
+# mkdir -p josm-${REVISION}
+# svn co -r ${REVISION} http://josm.openstreetmap.de/svn/trunk/ josm-${REVISION}
+# cd josm-${REVISION} && ant init-svn-revision-xml && cd -
+# tar -cz --exclude=.svn -f /usr/portage/distfiles/josm-${REVISION}.tar.gz josm-${REVISION}
+[[ ${PV} == "99999" ]] || SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == "99999" ]] || \
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+IUSE=""
+
+src_prepare() {
+
+ if [[ ${PV} == "99999" ]]; then
+
+ # create-revision needs the compile directory to be a svn directory
+ # see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
+ sed -i \
+ -e "s:arg[ ]value=\".\":arg value=\"${ESVN_STORE_DIR}\/${PN}\/trunk\":" \
+ build.xml || die "sed failed"
+
+ else
+
+ # Remove dependency on git and svn just for generating a
+ # revision - the tarball should already have REVISION.XML
+ sed -i -e 's:, *init-git-revision-xml::g' \
+ -e '/<exec[ \t].*"svn"[ \t].*/,+5{d;n;}' \
+ -e 's:${svn.info.result}:1:' \
+ build.xml || die "sed failed"
+
+ fi
+
+}
+
+src_compile() {
+ eant dist-optimized
+}
+
+src_install() {
+ java-pkg_newjar "dist/${PN}-custom-optimized.jar" "${PN}.jar" || die "java-pkg_newjar failed"
+ java-pkg_dolauncher "${PN}" --jar "${PN}.jar" || die "java-pkg_dolauncher failed"
+
+ newicon images/logo.png josm.png || die "newicon failed"
+ make_desktop_entry "${PN}" "Java OpenStreetMap Editor" josm "Utility;Science;Geoscience"
+}
diff --git a/sci-geosciences/josm/josm-9999.ebuild b/sci-geosciences/josm/josm-99999.ebuild
index 221c044ddd03..046af6e4807a 100644
--- a/sci-geosciences/josm/josm-9999.ebuild
+++ b/sci-geosciences/josm/josm-99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -6,31 +6,29 @@ EAPI=5
JAVA_ANT_ENCODING=UTF-8
-[[ ${PV} == "9999" ]] && SUBVERSION_ECLASS="subversion"
+[[ ${PV} == "99999" ]] && SUBVERSION_ECLASS="subversion"
ESVN_REPO_URI="http://josm.openstreetmap.de/svn/trunk"
inherit eutils java-pkg-2 java-ant-2 ${SUBVERSION_ECLASS}
unset SUBVERSION_ECLASS
DESCRIPTION="Java-based editor for the OpenStreetMap project"
HOMEPAGE="http://josm.openstreetmap.de/"
-[[ ${PV} == "9999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz"
+[[ ${PV} == "99999" ]] || SRC_URI="http://josm.hboeck.de/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
-[[ ${PV} == "9999" ]] || \
+[[ ${PV} == "99999" ]] || \
KEYWORDS="~amd64 ~x86"
DEPEND=">=virtual/jdk-1.7"
RDEPEND=">=virtual/jre-1.7"
-S="${WORKDIR}/${P}"
-
IUSE=""
src_prepare() {
- if [[ ${PV} == "9999" ]]; then
+ if [[ ${PV} == "99999" ]]; then
# create-revision needs the compile directory to be a svn directory
# see also http://lists.openstreetmap.org/pipermail/dev/2009-March/014182.html
diff --git a/sci-libs/lemon/metadata.xml b/sci-libs/lemon/metadata.xml
index f8ae72f9b7b7..1802bf9066b2 100644
--- a/sci-libs/lemon/metadata.xml
+++ b/sci-libs/lemon/metadata.xml
@@ -17,13 +17,10 @@
networks.
</longdescription>
<use>
- <flag name="coin">Enable the <pkg>coinor-clp</pkg> and
- <pkg>coinor-cbc</pkg> graph algorithms</flag>
+ <flag name="coin">Enable the <pkg>sci-libs/coinor-clp</pkg> and
+ <pkg>sci-libs/coinor-cbc</pkg> graph algorithms</flag>
<flag name="glpk">Enable GNU Linear Programming Kit
<pkg>sci-mathematics/glpk</pkg> support</flag>
<flag name="tools">Build additional tools</flag>
- <flag name="coin">Enable the <pkg>coinor-clp</pkg> and
- <pkg>coinor-cbc</pkg> graph algorithms
- </flag>
</use>
</pkgmetadata>
diff --git a/sci-libs/libbufr/Manifest b/sci-libs/libbufr/Manifest
new file mode 100644
index 000000000000..e0171be94843
--- /dev/null
+++ b/sci-libs/libbufr/Manifest
@@ -0,0 +1 @@
+DIST bufrdc_000405.tar.gz 11873311 SHA256 0c3ab33bdb3eea600c5af6f1e4064a000ec143f4c96a14b72ca09666ca3c3775 SHA512 3355d6bac54ef152f9feb13ae13f3c94f4e01a665a4b9bc7f85f0c98f9aa37411170668ba9adfb6b62c2fe906d0dff67b03a708cdf1acd21a0037e327c7c6169 WHIRLPOOL f97662c240e40086be2e2f7d33d446280576dd79ff119374d54d02af05bd51c9176a6592d965765baf549043ee80e8bb9e824e3149d4ce85599db1f5e3f42e10
diff --git a/sci-libs/libbufr/files/libbufr-000405-makefile.patch b/sci-libs/libbufr/files/libbufr-000405-makefile.patch
new file mode 100644
index 000000000000..08b30ded8d72
--- /dev/null
+++ b/sci-libs/libbufr/files/libbufr-000405-makefile.patch
@@ -0,0 +1,80 @@
+--- Makefile.orig 2016-01-04 13:09:58.661150785 -0800
++++ Makefile 2016-01-04 13:17:12.707621825 -0800
+@@ -1,7 +1,7 @@
+ # Makefile for libbufrex
+ #
+ R64 = R64
+-TARGETS = all clean
++TARGETS = all clean test
+ LIBRARY = libbufr$(R64).a
+ SHELL=/bin/sh
+ SUBDIRS = fortranC bufrdc pbio bufrtables examples
+@@ -11,12 +11,14 @@
+ ( echo "*************************"; \
+ echo "*** Make in $$name "; \
+ echo "*************************"; \
+- cd $$name ; make ; ) done
++ $(MAKE) -C $$name LIB=bufr ; ) done
++
++test :
+ ./test.sh
+ tables_tools/check_tables.sh bufrtables
+
+ clean :
+ @for name in $(SUBDIRS); do\
+- ( echo "*** Clean in $$name ***" ;cd $$name ; make clean ); \
++ ( echo "*** Clean in $$name ***" ;$(MAKE) -C $$name clean ); \
+ done
+ rm -f $(LIBRARY)
+--- examples/Makefile.in.orig 2016-01-04 13:42:39.790648703 -0800
++++ examples/Makefile.in 2016-01-04 13:45:02.384967830 -0800
+@@ -16,19 +16,19 @@
+ #
+ #
+ TARGETS = all clean
+-EXECS = decode_bufr decode_bufr_image bufr_decode_all tdexp tdexp create_bufr
++EXECS = decode_bufr decode_bufr_image bufr_decode_all bufr_compress tdexp create_bufr
+ #
+ #
+ all :$(EXECS)
+
+-decode_bufr: decode_bufr.o
++decode_bufr: decode_bufr.o
+ $(FC) $(FFLAGS) -o $@ decode_bufr.o -L$(PLACE) -l$(LIB)$(R64)
+
+-bufr_decode_all: bufr_decode_all.o
+- $(FC) $(FFLAGS) -o $@ bufr_decode_all.o -L$(PLACE) -l$(LIB)$(R64)
++bufr_decode_all: bufr_decode_all.o
++ $(FC) $(FFLAGS) -o $@ bufr_decode_all.o -L$(PLACE) -l$(LIB)$(R64)
+
+-bufr_compress: bufr_compress.o
+- $(FC) $(FFLAGS) -o $@ bufr_compress.o -L$(PLACE) -l$(LIB)$(R64)
++bufr_compress: bufr_compress.o
++ $(FC) $(FFLAGS) -o $@ bufr_compress.o -L$(PLACE) -l$(LIB)$(R64)
+
+ bufr2crex : bufr2crex.o
+ $(FC) $(FFLAGS) -o $@ bufr2crex.o -L$(PLACE) -l$(LIB)$(R64) -lcrex$(R64)
+@@ -48,4 +48,4 @@
+ clean :
+ @for name in $(EXECS); do\
+ (rm -f $$name *.o ); \
+- done
++ done
+--- bufrtables/Makefile.orig 2016-01-04 14:03:47.292850644 -0800
++++ bufrtables/Makefile 2016-01-04 14:05:22.242500485 -0800
+@@ -25,11 +25,14 @@
+ OBJECTS = $(OBJECTS.F) $(OBJECTS.c)
+ #
+ #
+-all: links
++all: pgms links
+
+ links:
+ ./clean.sh
+ ./links.sh
++
++pgms: bufr2txt_tables bufr_split_tables txt2bufr_tables
++
+ bufr2txt_tables: bufr2txt_tables.f
+ $(FC) $(FFLAGS) -o bufr2txt_tables bufr2txt_tables.f $(LIBRARY)
+ bufr_split_tables: bufr_split_tables.f
diff --git a/sci-libs/libbufr/libbufr-000405.ebuild b/sci-libs/libbufr/libbufr-000405.ebuild
new file mode 100644
index 000000000000..982dbca2c8c3
--- /dev/null
+++ b/sci-libs/libbufr/libbufr-000405.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils fortran-2 toolchain-funcs
+
+MY_P="${PN/lib/}dc_${PV}"
+
+DESCRIPTION="ECMWF BUFR library - includes both C and Fortran example utilities"
+HOMEPAGE="https://software.ecmwf.int/wiki/display/BUFR/BUFRDC+Home"
+SRC_URI="https://software.ecmwf.int/wiki/download/attachments/35752466/${MY_P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+# needs someone to test on these: ~alpha ~hppa ~ia64 ~sparc etc ...
+
+IUSE="debug doc examples lto"
+
+RDEPEND="
+ virtual/fortran
+ "
+
+DEPEND="sys-apps/findutils"
+
+S=${WORKDIR}/${MY_P}
+
+if use lto; then
+ RESTRICT="strip"
+fi
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ case "$(tc-getFC)" in
+ *gfortran)
+ export CNAME="_gfortran"
+ ;;
+ *g77)
+ export CNAME="_gnu"
+ ;;
+ *pgf90|*pgf77)
+ export CNAME=""
+ ;;
+ ifc|ifort)
+ export CNAME="_intel"
+ ;;
+ esac
+
+ elog "Note non-GNU compilers are not currently supported on non-x86"
+ elog "architectures. If you need it, please submit a patch..."
+
+ export target="linux"
+ export A64=""
+ export R64=""
+ case "${ARCH}" in
+ amd64)
+ export R64="R64"
+ export A64="A64"
+ ;;
+ ppc64)
+ export target="ppc_G5"
+ ;;
+ ppc)
+ export target="ppc"
+ ;;
+ *)
+ ;;
+ esac
+}
+
+src_prepare() {
+ update_configs
+ epatch "${FILESDIR}"/${P}-makefile.patch
+
+ local config="config/config.$target$CNAME$R64$A64"
+
+ if [[ "${ARCH}" == "ppc" ]] ; then
+ sed -i -e "s|= -mcpu=G4 -mtune=G4|= |" ${config}
+ elif [[ "${ARCH}" == "ppc64" ]] ; then
+ sed -i -e "s|= -mcpu=G5 -mtune=G5|= |" \
+ -e "s|-fdefault-real-8|-fdefault-real-8 -fdefault-double-8|" \
+ ${config}
+ elif [[ "${ARCH}" == "amd64" ]] ; then
+ cp ${config}.in ${config}
+ sed -i -e "s|-fdefault-real-8|-fdefault-real-8 -fdefault-double-8|" \
+ ${config}
+ else
+ cp ${config}.in ${config} || die "Error updating config!"
+ fi
+
+ sed -i -e "s:DEBUG = -O2:DEBUG = -g:g" ${config}
+ use debug || sed -i -e "s:DEBUG = -g:DEBUG =:g" ${config}
+
+ # add local CFLAGS to build flags
+ sed -i -e "s|\$(DEBUG)|${CFLAGS} \$(DEBUG) -fPIC|" \
+ -e 's|emos|/usr/share/bufrtables|g' ${config}
+
+ # add local LDFLAGS to bins
+ sed -i \
+ -e "s|-o|${LDFLAGS} -fPIC -o|" \
+ examples/Makefile \
+ bufrtables/Makefile
+}
+
+src_compile() {
+ export BUFR_TABLES="${S}"/bufrtables
+ EBUILD_ARCH="${ARCH}"
+ EBUILD_CFLAGS="${CFLAGS}"
+ unset ARCH CFLAGS
+
+ tc-export CC FC AR NM RANLIB
+ export STRIP="/bin/true"
+ TC_FLAGS="CC=$CC FC=$FC AR=$AR RANLIB=$RANLIB"
+ ARFLAGS="rv"
+
+ if use lto; then
+ PLUGIN_PATH="--plugin=$(gcc -print-prog-name=liblto_plugin.so)"
+ tc-ld-is-gold && ARFLAGS="rv ${PLUGIN_PATH}"
+ fi
+
+ # emake won't work with this fossil...
+ BUFRFLAGS="ARCH=$target R64=$R64 CNAME=$CNAME"
+ make $TC_FLAGS ARFLAGS="${ARFLAGS}" $BUFRFLAGS || die "make failed"
+
+ generate_files
+
+ ARCH="${EBUILD_ARCH}"
+ CFLAGS="${EBUILD_CFLAGS}"
+}
+
+src_test() {
+ unset ARCH CFLAGS
+ BUFRFLAGS="ARCH=$target R64=$R64 CNAME=$CNAME"
+ make $BUFRFLAGS test || die "make test failed"
+
+ ARCH="${EBUILD_ARCH}"
+ CFLAGS="${EBUILD_CFLAGS}"
+}
+
+src_install() {
+ # install library
+ dolib.a libbufr$R64.a
+
+ dosbin bufrtables/{bufr2txt_tables,bufr_split_tables,txt2bufr_tables}
+ dobin examples/{bufr_decode_all,create_bufr,decode_bufr,decode_bufr_image,tdexp}
+
+ keepdir /usr/share/bufrtables
+ insinto /usr/share/bufrtables
+ doins -r bufrtables/{B,C,D}*.*
+
+ # files generated above
+ doenvd 20${PN}
+
+ dodoc README
+ if use doc ; then
+ insinto /usr/share/doc/${PF}
+ doins doc/*.pdf
+ fi
+
+ if use examples ; then
+ newdoc examples/README README.examples
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/{*.F,*.c,Makefile}
+ fi
+}
+
+pkg_postinst() {
+ elog
+ elog "This is the only GPL'd BUFR decoder library written in C/Fortran"
+ elog "but the build system is an old kluge that pre-dates the discovery"
+ elog "of fire. File bugs as usual if you have build/runtime problems."
+ elog ""
+ elog "The default BUFR tables are stored in /usr/share/bufrtables, so"
+ elog "add your local tables there if needed. Only a static lib is"
+ elog "installed currently, as shared lib support is incomplete (feel"
+ elog "free to submit a patch :)"
+ elog ""
+ elog "The installed user-land bufr utilities are just the examples;"
+ elog "the main library is really all there is (and there are no man"
+ elog "pages either). Install the examples and use the source, Luke..."
+ elog
+}
+
+generate_files() {
+ ## Do not remove blank lines from the response file
+ cat <<-EOF > 20${PN}
+ BUFR_TABLES="/usr/share/bufrtables"
+ EOF
+}
+
+update_configs() {
+ find . -type f -name \*.distinct -o -name \*.f -o -name \*.in \
+ | xargs chmod -x
+ cp options/options_linux options/options_ppc
+ cp options/options_linux options/options_ppc_G5
+ cp pbio/sources.linux pbio/sources.ppc
+ cp pbio/sources.linux pbio/sources.ppc_G5
+ pushd config > /dev/null
+ cp config.ppc_gfortran.in config.ppc_gfortran
+ cp config.ppc_gfortranR64.in config.ppc_gfortranR64
+ cp config.ppc_gfortran_G5.in config.ppc_gfortran_G5
+ cp config.ppc_gfortranR64_G5.in config.ppc_gfortranR64_G5
+ popd > /dev/null
+}
diff --git a/sci-libs/libbufr/metadata.xml b/sci-libs/libbufr/metadata.xml
new file mode 100644
index 000000000000..2acd0555c4cf
--- /dev/null
+++ b/sci-libs/libbufr/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>nerdboy@gentoo.org</email>
+ </maintainer>
+ <longdescription lang="en">
+ This is the only useable open source BUFR library (from ECMWF)
+ and comes with a few example tools (some of which are built
+ and installed).
+ </longdescription>
+ <use>
+ <flag name="lto">
+ Use gold linker and -flto (requires existing env setup)
+ </flag>
+ </use>
+</pkgmetadata>
diff --git a/sci-mathematics/calc/Manifest b/sci-mathematics/calc/Manifest
index e8036b091c26..873d52670acc 100644
--- a/sci-mathematics/calc/Manifest
+++ b/sci-mathematics/calc/Manifest
@@ -1,5 +1,3 @@
-DIST calc-2.12.1.5.tar.gz 1020389 SHA256 3a8b6daa60de0b5aa7c33dcfdf0aeec9d4523f51638235468de32f843ce79171 SHA512 e049d200661f3d70d05119a30d1ba8ac83fbaa98d2ee9eaa90755585fe59c28a6c4b3d1930ee8a9a109c26aeda7d34ff7ee42f6061be466aa7ab1b3b9d6adfd4 WHIRLPOOL c75207ad96bc63c0fcbec0ea08a0b28f6f00f5bbc679749bf29c4370b18dbd2e20580ca28a61501c3d0ba0c60864a36b264e0f4f1f8b3e8b2709f4de2c0b6af3
DIST calc-2.12.2.2.tar.bz2 864687 SHA256 0a334cd331a4953a86365becce9b9f401b264a580a1f2130d5de700fa093772a SHA512 701e8414366f112aa0aba2359a0d76037994fa647d14beb216a23a05e328665b2e0218b902b5e2a447ccf6277795baef4c68e278e12dfc40b1ee95f23858b9f4 WHIRLPOOL 4392e55e6fe257457b87e3446f32f742fb3f7c0f116da8b399b29144e4c7997bafdd69fe971d206094503791a5511b2bd187b2b1676f9792c17feb3bd87b560f
DIST calc-2.12.4.13.tar.bz2 970778 SHA256 1e6fd3256bd7bf738fcfe6e2d6a9d8a6bb0f37393aba6020b01d96274419a92c SHA512 7b7136c793917652ce2f2b3866b2db16a69dbead729d8a72b8c1359ebb8a4e1d4e7a3a8b214f8e85b9ccf41193ba6ffcb49926cc68f494e2b6cdff58559f2534 WHIRLPOOL 365700655f53eb5efb58ee6fbdf1d123943c2cc6a799318d9a48e2c5b8e0e2e871fd36e54b185442e0a0bc5380644edca1612bbfe7e2506247015743cdb556ee
-DIST calc-2.12.4.3.tar.bz2 865956 SHA256 a4e7d8a9313e7d28653e2c372fca9b0defdc02f965b833bb43479bbdfee51a92 SHA512 b1ab7724769a39fe5d57715bb6edfe775b9a14ecfe14d9db7adc2ea44d1794b969edbf0d8265dfb30b2be0c022e7ff8af271be8e9bd78faa483e29a31fdf1b88 WHIRLPOOL 2abdacea7f2e363947c9911b38d6787edb75b2a6f5b7088e0b2a16d8f80bef549de2e3c58e4d38a8bf75ebd35ae52dbc0b63bed3b08da63dad742c21d598df5a
-DIST calc-2.12.4.4.tar.bz2 867180 SHA256 106a0e5dc4da94ec8711a8631cd5d17b3979cde1d248ba9385cdcb862cb1390b SHA512 58be9d70a2c79adeb44d86da6f5f2d04dbf09aaec10ad4e8eed870a7b8de1d4a7cd35b1738ccb5cc64ef5f945e6cfbe1944e27f064541289abe1a4e7f4703690 WHIRLPOOL 1a106ba7b10463aca673329b625721d47a14721467e7847fdbe509b8bf16b4c5829b006240faf58f915abb0f0bf9cbc033289077f20f0c74c2704fb63ccaf340
+DIST calc-2.12.5.4.tar.bz2 956258 SHA256 a776121efe49f3230a293e28682e52ff6d5f2f1896d3a9b474a51de8c890919e SHA512 07c89059d4718b29e649a5198e0bb6c6a6d9c6705a0050ad744146f1649c65d0fb1277a68eb45daca907b08ef9336de2002808a5f9b2312e413eb3afb74d491f WHIRLPOOL 210f259749c7ea5427b7c3698d17cb9af72243e39cde54d1371f246d96a9f9e360f645e8f0ce64514e92275a17756cf57c4757410bd7db192f0767f48676abfd
diff --git a/sci-mathematics/calc/calc-2.12.1.5.ebuild b/sci-mathematics/calc/calc-2.12.1.5.ebuild
deleted file mode 100644
index 2ddaa5a451b2..000000000000
--- a/sci-mathematics/calc/calc-2.12.1.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-DESCRIPTION="An arbitrary precision C-like arithmetic system"
-HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha ~amd64 ~ppc x86"
-
-IUSE=""
-
-DEPEND=">=sys-libs/ncurses-5.2
- >=sys-libs/readline-4.2"
-
-RDEPEND="${DEPEND}
- >=sys-apps/less-348"
-
-src_compile() {
- make \
- T="${D}" \
- DEBUG="${CFLAGS}" \
- CALCPAGER=less \
- USE_READLINE="-DUSE_READLINE" \
- READLINE_LIB="-lreadline -lhistory -lncurses" \
- all \
- || die
- if echo "${LD_PRELOAD}" | grep -q "sandbox"; then
- ewarn "Can't run check when running in sandbox - see bug #59676"
- else
- make chk || die "Check failed"
- fi
-}
-
-src_install() {
- make T="${D}" install || die
- dodoc BUGS CHANGES LIBRARY README
-}
diff --git a/sci-mathematics/calc/calc-2.12.4.13.ebuild b/sci-mathematics/calc/calc-2.12.4.13-r1.ebuild
index 66696e9940dc..09366368e973 100644
--- a/sci-mathematics/calc/calc-2.12.4.13.ebuild
+++ b/sci-mathematics/calc/calc-2.12.4.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,8 +17,8 @@ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="
- sys-libs/ncurses
- sys-libs/readline"
+ sys-libs/ncurses:0=
+ sys-libs/readline:0="
RDEPEND="${DEPEND}"
src_prepare() {
@@ -36,7 +36,7 @@ src_compile() {
LDFLAGS="${LDFLAGS}" \
CALCPAGER="${PAGER}" \
USE_READLINE="-DUSE_READLINE" \
- READLINE_LIB="-lreadline -lhistory -lncurses -L${S}/custom -lcustcalc" \
+ READLINE_LIB="-lreadline -lhistory -lncurses -L\"${S}\"/custom -lcustcalc" \
all
}
diff --git a/sci-mathematics/calc/calc-2.12.4.3.ebuild b/sci-mathematics/calc/calc-2.12.4.3.ebuild
deleted file mode 100644
index 4b011af490f1..000000000000
--- a/sci-mathematics/calc/calc-2.12.4.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="An arbitrary precision C-like arithmetic system"
-HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE=""
-
-DEPEND="
- >=sys-libs/ncurses-5.2
- >=sys-libs/readline-4.2"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.12.4.0-prefix.patch
- epatch "${FILESDIR}"/2.12.4.0-ldflags.patch
- ln -sf libcustcalc.so.${PV} custom/libcustcalc.so
-}
-
-src_compile() {
- # parallel compilation hard to fix. better to leave upstream.
- emake -j1 \
- CC=$(tc-getCC) \
- DEBUG="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- CALCPAGER="${PAGER}" \
- USE_READLINE="-DUSE_READLINE" \
- READLINE_LIB="-lreadline -lhistory -lncurses -L${S}/custom -lcustcalc" \
- all || die "emake failed"
-}
-
-src_test() {
- if echo "${LD_PRELOAD}" | grep -q "sandbox"; then
- ewarn "Can't run check when running in sandbox - see bug #59676"
- else
- make chk || die "Check failed"
- fi
-}
-
-src_install() {
- emake T="${D}" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install || die "emake install failed"
- dodoc BUGS CHANGES LIBRARY README
-}
diff --git a/sci-mathematics/calc/calc-2.12.4.4.ebuild b/sci-mathematics/calc/calc-2.12.5.4.ebuild
index 9aca67e632bc..14bfe65800eb 100644
--- a/sci-mathematics/calc/calc-2.12.4.4.ebuild
+++ b/sci-mathematics/calc/calc-2.12.5.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=4
+EAPI=6
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Arbitrary precision C-like arithmetic system"
HOMEPAGE="http://www.isthe.com/chongo/tech/comp/calc/"
@@ -16,15 +16,19 @@ KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
-DEPEND="
- sys-libs/ncurses
- sys-libs/readline"
-RDEPEND="${DEPEND}"
+RDEPEND="
+ sys-libs/ncurses:0=
+ sys-libs/readline:0="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${P}-as-needed.patch"
+)
src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.12.4.0-prefix.patch
- epatch "${FILESDIR}"/2.12.4.0-ldflags.patch
- ln -sf libcustcalc.so.${PV} custom/libcustcalc.so
+ default
+ ln -sf libcustcalc.so.${PV} custom/libcustcalc.so || die
sed -i -e "/DIR/s:/usr:${EPREFIX}/usr:g" Makefile || die
}
@@ -36,7 +40,7 @@ src_compile() {
LDFLAGS="${LDFLAGS}" \
CALCPAGER="${PAGER}" \
USE_READLINE="-DUSE_READLINE" \
- READLINE_LIB="-lreadline -lhistory -lncurses -L${S}/custom -lcustcalc" \
+ READLINE_LIB="-lreadline -lhistory $(pkg-config --libs ncurses) -L\"${S}\"/custom -lcustcalc" \
all
}
@@ -44,7 +48,7 @@ src_test() {
if echo "${LD_PRELOAD}" | grep -q "sandbox"; then
ewarn "Can't run check when running in sandbox - see bug #59676"
else
- emake chk || die "Check failed"
+ emake chk
fi
}
diff --git a/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch b/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch
new file mode 100644
index 000000000000..3e7e03002ac3
--- /dev/null
+++ b/sci-mathematics/calc/files/calc-2.12.5.4-as-needed.patch
@@ -0,0 +1,161 @@
+--- calc-2.12.5.3/Makefile
++++ calc-2.12.5.3/Makefile
+@@ -1136,14 +1136,14 @@
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
++LD_SHARE=
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
++LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ else
+-LIBCUSTCALC_SHLIB=
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
++LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ endif
+ #
+ CC_STATIC=
+@@ -1173,7 +1173,6 @@
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:${LIBDIR}:/usr/local/lib
+ LD_SHARE= ${DARWIN_ARCH}
+ #SET_INSTALL_NAME= no
+ SET_INSTALL_NAME= yes
+@@ -1249,14 +1248,14 @@
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
++LD_SHARE=
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
++LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ else
+-LIBCUSTCALC_SHLIB=
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
++LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ endif
+ #
+ CC_STATIC=
+@@ -1294,12 +1293,10 @@
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
++LD_SHARE=
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+ else
+ LIBCUSTCALC_SHLIB=
+ endif
+@@ -1333,12 +1330,10 @@
+ BLD_TYPE= calc-dynamic-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
++LD_SHARE=
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+ else
+ LIBCUSTCALC_SHLIB=
+ endif
+@@ -1370,12 +1365,10 @@
+ BLD_TYPE= calc-static-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
++LD_SHARE=
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+ else
+ LIBCUSTCALC_SHLIB=
+ endif
+@@ -1411,11 +1404,9 @@
+ BLD_TYPE= calc-static-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
++LD_SHARE=
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+ #
+ CC_STATIC=
+ LD_STATIC=
+@@ -1470,12 +1461,11 @@
+ BLD_TYPE= calc-static-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
++LD_SHARE=
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+ LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
+ else
+ LIBCUSTCALC_SHLIB=
+ endif
+@@ -1510,14 +1500,14 @@
+ BLD_TYPE= calc-static-only
+ #
+ CC_SHARE= -fPIC
+-DEFAULT_LIB_INSTALL_PATH= ${PWD}:/lib:/usr/lib:${LIBDIR}:/usr/local/lib
+-LD_SHARE= "-Wl,-rpath,${DEFAULT_LIB_INSTALL_PATH}" \
+- "-Wl,-rpath-link,${DEFAULT_LIB_INSTALL_PATH}"
+-LIBCALC_SHLIB= -shared "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
++LD_SHARE=
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ ifdef ALLOW_CUSTOM
+-LIBCUSTCALC_SHLIB= -shared "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
++LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ else
+-LIBCUSTCALC_SHLIB=
++LIBCUSTCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcustcalc${LIB_EXT_VERSION}"
++LIBCALC_SHLIB= -shared ${LDFLAGS} "-Wl,-soname,libcalc${LIB_EXT_VERSION}"
+ endif
+ #
+ CC_STATIC=
+@@ -2110,7 +2100,7 @@
+
+ calc${EXT}: .hsrc ${CALCOBJS} ${CALC_DYNAMIC_LIBS} ${MAKE_FILE}
+ ${RM} -f $@
+- ${CC} ${CALCOBJS} ${LDFLAGS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
++ ${CC} ${LDFLAGS} ${CALCOBJS} ${LD_SHARE} ${CALC_DYNAMIC_LIBS} \
+ ${READLINE_LIB} ${READLINE_EXTRAS} -o $@
+
+ libcalc${LIB_EXT_VERSION}: ${LIBOBJS} ver_calc${EXT} ${MAKE_FILE}
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index 3f5e1b0bc5aa..370bd04a20ad 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -2,3 +2,5 @@ DIST CGAL-4.3-doc_html.tar.xz 15582924 SHA256 dd28989ee950178b3f22d8b14111510312
DIST CGAL-4.3.tar.xz 10108992 SHA256 cc475885b4ca4b15ab5d446c0e554b7b69f6980969bc3a8c5b83f8da4ee1bb04 SHA512 dcf329232f6511be6b7eecef7afbfd505529385cb29a3717b762068a3dac52b3706b1d55c6e30b677c6cf2f99aae937de7d730d30cc33680fc39df0f0ff76e70 WHIRLPOOL 862d5bc3387afa1b6702974b7fab3b7d4c35334023eb813bb52a6c7092d6f89104db8c7b851fd7ebb7dfdd38392f9d6459e9afab34bf237b0484f7d395035873
DIST CGAL-4.6.1-doc_html-1.tar.xz 22890352 SHA256 d7259defe9980fa0d333d55050902a443f967889c9fd5217ca77b7042ed1bf27 SHA512 13558742b9baa8c58117a7ebd549d6fce931906c145145e917af3218b05eb7f8f889ee19015a36cc5c70e4699ae6288d6151727f627cf3b0717b8d0ef26a099f WHIRLPOOL dc13ccc90694c4c098941d0b5480017aecbdf49247e950bd93ca298a6e150aaf1b60f4e47938fea07013a7418b42ac3703a2523729b6d2b18e93494eea6faaf7
DIST CGAL-4.6.1.tar.xz 12014652 SHA256 33bd82871ccbaf16dc509f78f3f91dd35d44197cad64bffa63a1671a1812351a SHA512 4227ea03c23f3858a47e0559bc0a3df34e447e18e2b053048378c479b9b7fa2a157cf9aa546d7659a1d4d640218944fe1104a21769144cdfdc8a5144299f4b61 WHIRLPOOL 309deea6268d036b14796b411a7dcdbe75433a6d5eb2296387b05f2957e538cce6e6fe0b23be3921a500eae74db954058ed57aeef8759e44f4038d2fbab884f7
+DIST cgal-4.7-doc_html-1.tar.xz 25248068 SHA256 2a15a16229dd90f991ea976761c8ae3c1f9e09f4023bb4446629c3b948a3b9bd SHA512 7542d1937c8cd8cfd174aa67b74b1e242c1dbbd40ca772eb0b7bdc80a947f0851222b10d098193b5c2cab1fe3f32cd40ab2555248bd99b7a29c296df288dabf7 WHIRLPOOL f7657994ffa71e4c5f30b75060cd87fc46686b5d2e1a05012b36a0c0f2a6b2ddcf40b9fb1ae038c69e3f363d12e92acf6455c2ad2838567d3a1cc31dd4722c54
+DIST cgal-4.7.tar.xz 13673360 SHA256 50bd0a1cad7a8957b09012f831eebaf7d670e2a3467e8f365ec0c71fa5436369 SHA512 8126e861fb091a21a0eaf777205d5d688a0d33f005b91c85b2e5fb91afa66796611ec8a314647a322141169483ab8ff0dba769840bf4fb0f4397cf167172b21f WHIRLPOOL 6f1b0c9855161c0841faf1022742fd09157d5605fb5d5046d2b3bde1f1027b3ee6813ac631fb981f026239e0027434102c16d25b1dfda8619c571adc8639a921
diff --git a/sci-mathematics/cgal/cgal-4.6.1.ebuild b/sci-mathematics/cgal/cgal-4.6.1-r1.ebuild
index 522767f929bd..99fe2a963b95 100644
--- a/sci-mathematics/cgal/cgal-4.6.1.ebuild
+++ b/sci-mathematics/cgal/cgal-4.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -24,7 +24,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples +gmp mpfi qt4"
RDEPEND="
- dev-libs/boost
+ dev-libs/boost:=
dev-libs/mpfr:0
sys-libs/zlib
x11-libs/libX11
@@ -34,6 +34,7 @@ RDEPEND="
qt4? (
dev-qt/qtgui:4
dev-qt/qtopengl:4
+ dev-qt/qtsvg:4
)
mpfi? ( sci-libs/mpfi )"
DEPEND="${RDEPEND}
diff --git a/sci-mathematics/cgal/cgal-4.7.ebuild b/sci-mathematics/cgal/cgal-4.7.ebuild
new file mode 100644
index 000000000000..7fd5cb7ee10d
--- /dev/null
+++ b/sci-mathematics/cgal/cgal-4.7.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_P=CGAL-${PV}
+
+DESCRIPTION="C++ library for geometric algorithms and data structures"
+HOMEPAGE="http://www.cgal.org/"
+SRC_URI="
+ https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}.tar.xz -> ${P}.tar.xz
+ doc? ( https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}-doc_html.tar.xz -> ${P}-doc_html-1.tar.xz )"
+
+LICENSE="LGPL-3 GPL-3 Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples +gmp mpfi ntl qt5"
+
+RDEPEND="
+ >=dev-cpp/eigen-3.1
+ dev-libs/boost:=
+ dev-libs/mpfr:0
+ sys-libs/zlib
+ x11-libs/libX11
+ virtual/glu
+ virtual/opengl
+ gmp? ( dev-libs/gmp[cxx] )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ )
+ mpfi? ( sci-libs/mpfi )
+ ntl? ( dev-libs/ntl )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+ sed \
+ -e '/install(FILES AUTHORS/d' \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCGAL_INSTALL_LIB_DIR=$(get_libdir)
+ -DWITH_CGAL_Qt3=OFF
+ -DWITH_LEDA=OFF
+ -DWITH_Eigen3=ON
+ -DWITH_ZLIB=ON
+ -DWITH_GMP="$(usex gmp)"
+ -DWITH_GMPXX="$(usex gmp)"
+ -DWITH_CGAL_Qt5="$(usex qt5)"
+ -DWITH_MPFI="$(usex mpfi)"
+ -DWITH_NTL="$(usex ntl)"
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use examples; then
+ dodoc -r examples demo
+ fi
+ if use doc; then
+ docinto html/
+ dodoc -r "${WORKDIR}"/doc_html/*
+ fi
+}
diff --git a/sci-mathematics/cgal/files/cgal-4.7-fix-buildsystem.patch b/sci-mathematics/cgal/files/cgal-4.7-fix-buildsystem.patch
new file mode 100644
index 000000000000..6aabdc395395
--- /dev/null
+++ b/sci-mathematics/cgal/files/cgal-4.7-fix-buildsystem.patch
@@ -0,0 +1,19 @@
+Remove customized handling of ${CMAKE_BUILD_TYPE} which conflicts with
+how Gentoo handles ${CMAKE_BUILD_TYPE}:
+* CMake Error at cmake/modules/CGAL_SetupFlags.cmake:65 (message):
+* Gentoo is not a valid build type: only Release or Debug is allowed
+* Call Stack (most recent call first):
+* CMakeLists.txt:519 (include)
+
+--- CGAL-4.7/cmake/modules/CGAL_SetupFlags.cmake
++++ CGAL-4.7/cmake/modules/CGAL_SetupFlags.cmake
+@@ -61,9 +61,6 @@
+ add_definitions(-DCGAL_TEST_SUITE)
+ endif()
+
+-if ( NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" )
+- message( FATAL_ERROR "${CMAKE_BUILD_TYPE} is not a valid build type: only Release or Debug is allowed" )
+-endif()
+
+ message( STATUS "Build type: ${CMAKE_BUILD_TYPE}" )
+
diff --git a/sci-mathematics/cgal/metadata.xml b/sci-mathematics/cgal/metadata.xml
index a08e64a3f762..72fe79675d72 100644
--- a/sci-mathematics/cgal/metadata.xml
+++ b/sci-mathematics/cgal/metadata.xml
@@ -20,5 +20,6 @@
</longdescription>
<use>
<flag name="mpfi">Enable support for multiple recision interval arithmetic via <pkg>sci-mathematics/mpfi</pkg></flag>
+ <flag name="ntl">Enable support for <pkg>dev-libs/ntl</pkg></flag>
</use>
</pkgmetadata>
diff --git a/sci-mathematics/isabelle/Manifest b/sci-mathematics/isabelle/Manifest
index 87a47c5dd225..8e612b893f3e 100644
--- a/sci-mathematics/isabelle/Manifest
+++ b/sci-mathematics/isabelle/Manifest
@@ -1,17 +1,7 @@
-DIST Isabelle2011-1.tar.gz 42239059 SHA256 48d77fe31a16b44f6015aa7953a60bdad8fcec9e60847630dc7b98c053edfc08 SHA512 213207951455395659a91b0bc6c8520c084cb6c75098c8f24c0800e41474c90c92aae86ffb99415142f6cf63d569556661ba350024fe458daa54a5cc9db372fd WHIRLPOOL 7e7868c3f464f507aceb8e1f648c04394fdd69746242179e66cfad64f927cf4d6aba41970428da5e45cce90a30bcee29bdc373d8a9e4943eb61cd97480d0a366
-DIST Isabelle2012-doc-src.tar.gz 2688496 SHA256 e18965fe0f7f89b286d4707e38201f1edbea81f6b26aed59d63a633c03fec097 SHA512 5aaea56eb67e535d745d63314278b6ee8469e6d3bbf4ce4d7b3f5e04b24557783b56d50d905a5ad69187c42f44407023c95a9bfb6faab125c21edff7638ff21d WHIRLPOOL 278b63a243950b1596376ee04cbfddb7a93c747e9f6ee66c5b069ca0dae4ca8d10bef43e03069b6186a19c703f71a585633fc47c3c1a15de3a886ff468232127
-DIST Isabelle2012.tar.gz 49529865 SHA256 b86f957dee221041f92c9d4ced4758d45b4950339743d0d58b1ea6061e2b53f0 SHA512 1346f563233eba10bc14f7d140706b8bfba8e832f7ee5887316c829926136af07d700914a925272d8adc1275b0bdd682540518957910c136a15bfc60d61285a0 WHIRLPOOL 23b764a1a0044a9525d058e95da318f4425fadf7660edc8ab8f35b248f98dcff0dba2e533ff18d8bf47ea164cec12a9648642749de2a49887bbe84ed4e71a68b
-DIST Isabelle2013-2.tar.gz 52603110 SHA256 602e91377b0999c25950ae2a34c0fcb23e3aff3a196bdbc5ce61634bd90d7f22 SHA512 464a2735b2f4e28dcf44e55cd4abb4d8766a6bb7eb86f989f3592e7819e33d97922bdfb6701da85aa9d7c4cc2aee3eadebde1c7e3fc74bb3f6108a5daf5fea45 WHIRLPOOL 0dc354d60e3440ea0909dc09f25b66cb301b82f88fbe21c0b7f4bfef40ecc3631014757abd8657f0464047f0ad32827ad308e3f998fcf2477e05907ff7b19a84
-DIST Isabelle2013.tar.gz 54638791 SHA256 2f2cda9939248bd4346ad7e074cb6b2cfad70708777491c6262a5ae670c8f83a SHA512 e03f9b747f678749a562c3de6100f4f4e010ace51b2eb13bcde0a63591eec0cb4e081f7fad9147d022fe787b56eac3f037ab3a296080fd70cc7d058ea961a789 WHIRLPOOL 5cbcbc93bd2ce4723034c3d95d4678b2de90c924601b795c5da378cb76f58275e5d5f47ce9120234a9ea36e43ab759ced843dca76942378abfa1fb7aff858a65
DIST Isabelle2015.tar.gz 36529154 SHA256 08723d3be6f91c57a7a69a8624c54cc1e0cd31506988bf29ed365a5aa5a5156f SHA512 052bb80316a9345368a295a7c5f3869b58d71a6879548fc6240a04fd2cf8c11406274ead8a1ed098563ef9b7573a826656da543e745044fc1d275322af5cc212 WHIRLPOOL 0be4759a1064f4759c2f227b037c448093ff36b47e16002fbb7e99d2843583e01314c4ea5c7a8cbf4d1304f8f72a383052911e483d51e4af2e68c4c36dea5121
DIST csdp-isabelle-component-6.x.tar.gz 493 SHA256 65dde42fa476095052ca3820df4c0e45089653d4467a53de711c8e13670a1b19 SHA512 9be28ecbf61d0f6ad23e28d44bd7ceb8f06ab22f3a05a7c823a9c5bf52ddcf5e5c300c41e14451d6b8e6a4c32b1bbd17769c731cd890fab335a866cd5e735290 WHIRLPOOL c930c531637172e4c75ec44d68f71e69e748a8b976fa3651ef4015fb6a90e30b568bd092632dc16c6389aac09bc13f3249af6c3ac261f09ad2dc5ad915282f99
DIST exec_process-isabelle-component-1.0.3.tar.gz 814 SHA256 ee3b7b299852bcfd0bf7ffce6c8cd2279f2d71247c4a7b0042971b31c2b2a89d SHA512 7880b7f9843ff5806ab37d938a817a5b33e973772d9a6c6cf76bf04076fb532309bd22dfaa203be7c72c07f5a638f0f97e730c414ed164024fd31f1f09fc7c09 WHIRLPOOL 9d9beb7a41baac8b591ceee31bb7b69e1dd07fce66757511649977f6a85d85eef525ba0be13b0873c1aef47de0eace8bf88283b4a136397000e61cfc81da8d4d
-DIST jedit_build-20120414.tar.gz 7509120 SHA256 3c5840fd01b87013b05a92742d41f66f655df6fe9edef1525c6722f92d8f3e41 SHA512 2e2f0db4964a041ba54382a9c787246e1d433e43167019c6ea8d4cf6beb84ce438c0bc559d2588229b0166c91bac603bed39abc45d5d4267020f55eaba1aaa0c WHIRLPOOL 40b883943bde312b4c7adc43607ba4759e5ebe22cab3c922c81393375f917af21d4a8dc068e5692ffcf7bdfb1e7fe3081358dc8e346d1942582bf79e249b0cbb
-DIST jedit_build-isabelle-component-20130104.tar.gz 10734679 SHA256 22a4880deb1054a548476b22662b42bfaf5394ceb07b30eba69be433bcea1074 SHA512 bacdb3ca73d48fe9ba71dd32cd68e98333831f205dd3ced69bb9344c5b167ba084662f1108690f371b4b64f6b786955a332bcd51a2dc21c2179fb1b4727430dd WHIRLPOOL fc97923e08202e117ca3112b69f74a9f4663a70f55fa051ac55e02c85be57423f762263cac2ded33d9c2f412736e4fa0937aa07df3f36b915e806959055a796b
-DIST jedit_build-isabelle-component-20131106.tar.gz 8796625 SHA256 a13a896263804f5aee82db0e1fe6be7982abe3ca1266cd15f7fe9c8c2f6e2ba5 SHA512 7fc3313916cd408c906e453a4895f49223a8b9dc1e2c577c16468394b73a3724449b411521884d419683cd3d2eb3ef59929608483ff092b9b0e3663efd5e136e WHIRLPOOL 4e7c933df7eea5b9c312f8e0c2c46d44a442d0dd2bb76415bea1fcf307ff75d1f8fb592fe4cad647674dc387fe6fa017dbf4e0cf2ec64459bdafb093470e2abf
DIST jedit_build-isabelle-component-20150228.tar.gz 10674317 SHA256 2bee3c5242a3ce4150656f106e658096e82b6bd966e04d590e20023a956be29b SHA512 ba2d0804f21cee596fc3528a592941efc393e98b890efe054aed18fc0d31edfe459047b58ed79b42892e219b4c35a4fb5c8cca0f402b96d641ff8ce62e321339 WHIRLPOOL b2971bdef70e32d858385cb58603d6a5a7e357dbbc9810569093a31332a7838387f43a76a65048a12f259f08de86f200e962ccf2deb2bd3cd4e83dc4c1e41d8b
DIST jfreechart-isabelle-component-1.0.14-1.tar.gz 3444825 SHA256 b0eb7365c4c5877379889100f081a4afc4117afc0d332941c3dd01bef2c4aee9 SHA512 ee1d84a45e43029d5e3acee823176196da19789322e8d3c2c81d5504930ad81d50e16e5da87655e4151034901daefb4ce6b82334839e39134b3a7ce32203aa67 WHIRLPOOL e6f9caadb802ecb5b784e86e96c008e9271aa0b1c940152fb0b0358280d9c1e274bb0dee1507f8ff0fe7f43f863db538d631c76e146d1f66ab6e8a8fb27eb42d
-DIST jfreechart-isabelle-component-1.0.14.tar.gz 3443727 SHA256 c873ad6f07edbcceb5c76aac2e848c7d7f12c78c93c05f7e97c4b1fdba7c2df0 SHA512 c55ec01b215368f064de2f288f788960a256445adca5565c00aa9c0fab5732707a9e72bcdb3838676c80e735c520b9948855d7a32b9076bf35f1a279320ee72a WHIRLPOOL ba1a75e21525c302a3b755d814502dad60c540c2004dd894f60fdd6966766f85d71bbb45728ca220a4a7cff334de81db756fbb89e1059f32e248cabf0a7b97d6
-DIST polyml-isabelle-component-5.5.1-1.tar.gz 831 SHA256 f19a4dfc3117792423270cb98a5c406f7339f4bd7715c16976a281d964792844 SHA512 35ab69d0fd2737f3c6a13ca022103428bcb0e71032304d244614d271848b9ae8986da25bd4ef02668eef169f3a3a72576a619152ce3cbf036af7aa365e857c1a WHIRLPOOL 682e25b677e1b0401a43d4cff35c69658359b4c74f86d3459c050e7c7b0d17f1de1e7b792f2a51f97acf574ad56b3e89ade688bc24d090b3e89eaf0cb99a08d5
DIST polyml-isabelle-component-5.5.2-3.tar.gz 691 SHA256 1ba253974193efc70711b7fe32cc831d8bcc13107b0b130ddf6087bb6ff6d3e7 SHA512 45d68fa7a07ae9fc39cb21fa4c4c43a34576377fb828c8652002c56cc9ec7b3c7b5fcefb7604fc4bc90ce4868dd2fca41ddf37ce285da4902664ab21e4657b3f WHIRLPOOL 3a85c59b1bb928c5ea91f8150c6ded5309fae96bd7558b56e6c3d8f04c418b03b57fb49565af5ed919179fd9e30c957575ca7b65d938ce69c5d3131d8c55ab1e
DIST xz-java-isabelle-component-1.5.tar.gz 315 SHA256 e7fdd433608561c87558d4d0ee39166e8396ce11242e85391417ec7fd3ce7b8e SHA512 6dfec49e12c4cafbb6b6386dd54477e86b6bb419a77c52d9606a0305aeea9cd11f087ed6bba77352c7bf9ec656052ef617e845f472e57b5cdfbccf22b2eeb4fa WHIRLPOOL 9c1fc16db0adc88557b81608902d9d69007dc90d5849f4f7501101930842ce81ded76af0e76e38df8bd0b07d137e53bafaa338bf6c7ae338e97af2a1433d5c1d
diff --git a/sci-mathematics/isabelle/files/isabelle-2011.1-gentoo-settings.patch b/sci-mathematics/isabelle/files/isabelle-2011.1-gentoo-settings.patch
deleted file mode 100644
index 67e3476f2170..000000000000
--- a/sci-mathematics/isabelle/files/isabelle-2011.1-gentoo-settings.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- Isabelle2011-1-orig/etc/settings 2011-10-10 01:47:58.000000000 +1100
-+++ Isabelle2011-1/etc/settings 2012-01-01 16:33:27.922565527 +1100
-@@ -24,9 +24,16 @@
- "/usr/share/polyml/$ML_PLATFORM" \
- "/opt/polyml/$ML_PLATFORM" \
- "")"
--ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
--ML_OPTIONS="-H 200"
--ML_SOURCES="$ML_HOME/../src"
-+# ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
-+# ML_OPTIONS="-H 200"
-+# ML_SOURCES="$ML_HOME/../src"
-+
-+# Poly/ML 5.4.0 (64 bit)
-+ML_PLATFORM=x86_64-linux
-+ML_HOME=/usr/bin
-+ML_SYSTEM=polyml-5.4.0
-+ML_OPTIONS="-H 1000"
-+#ML_SOURCES="$ML_HOME/../src"
-
- # Poly/ML 32 bit (manual settings)
- #ML_SYSTEM=polyml-5.4.0
-@@ -106,7 +113,7 @@
- ISABELLE_TMP_PREFIX="/tmp/isabelle-$USER"
-
- # Heap input locations. ML system identifier is included in lookup.
--ISABELLE_PATH="$ISABELLE_HOME_USER/heaps:$ISABELLE_HOME/heaps"
-+ISABELLE_PATH="$ISABELLE_HOME_USER/heaps:/usr/lib64/Isabelle2011-1/heaps"
-
- # Heap output location. ML system identifier is appended automatically later on.
- ISABELLE_OUTPUT="$ISABELLE_HOME_USER/heaps"
-@@ -170,6 +177,7 @@
- "/usr/local/ProofGeneral" \
- "/usr/share/ProofGeneral" \
- "/opt/ProofGeneral" \
-+ "/usr/share/emacs/site-lisp/ProofGeneral" \
- "")"
-
- PROOFGENERAL_OPTIONS=""
diff --git a/sci-mathematics/isabelle/files/isabelle-2011.1-graphbrowser.patch b/sci-mathematics/isabelle/files/isabelle-2011.1-graphbrowser.patch
deleted file mode 100644
index ed8036a9b2d4..000000000000
--- a/sci-mathematics/isabelle/files/isabelle-2011.1-graphbrowser.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Isabelle2011-1-orig/lib/browser/build 2011-10-10 01:47:58.000000000 +1100
-+++ Isabelle2011-1/lib/browser/build 2012-01-08 12:58:06.041444651 +1100
-@@ -6,6 +6,8 @@
- #
- # Requires proper Isabelle settings environment.
-
-+ISABELLE_HOME="$(cd "$(dirname "${0}")/../.."; pwd -P)"
-+source "$ISABELLE_HOME/lib/scripts/getsettings" || exit 2
-
- ## diagnostics
-
diff --git a/sci-mathematics/isabelle/files/isabelle-2011.1-libsha1.patch b/sci-mathematics/isabelle/files/isabelle-2011.1-libsha1.patch
deleted file mode 100644
index 905a1eb60e5f..000000000000
--- a/sci-mathematics/isabelle/files/isabelle-2011.1-libsha1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Isabelle2011-1-orig/src/Pure/General/sha1_polyml.ML 2011-10-10 01:47:58.000000000 +1100
-+++ Isabelle2011-1/src/Pure/General/sha1_polyml.ML 2012-12-05 23:28:15.004733643 +1100
-@@ -18,7 +18,7 @@
- in (op ^) (pairself hex_digit (Integer.div_mod (Char.ord c) 16)) end
-
- val lib_path =
-- ("$ML_HOME/" ^ (if ML_System.platform_is_cygwin then "sha1.dll" else "libsha1.so"))
-+ ("$SHA1_HOME/" ^ (if ML_System.platform_is_cygwin then "sha1.dll" else "libsha1.so"))
- |> Path.explode;
-
- fun digest_external str =
diff --git a/sci-mathematics/isabelle/files/isabelle-2011.1-proofgeneral-gentoo-path.patch b/sci-mathematics/isabelle/files/isabelle-2011.1-proofgeneral-gentoo-path.patch
deleted file mode 100644
index 67e3476f2170..000000000000
--- a/sci-mathematics/isabelle/files/isabelle-2011.1-proofgeneral-gentoo-path.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- Isabelle2011-1-orig/etc/settings 2011-10-10 01:47:58.000000000 +1100
-+++ Isabelle2011-1/etc/settings 2012-01-01 16:33:27.922565527 +1100
-@@ -24,9 +24,16 @@
- "/usr/share/polyml/$ML_PLATFORM" \
- "/opt/polyml/$ML_PLATFORM" \
- "")"
--ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
--ML_OPTIONS="-H 200"
--ML_SOURCES="$ML_HOME/../src"
-+# ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
-+# ML_OPTIONS="-H 200"
-+# ML_SOURCES="$ML_HOME/../src"
-+
-+# Poly/ML 5.4.0 (64 bit)
-+ML_PLATFORM=x86_64-linux
-+ML_HOME=/usr/bin
-+ML_SYSTEM=polyml-5.4.0
-+ML_OPTIONS="-H 1000"
-+#ML_SOURCES="$ML_HOME/../src"
-
- # Poly/ML 32 bit (manual settings)
- #ML_SYSTEM=polyml-5.4.0
-@@ -106,7 +113,7 @@
- ISABELLE_TMP_PREFIX="/tmp/isabelle-$USER"
-
- # Heap input locations. ML system identifier is included in lookup.
--ISABELLE_PATH="$ISABELLE_HOME_USER/heaps:$ISABELLE_HOME/heaps"
-+ISABELLE_PATH="$ISABELLE_HOME_USER/heaps:/usr/lib64/Isabelle2011-1/heaps"
-
- # Heap output location. ML system identifier is appended automatically later on.
- ISABELLE_OUTPUT="$ISABELLE_HOME_USER/heaps"
-@@ -170,6 +177,7 @@
- "/usr/local/ProofGeneral" \
- "/usr/share/ProofGeneral" \
- "/opt/ProofGeneral" \
-+ "/usr/share/emacs/site-lisp/ProofGeneral" \
- "")"
-
- PROOFGENERAL_OPTIONS=""
diff --git a/sci-mathematics/isabelle/files/isabelle-2011.1-reverse-line-editor-order.patch b/sci-mathematics/isabelle/files/isabelle-2011.1-reverse-line-editor-order.patch
deleted file mode 100644
index b2f2c35ee087..000000000000
--- a/sci-mathematics/isabelle/files/isabelle-2011.1-reverse-line-editor-order.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- Isabelle2011-1-orig/etc/settings 2011-10-10 01:47:58.000000000 +1100
-+++ Isabelle2011-1/etc/settings 2012-05-27 23:28:37.283028668 +1000
-@@ -66,8 +66,8 @@
- ###
-
- ISABELLE_LINE_EDITOR=""
--[ -z "$ISABELLE_LINE_EDITOR" ] && ISABELLE_LINE_EDITOR="$(type -p rlwrap)"
- [ -z "$ISABELLE_LINE_EDITOR" ] && ISABELLE_LINE_EDITOR="$(type -p ledit)"
-+[ -z "$ISABELLE_LINE_EDITOR" ] && ISABELLE_LINE_EDITOR="$(type -p rlwrap)"
-
-
- ###
diff --git a/sci-mathematics/isabelle/files/isabelle-2012-gentoo-settings.patch b/sci-mathematics/isabelle/files/isabelle-2012-gentoo-settings.patch
deleted file mode 100644
index 8994491445d5..000000000000
--- a/sci-mathematics/isabelle/files/isabelle-2012-gentoo-settings.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- Isabelle2012-orig/etc/settings 2012-05-23 03:07:38.000000000 +1000
-+++ Isabelle2012/etc/settings 2012-05-27 18:07:26.502878614 +1000
-@@ -16,17 +16,24 @@
- # Only one of the sections below should be activated.
-
- # Poly/ML default (automated settings)
--ML_PLATFORM="$ISABELLE_PLATFORM"
--ML_HOME="$(choosefrom \
-- "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \
-- "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \
-- "/usr/local/polyml/$ML_PLATFORM" \
-- "/usr/share/polyml/$ML_PLATFORM" \
-- "/opt/polyml/$ML_PLATFORM" \
-- "")"
--ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
--ML_OPTIONS="-H 200"
--ML_SOURCES="$ML_HOME/../src"
-+# ML_PLATFORM="$ISABELLE_PLATFORM"
-+# ML_HOME="$(choosefrom \
-+# "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \
-+# "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \
-+# "/usr/local/polyml/$ML_PLATFORM" \
-+# "/usr/share/polyml/$ML_PLATFORM" \
-+# "/opt/polyml/$ML_PLATFORM" \
-+# "")"
-+# ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
-+# ML_OPTIONS="-H 200"
-+# ML_SOURCES="$ML_HOME/../src"
-+
-+# Poly/ML Gentoo (x86_64)
-+ML_PLATFORM=x86_64-linux
-+ML_HOME="/usr/bin"
-+ML_SYSTEM=polyml-5.4.0
-+ML_OPTIONS="-H 1000"
-+ML_SOURCES="/usr/src/debug/dev-lang/polyml-5.4.0"
-
- # Poly/ML 32 bit (manual settings)
- #ML_SYSTEM=polyml-5.4.1
-@@ -102,7 +109,7 @@
- ISABELLE_TMP_PREFIX="/tmp/isabelle-$USER"
-
- # Heap input locations. ML system identifier is included in lookup.
--ISABELLE_PATH="$ISABELLE_HOME_USER/heaps:$ISABELLE_HOME/heaps"
-+ISABELLE_PATH="$ISABELLE_HOME_USER/heaps:/usr/lib64/Isabelle2012/heaps"
-
- # Heap output location. ML system identifier is appended automatically later on.
- ISABELLE_OUTPUT="$ISABELLE_HOME_USER/heaps"
-@@ -161,13 +168,7 @@
- ###
-
- # Proof General home, look in a variety of places
--PROOFGENERAL_HOME="$(choosefrom \
-- "$ISABELLE_HOME/contrib/ProofGeneral" \
-- "$ISABELLE_HOME/../ProofGeneral" \
-- "/usr/local/ProofGeneral" \
-- "/usr/share/ProofGeneral" \
-- "/opt/ProofGeneral" \
-- "")"
-+PROOFGENERAL_HOME="/usr/share/emacs/site-lisp/ProofGeneral"
-
- PROOFGENERAL_OPTIONS=""
- #PROOFGENERAL_OPTIONS="-m no_brackets -m no_type_brackets"
diff --git a/sci-mathematics/isabelle/files/isabelle-2012-redundant-equations-in-function-definitions-error.patch b/sci-mathematics/isabelle/files/isabelle-2012-redundant-equations-in-function-definitions-error.patch
deleted file mode 100644
index 18ae43d00fe5..000000000000
--- a/sci-mathematics/isabelle/files/isabelle-2012-redundant-equations-in-function-definitions-error.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -r dd611ab202a8 -r e7e647949c95 src/HOL/Tools/Function/fun.ML
---- a/src/HOL/Tools/Function/fun.ML Wed Jun 06 10:35:05 2012 +0200
-+++ b/src/HOL/Tools/Function/fun.ML Wed Jun 06 21:36:21 2012 +0200
-@@ -84,10 +84,10 @@
- spec @ mk_catchall fixes arity_of
- end
-
--fun warnings ctxt origs tss =
-+fun further_checks ctxt origs tss =
- let
-- fun warn_redundant t =
-- warning ("Ignoring redundant equation: " ^ quote (Syntax.string_of_term ctxt t))
-+ fun fail_redundant t =
-+ error (cat_lines ["Equation is redundant (covered by preceding clauses):", Syntax.string_of_term ctxt t])
- fun warn_missing strs =
- warning (cat_lines ("Missing patterns in function definition:" :: strs))
-
-@@ -100,7 +100,7 @@
- @ ["(" ^ string_of_int (length rest) ^ " more)"])
-
- val _ = (origs ~~ tss')
-- |> map (fn (t, ts) => if null ts then warn_redundant t else ())
-+ |> map (fn (t, ts) => if null ts then fail_redundant t else ())
- in
- ()
- end
-@@ -119,7 +119,7 @@
- val compleqs = add_catchall ctxt fixes feqs (* Completion *)
-
- val spliteqs = Function_Split.split_all_equations ctxt compleqs
-- |> tap (warnings ctxt feqs)
-+ |> tap (further_checks ctxt feqs)
-
- fun restore_spec thms =
- bnds ~~ take (length bnds) (unflat spliteqs thms)
diff --git a/sci-mathematics/isabelle/files/isabelle-2012-signal-handling.patch b/sci-mathematics/isabelle/files/isabelle-2012-signal-handling.patch
deleted file mode 100644
index d238f41bd32b..000000000000
--- a/sci-mathematics/isabelle/files/isabelle-2012-signal-handling.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -r c79adcae9869 -r 6de952f4069f lib/scripts/run-polyml
---- a/lib/scripts/run-polyml Fri May 25 13:23:43 2012 +0200
-+++ b/lib/scripts/run-polyml Fri May 25 17:14:14 2012 +0200
-@@ -76,3 +76,3 @@
- "$ISABELLE_HOME/lib/scripts/feeder" -p -h "$MLTEXT" -t "$MLEXIT" $FEEDER_OPTS | \
-- { read FPID; "$POLY" -q $ML_OPTIONS; RC="$?"; kill -HUP "$FPID"; exit "$RC"; }
-+ { read FPID; "$POLY" -q $ML_OPTIONS; RC="$?"; kill -TERM "$FPID"; exit "$RC"; }
- RC="$?"
diff --git a/sci-mathematics/isabelle/files/isabelle-2013-HOL-Predicate_Compile_Examples.patch b/sci-mathematics/isabelle/files/isabelle-2013-HOL-Predicate_Compile_Examples.patch
deleted file mode 100644
index bce7eec4417c..000000000000
--- a/sci-mathematics/isabelle/files/isabelle-2013-HOL-Predicate_Compile_Examples.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- Isabelle2013-orig/src/HOL/Predicate_Compile_Examples/Hotel_Example_Prolog.thy 2013-02-13 00:31:10.000000000 +1100
-+++ Isabelle2013/src/HOL/Predicate_Compile_Examples/Hotel_Example_Prolog.thy 2013-08-31 14:37:02.015159000 +1000
-@@ -82,7 +82,7 @@
- setup {* Context.theory_map (Quickcheck.add_tester ("prolog", (Code_Prolog.active, Code_Prolog.test_goals))) *}
-
- lemma "\<lbrakk> hotel s; isinp s r g \<rbrakk> \<Longrightarrow> owns s r = Some g"
--quickcheck[tester = prolog, iterations = 1, expect = counterexample]
-+quickcheck[tester = prolog, iterations = 1]
- oops
-
- section {* Manual setup to find the counterexample *}
-@@ -110,7 +110,7 @@
-
- lemma
- "hotel s ==> feels_safe s r ==> isinp s r g ==> owns s r = Some g"
--quickcheck[tester = prolog, iterations = 1, expect = counterexample]
-+quickcheck[tester = prolog, iterations = 1]
- oops
-
- section {* Using a global limit for limiting the execution *}
-@@ -146,7 +146,7 @@
-
- lemma
- "hotel s ==> feels_safe s r ==> isinp s r g ==> owns s r = Some g"
--quickcheck[tester = prolog, iterations = 1, expect = counterexample]
-+quickcheck[tester = prolog, iterations = 1]
- oops
-
- end
-\ No newline at end of file
---- Isabelle2013-orig/src/HOL/Predicate_Compile_Examples/Context_Free_Grammar_Example.thy 2013-02-13 00:31:10.000000000 +1100
-+++ Isabelle2013/src/HOL/Predicate_Compile_Examples/Context_Free_Grammar_Example.thy 2013-08-31 14:36:47.049851000 +1000
-@@ -33,7 +33,7 @@
-
- lemma
- "S\<^isub>1p w \<Longrightarrow> w = []"
--quickcheck[tester = prolog, iterations=1, expect = counterexample]
-+quickcheck[tester = prolog, iterations=1]
- oops
-
- definition "filter_a = filter (\<lambda>x. x = a)"
-@@ -67,7 +67,7 @@
-
- theorem S\<^isub>1_sound:
- "S\<^isub>1p w \<Longrightarrow> length [x \<leftarrow> w. x = a] = length [x \<leftarrow> w. x = b]"
--quickcheck[tester = prolog, iterations=1, expect = counterexample]
-+quickcheck[tester = prolog, iterations=1]
- oops
-
-
-@@ -91,7 +91,7 @@
-
- theorem S\<^isub>2_sound:
- "S\<^isub>2p w \<longrightarrow> length [x \<leftarrow> w. x = a] = length [x \<leftarrow> w. x = b]"
--quickcheck[tester = prolog, iterations=1, expect = counterexample]
-+quickcheck[tester = prolog, iterations=1]
- oops
-
- inductive_set S\<^isub>3 and A\<^isub>3 and B\<^isub>3 where
---- Isabelle2013-orig/src/HOL/Predicate_Compile_Examples/Lambda_Example.thy 2013-02-13 00:31:10.000000000 +1100
-+++ Isabelle2013/src/HOL/Predicate_Compile_Examples/Lambda_Example.thy 2013-08-31 14:28:11.784390000 +1000
-@@ -92,7 +92,7 @@
-
- lemma
- "\<Gamma> \<turnstile> t : U \<Longrightarrow> t \<rightarrow>\<^sub>\<beta> t' \<Longrightarrow> \<Gamma> \<turnstile> t' : U"
--quickcheck[tester = prolog, iterations = 1, expect = counterexample]
-+quickcheck[tester = prolog, iterations = 1]
- oops
-
- text {* Verifying that the found counterexample really is one by means of a proof *}
---- Isabelle2013-orig/src/HOL/Predicate_Compile_Examples/List_Examples.thy 2013-02-13 00:31:10.000000000 +1100
-+++ Isabelle2013/src/HOL/Predicate_Compile_Examples/List_Examples.thy 2013-08-31 14:27:52.013962000 +1000
-@@ -21,7 +21,7 @@
- lemma "(xs :: nat list) = ys @ ys --> rev xs = xs"
- quickcheck[tester = random, iterations = 10000]
- quickcheck[tester = smart_exhaustive, iterations = 1, expect = counterexample]
--quickcheck[tester = prolog, expect = counterexample]
-+quickcheck[tester = prolog]
- oops
-
- end
-\ No newline at end of file
diff --git a/sci-mathematics/isabelle/files/isabelle-2013-classpath.patch b/sci-mathematics/isabelle/files/isabelle-2013-classpath.patch
deleted file mode 100644
index e3b2271a30c5..000000000000
--- a/sci-mathematics/isabelle/files/isabelle-2013-classpath.patch
+++ /dev/null
@@ -1,149 +0,0 @@
---- Isabelle2013-orig/lib/Tools/java 2013-02-13 00:31:02.000000000 +1100
-+++ Isabelle2013/lib/Tools/java 2015-04-17 12:16:04.734716358 +1000
-@@ -6,5 +6,5 @@
-
- CLASSPATH="$(jvmpath "$CLASSPATH")"
- isabelle_jdk java -Dfile.encoding=UTF-8 -server \
-- "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext")" "$@"
-+ "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala-2.10 | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
-
---- Isabelle2013-orig/lib/Tools/scala 2013-02-13 00:31:02.000000000 +1100
-+++ Isabelle2013/lib/Tools/scala 2015-04-17 12:12:21.606890256 +1000
-@@ -8,4 +8,4 @@
-
- CLASSPATH="$(jvmpath "$CLASSPATH")"
- isabelle_scala scala -Dfile.encoding=UTF-8 \
-- "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext")" "$@"
-+ "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala-2.10 | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
---- Isabelle2013-orig/lib/Tools/scalac 2013-02-13 00:31:02.000000000 +1100
-+++ Isabelle2013/lib/Tools/scalac 2015-04-17 12:12:36.895871214 +1000
-@@ -8,5 +8,5 @@
-
- CLASSPATH="$(jvmpath "$CLASSPATH")"
- isabelle_scala scalac -Dfile.encoding=UTF-8 \
-- "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext")" "$@"
-+ "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala-2.10 | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
-
---- Isabelle2013-orig/src/Pure/build-jars 2013-02-13 00:31:15.000000000 +1100
-+++ Isabelle2013/src/Pure/build-jars 2013-08-18 12:55:51.400924000 +1000
-@@ -133,7 +133,7 @@
- declare -a JFREECHART_JARS=()
- for NAME in $JFREECHART_JAR_NAMES
- do
-- JFREECHART_JARS["${#JFREECHART_JARS[@]}"]="$JFREECHART_HOME/lib/$NAME"
-+ JFREECHART_JARS["${#JFREECHART_JARS[@]}"]="$NAME"
- done
-
-
---- Isabelle2013-orig/src/Tools/jEdit/lib/Tools/jedit 2013-02-13 00:31:16.000000000 +1100
-+++ Isabelle2013/src/Tools/jEdit/lib/Tools/jedit 2013-08-18 16:39:15.495244000 +1000
-@@ -214,97 +214,11 @@
- declare -a JFREECHART_JARS=()
- for NAME in $JFREECHART_JAR_NAMES
- do
-- JFREECHART_JARS["${#JFREECHART_JARS[@]}"]="$JFREECHART_HOME/lib/$NAME"
-+ JFREECHART_JARS["${#JFREECHART_JARS[@]}"]="$NAME"
- done
-
--
--# target
--
--TARGET="dist/jars/Isabelle-jEdit.jar"
--
--declare -a UPDATED=()
--
--if [ "$BUILD_JARS" = jars_fresh ]; then
-- OUTDATED=true
--else
-- OUTDATED=false
-- if [ ! -e "$TARGET" ]; then
-- OUTDATED=true
-- else
-- if [ -n "$ISABELLE_JEDIT_BUILD_HOME" ]; then
-- declare -a DEPS=(
-- "$JEDIT_JAR" "${JEDIT_JARS[@]}" "${JFREECHART_JARS[@]}"
-- "$PURE_JAR" "$GRAPHVIEW_JAR" "${SOURCES[@]}" "${RESOURCES[@]}"
-- )
-- elif [ -e "$ISABELLE_HOME/Admin/build" ]; then
-- declare -a DEPS=("$PURE_JAR" "$GRAPHVIEW_JAR" "${SOURCES[@]}" "${RESOURCES[@]}")
-- else
-- declare -a DEPS=()
-- fi
-- for DEP in "${DEPS[@]}"
-- do
-- [ ! -e "$DEP" ] && fail "Missing file: $DEP"
-- [ "$DEP" -nt "$TARGET" ] && {
-- OUTDATED=true
-- UPDATED["${#UPDATED[@]}"]="$DEP"
-- }
-- done
-- fi
--fi
--
--
--# build
--
--if [ "$OUTDATED" = true ]
--then
-- echo "### Building Isabelle/jEdit ..."
--
-- [ "${#UPDATED[@]}" -gt 0 ] && {
-- echo "Changed files:"
-- for FILE in "${UPDATED[@]}"
-- do
-- echo " $FILE"
-- done
-- }
--
-- [ -z "$ISABELLE_JEDIT_BUILD_HOME" ] && \
-- fail "Unknown ISABELLE_JEDIT_BUILD_HOME -- missing auxiliary component"
--
-- rm -rf dist || failed
-- mkdir -p dist dist/classes || failed
--
-- cp -p -R -f "$ISABELLE_JEDIT_BUILD_HOME/contrib/$ISABELLE_JEDIT_BUILD_VERSION/." dist/.
-- cp -p -R -f "${RESOURCES[@]}" dist/classes/.
-- cp src/jEdit.props dist/properties/.
-- cp -p -R -f src/modes/. dist/modes/.
--
-- perl -i -e 'while (<>) {
-- if (m/NAME="javacc"/) {
-- print qq,<MODE NAME="isabelle" FILE="isabelle.xml" FILE_NAME_GLOB="*.thy"/>\n\n,;
-- print qq,<MODE NAME="isabelle-options" FILE="isabelle-options.xml"/>\n\n,;
-- print qq,<MODE NAME="isabelle-root" FILE="isabelle-root.xml" FILE_NAME_GLOB="ROOT"/>\n\n,; }
-- print; }' dist/modes/catalog
--
-- cp -p -R -f "${JEDIT_JARS[@]}" dist/jars/. || failed
-- (
-- for JAR in "$JEDIT_JAR" "${JEDIT_JARS[@]}" "${JFREECHART_JARS[@]}" "$PURE_JAR" \
-- "$GRAPHVIEW_JAR" "$SCALA_HOME/lib/scala-compiler.jar"
-- do
-- CLASSPATH="$CLASSPATH:$JAR"
-- done
-- CLASSPATH="$(jvmpath "$CLASSPATH")"
-- exec "$SCALA_HOME/bin/scalac" $ISABELLE_SCALA_BUILD_OPTIONS -d dist/classes "${SOURCES[@]}"
-- ) || fail "Failed to compile sources"
--
-- cd dist/classes
-- isabelle_jdk jar cf "../jars/Isabelle-jEdit.jar" * || failed
-- cd ../..
-- rm -rf dist/classes
--fi
--
- popd >/dev/null
-
--
- ## main
-
- if [ "$BUILD_ONLY" = false ]; then
---- Isabelle2013-orig/contrib/jfreechart-1.0.14/etc/settings 2012-12-09 07:23:53.000000000 +1100
-+++ Isabelle2013/contrib/jfreechart-1.0.14/etc/settings 2013-08-18 16:18:10.244698000 +1000
-@@ -1,7 +1,5 @@
- # -*- shell-script -*- :mode=shellscript:
-
- JFREECHART_HOME="$COMPONENT"
--JFREECHART_JAR_NAMES="iText-2.1.5.jar jcommon-1.0.18.jar jfreechart-1.0.14.jar"
--
--ISABELLE_JAVA_EXT="$ISABELLE_JAVA_EXT:$JFREECHART_HOME/lib"
-+JFREECHART_JAR_NAMES="$(java-config -p itext | sed -e 's@:@ @g') $(java-config -p jcommon-1.0 | sed -e 's@:@ @g') $(java-config -p jfreechart-1.0 | sed -e 's@:@ @g')"
-
diff --git a/sci-mathematics/isabelle/files/isabelle-2013.2-classpath.patch b/sci-mathematics/isabelle/files/isabelle-2013.2-classpath.patch
deleted file mode 100644
index b3ad4ae95cd9..000000000000
--- a/sci-mathematics/isabelle/files/isabelle-2013.2-classpath.patch
+++ /dev/null
@@ -1,135 +0,0 @@
---- Isabelle2013-2-orig/lib/Tools/java 2013-12-06 02:18:34.000000000 +1100
-+++ Isabelle2013-2/lib/Tools/java 2015-04-17 12:23:11.535463796 +1000
-@@ -10,5 +10,5 @@
- unset CLASSPATH
-
- isabelle_jdk java "${JAVA_ARGS[@]}" \
-- -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@"
-+ -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala-2.11 | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
-
---- Isabelle2013-2-orig/lib/Tools/scala 2013-12-06 02:18:34.000000000 +1100
-+++ Isabelle2013-2/lib/Tools/scala 2015-04-17 12:23:24.836455672 +1000
-@@ -7,5 +7,5 @@
- isabelle_admin_build jars || exit $?
-
- isabelle_scala scala -Dfile.encoding=UTF-8 \
-- -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@"
-+ -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala-2.11 | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
-
---- Isabelle2013-2-orig/lib/Tools/scalac 2013-12-06 02:18:34.000000000 +1100
-+++ Isabelle2013-2/lib/Tools/scalac 2015-04-17 12:23:33.084450628 +1000
-@@ -7,5 +7,5 @@
- isabelle_admin_build jars || exit $?
-
- isabelle_scala scalac -Dfile.encoding=UTF-8 \
-- -classpath "$(jvmpath "$ISABELLE_CLASSPATH")" "$@"
-+ -classpath "$(jvmpath "$ISABELLE_CLASSPATH:$(java-config -p scala-2.11 | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
-
---- Isabelle2013-2-orig/src/Tools/jEdit/lib/Tools/jedit 2013-12-06 02:19:04.000000000 +1100
-+++ Isabelle2013-2/src/Tools/jEdit/lib/Tools/jedit 2014-02-09 20:59:14.026841490 +1100
-@@ -211,105 +211,6 @@
- "$ISABELLE_JEDIT_BUILD_HOME/contrib/jsr305-2.0.0.jar"
- )
-
--
--# target
--
--TARGET="dist/jars/Isabelle-jEdit.jar"
--
--declare -a UPDATED=()
--
--if [ "$BUILD_JARS" = jars_fresh ]; then
-- OUTDATED=true
--else
-- OUTDATED=false
-- if [ ! -e "$TARGET" ]; then
-- OUTDATED=true
-- else
-- if [ -n "$ISABELLE_JEDIT_BUILD_HOME" ]; then
-- declare -a DEPS=(
-- "$JEDIT_JAR" "${JEDIT_JARS[@]}" "$PURE_JAR" "$GRAPHVIEW_JAR"
-- "${SOURCES[@]}" "${RESOURCES[@]}"
-- )
-- elif [ -e "$ISABELLE_HOME/Admin/build" ]; then
-- declare -a DEPS=("$PURE_JAR" "$GRAPHVIEW_JAR" "${SOURCES[@]}" "${RESOURCES[@]}")
-- else
-- declare -a DEPS=()
-- fi
-- for DEP in "${DEPS[@]}"
-- do
-- [ ! -e "$DEP" ] && fail "Missing file: $DEP"
-- [ "$DEP" -nt "$TARGET" ] && {
-- OUTDATED=true
-- UPDATED["${#UPDATED[@]}"]="$DEP"
-- }
-- done
-- fi
--fi
--
--
--# build
--
--if [ "$OUTDATED" = true ]
--then
-- echo "### Building Isabelle/jEdit ..."
--
-- [ "${#UPDATED[@]}" -gt 0 ] && {
-- echo "Changed files:"
-- for FILE in "${UPDATED[@]}"
-- do
-- echo " $FILE"
-- done
-- }
--
-- [ -z "$ISABELLE_JEDIT_BUILD_HOME" ] && \
-- fail "Unknown ISABELLE_JEDIT_BUILD_HOME -- missing auxiliary component"
--
-- rm -rf dist || failed
-- mkdir -p dist dist/classes || failed
--
-- cp -p -R -f "$ISABELLE_JEDIT_BUILD_HOME/contrib/$ISABELLE_JEDIT_BUILD_VERSION/." dist/.
-- cp -p -R -f "${RESOURCES[@]}" dist/classes/.
-- cp src/jEdit.props dist/properties/.
-- cp -p -R -f src/modes/. dist/modes/.
--
-- perl -i -e 'while (<>) {
-- if (m/NAME="javacc"/) {
-- print qq,<MODE NAME="isabelle" FILE="isabelle.xml" FILE_NAME_GLOB="*.thy"/>\n\n,;
-- print qq,<MODE NAME="isabelle-news" FILE="isabelle-news.xml"/>\n\n,;
-- print qq,<MODE NAME="isabelle-options" FILE="isabelle-options.xml"/>\n\n,;
-- print qq,<MODE NAME="isabelle-root" FILE="isabelle-root.xml" FILE_NAME_GLOB="ROOT"/>\n\n,; }
-- print; }' dist/modes/catalog
--
-- cd dist
-- isabelle_jdk jar xf jedit.jar
-- cp "$ISABELLE_HOME/lib/logo/isabelle-32.gif" \
-- "org/gjt/sp/jedit/icons/themes/classic/32x32/apps/isabelle.gif" || failed
-- cp "$ISABELLE_HOME/lib/logo/isabelle-32.gif" \
-- "org/gjt/sp/jedit/icons/themes/tango/32x32/apps/isabelle.gif" || failed
-- isabelle_jdk jar cfe jedit.jar org.gjt.sp.jedit.jEdit org || failed
-- rm -rf META-INF org
-- cd ..
--
-- cp -p -R -f "${JEDIT_JARS[@]}" dist/jars/. || failed
-- (
-- #workaround for scalac 2.10.2
-- function stty() { :; }
-- export -f stty
--
-- for JAR in "$JEDIT_JAR" "${JEDIT_JARS[@]}" "$PURE_JAR" "$GRAPHVIEW_JAR"
-- do
-- classpath "$JAR"
-- done
-- export CLASSPATH="$(jvmpath "$ISABELLE_CLASSPATH")"
-- exec "$SCALA_HOME/bin/scalac" $ISABELLE_SCALA_BUILD_OPTIONS -d dist/classes "${SOURCES[@]}"
-- ) || fail "Failed to compile sources"
--
-- cd dist/classes
-- isabelle_jdk jar cf "../jars/Isabelle-jEdit.jar" * || failed
-- cd ../..
-- rm -rf dist/classes
--fi
--
- popd >/dev/null
-
-
diff --git a/sci-mathematics/isabelle/isabelle-2011.1-r2.ebuild b/sci-mathematics/isabelle/isabelle-2011.1-r2.ebuild
deleted file mode 100644
index 6b96bcb57260..000000000000
--- a/sci-mathematics/isabelle/isabelle-2011.1-r2.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils java-pkg-2 multilib versionator
-
-MY_PN="Isabelle"
-MY_PV=$(replace_all_version_separators '-')
-MY_P="${MY_PN}${MY_PV}"
-
-DESCRIPTION="Isabelle is a generic proof assistant"
-HOMEPAGE="http://www.cl.cam.ac.uk/research/hvg/isabelle/index.html"
-SRC_URI="http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-ALL_LOGICS="Pure FOL +HOL ZF CCL CTT Cube FOLP LCF Sequents"
-IUSE="${ALL_LOGICS} doc graphbrowsing ledit readline +proofgeneral test"
-
-#upstream says
-#bash 2.x/3.x, Poly/ML 5.x, Perl 5.x,
-#for document preparation: complete LaTeX
-DEPEND=">=app-shells/bash-3.0:*
- >=dev-lang/polyml-5.4.1:=[-portable]
- >=dev-lang/perl-5.8.8-r2"
-
-RDEPEND="dev-perl/libwww-perl
- sci-mathematics/sha1-polyml
- doc? (
- virtual/latex-base
- dev-tex/rail
- )
- proofgeneral? (
- app-emacs/proofgeneral
- )
- ledit? (
- app-misc/ledit
- )
- readline? (
- app-misc/rlwrap
- )
- ${DEPEND}"
-
-S="${WORKDIR}"/Isabelle${MY_PV}
-TARGETDIR="/usr/share/Isabelle"${MY_PV}
-LIBDIR="/usr/"$(get_libdir)"/Isabelle"${MY_PV}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- if ! use proofgeneral
- then
- ewarn "You have deselected the Proof General interface."
- ewarn "Only a text terminal will be installed."
- ewarn "Emerge Isabelle with the proofgeneral USE flag enabled"
- ewarn "to get the common interface, that most people want."
- fi
-}
-
-src_prepare() {
- java-pkg-2_src_prepare
- epatch "${FILESDIR}/${PN}-2011.1-gentoo-settings.patch"
- polymlver=$(poly -v | cut -d' ' -f2)
- polymlarch=$(poly -v | cut -d' ' -f9 | cut -d'-' -f1)
- sed -e "s@5.4.0@${polymlver}@g" \
- -i "${S}/etc/settings" \
- || die "Could not configure polyml version in etc/settings"
- sed -e "s@ML_HOME=\"/@ML_HOME=\"${ROOT}@" \
- -i "${S}/etc/settings" \
- || die "Could not configure polyml ML_HOME in etc/settings"
- sed -e "s@x86_64@${polymlarch}@g" \
- -i "${S}/etc/settings" \
- || die "Could not configure polyml arch in etc/settings"
- sed -e "s@PROOFGENERAL_HOME=\"/@PROOFGENERAL_HOME=\"${ROOT}@" \
- -i "${S}/etc/settings" \
- || die "Could not configure PROOFGENERAL_HOME in etc/settings"
- sed -e "s@/usr/lib64/Isabelle${MY_PV}@${LIBDIR}@g" \
- -i "${S}/etc/settings" \
- || die "Could not configure Isabelle lib directory in etc/settings"
- epatch "${FILESDIR}/${PN}-2011.1-graphbrowser.patch"
- epatch "${FILESDIR}/${PN}-2011.1-libsha1.patch"
- cat <<- EOF >> "${S}/etc/settings"
-
- ISABELLE_GHC="${ROOT}usr/bin/ghc"
- ISABELLE_OCAML="${ROOT}usr/bin/ocaml"
- ISABELLE_SWIPL="${ROOT}usr/bin/swipl"
- ISABELLE_JDK_HOME="\$(java-config --jdk-home)"
- SCALA_HOME="${ROOT}usr/share/scala"
- SHA1_HOME="/usr/$(get_libdir)/sha1-polyml"
- EOF
- if use ledit && ! use readline; then
- epatch "${FILESDIR}/${PN}-2011.1-reverse-line-editor-order.patch"
- fi
-}
-
-src_compile() {
- LOGICS=""
- for l in "${ALL_LOGICS}"; do
- if has "${l/+/}"; then
- LOGICS="${LOGICS} ${l/+/}"
- fi
- done
- einfo "Building Isabelle logics ${LOGICS}. This may take some time."
- ./build -b -i "${LOGICS}" || die "building logics failed"
- ./bin/isabelle makeall || die "isabelle makeall failed"
- if use graphbrowsing
- then
- rm -f "${S}/lib/browser/GraphBrowser.jar" \
- || die "failed cleaning graph browser directory"
- pushd "${S}/lib/browser" \
- || die "Could not change directory to lib/browser"
- ./build || die "failed building the graph browser"
- popd
- fi
-}
-
-src_test() {
- einfo "Running tests. A test run can take up to several hours!"
- ./build -b -t || die "tests failed"
-}
-
-src_install() {
- exeinto ${TARGETDIR}/bin
- doexe bin/isabelle-process bin/isabelle
-
- insinto ${TARGETDIR}
- doins -r src
- doins -r lib
-
- for i in "./build" \
- "src/Pure/mk" \
- "src/Pure/build-jars" \
- "src/Tools/jEdit/dist/build-support/ci/copy_properties.groovy" \
- "src/Tools/jEdit/dist/build-support/ci/ci_release.groovy" \
- "src/Tools/jEdit/lib/Tools/jedit" \
- "src/Tools/Metis/fix_metis_license" \
- "src/Tools/Metis/make_metis" \
- "src/Tools/Metis/scripts/mlpp" \
- "src/Tools/WWW_Find/lib/Tools/wwwfind" \
- "src/Tools/Code/lib/Tools/codegen" \
- "src/HOL/Mirabelle/lib/Tools/mirabelle" \
- "src/HOL/Tools/Predicate_Compile/lib/scripts/swipl_version" \
- "src/HOL/Tools/SMT/lib/scripts/remote_smt" \
- "src/HOL/Tools/ATP/scripts/remote_atp" \
- "src/HOL/Tools/ATP/scripts/spass" \
- "src/HOL/Tools/Nitpick/lib/Tools/nitrox" \
- "src/HOL/Mutabelle/lib/Tools/mutabelle" \
- "src/HOL/Library/Sum_of_Squares/neos_csdp_client" \
- "lib/browser/build" \
- "lib/Tools/tty" \
- "lib/Tools/mkproject" \
- "lib/Tools/keywords" \
- "lib/Tools/browser" \
- "lib/Tools/install" \
- "lib/Tools/mkdir" \
- "lib/Tools/unsymbolize" \
- "lib/Tools/getenv" \
- "lib/Tools/java" \
- "lib/Tools/make" \
- "lib/Tools/emacs" \
- "lib/Tools/scala" \
- "lib/Tools/print" \
- "lib/Tools/latex" \
- "lib/Tools/findlogics" \
- "lib/Tools/doc" \
- "lib/Tools/logo" \
- "lib/Tools/usedir" \
- "lib/Tools/yxml" \
- "lib/Tools/version" \
- "lib/Tools/makeall" \
- "lib/Tools/scalac" \
- "lib/Tools/document" \
- "lib/Tools/env" \
- "lib/Tools/display" \
- "lib/Tools/dimacs2hol" \
- "lib/scripts/keywords" \
- "lib/scripts/unsymbolize" \
- "lib/scripts/run-polyml" \
- "lib/scripts/run-smlnj" \
- "lib/scripts/feeder" \
- "lib/scripts/java_ext_dirs" \
- "lib/scripts/yxml" \
- "lib/scripts/raw_dump" \
- "lib/scripts/polyml-version" \
- "lib/scripts/process"
- do
- exeinto $(dirname "${TARGETDIR}/${i}")
- doexe ${i}
- done
-
- docompress -x /usr/share/doc/${PF}
- dodoc -r doc
- if use doc; then
- dosym /usr/share/doc/${PF}/doc "${TARGETDIR}/doc"
- fi
-
- dodir /etc/isabelle
- insinto /etc/isabelle
- doins -r etc/*
-
- dosym /etc/isabelle "${TARGETDIR}/etc"
- dosym "${LIBDIR}/heaps" "${TARGETDIR}/heaps"
-
- insinto ${LIBDIR}
- doins -r heaps
-
- bin/isabelle install -d ${TARGETDIR} -p "${ED}usr/bin" \
- || die "isabelle install failed"
- newicon lib/icons/isabelle.xpm "${PN}.xpm"
- dodoc ANNOUNCE CONTRIBUTORS COPYRIGHT NEWS README
-
- java-pkg_regjar \
- "${ED}${TARGETDIR}/lib/browser/GraphBrowser.jar" \
- "${ED}${TARGETDIR}/lib/classes/ext/Pure.jar" \
- "${ED}${TARGETDIR}/lib/classes/ext/scala-library.jar" \
- "${ED}${TARGETDIR}/lib/classes/ext/scala-swing.jar" \
- "${ED}${TARGETDIR}/lib/classes/java_ext_dirs.jar"
-}
-
-pkg_postinst() {
- # If any of the directories in /etc/isabelle/components do not exist, then
- # even isabelle getenv ISABELLE_HOME fails. Hence it is necessary to
- # to delete any non-existing directories. If an old Isabelle version was
- # installed with component ebuilds like sci-mathematics/e, then the
- # Isabelle version is upgraded, then the contrib directories will not
- # exist initially, it is necessary to delete them from /etc/isabelle/components.
- # Then these components are rebuilt (creating these directories) using the
- # EAPI=5 subslot depends.
- for i in $(egrep '^[^#].*$' "${ROOT}etc/isabelle/components")
- do
- if [ ! -d /usr/share/Isabelle2012/${i} ]; then
- sed -e "\@${i}@d" -i "${ROOT}etc/isabelle/components"
- fi
- done
- if use ledit && use readline; then
- elog "Both readline and ledit use flags specified. The default setting"
- elog "if both are installed is to use readline (rlwrap), this can be"
- elog "modfied by editing the ISABELLE_LINE_EDITOR setting in"
- elog "${ROOT}/etc/isabelle/settings"
- fi
- elog "Please ensure you have a pdf viewer installed, for example:"
- elog "As root: emerge app-text/zathura-pdf-poppler"
- elog "Please configure your preferred pdf viewer, something like:"
- elog "As normal user: xdg-mime default zathura.desktop application/pdf"
- elog "Or alternatively by editing the PDF_VIEWER variable in the system"
- elog "settings file ${ROOT}etc/isabelle/settings and/or the user"
- elog "settings file \$HOME/.isabelle/${MY_P}/etc/settings"
- elog "To improve sledgehammer performance, consider installing:"
- elog "USE=isabelle emerge sci-mathematics/e sci-mathematics/spass"
- elog "For nitpick it is necessary to install:"
- elog "emerge sci-mathematics/kodkodi"
-}
diff --git a/sci-mathematics/isabelle/isabelle-2011.1.ebuild b/sci-mathematics/isabelle/isabelle-2011.1.ebuild
deleted file mode 100644
index f0e0c82faab2..000000000000
--- a/sci-mathematics/isabelle/isabelle-2011.1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-JAVA_PKG_OPT_USE="graphbrowsing"
-inherit eutils java-pkg-opt-2 multilib versionator
-
-MY_PN="Isabelle"
-MY_PV=$(replace_all_version_separators '-')
-MY_P="${MY_PN}${MY_PV}"
-
-DESCRIPTION="Isabelle is a generic proof assistant"
-HOMEPAGE="http://www.cl.cam.ac.uk/research/hvg/isabelle/index.html"
-SRC_URI="http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-ALL_LOGICS="Pure FOL +HOL ZF CCL CTT Cube FOLP LCF Sequents"
-IUSE="${ALL_LOGICS} doc graphbrowsing +proofgeneral test"
-
-#upstream says
-#bash 2.x/3.x, Poly/ML 5.x, Perl 5.x,
-#for document preparation: complete LaTeX
-DEPEND=">=app-shells/bash-3.0
- >=dev-lang/polyml-5.4.1[-portable]
- >=dev-lang/perl-5.8.8-r2"
-
-RDEPEND="doc? (
- virtual/latex-base
- dev-tex/rail
- )
- proofgeneral? (
- app-emacs/proofgeneral
- )
- ${DEPEND}"
-
-S="${WORKDIR}"/Isabelle${MY_PV}
-TARGETDIR="/usr/share/Isabelle"${MY_PV}
-LIBDIR="/usr/"$(get_libdir)"/Isabelle"${MY_PV}
-
-pkg_setup() {
- java-pkg-opt-2_pkg_setup
- if ! use proofgeneral
- then
- ewarn "You have deselected the Proof General interface."
- ewarn "Only a text terminal will be installed."
- ewarn "Emerge Isabelle with the proofgeneral USE flag enabled"
- ewarn "to get the common interface, that most people want."
- fi
-}
-
-src_prepare() {
- java-pkg-opt-2_src_prepare
- if use proofgeneral; then
- epatch "${FILESDIR}/${PN}-2011.1-proofgeneral-gentoo-path.patch"
- polymlver=$(poly -v | cut -d' ' -f2)
- polymlarch=$(poly -v | cut -d' ' -f9 | cut -d'-' -f1)
- sed -e "s@5.4.0@${polymlver}@g" \
- -i "${S}/etc/settings" \
- || die "Could not configure polyml version in etc/settings"
- sed -e "s@x86_64@${polymlarch}@g" \
- -i "${S}/etc/settings" \
- || die "Could not configure polyml arch in etc/settings"
- fi
- if use graphbrowsing; then
- epatch "${FILESDIR}/${PN}-2011.1-graphbrowser.patch"
- fi
-}
-
-src_compile() {
- LOGICS=""
- for l in "${ALL_LOGICS}"; do
- if has "${l/+/}"; then
- LOGICS="${LOGICS} ${l/+/}"
- fi
- done
- einfo "Building Isabelle logics ${LOGICS}. This may take some time."
- ./build -b -i "${LOGICS}" || die "building logics failed"
- ./bin/isabelle makeall || die "isabelle makeall failed"
- if use graphbrowsing
- then
- rm -f "${S}/lib/browser/GraphBrowser.jar" \
- || die "failed cleaning graph browser directory"
- pushd "${S}/lib/browser" \
- || die "Could not change directory to lib/browser"
- ./build || die "failed building the graph browser"
- popd
- fi
-}
-
-src_test() {
- einfo "Running tests. A test run can take up to several hours!"
- ./build -b -t || die "tests failed"
-}
-
-src_install() {
- exeinto ${TARGETDIR}/bin
- doexe bin/isabelle-process bin/isabelle
-
- exeinto ${TARGETDIR}
- doexe build
-
- insinto ${TARGETDIR}
- doins -r src
- dodoc -r doc
-
- dodir /etc/isabelle
- insinto /etc/isabelle
- doins -r etc/*
-
- dosym /etc/isabelle "${TARGETDIR}/etc"
- dosym "${LIBDIR}/heaps" "${TARGETDIR}/heaps"
-
- insinto ${LIBDIR}
- doins -r heaps
-
- # use cp to keep file attributes
- cp -R lib "${ED}${TARGETDIR}" || die "install lib failed"
-
- bin/isabelle install -d ${TARGETDIR} -p "${ED}usr/bin" \
- || die "isabelle install failed"
- newicon lib/icons/isabelle.xpm "${PN}.xpm"
- dodoc ANNOUNCE CONTRIBUTORS COPYRIGHT NEWS README
-
- java-pkg_regjar \
- "${ED}${TARGETDIR}/lib/browser/GraphBrowser.jar" \
- "${ED}${TARGETDIR}/lib/classes/ext/Pure.jar" \
- "${ED}${TARGETDIR}/lib/classes/ext/scala-library.jar" \
- "${ED}${TARGETDIR}/lib/classes/ext/scala-swing.jar" \
- "${ED}${TARGETDIR}/lib/classes/java_ext_dirs.jar"
-}
-
-pkg_postinst() {
- elog "You will need to re-emerge Isabelle after emerging polyml."
- elog "Please configure your preferred pdf viewer by editing"
- elog "the PDF_VIEWER variable in the system settings file"
- elog "/etc/isabelle/settings and/or the user settings file"
- elog "\$HOME/.isabelle/${MY_P}/etc/settings"
-}
diff --git a/sci-mathematics/isabelle/isabelle-2012-r1.ebuild b/sci-mathematics/isabelle/isabelle-2012-r1.ebuild
deleted file mode 100644
index 087bb7e2480e..000000000000
--- a/sci-mathematics/isabelle/isabelle-2012-r1.ebuild
+++ /dev/null
@@ -1,320 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils java-pkg-2 multilib versionator
-
-MY_PN="Isabelle"
-MY_PV=$(replace_all_version_separators '-')
-MY_P="${MY_PN}${MY_PV}"
-
-JEDIT_PV="20120414"
-JEDIT_PN="jedit_build"
-JEDIT_P="${JEDIT_PN}-${JEDIT_PV}"
-
-DESCRIPTION="Isabelle is a generic proof assistant"
-HOMEPAGE="http://www.cl.cam.ac.uk/research/hvg/isabelle/index.html"
-SRC_URI="http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/${MY_P}.tar.gz
- doc? ( https://dev.gentoo.org/~gienah/snapshots/${MY_P}-doc-src.tar.gz )
- pide? ( http://www4.in.tum.de/~wenzelm/test/${JEDIT_P}.tar.gz )"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-ALL_LOGICS="Pure FOL +HOL ZF CCL CTT Cube FOLP LCF Sequents"
-IUSE="${ALL_LOGICS} doc graphbrowsing ledit readline pide +proofgeneral test"
-
-#upstream says
-#bash 2.x/3.x, Poly/ML 5.x, Perl 5.x,
-#for document preparation: complete LaTeX
-DEPEND=">=app-shells/bash-3.0:*
- >=dev-lang/polyml-5.4.1:=[-portable]
- >=dev-lang/perl-5.8.8-r2"
-
-RDEPEND="dev-perl/libwww-perl
- sci-mathematics/sha1-polyml
- doc? (
- virtual/latex-base
- dev-tex/rail
- )
- proofgeneral? (
- app-emacs/proofgeneral
- )
- pide? (
- >=dev-lang/scala-2.8.2
- )
- ledit? (
- app-misc/ledit
- )
- readline? (
- app-misc/rlwrap
- )
- ${DEPEND}"
-
-S="${WORKDIR}"/Isabelle${MY_PV}
-JEDIT_S="${WORKDIR}/${JEDIT_P}"
-TARGETDIR="/usr/share/Isabelle"${MY_PV}
-LIBDIR="/usr/"$(get_libdir)"/Isabelle"${MY_PV}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- if ! use proofgeneral
- then
- ewarn "You have deselected the Proof General interface."
- ewarn "Only a text terminal will be installed."
- ewarn "Emerge Isabelle with the proofgeneral USE flag enabled"
- ewarn "to get the common interface, that most people want."
- fi
-}
-
-src_prepare() {
- java-pkg-2_src_prepare
- epatch "${FILESDIR}/${PN}-2012-gentoo-settings.patch"
- # http://article.gmane.org/gmane.science.mathematics.logic.isabelle.devel/2732
- epatch "${FILESDIR}/${PN}-2012-signal-handling.patch"
- # http://article.gmane.org/gmane.science.mathematics.logic.isabelle.devel/2780
- epatch "${FILESDIR}/${PN}-2012-redundant-equations-in-function-definitions-error.patch"
- polymlver=$(poly -v | cut -d' ' -f2)
- polymlarch=$(poly -v | cut -d' ' -f9 | cut -d'-' -f1)
- sed -e "s@5.4.0@${polymlver}@g" \
- -i "${S}/etc/settings" \
- || die "Could not configure polyml version in etc/settings"
- sed -e "s@ML_HOME=\"/@ML_HOME=\"${ROOT}@" \
- -i "${S}/etc/settings" \
- || die "Could not configure polyml ML_HOME in etc/settings"
- sed -e "s@x86_64@${polymlarch}@g" \
- -i "${S}/etc/settings" \
- || die "Could not configure polyml arch in etc/settings"
- sed -e "s@PROOFGENERAL_HOME=\"/@PROOFGENERAL_HOME=\"${ROOT}@" \
- -i "${S}/etc/settings" \
- || die "Could not configure PROOFGENERAL_HOME in etc/settings"
- sed -e "s@/usr/lib64/Isabelle${MY_PV}@${LIBDIR}@g" \
- -i "${S}/etc/settings" \
- || die "Could not configure Isabelle lib directory in etc/settings"
- epatch "${FILESDIR}/${PN}-2012-graphbrowser.patch"
- epatch "${FILESDIR}/${PN}-2012-libsha1.patch"
- cat <<- EOF >> "${S}/etc/settings"
-
- ISABELLE_GHC="${ROOT}usr/bin/ghc"
- ISABELLE_OCAML="${ROOT}usr/bin/ocaml"
- ISABELLE_SWIPL="${ROOT}usr/bin/swipl"
- ISABELLE_JDK_HOME="\$(java-config --jdk-home)"
- SCALA_HOME="${ROOT}usr/share/scala"
- SHA1_HOME="/usr/$(get_libdir)/sha1-polyml"
- EOF
- if use pide; then
- cat <<- EOF >> "${S}/etc/settings"
- ISABELLE_JEDIT_BUILD_HOME="\$ISABELLE_HOME/${JEDIT_P}"
- init_component ${JEDIT_S}
- EOF
- fi
- if use ledit && ! use readline; then
- epatch "${FILESDIR}/${PN}-2012-reverse-line-editor-order.patch"
- fi
-}
-
-src_compile() {
- LOGICS=""
- for l in "${ALL_LOGICS}"; do
- if has "${l/+/}"; then
- LOGICS="${LOGICS} ${l/+/}"
- fi
- done
- einfo "Building Isabelle logics ${LOGICS}. This may take some time."
- ./build -b -i "${LOGICS}" || die "building logics failed"
- ./bin/isabelle makeall || die "isabelle makeall failed"
- if use graphbrowsing
- then
- rm -f "${S}/lib/browser/GraphBrowser.jar" \
- || die "failed cleaning graph browser directory"
- pushd "${S}/lib/browser" \
- || die "Could not change directory to lib/browser"
- ./build || die "failed building the graph browser"
- popd
- fi
- if use pide; then
- pushd "${S}/src/Tools/jEdit" \
- || die "Could not change directory to src/Tools/jEdit"
- "${S}"/bin/isabelle jedit -b -f \
- || die "pide build failed"
- popd
- # The jedit_build stuff is only required to build
- # Isabelle/jEdit Prover IDE (PIDE). These 2 lines need to be deleted
- # from etc/settings as the jedit_build source code is not installed
- sed -e '/ISABELLE_JEDIT_BUILD_HOME/d' \
- -e '/init_component/d' \
- -i "${S}/etc/settings" \
- || die "Could not delete jedit_build lines from etc/settings"
- fi
-}
-
-src_test() {
- einfo "Running tests. A test run can take up to several hours!"
- ./build -b -t || die "tests failed"
-}
-
-src_install() {
- exeinto ${TARGETDIR}/bin
- doexe bin/isabelle-process bin/isabelle
-
- insinto ${TARGETDIR}
- doins -r src
- doins -r lib
-
- docompress -x /usr/share/doc/${PF}
- dodoc -r doc
- if use doc; then
- dosym /usr/share/doc/${PF}/doc "${TARGETDIR}/doc"
- # The build of sci-mathematics/haskabelle with use doc requires
- # sci-mathematics/isabelle[doc?]. The haskabelle doc build requires
- # the doc-src directory stuff in the isabelle package. Which is not
- # provided in the Isabelle 2012 src tarball. So extract it from a
- # snapshot of the isabelle repo taken soon after the Isabelle 2012
- # release.
- doins -r doc-src
- for i in "./doc-src/IsarRef/showsymbols" \
- "./doc-src/TutorialI/Overview/LNCS/makeDemo" \
- "./doc-src/TutorialI/isa-index" \
- "./doc-src/sedindex"
- do
- exeinto $(dirname "${TARGETDIR}/${i}")
- doexe ${i}
- done
- fi
-
- for i in "./build" \
- "./src/Pure/mk" \
- "./src/Pure/build-jars" \
- "./src/Tools/JVM/build" \
- "./src/Tools/JVM/java_ext_dirs" \
- "./src/Tools/jEdit/lib/Tools/jedit" \
- "./src/Tools/Metis/fix_metis_license" \
- "./src/Tools/Metis/make_metis" \
- "./src/Tools/Metis/scripts/mlpp" \
- "./src/Tools/WWW_Find/lib/Tools/wwwfind" \
- "./src/Tools/Code/lib/Tools/codegen" \
- "./src/HOL/Mirabelle/lib/Tools/mirabelle" \
- "./src/HOL/Tools/Predicate_Compile/lib/scripts/swipl_version" \
- "./src/HOL/Tools/SMT/lib/scripts/remote_smt" \
- "./src/HOL/Tools/ATP/scripts/remote_atp" \
- "./src/HOL/Tools/ATP/scripts/spass" \
- "./src/HOL/Mutabelle/lib/Tools/mutabelle" \
- "./src/HOL/TPTP/TPTP_Parser/make_mlyacclib" \
- "./src/HOL/TPTP/TPTP_Parser/make_tptp_parser" \
- "./src/HOL/TPTP/lib/Tools/tptp_isabelle_demo" \
- "./src/HOL/TPTP/lib/Tools/tptp_graph" \
- "./src/HOL/TPTP/lib/Tools/tptp_isabelle_comp" \
- "./src/HOL/TPTP/lib/Tools/tptp_refute" \
- "./src/HOL/TPTP/lib/Tools/tptp_translate" \
- "./src/HOL/TPTP/lib/Tools/tptp_sledgehammer" \
- "./src/HOL/TPTP/lib/Tools/tptp_nitpick" \
- "./src/HOL/Library/Sum_of_Squares/neos_csdp_client" \
- "./src/HOL/IMP/export.sh" \
- "./lib/browser/build" \
- "./lib/Tools/tty" \
- "./lib/Tools/mkproject" \
- "./lib/Tools/keywords" \
- "./lib/Tools/browser" \
- "./lib/Tools/install" \
- "./lib/Tools/mkdir" \
- "./lib/Tools/unsymbolize" \
- "./lib/Tools/getenv" \
- "./lib/Tools/java" \
- "./lib/Tools/make" \
- "./lib/Tools/emacs" \
- "./lib/Tools/scala" \
- "./lib/Tools/print" \
- "./lib/Tools/latex" \
- "./lib/Tools/findlogics" \
- "./lib/Tools/doc" \
- "./lib/Tools/logo" \
- "./lib/Tools/usedir" \
- "./lib/Tools/yxml" \
- "./lib/Tools/version" \
- "./lib/Tools/makeall" \
- "./lib/Tools/scalac" \
- "./lib/Tools/document" \
- "./lib/Tools/env" \
- "./lib/Tools/display" \
- "./lib/Tools/dimacs2hol" \
- "./lib/scripts/keywords" \
- "./lib/scripts/unsymbolize" \
- "./lib/scripts/run-polyml" \
- "./lib/scripts/run-smlnj" \
- "./lib/scripts/feeder" \
- "./lib/scripts/yxml" \
- "./lib/scripts/polyml-version" \
- "./lib/scripts/process"
- do
- exeinto $(dirname "${TARGETDIR}/${i}")
- doexe ${i}
- done
-
- dodir /etc/isabelle
- insinto /etc/isabelle
- doins -r etc/*
-
- dosym /etc/isabelle "${TARGETDIR}/etc"
- dosym "${LIBDIR}/heaps" "${TARGETDIR}/heaps"
-
- insinto ${LIBDIR}
- doins -r heaps
-
- bin/isabelle install -d ${TARGETDIR} -p "${ED}usr/bin" \
- || die "isabelle install failed"
- newicon lib/icons/isabelle.xpm "${PN}.xpm"
- dodoc ANNOUNCE CONTRIBUTORS COPYRIGHT NEWS README
-
- java-pkg_regjar \
- "${ED}${TARGETDIR}/src/Tools/JVM/java_ext_dirs.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/QuickNotepad.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/Console.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/ErrorList.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/Hyperlinks.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/SideKick.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/cobra.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/js.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/scala-compiler.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/Isabelle-jEdit.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jedit.jar" \
- "${ED}${TARGETDIR}/lib/classes/ext/scala-swing.jar" \
- "${ED}${TARGETDIR}/lib/classes/ext/scala-library.jar" \
- "${ED}${TARGETDIR}/lib/classes/ext/Pure.jar" \
- "${ED}${TARGETDIR}/lib/browser/GraphBrowser.jar"
-}
-
-pkg_postinst() {
- # If any of the directories in /etc/isabelle/components do not exist, then
- # even isabelle getenv ISABELLE_HOME fails. Hence it is necessary to
- # to delete any non-existing directories. If an old Isabelle version was
- # installed with component ebuilds like sci-mathematics/e, then the
- # Isabelle version is upgraded, then the contrib directories will not
- # exist initially, it is necessary to delete them from /etc/isabelle/components.
- # Then these components are rebuilt (creating these directories) using the
- # EAPI=5 subslot depends.
- for i in $(egrep '^[^#].*$' "${ROOT}etc/isabelle/components")
- do
- if [ ! -d /usr/share/Isabelle2012/${i} ]; then
- sed -e "\@${i}@d" -i "${ROOT}etc/isabelle/components"
- fi
- done
- if use ledit && use readline; then
- elog "Both readline and ledit use flags specified. The default setting"
- elog "if both are installed is to use readline (rlwrap), this can be"
- elog "modfied by editing the ISABELLE_LINE_EDITOR setting in"
- elog "${ROOT}/etc/isabelle/settings"
- fi
- elog "Please ensure you have a pdf viewer installed, for example:"
- elog "As root: emerge app-text/zathura-pdf-poppler"
- elog "Please configure your preferred pdf viewer, something like:"
- elog "As normal user: xdg-mime default zathura.desktop application/pdf"
- elog "Or alternatively by editing the PDF_VIEWER variable in the system"
- elog "settings file ${ROOT}etc/isabelle/settings and/or the user"
- elog "settings file \$HOME/.isabelle/${MY_P}/etc/settings"
- elog "To improve sledgehammer performance, consider installing:"
- elog "USE=isabelle emerge sci-mathematics/e sci-mathematics/spass"
- elog "For nitpick it is necessary to install:"
- elog "emerge sci-mathematics/kodkodi"
-}
diff --git a/sci-mathematics/isabelle/isabelle-2013-r2.ebuild b/sci-mathematics/isabelle/isabelle-2013-r2.ebuild
deleted file mode 100644
index 6b5c7f622f8c..000000000000
--- a/sci-mathematics/isabelle/isabelle-2013-r2.ebuild
+++ /dev/null
@@ -1,353 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils java-pkg-2 multilib versionator
-
-MY_PN="Isabelle"
-MY_PV=$(replace_all_version_separators '-')
-MY_P="${MY_PN}${MY_PV}"
-
-JEDIT_PV="20130104"
-JEDIT_PN="jedit_build"
-JEDIT_P="${JEDIT_PN}-${JEDIT_PV}"
-JEDIT_IC_PN="${JEDIT_PN}-isabelle-component"
-JEDIT_IC_P="${JEDIT_IC_PN}-${JEDIT_PV}"
-
-JFREECHART_PV="1.0.14"
-JFREECHART_PN="jfreechart"
-JFREECHART_P="${JFREECHART_PN}-${JFREECHART_PV}"
-JFREECHART_IC_PN="${JFREECHART_PN}-isabelle-component"
-JFREECHART_IC_P="${JFREECHART_IC_PN}-${JFREECHART_PV}"
-
-SS="2.10"
-
-DESCRIPTION="Isabelle is a generic proof assistant"
-HOMEPAGE="http://www.cl.cam.ac.uk/research/hvg/Isabelle/index.html"
-SRC_URI="http://www.cl.cam.ac.uk/research/hvg/Isabelle/dist/${MY_P}.tar.gz
- http://isabelle.in.tum.de/components/${JEDIT_P}.tar.gz -> ${JEDIT_IC_P}.tar.gz
- http://isabelle.in.tum.de/components/${JFREECHART_P}.tar.gz -> ${JFREECHART_IC_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc graphbrowsing ledit readline proofgeneral"
-
-#upstream says
-#bash 2.x/3.x, Poly/ML 5.x, Perl 5.x,
-#for document preparation: complete LaTeX
-DEPEND=">=app-shells/bash-3.0:*
- dev-java/ant-core:0
- >=dev-java/jcommon-1.0.18:1.0
- >=dev-java/jfreechart-1.0.14:1.0
- >=dev-java/itext-2.1.5:0
- dev-java/xml-xmlbeans:1
- >=dev-lang/ghc-7.6.3
- >=dev-lang/polyml-5.5.0:=[-portable]
- >=dev-lang/perl-5.8.8-r2
- dev-lang/swi-prolog
- virtual/jdk:1.7
- doc? (
- virtual/latex-base
- dev-tex/rail
- )
- >=dev-lang/scala-2.10.2:${SS}
- ledit? (
- app-misc/ledit
- )
- readline? (
- app-misc/rlwrap
- )"
-
-RDEPEND="dev-perl/libwww-perl
- sci-mathematics/sha1-polyml
- >=virtual/jre-1.7
- proofgeneral? (
- >=app-emacs/proofgeneral-4.1
- )
- ${DEPEND}"
-
-S="${WORKDIR}"/Isabelle${MY_PV}
-JEDIT_S="${WORKDIR}/${JEDIT_P}"
-JFREECHART_S="${WORKDIR}/${JFREECHART_P}"
-TARGETDIR="/usr/share/Isabelle"${MY_PV}
-LIBDIR="/usr/"$(get_libdir)"/Isabelle"${MY_PV}
-
-LIBRARY_PKGS="scala-${SS},itext,jcommon-1.0,jfreechart-1.0,xml-xmlbeans-1"
-
-src_unpack() {
- unpack "${MY_P}.tar.gz"
- pushd "${S}/contrib" || die
- unpack ${JEDIT_IC_P}.tar.gz
- unpack ${JFREECHART_IC_P}.tar.gz
-}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-2_src_prepare
- java-pkg_getjars ${LIBRARY_PKGS}
- epatch "${FILESDIR}/${PN}-2013-gentoo-settings.patch"
- epatch "${FILESDIR}/${PN}-2013-classpath.patch"
- polymlver=$(poly -v | cut -d' ' -f2)
- polymlarch=$(poly -v | cut -d' ' -f9 | cut -d'-' -f1)
- sed -e "s@5.5.0@${polymlver}@g" \
- -i "${S}/etc/settings" \
- || die "Could not configure polyml version in etc/settings"
- sed -e "s@ML_HOME=\"/@ML_HOME=\"${ROOT}@" \
- -i "${S}/etc/settings" \
- || die "Could not configure polyml ML_HOME in etc/settings"
- sed -e "s@x86_64@${polymlarch}@g" \
- -i "${S}/etc/settings" \
- || die "Could not configure polyml arch in etc/settings"
- sed -e "s@PROOFGENERAL_HOME=\"/@PROOFGENERAL_HOME=\"${ROOT}@" \
- -i "${S}/etc/settings" \
- || die "Could not configure PROOFGENERAL_HOME in etc/settings"
- sed -e "s@/usr/lib64/Isabelle${MY_PV}@${LIBDIR}@g" \
- -i "${S}/etc/settings" \
- || die "Could not configure Isabelle lib directory in etc/settings"
- epatch "${FILESDIR}/${PN}-2012-graphbrowser.patch"
- epatch "${FILESDIR}/${PN}-2012-libsha1.patch"
- # this example fails to compile with swi-prolog 6.5.2, so patch it so that
- # Isabelle will build, then reverse the patch so that the user can see the
- # original code.
- epatch "${FILESDIR}/${PN}-2013-HOL-Predicate_Compile_Examples.patch"
- cat <<- EOF >> "${S}/etc/settings"
-
- ISABELLE_GHC="${ROOT}usr/bin/ghc"
- ISABELLE_OCAML="${ROOT}usr/bin/ocaml"
- ISABELLE_SWIPL="${ROOT}usr/bin/swipl"
- ISABELLE_JDK_HOME="\$(java-config --jdk-home)"
- SCALA_HOME="${ROOT}usr/share/scala-${SS}"
- SHA1_HOME="/usr/$(get_libdir)/sha1-polyml"
- EOF
- cat <<- EOF >> "${S}/etc/components"
- #bundled components
- contrib/${JEDIT_P}
- contrib/${JFREECHART_P}
- EOF
- if use ledit && ! use readline; then
- epatch "${FILESDIR}/${PN}-2012-reverse-line-editor-order.patch"
- fi
- rm -f "${S}/contrib/jfreechart-1.0.14/lib/iText-2.1.5.jar" \
- "${S}/contrib/jfreechart-1.0.14/lib/jfreechart-1.0.14.jar" \
- "${S}/contrib/jfreechart-1.0.14/lib/jcommon-1.0.18.jar" \
- "${S}/lib/classes/ext/scala-actors.jar" \
- "${S}/lib/classes/ext/scala-compiler.jar" \
- "${S}/lib/classes/ext/scala-library.jar" \
- "${S}/lib/classes/ext/scala-reflect.jar" \
- "${S}/lib/classes/ext/scala-swing.jar" \
- || die "Could not rm bundled jar files supplied by Gentoo"
-}
-
-src_compile() {
- einfo "Building Isabelle. This may take some time."
- ./bin/isabelle build -a -b -s -v || die "isabelle build failed"
- epatch --reverse "${FILESDIR}/${PN}-2013-HOL-Predicate_Compile_Examples.patch"
- if use graphbrowsing
- then
- rm -f "${S}/lib/browser/GraphBrowser.jar" \
- || die "failed cleaning graph browser directory"
- pushd "${S}/lib/browser" \
- || die "Could not change directory to lib/browser"
- ./build || die "failed building the graph browser"
- popd
- fi
- ./bin/isabelle jedit -b -f || die "pide build failed"
-}
-
-src_install() {
- exeinto ${TARGETDIR}/bin
- doexe bin/isabelle-process bin/isabelle
-
- insinto ${TARGETDIR}
- doins -r src
- doins -r lib
- doins -r contrib
- doins ROOTS
-
- docompress -x /usr/share/doc/${PF}
- dodoc -r doc
- if use doc; then
- dosym /usr/share/doc/${PF}/doc "${TARGETDIR}/doc"
- # The build of sci-mathematics/haskabelle with use doc requires
- # sci-mathematics/isabelle[doc?]. The haskabelle doc build requires
- # the src/Doc directory stuff in the isabelle package.
- doins -r src/Doc
- for i in "./src/Doc/Classes/document/build" \
- "./src/Doc/Codegen/document/build" \
- "./src/Doc/Functions/document/build" \
- "./src/Doc/HOL/document/build" \
- "./src/Doc/Intro/document/build" \
- "./src/Doc/IsarImplementation/document/build" \
- "./src/Doc/IsarRef/document/build" \
- "./src/Doc/IsarRef/document/showsymbols" \
- "./src/Doc/LaTeXsugar/document/build" \
- "./src/Doc/Locales/document/build" \
- "./src/Doc/Logics/document/build" \
- "./src/Doc/Main/document/build" \
- "./src/Doc/Nitpick/document/build" \
- "./src/Doc/ProgProve/document/build" \
- "./src/Doc/Ref/document/build" \
- "./src/Doc/Sledgehammer/document/build" \
- "./src/Doc/System/document/build" \
- "./src/Doc/Tutorial/document/build" \
- "./src/Doc/Tutorial/document/isa-index" \
- "./src/Doc/ZF/document/build" \
- "./src/Doc/fixbookmarks" \
- "./src/Doc/prepare_document" \
- "./src/Doc/sedindex"
- do
- exeinto $(dirname "${TARGETDIR}/${i}")
- doexe ${i}
- done
- fi
-
- for i in "./Isabelle " \
- "./bin/isabelle" \
- "./bin/isabelle-process" \
- "./lib/Tools/browser" \
- "./lib/Tools/build" \
- "./lib/Tools/build_dialog" \
- "./lib/Tools/components" \
- "./lib/Tools/dimacs2hol" \
- "./lib/Tools/display" \
- "./lib/Tools/doc" \
- "./lib/Tools/document" \
- "./lib/Tools/emacs" \
- "./lib/Tools/env" \
- "./lib/Tools/findlogics" \
- "./lib/Tools/getenv" \
- "./lib/Tools/install" \
- "./lib/Tools/java" \
- "./lib/Tools/keywords" \
- "./lib/Tools/latex" \
- "./lib/Tools/logo" \
- "./lib/Tools/make" \
- "./lib/Tools/mkdir" \
- "./lib/Tools/mkproject" \
- "./lib/Tools/mkroot" \
- "./lib/Tools/options" \
- "./lib/Tools/print" \
- "./lib/Tools/scala" \
- "./lib/Tools/scalac" \
- "./lib/Tools/tty" \
- "./lib/Tools/unsymbolize" \
- "./lib/Tools/usedir" \
- "./lib/Tools/version" \
- "./lib/Tools/yxml" \
- "./lib/browser/build" \
- "./lib/scripts/feeder" \
- "./lib/scripts/getsettings" \
- "./lib/scripts/keywords" \
- "./lib/scripts/polyml-version" \
- "./lib/scripts/process" \
- "./lib/scripts/run-polyml" \
- "./lib/scripts/run-smlnj" \
- "./lib/scripts/unsymbolize" \
- "./lib/scripts/yxml" \
- "./src/HOL/IMP/export.sh" \
- "./src/HOL/Library/Sum_of_Squares/neos_csdp_client" \
- "./src/HOL/Mirabelle/lib/Tools/mirabelle" \
- "./src/HOL/Mutabelle/lib/Tools/mutabelle" \
- "./src/HOL/SPARK/Examples/README" \
- "./src/HOL/TPTP/TPTP_Parser/make_mlyacclib" \
- "./src/HOL/TPTP/TPTP_Parser/make_tptp_parser" \
- "./src/HOL/TPTP/lib/Tools/tptp_graph" \
- "./src/HOL/TPTP/lib/Tools/tptp_isabelle" \
- "./src/HOL/TPTP/lib/Tools/tptp_isabelle_hot" \
- "./src/HOL/TPTP/lib/Tools/tptp_nitpick" \
- "./src/HOL/TPTP/lib/Tools/tptp_refute" \
- "./src/HOL/TPTP/lib/Tools/tptp_sledgehammer" \
- "./src/HOL/Tools/ATP/scripts/dummy_atp" \
- "./src/HOL/Tools/ATP/scripts/remote_atp" \
- "./src/HOL/Tools/Predicate_Compile/lib/scripts/swipl_version" \
- "./src/HOL/Tools/SMT/lib/scripts/remote_smt" \
- "./src/HOL/Tools/Sledgehammer/MaSh/src/compareStats.py" \
- "./src/HOL/Tools/Sledgehammer/MaSh/src/mash.py" \
- "./src/Pure/build" \
- "./src/Pure/build-jars" \
- "./src/Tools/Code/lib/Tools/codegen" \
- "./src/Tools/Graphview/lib/Tools/graphview" \
- "./src/Tools/Metis/fix_metis_license" \
- "./src/Tools/Metis/make_metis" \
- "./src/Tools/Metis/scripts/mlpp" \
- "./src/Tools/WWW_Find/lib/Tools/wwwfind" \
- "./src/Tools/jEdit/lib/Tools/jedit"
- do
- exeinto $(dirname "${TARGETDIR}/${i}")
- doexe ${i}
- done
-
- insinto /etc/isabelle
- doins -r etc/*
- dosym /etc/isabelle "${TARGETDIR}/etc"
-
- dosym "${LIBDIR}/heaps" "${TARGETDIR}/heaps"
- insinto ${LIBDIR}
- doins -r heaps
-
- bin/isabelle install -d ${TARGETDIR} "${ED}usr/bin" \
- || die "isabelle install failed"
- newicon lib/icons/isabelle.xpm "${PN}.xpm"
- dodoc ANNOUNCE CONTRIBUTORS COPYRIGHT NEWS README
-
- java-pkg_regjar \
- "${ED}${TARGETDIR}/contrib/jedit_build-20130104/contrib/Highlight.jar" \
- "${ED}${TARGETDIR}/contrib/jedit_build-20130104/contrib/ErrorList.jar" \
- "${ED}${TARGETDIR}/contrib/jedit_build-20130104/contrib/Console.jar" \
- "${ED}${TARGETDIR}/contrib/jedit_build-20130104/contrib/cobra.jar" \
- "${ED}${TARGETDIR}/contrib/jedit_build-20130104/contrib/js.jar" \
- "${ED}${TARGETDIR}/contrib/jedit_build-20130104/contrib/jedit-5.0.0-patched/jedit.jar" \
- "${ED}${TARGETDIR}/contrib/jedit_build-20130104/contrib/jedit-5.0.0-patched/jars/QuickNotepad.jar" \
- "${ED}${TARGETDIR}/contrib/jfreechart-1.0.14/jfreechart-1.0.14-demo.jar" \
- "${ED}${TARGETDIR}/lib/classes/ext/Graphview.jar" \
- "${ED}${TARGETDIR}/lib/classes/ext/Pure.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/Console.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/ErrorList.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/Highlight.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/Isabelle-jEdit.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/QuickNotepad.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/SideKick.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/cobra.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/js.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jedit.jar"
-}
-
-pkg_postinst() {
- # If any of the directories in /etc/isabelle/components do not exist, then
- # even isabelle getenv ISABELLE_HOME fails. Hence it is necessary to
- # to delete any non-existing directories. If an old Isabelle version was
- # installed with component ebuilds like sci-mathematics/e, then the
- # Isabelle version is upgraded, then the contrib directories will not
- # exist initially, it is necessary to delete them from /etc/isabelle/components.
- # Then these components are rebuilt (creating these directories) using the
- # EAPI=5 subslot depends.
- for i in $(egrep '^[^#].*$' "${ROOT}etc/isabelle/components")
- do
- if [ ! -d /usr/share/${MY_P}/${i} ]; then
- sed -e "\@${i}@d" -i "${ROOT}etc/isabelle/components"
- fi
- done
- if use ledit && use readline; then
- elog "Both readline and ledit use flags specified. The default setting"
- elog "if both are installed is to use readline (rlwrap), this can be"
- elog "modfied by editing the ISABELLE_LINE_EDITOR setting in"
- elog "${ROOT}/etc/isabelle/settings"
- fi
- elog "Please ensure you have a pdf viewer installed, for example:"
- elog "As root: emerge app-text/zathura-pdf-poppler"
- elog "Please configure your preferred pdf viewer, something like:"
- elog "As normal user: xdg-mime default zathura.desktop application/pdf"
- elog "Or alternatively by editing the PDF_VIEWER variable in the system"
- elog "settings file ${ROOT}etc/isabelle/settings and/or the user"
- elog "settings file \$HOME/.isabelle/${MY_P}/etc/settings"
- elog "To improve sledgehammer performance, consider installing:"
- elog "USE=isabelle emerge sci-mathematics/e sci-mathematics/spass"
- elog "For nitpick it is necessary to install:"
- elog "emerge sci-mathematics/kodkodi"
-}
diff --git a/sci-mathematics/isabelle/isabelle-2013.2-r1.ebuild b/sci-mathematics/isabelle/isabelle-2013.2-r1.ebuild
deleted file mode 100644
index 601509a8b37a..000000000000
--- a/sci-mathematics/isabelle/isabelle-2013.2-r1.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"
-
-inherit eutils java-pkg-2 multilib versionator
-
-MY_PN="Isabelle"
-MY_PV=$(replace_all_version_separators '-')
-MY_P="${MY_PN}${MY_PV}"
-
-JEDIT_PV="20131106"
-JEDIT_PN="jedit_build"
-JEDIT_P="${JEDIT_PN}-${JEDIT_PV}"
-JEDIT_IC_PN="${JEDIT_PN}-isabelle-component"
-JEDIT_IC_P="${JEDIT_IC_PN}-${JEDIT_PV}"
-
-JFREECHART_PV="1.0.14-1"
-JFREECHART_PN="jfreechart"
-JFREECHART_P="${JFREECHART_PN}-${JFREECHART_PV}"
-JFREECHART_IC_PN="${JFREECHART_PN}-isabelle-component"
-JFREECHART_IC_P="${JFREECHART_IC_PN}-${JFREECHART_PV}"
-
-POLYML_PV="5.5.1-1"
-POLYML_PN="polyml"
-POLYML_P="${POLYML_PN}-${POLYML_PV}"
-POLYML_IC_PN="${POLYML_PN}-isabelle-component"
-POLYML_IC_P="${POLYML_IC_PN}-${POLYML_PV}"
-
-SS="2.11"
-
-DESCRIPTION="Isabelle is a generic proof assistant"
-HOMEPAGE="http://www.cl.cam.ac.uk/research/hvg/Isabelle/index.html"
-SRC_URI="http://www.cl.cam.ac.uk/users/lcp/archive/${MY_P}.tar.gz
- http://isabelle.in.tum.de/components/${JEDIT_P}.tar.gz -> ${JEDIT_IC_P}.tar.gz
- http://isabelle.in.tum.de/dist/contrib/${JFREECHART_P}.tar.gz -> ${JFREECHART_IC_P}.tar.gz
- https://dev.gentoo.org/~gienah/snapshots/${POLYML_IC_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc graphbrowsing ledit readline proofgeneral"
-
-#upstream says
-#bash 2.x/3.x, Poly/ML 5.x, Perl 5.x,
-#for document preparation: complete LaTeX
-DEPEND=">=app-shells/bash-3.0:*
- dev-java/ant-core:0
- >=dev-java/jcommon-1.0.18:1.0
- >=dev-java/jfreechart-1.0.14:1.0
- >=dev-java/itext-2.1.5:0
- dev-java/xml-xmlbeans:1
- dev-java/xz-java:0
- >=dev-lang/ghc-7.6.3
- >=dev-lang/polyml-5.5.1:=[-portable]
- >=dev-lang/perl-5.8.8-r2
- dev-lang/swi-prolog
- virtual/jdk:1.7
- doc? (
- virtual/latex-base
- dev-tex/rail
- )
- >=dev-lang/scala-2.11.1:${SS}
- ledit? (
- app-misc/ledit
- )
- readline? (
- app-misc/rlwrap
- )"
-
-RDEPEND="dev-perl/libwww-perl
- sci-mathematics/sha1-polyml
- >=virtual/jre-1.7
- proofgeneral? (
- >=app-emacs/proofgeneral-4.1
- )
- ${DEPEND}"
-
-S="${WORKDIR}"/Isabelle${MY_PV}
-JEDIT_S="${WORKDIR}/${JEDIT_P}"
-JFREECHART_S="${WORKDIR}/${JFREECHART_P}"
-TARGETDIR="/usr/share/Isabelle"${MY_PV}
-LIBDIR="/usr/"$(get_libdir)"/Isabelle"${MY_PV}
-
-# Notes on QA warnings: * Class files not found via DEPEND in package.env
-# Stuff with $ in the name appear to be spurious:
-# isabelle/Markup_Tree$$anonfun$results$1$1.class
-# scala/tools/nsc/backend/jvm/GenJVM$BytecodeGenerator$$anonfun$computeLocalVarsIndex$1.class
-# It wants javafx, I am unsure how to fix this. I test isabelle with the Sun JDK:
-# javafx/application/Platform.class javafx
-# Presumably the user can provide the jEdit plugins if they are necessary:
-# marker/MarkerSetsPlugin.class http://plugins.jedit.org/plugins/?MarkerSets
-# projectviewer/gui/OptionPaneBase.class http://plugins.jedit.org/plugins/?ProjectViewer
-
-LIBRARY_PKGS="ant-core,itext,jcommon-1.0,jfreechart-1.0,scala-${SS},xml-xmlbeans-1,xz-java"
-
-src_unpack() {
- unpack "${MY_P}.tar.gz"
- pushd "${S}/contrib" || die
- unpack ${JEDIT_IC_P}.tar.gz
- unpack ${JFREECHART_IC_P}.tar.gz
- unpack ${POLYML_IC_P}.tar.gz
-}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
-}
-
-src_prepare() {
- java-pkg-2_src_prepare
- java-pkg_getjars ${LIBRARY_PKGS}
- epatch "${FILESDIR}/${PN}-2013-gentoo-settings.patch"
- epatch "${FILESDIR}/${PN}-2013.2-classpath.patch"
- polymlver=$(poly -v | cut -d' ' -f2)
- polymlarch=$(poly -v | cut -d' ' -f9 | cut -d'-' -f1)
- sed -e "s@5.5.0@${polymlver}@g" \
- -i "${S}/etc/settings" \
- || die "Could not configure polyml version in etc/settings"
- sed -e "s@ML_HOME=\"/@ML_HOME=\"${ROOT}@" \
- -i "${S}/etc/settings" \
- || die "Could not configure polyml ML_HOME in etc/settings"
- sed -e "s@x86_64@${polymlarch}@g" \
- -i "${S}/etc/settings" \
- || die "Could not configure polyml arch in etc/settings"
- sed -e "s@PROOFGENERAL_HOME=\"/@PROOFGENERAL_HOME=\"${ROOT}@" \
- -i "${S}/etc/settings" \
- || die "Could not configure PROOFGENERAL_HOME in etc/settings"
- sed -e "s@/usr/lib64/Isabelle${MY_PV}@${LIBDIR}@g" \
- -i "${S}/etc/settings" \
- || die "Could not configure Isabelle lib directory in etc/settings"
- epatch "${FILESDIR}/${PN}-2012-graphbrowser.patch"
- epatch "${FILESDIR}/${PN}-2012-libsha1.patch"
- # this example fails to compile with swi-prolog 6.5.2, so patch it so that
- # Isabelle will build, then reverse the patch so that the user can see the
- # original code.
- epatch "${FILESDIR}/${PN}-2013.2-HOL-Predicate_Compile_Examples.patch"
- cat <<- EOF >> "${S}/etc/settings"
-
- ISABELLE_GHC="${ROOT}usr/bin/ghc"
- ISABELLE_OCAML="${ROOT}usr/bin/ocaml"
- ISABELLE_SWIPL="${ROOT}usr/bin/swipl"
- ISABELLE_JDK_HOME="\$(java-config --jdk-home)"
- SCALA_HOME="${ROOT}usr/share/scala-${SS}"
- SHA1_HOME="/usr/$(get_libdir)/sha1-polyml"
- EOF
- cat <<- EOF >> "${S}/etc/components"
- #bundled components
- contrib/${JEDIT_P}
- contrib/${JFREECHART_P}
- contrib/${POLYML_P}
- EOF
- if use ledit && ! use readline; then
- epatch "${FILESDIR}/${PN}-2012-reverse-line-editor-order.patch"
- fi
- rm -f "${S}/contrib/jfreechart-1.0.14-1/lib/iText-2.1.5.jar" \
- "${S}/contrib/jfreechart-1.0.14-1/lib/jfreechart-1.0.14.jar" \
- "${S}/contrib/jfreechart-1.0.14-1/lib/jcommon-1.0.18.jar" \
- "${S}/lib/classes/ext/scala-actors.jar" \
- "${S}/lib/classes/ext/scala-compiler.jar" \
- "${S}/lib/classes/ext/scala-library.jar" \
- "${S}/lib/classes/ext/scala-reflect.jar" \
- "${S}/lib/classes/ext/scala-swing.jar" \
- || die "Could not rm bundled jar files supplied by Gentoo"
-}
-
-src_compile() {
- einfo "Building Isabelle. This may take some time."
- ./bin/isabelle build -a -b -s -v || die "isabelle build failed"
- epatch --reverse "${FILESDIR}/${PN}-2013.2-HOL-Predicate_Compile_Examples.patch"
- if use graphbrowsing
- then
- rm -f "${S}/lib/browser/GraphBrowser.jar" \
- || die "failed cleaning graph browser directory"
- pushd "${S}/lib/browser" \
- || die "Could not change directory to lib/browser"
- ./build || die "failed building the graph browser"
- popd
- fi
- ./bin/isabelle jedit -b -f || die "pide build failed"
-}
-
-src_install() {
- insinto ${TARGETDIR}
- doins -r src
- doins -r lib
- doins -r contrib
- doins ROOTS
-
- docompress -x /usr/share/doc/${PF}
- dodoc -r doc
- if use doc; then
- dosym /usr/share/doc/${PF}/doc "${TARGETDIR}/doc"
- # The build of sci-mathematics/haskabelle with use doc requires
- # sci-mathematics/isabelle[doc?]. The haskabelle doc build requires
- # the src/Doc directory stuff in the isabelle package.
- doins -r src/Doc
- for i in "./src/Doc/Classes/document/build" \
- "./src/Doc/Codegen/document/build" \
- "./src/Doc/Datatypes/document/build" \
- "./src/Doc/fixbookmarks" \
- "./src/Doc/Functions/document/build" \
- "./src/Doc/Intro/document/build" \
- "./src/Doc/IsarImplementation/document/build" \
- "./src/Doc/IsarRef/document/build" \
- "./src/Doc/IsarRef/document/showsymbols" \
- "./src/Doc/JEdit/document/build" \
- "./src/Doc/LaTeXsugar/document/build" \
- "./src/Doc/Locales/document/build" \
- "./src/Doc/Logics/document/build" \
- "./src/Doc/Main/document/build" \
- "./src/Doc/Nitpick/document/build" \
- "./src/Doc/prepare_document" \
- "./src/Doc/ProgProve/document/build" \
- "./src/Doc/sedindex" \
- "./src/Doc/Sledgehammer/document/build" \
- "./src/Doc/System/document/build" \
- "./src/Doc/Tutorial/document/build" \
- "./src/Doc/Tutorial/document/isa-index" \
- "./src/Doc/ZF/document/build"
- do
- exeinto $(dirname "${TARGETDIR}/${i}")
- doexe ${i}
- done
- fi
-
- for i in "./bin/isabelle" \
- "./bin/isabelle-process" \
- "./bin/isabelle_scala_script" \
- "./lib/browser/build" \
- "./lib/scripts/feeder" \
- "./lib/scripts/getsettings" \
- "./lib/scripts/polyml-version" \
- "./lib/scripts/process" \
- "./lib/scripts/run-polyml" \
- "./lib/scripts/run-polyml-5.5.1" \
- "./lib/scripts/run-smlnj" \
- "./lib/scripts/unsymbolize" \
- "./lib/scripts/update_sub_sup" \
- "./lib/scripts/yxml" \
- "./lib/Tools/browser" \
- "./lib/Tools/build" \
- "./lib/Tools/components" \
- "./lib/Tools/display" \
- "./lib/Tools/doc" \
- "./lib/Tools/document" \
- "./lib/Tools/emacs" \
- "./lib/Tools/env" \
- "./lib/Tools/findlogics" \
- "./lib/Tools/getenv" \
- "./lib/Tools/install" \
- "./lib/Tools/java" \
- "./lib/Tools/keywords" \
- "./lib/Tools/latex" \
- "./lib/Tools/logo" \
- "./lib/Tools/mkroot" \
- "./lib/Tools/options" \
- "./lib/Tools/scala" \
- "./lib/Tools/scalac" \
- "./lib/Tools/tty" \
- "./lib/Tools/unsymbolize" \
- "./lib/Tools/update_sub_sup" \
- "./lib/Tools/version" \
- "./lib/Tools/yxml" \
- "./src/HOL/IMP/export.sh" \
- "./src/HOL/Library/Sum_of_Squares/neos_csdp_client" \
- "./src/HOL/Mirabelle/lib/Tools/mirabelle" \
- "./src/HOL/Mutabelle/lib/Tools/mutabelle" \
- "./src/HOL/SPARK/Examples/README" \
- "./src/HOL/Tools/ATP/scripts/dummy_atp" \
- "./src/HOL/Tools/ATP/scripts/remote_atp" \
- "./src/HOL/Tools/Sledgehammer/MaSh/src/compareStats.py" \
- "./src/HOL/Tools/Sledgehammer/MaSh/src/mash.py" \
- "./src/HOL/Tools/Sledgehammer/MaSh/src/server.py" \
- "./src/HOL/Tools/SMT/lib/scripts/remote_smt" \
- "./src/HOL/TPTP/lib/Tools/tptp_graph" \
- "./src/HOL/TPTP/lib/Tools/tptp_isabelle" \
- "./src/HOL/TPTP/lib/Tools/tptp_isabelle_hot" \
- "./src/HOL/TPTP/lib/Tools/tptp_nitpick" \
- "./src/HOL/TPTP/lib/Tools/tptp_refute" \
- "./src/HOL/TPTP/lib/Tools/tptp_sledgehammer" \
- "./src/HOL/TPTP/TPTP_Parser/make_mlyacclib" \
- "./src/HOL/TPTP/TPTP_Parser/make_tptp_parser" \
- "./src/Pure/build" \
- "./src/Pure/build-jars" \
- "./src/Tools/Code/lib/Tools/codegen" \
- "./src/Tools/Graphview/lib/Tools/graphview" \
- "./src/Tools/jEdit/lib/Tools/jedit" \
- "./src/Tools/Metis/fix_metis_license" \
- "./src/Tools/Metis/make_metis" \
- "./src/Tools/Metis/scripts/mlpp" \
- "./src/Tools/WWW_Find/lib/Tools/wwwfind"
- do
- exeinto $(dirname "${TARGETDIR}/${i}")
- doexe ${i}
- done
-
- insinto /etc/isabelle
- doins -r etc/*
- dosym /etc/isabelle "${TARGETDIR}/etc"
-
- dosym "${LIBDIR}/heaps" "${TARGETDIR}/heaps"
- insinto ${LIBDIR}
- doins -r heaps
-
- bin/isabelle install -d ${TARGETDIR} "${ED}usr/bin" \
- || die "isabelle install failed"
- newicon lib/icons/"${PN}.xpm" "${PN}.xpm"
- newicon lib/icons/"${PN}-mini.xpm" "${PN}-mini.xpm"
- dodoc ANNOUNCE CONTRIBUTORS COPYRIGHT NEWS README
-
- java-pkg_regjar \
- "${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/Console.jar" \
- "${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/ErrorList.jar" \
- "${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/Highlight.jar" \
- "${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/idea-icons.jar" \
- "${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/jedit-5.1.0-patched/jars/QuickNotepad.jar" \
- "${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/jedit-5.1.0-patched/jedit.jar" \
- "${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/jsr305-2.0.0.jar" \
- "${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/MacOSX.jar" \
- "${ED}${TARGETDIR}/contrib/${JEDIT_P}/contrib/SideKick.jar" \
- "${ED}${TARGETDIR}/contrib/${JFREECHART_P}/jfreechart-1.0.14-demo.jar" \
- "${ED}${TARGETDIR}/lib/browser/GraphBrowser.jar" \
- "${ED}${TARGETDIR}/lib/classes/Graphview.jar" \
- "${ED}${TARGETDIR}/lib/classes/Pure.jar" \
- "${ED}${TARGETDIR}/lib/classes/scala-actors.jar" \
- "${ED}${TARGETDIR}/lib/classes/scala-compiler.jar" \
- "${ED}${TARGETDIR}/lib/classes/scala-library.jar" \
- "${ED}${TARGETDIR}/lib/classes/scala-reflect.jar" \
- "${ED}${TARGETDIR}/lib/classes/scala-swing.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/Console.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/ErrorList.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/Highlight.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/idea-icons.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/Isabelle-jEdit.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/jsr305-2.0.0.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/MacOSX.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/QuickNotepad.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jars/SideKick.jar" \
- "${ED}${TARGETDIR}/src/Tools/jEdit/dist/jedit.jar"
-}
-
-pkg_postinst() {
- # If any of the directories in /etc/isabelle/components do not exist, then
- # even isabelle getenv ISABELLE_HOME fails. Hence it is necessary to
- # to delete any non-existing directories. If an old Isabelle version was
- # installed with component ebuilds like sci-mathematics/e, then the
- # Isabelle version is upgraded, then the contrib directories will not
- # exist initially, it is necessary to delete them from /etc/isabelle/components.
- # Then these components are rebuilt (creating these directories) using the
- # EAPI=5 subslot depends.
- for i in $(egrep '^[^#].*$' "${ROOT}etc/isabelle/components")
- do
- if [ ! -d /usr/share/${MY_P}/${i} ]; then
- sed -e "\@${i}@d" -i "${ROOT}etc/isabelle/components"
- fi
- done
- if use ledit && use readline; then
- elog "Both readline and ledit use flags specified. The default setting"
- elog "if both are installed is to use readline (rlwrap), this can be"
- elog "modfied by editing the ISABELLE_LINE_EDITOR setting in"
- elog "${ROOT}/etc/isabelle/settings"
- fi
- elog "Please ensure you have a pdf viewer installed, for example:"
- elog "As root: emerge app-text/zathura-pdf-poppler"
- elog "Please configure your preferred pdf viewer, something like:"
- elog "As normal user: xdg-mime default zathura.desktop application/pdf"
- elog "Or alternatively by editing the PDF_VIEWER variable in the system"
- elog "settings file ${ROOT}etc/isabelle/settings and/or the user"
- elog "settings file \$HOME/.isabelle/${MY_P}/etc/settings"
- elog "To improve sledgehammer performance, consider installing:"
- elog "USE=isabelle emerge sci-mathematics/e sci-mathematics/spass"
- elog "For nitpick it is necessary to install:"
- elog "emerge sci-mathematics/kodkodi"
-}
diff --git a/sci-mathematics/isabelle/metadata.xml b/sci-mathematics/isabelle/metadata.xml
index b1da3cf49700..a23d48b1035d 100644
--- a/sci-mathematics/isabelle/metadata.xml
+++ b/sci-mathematics/isabelle/metadata.xml
@@ -18,20 +18,6 @@ correctness of computer hardware or software and proving
properties of computer languages and protocols.
</longdescription>
<use>
- <flag name="Pure">Pure is the basis for all object-logics.</flag>
- <flag name="FOL">FOL (Many-sorted First-Order Logic) provides basic
- classical and intuitionistic first-order logic. It is polymorphic.</flag>
- <flag name="HOL">(Higher-Order Logic) is a version of classical higher-order
- logic resembling that of the HOL System.</flag>
- <flag name="ZF">ZF (Set Theory) offers a formulation of Zermelo-Fraenkel
- set theory on top of FOL.</flag>
- <flag name="CCL">CCL (Classical Computational Logic)</flag>
- <flag name="CTT">CTT (Constructive Type Theory) is an extensional version
- of Martin-Löf's Type Theory.</flag>
- <flag name="Cube">Cube (The Lambda Cube)</flag>
- <flag name="FOLP">FOLP (FOL with Proof Terms)</flag>
- <flag name="LCF">LCF (Logic of Computable Functions)</flag>
- <flag name="Sequents">Sequents (first-order, modal and linear logics)</flag>
<flag name="graphbrowsing">Generate theory browsing information,
including HTML documents that show a theory's definition, the
theorems proved in its ML file and the relationship with its
@@ -41,6 +27,5 @@ properties of computer languages and protocols.
editor</flag>
<flag name="proofgeneral">Add support for the
<pkg>app-emacs/proofgeneral</pkg> proof assistant front end.</flag>
- <flag name="pide">Build Isabelle/jEdit Prover IDE (PIDE).</flag>
</use>
</pkgmetadata>
diff --git a/sci-mathematics/maxima/maxima-5.37.3-r4.ebuild b/sci-mathematics/maxima/maxima-5.37.3-r4.ebuild
index b769f1a25a18..06cbc93faa03 100644
--- a/sci-mathematics/maxima/maxima-5.37.3-r4.ebuild
+++ b/sci-mathematics/maxima/maxima-5.37.3-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2 GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
# Supported lisps
LISPS=( sbcl cmucl gcl ecls clozurecl clisp )
diff --git a/sci-visualization/gwyddion/metadata.xml b/sci-visualization/gwyddion/metadata.xml
index 7f9a3eb42322..97387838bbc5 100644
--- a/sci-visualization/gwyddion/metadata.xml
+++ b/sci-visualization/gwyddion/metadata.xml
@@ -14,12 +14,10 @@
</longdescription>
<use>
<flag name="sourceview">
- Enable support for <pkg>x11-libs/gtksourceview</pkg>
- </flag>
- </use>
- <use>
+ Enable support for <pkg>x11-libs/gtksourceview</pkg>
+ </flag>
<flag name="fits">
- Enable FITS image import via <pkg>sci-libs/cfitsio</pkg>
- </flag>
+ Enable FITS image import via <pkg>sci-libs/cfitsio</pkg>
+ </flag>
</use>
</pkgmetadata>
diff --git a/sci-visualization/veusz/veusz-1.23.2-r1.ebuild b/sci-visualization/veusz/veusz-1.23.2-r1.ebuild
new file mode 100644
index 000000000000..5fa0e112808d
--- /dev/null
+++ b/sci-visualization/veusz/veusz-1.23.2-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit eutils fdo-mime distutils-r1 virtualx
+
+DESCRIPTION="Qt scientific plotting package with good Postscript output"
+HOMEPAGE="http://home.gna.org/veusz/"
+SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="dbus doc emf fits hdf5 minuit vo"
+
+CDEPEND="
+ dev-python/numpy[${PYTHON_USEDEP}]
+ >=dev-python/PyQt4-4.11.4[X,svg,${PYTHON_USEDEP}]
+"
+RDEPEND="${CDEPEND}
+ dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
+ emf? ( dev-python/pyemf[$(python_gen_usedep 'python2*')] )
+ fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
+ hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
+ minuit? ( dev-python/pyminuit[${PYTHON_USEDEP}] )
+ vo? (
+ dev-python/astropy[${PYTHON_USEDEP}]
+ dev-python/sampy[$(python_gen_usedep 'python2*')]
+ )"
+DEPEND="${CDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/sip[${PYTHON_USEDEP}]
+ "
+
+python_test() {
+ distutils_install_for_testing
+ cd tests || die
+ VIRTUALX_COMMAND="${EPYTHON}" \
+ VEUSZ_RESOURCE_DIR="${S}" \
+ virtualmake runselftest.py
+}
+
+python_install() {
+ distutils-r1_python_install
+ # symlink the license, bug #341653
+ rm "${D}/$(python_get_sitedir)"/${PN}/{COPYING,AUTHORS,ChangeLog} || die
+ mkdir -p "${D}/$(python_get_sitedir)" || die
+ cat >> "${D}/$(python_get_sitedir)"/${PN}/COPYING <<- EOF
+ Please visit
+
+ https://www.gnu.org/licenses/gpl-2.0.html
+
+ for the full license text.
+ EOF
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ use doc && dodoc Documents/manual.pdf && \
+ dohtml -r Documents/{manimages,manual.html}
+
+ doicon icons/veusz.png
+ domenu "${FILESDIR}"/veusz.desktop
+ insinto /usr/share/mime/packages
+ doins "${FILESDIR}"/veusz.xml
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/sys-apps/baobab/baobab-3.18.1.ebuild b/sys-apps/baobab/baobab-3.18.1.ebuild
index 783447c6da49..adb811fbd36e 100644
--- a/sys-apps/baobab/baobab-3.18.1.ebuild
+++ b/sys-apps/baobab/baobab-3.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
LICENSE="GPL-2+ FDL-1.1+"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
COMMON_DEPEND="
>=dev-libs/glib-2.40:2[dbus]
diff --git a/sys-apps/dbus/dbus-1.10.6.ebuild b/sys-apps/dbus/dbus-1.10.6.ebuild
index 00b05ee6c75d..54cde6c61317 100644
--- a/sys-apps/dbus/dbus-1.10.6.ebuild
+++ b/sys-apps/dbus/dbus-1.10.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
LICENSE="|| ( AFL-2.1 GPL-2 )"
SLOT="0"
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="debug doc selinux static-libs systemd test X"
RESTRICT="test"
diff --git a/sys-apps/etckeeper/etckeeper-1.18.1.ebuild b/sys-apps/etckeeper/etckeeper-1.18.1.ebuild
index 404763e640a3..faba550d5c3b 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.1.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://etckeeper.branchable.com/"
SRC_URI="https://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
SLOT="0"
IUSE="bazaar cron"
REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-apps/findutils/findutils-4.6.0.ebuild b/sys-apps/findutils/findutils-4.6.0.ebuild
index 9071c04ff8c2..935a16c6c627 100644
--- a/sys-apps/findutils/findutils-4.6.0.ebuild
+++ b/sys-apps/findutils/findutils-4.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug nls selinux static test"
RDEPEND="selinux? ( sys-libs/libselinux )
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index 5e59ca78471d..edb8b8337bfe 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -1,2 +1,3 @@
DIST gentoo-systemd-integration-2.tar.bz2 51951 SHA256 2466a11d9b6f6e8d726cb5549bc1c38d28d6742d596e2b2c455c9089c1baf7fd SHA512 dc962165516612ca0ff41fdbd53a420549967a3952640ae7d37aafdbb3543a9b37a928e0528fcbbce74e0ded970e311c350272856fc8a75d9c8dc94a960e3bbc WHIRLPOOL 0517b515b9d01605c46d95fc3e86bf38c200923e3b7df1dde59b875c3eeef232c7dec38833007a943390631cb8eeb4f7c89e79c4b8dab737eea8c63bb36341bf
DIST gentoo-systemd-integration-4.tar.bz2 52449 SHA256 7027bd2056449e5ec8f9fc3da81c0f157810d482bfa11be48903643335fc6bde SHA512 2f60a98062fc5b9c7247e5df77b8875e532d28b2b903a2770713bbcfb2706f0f1bd7809396dd49ff1cc41f69d8c3dceaef87909fa8683c458a5f818f5e05a574 WHIRLPOOL f87b8aa01f24fad4ff90e694fa03b718425bbb0c0dc8a00950b0ae81230f3b92255d07efc9161707a35c8f3e0e7664c57b7ae061ccc0d896bfc55a632a8b4f09
+DIST gentoo-systemd-integration-5.tar.gz 64505 SHA256 5e4245ea6fa857a0a4ee23abb1751a0165e17a7f2136b1822a7a651b51463a41 SHA512 3f4755a680f4df590e86a0ccc12dc48d3c8595248988d573613cd1cedd10ee8cdc5dd4f6b54d15e9be0bef3f69f9546f7e952b0ec22db311e7069cb8599194ad WHIRLPOOL 4ff3d839cba4bc6f24eb2e14d5d0d507ccf873ce34624ef75662a2da3c61a4c63110baec5dc8b9a932bd41d768e7c3ec3cc30a4be07ea135d44f6f7cebf3456d
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-5.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-5.ebuild
new file mode 100644
index 000000000000..93648ddc5336
--- /dev/null
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
+ inherit autotools git-r3
+else
+ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+inherit systemd
+
+DESCRIPTION="systemd integration files for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Systemd"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=sys-apps/systemd-207
+ !sys-fs/eudev
+ !sys-fs/udev"
+
+if [[ ${PV} == 9999 ]]; then
+ DEPEND+=" sys-devel/systemd-m4"
+fi
+
+src_prepare() {
+ default
+ [[ ${PV} != 9999 ]] || eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ # TODO: solve it better in the eclass
+ --with-systemdsystemgeneratordir="$(systemd_get_utildir)"/system-generators
+ )
+
+ econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
index 8aba232815ea..93648ddc5336 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
@@ -1,44 +1,45 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-#if LIVE
-AUTOTOOLS_AUTORECONF=1
-EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-inherit git-2
-#endif
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
+ inherit autotools git-r3
+else
+ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
-inherit autotools-utils systemd
+inherit systemd
DESCRIPTION="systemd integration files for Gentoo"
-HOMEPAGE="https://bitbucket.org/mgorny/gentoo-systemd-integration"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Systemd"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND=">=sys-apps/systemd-207
!sys-fs/eudev
!sys-fs/udev"
-#if LIVE
-SRC_URI=
-KEYWORDS=
+if [[ ${PV} == 9999 ]]; then
+ DEPEND+=" sys-devel/systemd-m4"
+fi
-DEPEND="${DEPEND}
- sys-devel/systemd-m4"
-#endif
+src_prepare() {
+ default
+ [[ ${PV} != 9999 ]] || eautoreconf
+}
src_configure() {
local myeconfargs=(
- "$(systemd_with_unitdir)"
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
# TODO: solve it better in the eclass
--with-systemdsystemgeneratordir="$(systemd_get_utildir)"/system-generators
)
- autotools-utils_src_configure
+ econf "${myeconfargs[@]}"
}
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.3.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.3.1.ebuild
index f09f650cda90..364a8d04ed9f 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.3.1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.18.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-disk-utility"
LICENSE="GPL-2+"
SLOT="0"
IUSE="fat gnome systemd"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
COMMON_DEPEND="
>=dev-libs/glib-2.31:2[dbus]
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index b267ad089830..d85e94f3278e 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -6,3 +6,4 @@ DIST hwids-20150129.tar.gz 1707029 SHA256 33a7f4dbf14704076b0fe1d0052e86bb618e38
DIST hwids-20150417.tar.gz 1724883 SHA256 ef4d3e3f722ef7a2294af3e1c048c735cb0aa604259d54ed704dd7b8275c2569 SHA512 9acbf4ef7907e380bace30c38f1c2cf58e76cd68f258d59eb6d3b0e13287537205310f34783acd276cd7e7964b7f67eb7de8f636abf3419bf7bc9accb07e1761 WHIRLPOOL 33ca057faf1445409c563463271d67715077b27a7b402f2c91b82d893ff7b950e0443fb86611e9ec1d4118767e99d18ce40d9bc73bc1f471af69f163297f5b97
DIST hwids-20150421.tar.gz 1726968 SHA256 2c3ced90c069392f1f6ccdf7a8541ea2c3d871c575b8b6b02129e62bcec6f6a4 SHA512 3418d48b4f9b2dcb6e221a07ab74c81004866b40aa9d7b5ab0b73d2ed1febbd9e4d3d2d76e0a0e3c9d71c4dd79767c1cffa346d68c91e8fb19bcef3baccb101c WHIRLPOOL 5427dcd0725a5dfc16af441b52ad0bad1bf770a2287f814c6f032b5696062b76b934ca6cf968f45addd5b197c66011da6ddfd3a4b9539103672e1b66d68fb262
DIST hwids-20150717.tar.gz 1745565 SHA256 5a4769cd0e57a96c2693e7ec3d48f53e493afae58376a1f7124a08844632d917 SHA512 431a3a024512719ed5d53f21291de28bb5f904987fbeb8a90583517e24abcf5e19d9312819f02bcffbb42c0b16e761e4517575a600d1d8102f8373d1a21806d0 WHIRLPOOL 2ef9b880801d1ca94311104193e96f64eef58b7db86ee486614e80e63a1e9c42d9f940aadebd19c708ad0caab9a0be43ffcd44d9288bbce41238a64815d82076
+DIST hwids-20160306.tar.gz 1900745 SHA256 d5ae6937e87c4ae0a4dad84b8a917434831eda15b0bfcc5a8444bfca84279645 SHA512 766736ed2586ea163b0ea97654d6b73314bacc822d26f9d823dcd9de8661747a0372b0cd754b3c2605c6b1795440f87df126beafc391cf64577f461bd27b5e6c WHIRLPOOL 9a5d38fb4afa232917f69aa8d1fde3e55e20674d740941a392ee7cfa3f7d64d679a6e0a96553fb6c327bf5c98a1c3e8f6eff902dda99751dd5a15c6c20585022
diff --git a/sys-apps/hwids/hwids-20160306.ebuild b/sys-apps/hwids/hwids-20160306.ebuild
new file mode 100644
index 000000000000..e9a265691b36
--- /dev/null
+++ b/sys-apps/hwids/hwids-20160306.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit udev eutils
+
+DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
+HOMEPAGE="https://github.com/gentoo/hwids"
+if [[ ${PV} == "99999999" ]]; then
+ EGIT_REPO_URI="${HOMEPAGE}.git"
+ inherit git-2
+else
+ SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+
+LICENSE="|| ( GPL-2 BSD ) public-domain"
+SLOT="0"
+IUSE="+net +pci +udev +usb"
+
+DEPEND="udev? (
+ dev-lang/perl
+ >=virtual/udev-206
+)"
+[[ ${PV} == "99999999" ]] && DEPEND+=" udev? ( net-misc/curl )"
+RDEPEND="!<sys-apps/pciutils-3.1.9-r2
+ !<sys-apps/usbutils-005-r1"
+
+S=${WORKDIR}/hwids-${P}
+
+src_prepare() {
+ [[ ${PV} == "99999999" ]] && emake fetch
+
+ sed -i -e '/udevadm hwdb/d' Makefile || die
+
+ # Create a rules file compatible with older udev.
+ sed -e 's/evdev:name/keyboard:name/' \
+ -e 's/evdev:atkbd:dmi/keyboard:dmi/' \
+ -e 's/evdev:input:b\([^v]*\)v\([^p]*\)p\([^e]*\)\(e.*\)\?/keyboard:usb:v\2p\3/' \
+ -e 's/keyboard:usb:v046DpC52D\*/keyboard:usb:v046DpC52Dd*dc*dsc*dp*ic*isc*ip*in00*/' \
+ -e 's/keyboard:usb:v0458p0708\*/keyboard:usb:v0458p0708d*dc*dsc*dp*ic*isc*ip*in01*/' \
+ udev/60-keyboard.hwdb > udev/61-oldkeyboard.hwdb || die
+}
+
+_emake() {
+ emake \
+ NET=$(usex net) \
+ PCI=$(usex pci) \
+ UDEV=$(usex udev) \
+ USB=$(usex usb) \
+ "$@"
+}
+
+src_compile() {
+ _emake
+}
+
+src_install() {
+ _emake install \
+ DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+ MISCDIR="${EPREFIX}/usr/share/misc" \
+ HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
+ DESTDIR="${D}"
+}
+
+pkg_postinst() {
+ if use udev; then
+ udevadm hwdb --update --root="${ROOT%/}"
+ # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+ [ "${ROOT:-/}" = "/" ] && udevadm control --reload
+ fi
+}
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index c68cf73b51e9..e9a265691b36 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/sys-apps/hwids/metadata.xml b/sys-apps/hwids/metadata.xml
index 46f03f731098..621b5903d118 100644
--- a/sys-apps/hwids/metadata.xml
+++ b/sys-apps/hwids/metadata.xml
@@ -1,6 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<maintainer type="person">
<email>flameeyes@gentoo.org</email>
</maintainer>
@@ -10,10 +14,6 @@
<maintainer type="person">
<email>floppym@gentoo.org</email>
</maintainer>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
<use>
<flag name="net">Install the oui.txt and iab.txt databases</flag>
<flag name="pci">Install the pci.ids database</flag>
diff --git a/sys-apps/openrc/openrc-0.19.1.ebuild b/sys-apps/openrc/openrc-0.19.1.ebuild
index b55a2518ddac..9ef7ab9ff376 100644
--- a/sys-apps/openrc/openrc-0.19.1.ebuild
+++ b/sys-apps/openrc/openrc-0.19.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
- 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"
fi
LICENSE="BSD-2"
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 4d8107e07afd..3c8ebdeccf16 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,3 +1,5 @@
DIST systemd-218.tar.xz 3782276 SHA256 1b0768b53b6c6d813a93a4b8fe1f80cf53561b09075010a97c7aa08eee3fd59b SHA512 c183cce8532ccb4716b84587c96a626eea390202a5469b9d89c8cee7f703e40d7c584e05f29501d375b8cd2a1409d011de564df16f54e27f66b3c3007a6e5bd4 WHIRLPOOL 4d0bcf3ddfecd3354d9f4ab13851f8da6baf31e89e64d3b1ac671159f16f23597d88cc2525aece2f867c140fc97e80bce086a5af91f84b8095e2503c13995e6d
DIST systemd-226.tar.gz 3914162 SHA256 baff6a938c5579769330d0224280bf1a1ff5920151d7201545fc9880b6326c67 SHA512 565331661e7d144dcdf1505f9a1a70b20a9b904567478593a8fa47ed18f9eb68a9339cf32f117ede994676a84d0cfe3fcedbc9b8d8c964445b741a32271e5584 WHIRLPOOL 9f0d7b761ad84f0bb557a22738d7fcc1b6515340db776790d9199401017747a62c24de214300c1f00fb33f86284f3498cadbece713d6e66a30903475f6bce273
DIST systemd-228.tar.gz 4034401 SHA256 dd124ff561a07e6439ed2b3713f38ca914df7747f110ce86deea17b56d245ae6 SHA512 e54f282f550854dc082a4788709905e5767b75d2057e18d749b54821f2e44e0a8d1349b1a9180036cc854ecccaf5ff86b3b1dba4d3c2ce1b1fc766930ea4c0ea WHIRLPOOL 16b28367edc29a74f5b08691839da39a02d55bf5bcdffef55bfb1a2e8065eeecbe22a2b661e2d5f161f008d05baa000aff60d662d65db380d6c3fe0c1380eea1
+DIST systemd-229-patches.tar.gz 10782 SHA256 bd688e614177903bbf0204a00afebcb39760c3c694e7a6dd71544290677bfb5a SHA512 b0a7be84827f1553dccc00a0100c2f79160cc5285ce1582e7093e790a373d34b2a94f2805df5ade37a17285ae2f7d02890a495c2cc57e3475a3bdc831f05db52 WHIRLPOOL 643daee4fd23a5a326419cc769f8735d82bffa5ae1d9e9019ed4adfb04aba343f1459761c1d9b6ab3482e1a50cd7b0976a77ecc0bfb7075839000551d35bcb3f
+DIST systemd-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392
diff --git a/sys-apps/systemd/systemd-229.ebuild b/sys-apps/systemd/systemd-229.ebuild
new file mode 100644
index 000000000000..bbb88dc8c52a
--- /dev/null
+++ b/sys-apps/systemd/systemd-229.ebuild
@@ -0,0 +1,490 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~floppym/dist/${P}-patches.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+inherit autotools bash-completion-r1 linux-info \
+ multilib-minimal pam systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit cryptsetup curl elfutils +gcrypt gnuefi http
+ idn importd +kdbus +kmod +lz4 lzma nat pam policykit
+ qrcode +seccomp selinux ssl sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ !<sys-libs/glibc-2.16
+ acl? ( sys-apps/acl:0= )
+ apparmor? ( sys-libs/libapparmor:0= )
+ audit? ( >=sys-process/audit-2:0= )
+ cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+ curl? ( net-misc/curl:0= )
+ elfutils? ( >=dev-libs/elfutils-0.158:0= )
+ gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+ http? (
+ >=net-libs/libmicrohttpd-0.9.33:0=
+ ssl? ( >=net-libs/gnutls-3.1.4:0= )
+ )
+ idn? ( net-dns/libidn:0= )
+ importd? (
+ app-arch/bzip2:0=
+ sys-libs/zlib:0=
+ )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+ nat? ( net-firewall/iptables:0= )
+ pam? ( virtual/pam:= )
+ qrcode? ( media-gfx/qrencode:0= )
+ seccomp? ( sys-libs/libseccomp:0= )
+ selinux? ( sys-libs/libselinux:0= )
+ sysv-utils? (
+ !sys-apps/systemd-sysv-utils
+ !sys-apps/sysvinit )
+ xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+ abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+
+# baselayout-2.2 has /run
+# laptop-mode-tools: https://github.com/systemd/systemd/issues/2684
+RDEPEND="${COMMON_DEPEND}
+ >=sys-apps/baselayout-2.2
+ !sys-auth/nss-myhostname
+ !sys-fs/eudev
+ !sys-fs/udev
+ !app-laptop/laptop-mode-tools"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.6.8-r1:0[systemd]
+ >=sys-apps/hwids-20150417[udev]
+ >=sys-fs/udev-init-scripts-25
+ policykit? ( sys-auth/polkit )
+ !vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils:0
+ dev-util/gperf
+ >=dev-util/intltool-0.50
+ >=sys-apps/coreutils-8.16
+ >=sys-devel/binutils-2.23.1
+ >=sys-devel/gcc-4.6
+ >=sys-kernel/linux-headers-${MINKV}
+ virtual/pkgconfig
+ gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+ test? ( >=sys-apps/dbus-1.6.8-r1:0 )
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt:0
+"
+
+pkg_pretend() {
+ local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+ ~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
+ ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
+ ~TIMERFD ~TMPFS_XATTR
+ ~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2"
+
+ use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+ kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+
+ if linux_config_exists; then
+ local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+ if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+ ewarn "It's recommended to set an empty value to the following kernel config option:"
+ ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+ fi
+ fi
+
+ if [[ ${MERGE_TYPE} != binary ]]; then
+ if [[ $(gcc-major-version) -lt 4
+ || ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
+ then
+ eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
+ eerror "gcc version using gcc-config."
+ die "systemd requires at least gcc 4.6"
+ fi
+ fi
+
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ if kernel_is -lt ${MINKV//./ }; then
+ ewarn "Kernel version at least ${MINKV} required"
+ fi
+
+ check_extra_config
+ fi
+}
+
+pkg_setup() {
+ :
+}
+
+src_unpack() {
+ default
+ [[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+ # Bug 463376
+ sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+ local PATCHES=(
+ "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
+ "${FILESDIR}/228-noclean-tmp.patch"
+ )
+ [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # Keep using the one where the rules were installed.
+ MY_UDEVDIR=$(get_udevdir)
+ # Fix systems broken by bug #509454.
+ [[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
+
+ # Prevent conflicts with i686 cross toolchain, bug 559726
+ tc-export AR CC NM OBJCOPY RANLIB
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ # disable -flto since it is an optimization flag
+ # and makes distcc less effective
+ cc_cv_CFLAGS__flto=no
+ # disable -fuse-ld=gold since Gentoo supports explicit linker
+ # choice and forcing gold is undesired, #539998
+ # ld.gold may collide with user's LDFLAGS, #545168
+ # ld.gold breaks sparc, #573874
+ cc_cv_LDFLAGS__Wl__fuse_ld_gold=no
+
+ # Workaround for gcc-4.7, bug 554454.
+ cc_cv_CFLAGS__Werror_shadow=no
+
+ # Workaround for bug 516346
+ --enable-dependency-tracking
+
+ --disable-maintainer-mode
+ --localstatedir=/var
+ --with-pamlibdir=$(getpam_mod_dir)
+ # avoid bash-completion dep
+ --with-bashcompletiondir="$(get_bashcompdir)"
+ # make sure we get /bin:/sbin in $PATH
+ --enable-split-usr
+ # For testing.
+ --with-rootprefix="${ROOTPREFIX-/usr}"
+ --with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)"
+ # disable sysv compatibility
+ --with-sysvinit-path=
+ --with-sysvrcnd-path=
+ # no deps
+ --enable-efi
+ --enable-ima
+ --without-python
+
+ # Optional components/dependencies
+ $(multilib_native_use_enable acl)
+ $(multilib_native_use_enable apparmor)
+ $(multilib_native_use_enable audit)
+ $(multilib_native_use_enable cryptsetup libcryptsetup)
+ $(multilib_native_use_enable curl libcurl)
+ $(multilib_native_use_enable elfutils)
+ $(use_enable gcrypt)
+ $(multilib_native_use_enable gnuefi)
+ $(multilib_native_use_enable http microhttpd)
+ $(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls)
+ $(multilib_native_use_enable idn libidn)
+ $(multilib_native_use_enable importd)
+ $(multilib_native_use_enable importd bzip2)
+ $(multilib_native_use_enable importd zlib)
+ $(use_enable kdbus)
+ $(multilib_native_use_enable kmod)
+ $(use_enable lz4)
+ $(use_enable lzma xz)
+ $(multilib_native_use_enable nat libiptc)
+ $(multilib_native_use_enable pam)
+ $(multilib_native_use_enable policykit polkit)
+ $(multilib_native_use_enable qrcode qrencode)
+ $(multilib_native_use_enable seccomp)
+ $(multilib_native_use_enable selinux)
+ $(multilib_native_use_enable test tests)
+ $(multilib_native_use_enable test dbus)
+ $(multilib_native_use_enable xkb xkbcommon)
+
+ # hardcode a few paths to spare some deps
+ QUOTAON=/usr/sbin/quotaon
+ QUOTACHECK=/usr/sbin/quotacheck
+
+ # TODO: we may need to restrict this to gcc
+ EFI_CC="$(tc-getCC)"
+
+ # dbus paths
+ --with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d"
+ --with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
+ --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
+
+ --with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+ )
+
+ # Work around bug 463846.
+ tc-export CC
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ local mymakeopts=(
+ udevlibexecdir="${MY_UDEVDIR}"
+ )
+
+ if multilib_is_native_abi; then
+ emake "${mymakeopts[@]}"
+ else
+ echo 'gentoo: $(BUILT_SOURCES)' | \
+ emake "${mymakeopts[@]}" -f Makefile -f - gentoo
+ echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
+ emake "${mymakeopts[@]}" -f Makefile -f - gentoo
+ fi
+}
+
+multilib_src_test() {
+ multilib_is_native_abi || continue
+
+ # Needed for bus-related tests
+ local -x SANDBOX_WRITE=${SANDBOX_WRITE}
+ addwrite /sys/fs/kdbus
+
+ default
+}
+
+multilib_src_install() {
+ local mymakeopts=(
+ # automake fails with parallel libtool relinking
+ # https://bugs.gentoo.org/show_bug.cgi?id=491398
+ -j1
+
+ udevlibexecdir="${MY_UDEVDIR}"
+ dist_udevhwdb_DATA=
+ DESTDIR="${D}"
+ )
+
+ if multilib_is_native_abi; then
+ emake "${mymakeopts[@]}" install
+ else
+ mymakeopts+=(
+ install-libLTLIBRARIES
+ install-pkgconfiglibDATA
+ install-includeHEADERS
+ # safe to call unconditionally, 'installs' empty list
+ install-pkgincludeHEADERS
+ )
+
+ emake "${mymakeopts[@]}"
+ fi
+
+ # install compat pkg-config files
+ # Change dbus to >=sys-apps/dbus-1.8.8 if/when this is dropped.
+ local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
+ emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
+ pkgconfiglib_DATA="${pcfiles[*]}"
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --modules
+ einstalldocs
+
+ if use sysv-utils; then
+ for app in halt poweroff reboot runlevel shutdown telinit; do
+ dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
+ done
+ dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
+ else
+ # we just keep sysvinit tools, so no need for the mans
+ rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+ || die
+ rm "${D}"/usr/share/man/man1/init.1 || die
+ fi
+
+ # Disable storing coredumps in journald, bug #433457
+ mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
+
+ # Preserve empty dirs in /etc & /var, bug #437008
+ keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
+ /etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
+ /var/log/journal/remote
+
+ # Symlink /etc/sysctl.conf for easy migration.
+ dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+ # If we install these symlinks, there is no way for the sysadmin to remove them
+ # permanently.
+ rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+ rm -f "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+ rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
+ rm -r "${D}"/etc/systemd/system/sockets.target.wants || die
+ rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
+}
+
+migrate_locale() {
+ local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+ local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+ local locale_conf="${EROOT%/}/etc/locale.conf"
+
+ if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+ # If locale.conf does not exist...
+ if [[ -e ${envd_locale} ]]; then
+ # ...either copy env.d/??locale if there's one
+ ebegin "Moving ${envd_locale} to ${locale_conf}"
+ mv "${envd_locale}" "${locale_conf}"
+ eend ${?} || FAIL=1
+ else
+ # ...or create a dummy default
+ ebegin "Creating ${locale_conf}"
+ cat > "${locale_conf}" <<-EOF
+ # This file has been created by the sys-apps/systemd ebuild.
+ # See locale.conf(5) and localectl(1).
+
+ # LANG=${LANG}
+ EOF
+ eend ${?} || FAIL=1
+ fi
+ fi
+
+ if [[ ! -L ${envd_locale} ]]; then
+ # now, if env.d/??locale is not a symlink (to locale.conf)...
+ if [[ -e ${envd_locale} ]]; then
+ # ...warn the user that he has duplicate locale settings
+ ewarn
+ ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+ ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+ ewarn "and create the symlink with the following command:"
+ ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+ ewarn
+ else
+ # ...or just create the symlink if there's nothing here
+ ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+ ln -n -s ../locale.conf "${envd_locale_def}"
+ eend ${?} || FAIL=1
+ fi
+ fi
+}
+
+migrate_net_name_slot() {
+ # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+ # do the same for 80-net-setup-link.rules to keep the old behavior
+ local net_move=no
+ local net_name_slot_sym=no
+ local net_rules_path="${EROOT%/}"/etc/udev/rules.d
+ local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+ local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+ if [[ -e ${net_setup_link} ]]; then
+ net_move=no
+ elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then
+ net_move=yes
+ elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+ net_move=yes
+ net_name_slot_sym=yes
+ fi
+ if [[ ${net_move} == yes ]]; then
+ ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+ if [[ ${net_name_slot_sym} == yes ]]; then
+ ln -nfs /dev/null "${net_setup_link}"
+ else
+ cp "${net_name_slot}" "${net_setup_link}"
+ fi
+ eend $? || FAIL=1
+ fi
+}
+
+reenable_unit() {
+ if systemctl is-enabled --root="${ROOT}" "$1" &> /dev/null; then
+ ebegin "Re-enabling $1"
+ systemctl reenable --root="${ROOT}" "$1"
+ eend $? || FAIL=1
+ fi
+}
+
+pkg_postinst() {
+ newusergroup() {
+ enewgroup "$1"
+ enewuser "$1" -1 -1 -1 "$1"
+ }
+
+ enewgroup input
+ enewgroup systemd-journal
+ newusergroup systemd-bus-proxy
+ newusergroup systemd-coredump
+ newusergroup systemd-journal-gateway
+ newusergroup systemd-journal-remote
+ newusergroup systemd-journal-upload
+ newusergroup systemd-network
+ newusergroup systemd-resolve
+ newusergroup systemd-timesync
+ use http && newusergroup systemd-journal-gateway
+
+ systemd_update_catalog
+
+ # Keep this here in case the database format changes so it gets updated
+ # when required. Despite that this file is owned by sys-apps/hwids.
+ if has_version "sys-apps/hwids[udev]"; then
+ udevadm hwdb --update --root="${ROOT%/}"
+ fi
+
+ udev_reload || FAIL=1
+
+ # Bug 465468, make sure locales are respect, and ensure consistency
+ # between OpenRC & systemd
+ migrate_locale
+
+ # Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules
+ migrate_net_name_slot
+
+ # Re-enable systemd-networkd for socket activation
+ reenable_unit systemd-networkd.service
+
+ if [[ ${FAIL} ]]; then
+ eerror "One of the postinst commands failed. Please check the postinst output"
+ eerror "for errors. You may need to clean up your system and/or try installing"
+ eerror "systemd again."
+ eerror
+ fi
+
+ if [[ $(readlink "${ROOT}"/etc/resolv.conf) == */run/systemd/network/resolv.conf ]]; then
+ ewarn "resolv.conf is now generated by systemd-resolved. To use it, enable"
+ ewarn "systemd-resolved.service, and create a symlink from /etc/resolv.conf"
+ ewarn "to /run/systemd/resolve/resolv.conf"
+ ewarn
+ fi
+}
+
+pkg_prerm() {
+ # If removing systemd completely, remove the catalog database.
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+ fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index df82d8e5e7f1..8a5942c4e56a 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/systemd/systemd.git"
@@ -12,7 +12,7 @@ else
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi
-inherit autotools bash-completion-r1 linux-info multilib \
+inherit autotools bash-completion-r1 linux-info \
multilib-minimal pam systemd toolchain-funcs udev user
DESCRIPTION="System and service manager for Linux"
@@ -63,14 +63,16 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
# baselayout-2.2 has /run
+# laptop-mode-tools: https://github.com/systemd/systemd/issues/2684
RDEPEND="${COMMON_DEPEND}
>=sys-apps/baselayout-2.2
!sys-auth/nss-myhostname
!sys-fs/eudev
- !sys-fs/udev"
+ !sys-fs/udev
+ !app-laptop/laptop-mode-tools"
# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.6.8-r1:0[systemd]
+PDEPEND=">=sys-apps/dbus-1.8.8:0[systemd]
>=sys-apps/hwids-20150417[udev]
>=sys-fs/udev-init-scripts-25
policykit? ( sys-auth/polkit )
@@ -144,9 +146,15 @@ src_unpack() {
src_prepare() {
# Bug 463376
sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
- epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
- epatch "${FILESDIR}/228-noclean-tmp.patch"
- epatch_user
+
+ local PATCHES=(
+ "${FILESDIR}/218-Dont-enable-audit-by-default.patch"
+ "${FILESDIR}/228-noclean-tmp.patch"
+ )
+ [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+ default
+
eautoreconf
}
@@ -296,12 +304,6 @@ multilib_src_install() {
emake "${mymakeopts[@]}"
fi
-
- # install compat pkg-config files
- # Change dbus to >=sys-apps/dbus-1.8.8 if/when this is dropped.
- local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
- emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
- pkgconfiglib_DATA="${pcfiles[*]}"
}
multilib_src_install_all() {
diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index 0abb1d6eb7b7..59371592a371 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -1,3 +1 @@
-DIST udevil-0.4.1.tar.xz 299636 SHA256 2ade0860d549455c73447f9b0d661c333e6f7fabe01008bebdc3045500feb057 SHA512 e67a1645b859b2a11671b3c78d093596f7151aa6e30d28622ad1620633297edcf423823a472ead9c703c9de7a9768c59999ea0ed65578d7fd2975a1408c13fc6 WHIRLPOOL b690861bfa5661a49fe4b9194488364d4ac28266764a04a774bc593f5fdf81098e5c237553d80426165b0271c48a53e977160a3defcf68c78fe21134fb7d40fd
-DIST udevil-0.4.3.tar.gz 474453 SHA256 c49d2644baf87182c160550d708f75fe1253a2ceb749148e9148d7f1cfbc6209 SHA512 7fc04a8166d189dab73e7ef0ed8d9db6d98dc74c9ae41a9ce2ee1a29b34d3ca6379fce96e89a5cbc9a10bf88167934710827487fe59c9f7c438832bbefc16adf WHIRLPOOL 17e56ca0026deb24d5d00718b83fe9fe49437f6f037ee91075542c70f46b993f8060fc4ccc9a1bf54b8cff90fad8706f4cd72f1a37794c8f9ad0086ff86d3597
DIST udevil-0.4.4.tar.gz 477254 SHA256 ad2fd8375bd62622718a04235e9772119459089938dbb78e657955e595822b7c SHA512 adce4916e06d1cc4965521abbcbc2901e53930691167f431cb18e28d3ef8bde740e95a6a5f40dfc58dfd7b4b661b4475d3dd2b6174a5d7a55ae7c65629b82327 WHIRLPOOL 6bd7b5e6792e9f556113260a86f1aa29b795a0d7ddc577f86fd286d2a95515ac32e80bdfc4677a1aa59b0efcbddd8e40eec83db4e63439e8d1fead6061b64bec
diff --git a/sys-apps/udevil/files/udevil-0.4.1-automake-1.13.patch b/sys-apps/udevil/files/udevil-0.4.1-automake-1.13.patch
deleted file mode 100644
index 44da794b195b..000000000000
--- a/sys-apps/udevil/files/udevil-0.4.1-automake-1.13.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- udevil-0.4.1/configure.ac
-+++ udevil-0.4.1/configure.ac
-@@ -1,7 +1,7 @@
- AC_PREREQ(2.52)
-
- AC_INIT(src/udevil.c)
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AC_CONFIG_SRCDIR(src)
- AM_INIT_AUTOMAKE(udevil, 0.4.1)
-
diff --git a/sys-apps/udevil/files/udevil-0.4.1-flags.patch b/sys-apps/udevil/files/udevil-0.4.1-flags.patch
deleted file mode 100644
index 166a4357e9f3..000000000000
--- a/sys-apps/udevil/files/udevil-0.4.1-flags.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Oct 21 19:33:04 UTC 2012
-Subject: build system
-
- respect flags where possible
-
---- configure.ac
-+++ configure.ac
-@@ -18,26 +18,6 @@
-
-
- dnl linker optimizations
--AC_MSG_CHECKING([whether $LD accepts --as-needed])
--case `$LD --as-needed -v 2>&1 </dev/null` in
--*GNU* | *'with BFD'*)
-- LDFLAGS="$LDFLAGS -Wl,--as-needed"
-- AC_MSG_RESULT([yes])
-- ;;
--*)
-- AC_MSG_RESULT([no])
-- ;;
--esac
--AC_MSG_CHECKING([whether $LD accepts -O1])
--case `$LD -O1 -v 2>&1 </dev/null` in
--*GNU* | *'with BFD'*)
-- LDFLAGS="$LDFLAGS -Wl,-O1"
-- AC_MSG_RESULT([yes])
-- ;;
--*)
-- AC_MSG_RESULT([no])
-- ;;
--esac
- AC_MSG_CHECKING([whether $LD accepts -Bsymbolic-functions])
- case `$LD -Bsymbolic-functions -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-@@ -49,10 +29,6 @@
- ;;
- esac
-
--dnl advanced compiler tweaking
--CPPFLAGS="$CPPFLAGS -fstrict-aliasing -fmessage-length=0"
--
--
- # program paths
- AC_ARG_WITH(mount-prog,
- AC_HELP_STRING([--with-mount-prog=PATH], [Path to mount program (default: /bin/mount)]),
diff --git a/sys-apps/udevil/udevil-0.4.1.ebuild b/sys-apps/udevil/udevil-0.4.1.ebuild
deleted file mode 100644
index fcd4553f38a3..000000000000
--- a/sys-apps/udevil/udevil-0.4.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools user
-
-DESCRIPTION="mount and unmount removable devices without a password"
-HOMEPAGE="https://ignorantguru.github.com/udevil/"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-shells/bash-4.0
- dev-libs/glib:2
- sys-apps/util-linux
- virtual/acl
- >=virtual/udev-143"
-DEPEND="${RDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-pkg_setup(){
- enewgroup plugdev
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-{flags,automake-1.13}.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-setfacl-prog="$(type -P setfacl)" \
- --enable-systemd
-}
-
-src_install() {
- default
- fowners root:plugdev /usr/bin/udevil
- fperms 4754 /usr/bin/udevil
-}
-
-pkg_postinst() {
- einfo
- elog "Please add your user to the plugdev group"
- elog "to be able to use ${PN} as a user"
- elog
- elog "Optional dependencies:"
- elog " gnome-extra/zenity (devmon popups)"
- elog " net-fs/davfs2 (mount WebDAV resources)"
- elog " net-fs/cifs-utils (mounting samba shares)"
- elog " net-fs/curlftpfs (mounting ftp shares)"
- elog " net-fs/nfs-utils (mounting nfs shares)"
- elog " sys-fs/sshfs-fuse (mounting sftp shares)"
- elog " virtual/eject (eject via devmon)"
- if ! has_version 'sys-fs/udisks' ; then
- elog
- elog "When using ${PN} without udisks, and without the udisks-daemon running,"
- elog "you may need to enable kernel polling for device media changes to be detected."
- elog "See https://ignorantguru.github.com/${PN}/#polling"
- has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
- kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
- einfo
- fi
-}
diff --git a/sys-apps/udevil/udevil-0.4.3.ebuild b/sys-apps/udevil/udevil-0.4.3.ebuild
deleted file mode 100644
index c6308537ffdb..000000000000
--- a/sys-apps/udevil/udevil-0.4.3.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 eutils autotools user
-
-DESCRIPTION="mount and unmount removable devices without a password"
-HOMEPAGE="https://ignorantguru.github.com/udevil/"
-SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=app-shells/bash-4.0
- dev-libs/glib:2
- sys-apps/util-linux
- virtual/acl
- >=virtual/udev-143"
-DEPEND="${RDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-pkg_setup(){
- enewgroup plugdev
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-flags.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-setfacl-prog="$(type -P setfacl)" \
- --enable-systemd
-}
-
-src_install() {
- default
- fowners root:plugdev /usr/bin/udevil
- fperms 4754 /usr/bin/udevil
-}
-
-pkg_postinst() {
- einfo
- elog "Please add your user to the plugdev group"
- elog "to be able to use ${PN} as a user"
- elog
- elog "Optional dependencies:"
- elog " gnome-extra/zenity (devmon popups)"
- elog " net-fs/davfs2 (mount WebDAV resources)"
- elog " net-fs/cifs-utils (mounting samba shares)"
- elog " net-fs/curlftpfs (mounting ftp shares)"
- elog " net-fs/nfs-utils (mounting nfs shares)"
- elog " sys-fs/sshfs-fuse (mounting sftp shares)"
- elog " virtual/eject (eject via devmon)"
- if ! has_version 'sys-fs/udisks' ; then
- elog
- elog "When using ${PN} without udisks, and without the udisks-daemon running,"
- elog "you may need to enable kernel polling for device media changes to be detected."
- elog "See https://ignorantguru.github.com/${PN}/#polling"
- has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
- kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
- einfo
- fi
-}
diff --git a/sys-apps/udevil/udevil-0.4.4.ebuild b/sys-apps/udevil/udevil-0.4.4.ebuild
deleted file mode 100644
index f50e632c1b82..000000000000
--- a/sys-apps/udevil/udevil-0.4.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils autotools user
-
-DESCRIPTION="mount and unmount removable devices without a password"
-HOMEPAGE="https://ignorantguru.github.com/udevil/"
-SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-shells/bash-4.0:*
- dev-libs/glib:2
- sys-apps/util-linux
- virtual/acl
- >=virtual/udev-143"
-DEPEND="${RDEPEND}
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-pkg_setup(){
- enewgroup plugdev
-}
-
-src_prepare() {
- # This works for 0.4.4 too, no sense copying the patch
- epatch "${FILESDIR}"/${PN}-0.4.3-flags.patch
- eautoreconf
-}
-
-src_configure() {
- econf \
- --with-setfacl-prog="$(type -P setfacl)" \
- --enable-systemd
-}
-
-src_install() {
- default
- fowners root:plugdev /usr/bin/udevil
- fperms 4754 /usr/bin/udevil
-}
-
-pkg_postinst() {
- einfo
- elog "Please add your user to the plugdev group"
- elog "to be able to use ${PN} as a user"
- elog
- elog "Optional dependencies:"
- elog " gnome-extra/zenity (devmon popups)"
- elog " net-fs/davfs2 (mount WebDAV resources)"
- elog " net-fs/cifs-utils (mounting samba shares)"
- elog " net-fs/curlftpfs (mounting ftp shares)"
- elog " net-fs/nfs-utils (mounting nfs shares)"
- elog " sys-fs/sshfs-fuse (mounting sftp shares)"
- elog " virtual/eject (eject via devmon)"
- if ! has_version 'sys-fs/udisks' ; then
- elog
- elog "When using ${PN} without udisks, and without the udisks-daemon running,"
- elog "you may need to enable kernel polling for device media changes to be detected."
- elog "See https://ignorantguru.github.com/${PN}/#polling"
- has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
- kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
- einfo
- fi
-}
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
index 7e46776b11b2..9fc5c1723a53 100644
--- a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.xinetd.org/${P}.tar.gz"
LICENSE="BSD"
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="perl rpc tcpd"
DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
diff --git a/sys-auth/otpcalc/otpcalc-0.97-r8.ebuild b/sys-auth/otpcalc/otpcalc-0.97-r8.ebuild
index 76c2de454282..c366739c43ac 100644
--- a/sys-auth/otpcalc/otpcalc-0.97-r8.ebuild
+++ b/sys-auth/otpcalc/otpcalc-0.97-r8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://killa.net/infosec/otpCalc/otpCalc-${PV}.tar.gz
LICENSE="GPL-2+" # bundled crypto functions are not used
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86"
RDEPEND="x11-libs/gtk+:2
dev-libs/openssl:0"
diff --git a/sys-auth/skey/skey-1.1.5-r10.ebuild b/sys-auth/skey/skey-1.1.5-r10.ebuild
index 928968a5b468..c3ba1e1e18a7 100644
--- a/sys-auth/skey/skey-1.1.5-r10.ebuild
+++ b/sys-auth/skey/skey-1.1.5-r10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
LICENSE="BSD MIT RSA BEER-WARE"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="static-libs"
DEPEND="dev-lang/perl
diff --git a/sys-block/gparted/gparted-0.25.0.ebuild b/sys-block/gparted/gparted-0.25.0.ebuild
index c610c5beff7d..1cc3abbc5a8c 100644
--- a/sys-block/gparted/gparted-0.25.0.ebuild
+++ b/sys-block/gparted/gparted-0.25.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2+ FDL-1.2+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
IUSE="btrfs dmraid f2fs fat hfs jfs kde mdadm ntfs policykit reiserfs reiser4 xfs"
# FIXME: add gpart support
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index ae1a4a28657d..a3561c1013c7 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,7 +1,10 @@
DIST dejavu-sans-ttf-2.34.zip 406977 SHA256 242e8c1cb2bdc7458bece02cca898f962c2bc919dcf67d97428149228290184d SHA512 dcd802b9c83cfa749b7542d0855eb1facb665a035af8c05f58830fce3ce37ba8d4a6f0353c07ae924c7fc25460d330b7312cbaffd34a2cb314a8e222de385c1b WHIRLPOOL d8b3289997cc39aca1c909ac1cae79727a19932f07b116a4a0bcc83e4a2f136d05d18c8ef2b05504a2f1f65eba85f93d61d52b0c913be7bb3e23f6a403eb6a82
+DIST dejavu-sans-ttf-2.35.zip 415463 SHA256 c629bce270e75b6234d5285a739cd186bebc27319993f4b1ea6beb3631810799 SHA512 23c24218da70b3a93fa8c72e8db972b2b881bf3f76056a9315e29162743a8edaf5b699e0a527de121ca5f9efe07243eaf15811db355dba8cca1b92bdd1210732 WHIRLPOOL e3436818e11dab0330bff1a129d1e6fbf670b06a362b353f7bd00388cf46790bde202f1f7dd67b03ad7f9ae7d76098a5a72bc5321f359c2138c4d42c0cebc2aa
DIST grub-0.97-patches-1.14.tar.bz2 52916 SHA256 5c7ca31fd9b2123471daf2e46a1936c4044ad0c12e353d9d3d8c3f83a1c7a0e5 SHA512 d9a8d420fd5a36f181ca608f9b70be90f9d82cee66c8484636fda5085290586071b5d9379d917e8141b993ffc4777859cd02971c916d6167dca6f50d83282c26 WHIRLPOOL 60abd5087e85d9969784b9f5a100934606a76da03b665533d9d4d1d13f4e2d15de233a71e67a32d18a5fbfe128c2c8bf04c0d4451de24e6ca4fbd8dd862e23ea
DIST grub-0.97.tar.gz 971783 SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b SHA512 c2bc9ffc8583aeae71cee9ddcc4418969768d4e3764d47307da54f93981c0109fb07d84b061b3a3628bd00ba4d14a54742bc04848110eb3ae8ca25dbfbaabadb WHIRLPOOL 0ad7f5dc035e2a3ad5fd29b6388f06fd12a8cc694117b4cbd42b5302433aa522db23566222d35219fe17fb95edb5090553156198507f70208eda5d858fd52dd5
DIST grub-2.02_beta2-gentoo-r3.tar.xz 14532 SHA256 78d14f27ed60458601021d13c247387dad324d4141ed46721e2e14f4a4fda990 SHA512 b46390c217e9a1f9fccbefbc5aab062c228919b9b7b6f16effd9d292534c516a28747376d85d5db8b7f883cf7e8c2aa0ca6573e8ed2913aadabbc1cd795fc861 WHIRLPOOL acb6d2e39e1670a4342e21e6d35ab390e36557512784a8ee0b5bda051ec5fb633061a28d2a2deab8c3d1961052db6c3870742ff866e292d8e4c0fd3c7a0acf45
DIST grub-2.02~beta2.tar.xz 5798740 SHA256 f6c702b2a8ea58f27a2b02928bb77973cb5a827af08f63db38c471c0a01b418d SHA512 359903928febce1df53b3bd38aab701b4ea010dfad0dee434e853c865af4bbc60d115e61eac100c79f18d89aa78b2216ef20123f4ef04cc948ecbe226ea1a58c WHIRLPOOL f92e94f43888648484a972a0c82b0a2ac4dc7fbdd6e35ca8b11a6ee92168ac8cf7ee68987b84697ec46ad18189e5c5c9aee8105b91bb131cd7f6f499f45cd58f
+DIST grub-2.02~beta3.tar.xz 6030784 SHA256 30ec3d555e52a702c3eef449872ef874eff28b320f40b55ffc47f70db8e5ada1 SHA512 4a530efef4dae45f4046cf3550563f14acb24d25cb88d5e06c93953ca5b1eec115118c6860233a9f627edcddae2571e5d6b867b70ff9dd5c184c9fef83ef7e11 WHIRLPOOL b1042c24060e35ea5a492b7258b147fde80c949c2e81dcff3a31750966b7d31cdb62e1492274843f313226d70b202a8edbf08d11c5e79e4173a4c373879e4aad
DIST splash.xpm.gz 33856 SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da WHIRLPOOL d95b7b588ea8ac7c2c8c53eb8057aef21c825da6411afe3b7e864c606aeffaaebce8ae41ce3e979f277bd6b48a9e82a1f2ea8afc836213b56523d8a854227d7b
DIST unifont-7.0.06.pcf.gz 1359006 SHA256 acf516b464928244c25dd1afddd02f6f459686b5135685694d875d7eca8bf4f2 SHA512 a62f21366b51a582d2b5a66710c8a6183bc869407867da78e59ecec9dabcff7a2522a8bc454cf511592d336befea812d36622589ef119160fe3014d927fa11b3 WHIRLPOOL 9f431f9b6af23a87e3291e5c66d6f1e56f8c8ce23222821dbf41aa03edac4d80e8e6c5895c024951cf199d41904e6c9f830103427568a9b0386f68adc0a959d7
+DIST unifont-8.0.01.pcf.gz 1359487 SHA256 28c3f7ffe986e611a42f3d209e1f7730669e2e317b6913510746a77fa6f0ed56 SHA512 8a2872a389bb6e1bb4badf8bbe717c4fff632fed53baaea018b7b277c2b88678df485bcd0663a8b1ec76a344e04a3a1cd9de24b7f953ffd9d58844eef029bbc8 WHIRLPOOL 33433d9cfc2fedc9969fa438be4ceaaf2ebc3801424ca247f5dd448607f45e7b9cb503a11ba72e76cf4608142161268c0b078ea65bfa970595f571c807ad6ae8
diff --git a/sys-boot/grub/files/2.02_beta3-10_linux-UUID.patch b/sys-boot/grub/files/2.02_beta3-10_linux-UUID.patch
new file mode 100644
index 000000000000..1dcf3b5b781f
--- /dev/null
+++ b/sys-boot/grub/files/2.02_beta3-10_linux-UUID.patch
@@ -0,0 +1,27 @@
+From ea8de5d2ee58178381e5809e4d5fe79861e61b04 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 5 Mar 2016 17:21:15 -0500
+Subject: [PATCH] [2.02] 10_linux: Fix grouping of tests for GRUB_DEVICE
+
+Commit 7290bb562 causes GRUB_DISABLE_LINUX_UUID to be ignored due to
+mixing of || and && operators. Add some parens to help with that.
+---
+ util/grub.d/10_linux.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 5a78513..de9044c 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -47,7 +47,7 @@ esac
+ # and mounting btrfs requires user space scanning, so force UUID in this case.
+ if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
+ || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
+- || test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then
++ || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
+ LINUX_ROOT_DEVICE=${GRUB_DEVICE}
+ else
+ LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
+--
+2.7.2
+
diff --git a/sys-boot/grub/files/gfxpayload.patch b/sys-boot/grub/files/gfxpayload.patch
new file mode 100644
index 000000000000..6c63ef88b09e
--- /dev/null
+++ b/sys-boot/grub/files/gfxpayload.patch
@@ -0,0 +1,29 @@
+From e2d5bf1bc6aaaabeba538c1ca94ea8601e4e1474 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 16 Oct 2014 23:43:51 -0400
+Subject: [PATCH] 10_linux: Default gfxpayload=keep only when booting using efi
+
+vesafb seems to be unreliable when using BIOS compat mode.
+
+---
+ util/grub.d/10_linux.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index d2e2a8f..a54b888 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -104,7 +104,9 @@ linux_entry ()
+ echo " load_video" | sed "s/^/$submenu_indentation/"
+ if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
+ && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
+- echo " set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
++ echo ' if [ "x$grub_platform" = xefi ]; then' | sed "s/^/$submenu_indentation/"
++ echo " set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
++ echo ' fi' | sed "s/^/$submenu_indentation/"
+ fi
+ else
+ if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
+--
+2.7.2
+
diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
index ed8e0472e4c9..48b6fbfe81bb 100644
--- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild
+++ b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} != 9999 ]]; then
https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
S=${WORKDIR}/${P%_*}
fi
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
diff --git a/sys-boot/grub/grub-2.02_beta3-r1.ebuild b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
new file mode 100644
index 000000000000..87d786d64fa3
--- /dev/null
+++ b/sys-boot/grub/grub-2.02_beta3-r1.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+ PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+ inherit autotools python-any-r1
+fi
+
+inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
+
+if [[ ${PV} != 9999 ]]; then
+ if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
+ # The quote style is to work with <=bash-4.2 and >=bash-4.3 #503860
+ MY_P=${P/_/'~'}
+ SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
+ S=${WORKDIR}/${MY_P}
+ else
+ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+ mirror://gentoo/${P}.tar.xz
+ https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
+ S=${WORKDIR}/${P%_*}
+ fi
+ KEYWORDS="~amd64 ~x86"
+else
+ inherit git-r3
+ EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
+ http://git.savannah.gnu.org/r/grub.git"
+fi
+
+PATCHES=(
+ "${FILESDIR}"/gfxpayload.patch
+ "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+ "${FILESDIR}"/2.02_beta3-10_linux-UUID.patch
+)
+
+DEJAVU=dejavu-sans-ttf-2.35
+UNIFONT=unifont-8.0.01
+SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
+ themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
+
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="https://www.gnu.org/software/grub/"
+
+# Includes licenses for dejavu and unifont
+LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
+SLOT="2/${PVR}"
+IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
+
+GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
+IUSE+=" ${GRUB_ALL_PLATFORMS[@]/#/grub_platforms_}"
+
+REQUIRED_USE="
+ grub_platforms_coreboot? ( fonts )
+ grub_platforms_qemu? ( fonts )
+ grub_platforms_ieee1275? ( fonts )
+ grub_platforms_loongson? ( fonts )
+"
+
+# os-prober: Used on runtime to detect other OSes
+# xorriso (dev-libs/libisoburn): Used on runtime for mkrescue
+RDEPEND="
+ app-arch/xz-utils
+ >=sys-libs/ncurses-5.2-r5:0=
+ debug? (
+ sdl? ( media-libs/libsdl )
+ )
+ device-mapper? ( >=sys-fs/lvm2-2.02.45 )
+ libzfs? ( sys-fs/zfs )
+ mount? ( sys-fs/fuse )
+ truetype? ( media-libs/freetype:2= )
+ ppc? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+ ppc64? ( sys-apps/ibm-powerpc-utils sys-apps/powerpc-utils )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ app-misc/pax-utils
+ sys-devel/flex
+ sys-devel/bison
+ sys-apps/help2man
+ sys-apps/texinfo
+ fonts? ( media-libs/freetype:2 )
+ grub_platforms_xen? ( app-emulation/xen-tools:= )
+ static? (
+ app-arch/xz-utils[static-libs(+)]
+ truetype? (
+ app-arch/bzip2[static-libs(+)]
+ media-libs/freetype[static-libs(+)]
+ sys-libs/zlib[static-libs(+)]
+ )
+ )
+ test? (
+ dev-libs/libisoburn
+ app-emulation/qemu
+ )
+ themes? (
+ app-arch/unzip
+ media-libs/freetype:2
+ )
+"
+RDEPEND+="
+ kernel_linux? (
+ grub_platforms_efi-32? ( sys-boot/efibootmgr )
+ grub_platforms_efi-64? ( sys-boot/efibootmgr )
+ )
+ !multislot? ( !sys-boot/grub:0 )
+ nls? ( sys-devel/gettext )
+"
+
+DEPEND+=" !!=media-libs/freetype-2.5.4"
+
+STRIP_MASK="*/grub/*/*.{mod,img}"
+RESTRICT="test"
+
+QA_EXECSTACK="
+ usr/bin/grub*-emu*
+ usr/lib*/grub/*/*.mod
+ usr/lib*/grub/*/*.module
+ usr/lib*/grub/*/kernel.exec
+ usr/lib*/grub/*/kernel.img
+"
+
+QA_WX_LOAD="
+ usr/lib*/grub/*/kernel.exec
+ usr/lib*/grub/*/kernel.img
+ usr/lib*/grub/*/*.image
+"
+
+QA_PRESTRIPPED="
+ usr/lib.*/grub/.*/kernel.img
+"
+
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ fi
+ default
+}
+
+src_prepare() {
+ default
+
+ sed -i -e /autoreconf/d autogen.sh || die
+
+ if use multislot; then
+ # fix texinfo file name, bug 416035
+ sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
+ fi
+
+ if [[ ${PV} == 9999 ]]; then
+ python_setup
+ bash autogen.sh || die
+ autopoint() { :; }
+ eautoreconf
+ fi
+}
+
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
+}
+
+grub_configure() {
+ local platform
+
+ case ${MULTIBUILD_VARIANT} in
+ efi-32)
+ platform=efi
+ if [[ ${CTARGET:-${CHOST}} == x86_64* ]]; then
+ local CTARGET=${CTARGET:-i386}
+ fi ;;
+ efi-64)
+ platform=efi
+ if [[ ${CTARGET:-${CHOST}} == i?86* ]]; then
+ local CTARGET=${CTARGET:-x86_64}
+ local TARGET_CFLAGS="-Os -march=x86-64 ${TARGET_CFLAGS}"
+ local TARGET_CPPFLAGS="-march=x86-64 ${TARGET_CPPFLAGS}"
+ export TARGET_CFLAGS TARGET_CPPFLAGS
+ fi ;;
+ guessed) ;;
+ *) platform=${MULTIBUILD_VARIANT} ;;
+ esac
+
+ local myeconfargs=(
+ --disable-werror
+ --program-prefix=
+ --libdir="${EPREFIX}"/usr/lib
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+ $(use_enable debug mm-debug)
+ $(use_enable device-mapper)
+ $(use_enable mount grub-mount)
+ $(use_enable nls)
+ $(use_enable themes grub-themes)
+ $(use_enable truetype grub-mkfont)
+ $(use_enable libzfs)
+ $(use sdl && use_enable debug grub-emu-sdl)
+ ${platform:+--with-platform=}${platform}
+
+ # Let configure detect this where supported
+ $(usex efiemu '' '--disable-efiemu')
+ )
+
+ if use multislot; then
+ myeconfargs+=( --program-transform-name="s,grub,grub2," )
+ fi
+
+ # Set up font symlinks
+ ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ if use themes; then
+ ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+ # Bug 508758.
+ replace-flags -O3 -O2
+
+ # We don't want to leak flags onto boot code.
+ export HOST_CCASFLAGS=${CCASFLAGS}
+ export HOST_CFLAGS=${CFLAGS}
+ export HOST_CPPFLAGS=${CPPFLAGS}
+ export HOST_LDFLAGS=${LDFLAGS}
+ unset CCASFLAGS CFLAGS CPPFLAGS LDFLAGS
+
+ use static && HOST_LDFLAGS+=" -static"
+
+ tc-ld-disable-gold #439082 #466536 #526348
+ export TARGET_LDFLAGS="${TARGET_LDFLAGS} ${LDFLAGS}"
+ unset LDFLAGS
+
+ tc-export CC NM OBJCOPY RANLIB STRIP
+ tc-export BUILD_CC # Bug 485592
+
+ # Portage will take care of cleaning up GRUB_PLATFORMS
+ MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
+ grub_do grub_configure
+}
+
+src_compile() {
+ # Sandbox bug 404013.
+ use libzfs && addpredict /etc/dfs:/dev/zfs
+
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
+}
+
+src_test() {
+ # The qemu dependency is a bit complex.
+ # You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
+ grub_do emake check
+}
+
+src_install() {
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
+
+ einstalldocs
+
+ if use multislot; then
+ mv "${ED%/}"/usr/share/info/grub{,2}.info || die
+ fi
+
+ insinto /etc/default
+ newins "${FILESDIR}"/grub.default-3 grub
+}
+
+pkg_postinst() {
+ elog "For information on how to configure GRUB2 please refer to the guide:"
+ elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
+
+ if has_version 'sys-boot/grub:0'; then
+ elog "A migration guide for GRUB Legacy users is available:"
+ elog " https://wiki.gentoo.org/wiki/GRUB2_Migration"
+ fi
+
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog
+ elog "You may consider installing the following optional packages:"
+ optfeature "Detect other operating systems (grub-mkconfig)" sys-boot/os-prober
+ optfeature "Create rescue media (grub-mkrescue)" dev-libs/libisoburn
+ optfeature "Enable RAID device detection" sys-fs/mdadm
+ fi
+}
diff --git a/sys-boot/grub/grub-9999-r1.ebuild b/sys-boot/grub/grub-9999-r1.ebuild
index 149153a2dd29..350857b9672c 100644
--- a/sys-boot/grub/grub-9999-r1.ebuild
+++ b/sys-boot/grub/grub-9999-r1.ebuild
@@ -1,20 +1,15 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
-if [[ ${PV} == 9999 ]]; then
- AUTOTOOLS_AUTORECONF=1
- GRUB_AUTOGEN=1
+if [[ ${PV} == 9999 ]]; then
+ PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+ inherit autotools python-any-r1
fi
-if [[ -n ${GRUB_AUTOGEN} ]]; then
- PYTHON_COMPAT=( python{2_7,3_3,3_4} )
- inherit python-any-r1
-fi
-
-inherit autotools-utils bash-completion-r1 eutils flag-o-matic mount-boot multibuild pax-utils toolchain-funcs versionator
+inherit autotools bash-completion-r1 flag-o-matic multibuild pax-utils toolchain-funcs versionator
if [[ ${PV} != 9999 ]]; then
if [[ ${PV} == *_alpha* || ${PV} == *_beta* || ${PV} == *_rc* ]]; then
@@ -29,15 +24,19 @@ if [[ ${PV} != 9999 ]]; then
S=${WORKDIR}/${P%_*}
fi
KEYWORDS="~amd64 ~x86"
- PATCHES=()
else
inherit git-r3
EGIT_REPO_URI="git://git.sv.gnu.org/grub.git
http://git.savannah.gnu.org/r/grub.git"
fi
-DEJAVU=dejavu-sans-ttf-2.34
-UNIFONT=unifont-7.0.06
+PATCHES=(
+ "${FILESDIR}"/gfxpayload.patch
+ "${FILESDIR}"/grub-2.02_beta2-KERNEL_GLOBS.patch
+)
+
+DEJAVU=dejavu-sans-ttf-2.35
+UNIFONT=unifont-8.0.01
SRC_URI+=" fonts? ( mirror://gnu/unifont/${UNIFONT}/${UNIFONT}.pcf.gz )
themes? ( mirror://sourceforge/dejavu/${DEJAVU}.zip )"
@@ -46,7 +45,7 @@ HOMEPAGE="https://www.gnu.org/software/grub/"
# Includes licenses for dejavu and unifont
LICENSE="GPL-3 fonts? ( GPL-2-with-font-exception ) themes? ( BitstreamVera )"
-SLOT="2"
+SLOT="2/${PVR}"
IUSE="debug device-mapper doc efiemu +fonts mount +multislot nls static sdl test +themes truetype libzfs"
GRUB_ALL_PLATFORMS=( coreboot efi-32 efi-64 emu ieee1275 loongson multiboot qemu qemu-mips pc uboot xen )
@@ -136,11 +135,11 @@ src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
fi
- default_src_unpack
+ default
}
src_prepare() {
- [[ ${PATCHES} ]] && epatch "${PATCHES[@]}"
+ default
sed -i -e /autoreconf/d autogen.sh || die
@@ -149,24 +148,20 @@ src_prepare() {
sed -i -e 's/^\* GRUB:/* GRUB2:/' -e 's/(grub)/(grub2)/' docs/grub.texi || die
fi
- epatch_user
-
- if [[ -n ${GRUB_AUTOGEN} ]]; then
+ if [[ ${PV} == 9999 ]]; then
python_setup
bash autogen.sh || die
- fi
-
- if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
- autopoint() { return 0; }
+ autopoint() { :; }
eautoreconf
fi
}
-setup_fonts() {
- ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
- if use themes; then
- ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
- fi
+grub_do() {
+ multibuild_foreach_variant run_in_build_dir "$@"
+}
+
+grub_do_once() {
+ multibuild_for_best_variant run_in_build_dir "$@"
}
grub_configure() {
@@ -196,7 +191,6 @@ grub_configure() {
--libdir="${EPREFIX}"/usr/lib
--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
$(use_enable debug mm-debug)
- $(use_enable debug grub-emu-usb)
$(use_enable device-mapper)
$(use_enable mount grub-mount)
$(use_enable nls)
@@ -214,10 +208,13 @@ grub_configure() {
myeconfargs+=( --program-transform-name="s,grub,grub2," )
fi
- mkdir -p "${BUILD_DIR}" || die
- run_in_build_dir setup_fonts
+ # Set up font symlinks
+ ln -s "${WORKDIR}/${UNIFONT}.pcf" unifont.pcf || die
+ if use themes; then
+ ln -s "${WORKDIR}/${DEJAVU}/ttf/DejaVuSans.ttf" DejaVuSans.ttf || die
+ fi
- autotools-utils_src_configure
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
src_configure() {
@@ -242,31 +239,28 @@ src_configure() {
# Portage will take care of cleaning up GRUB_PLATFORMS
MULTIBUILD_VARIANTS=( ${GRUB_PLATFORMS:-guessed} )
- multibuild_parallel_foreach_variant grub_configure
+ grub_do grub_configure
}
src_compile() {
# Sandbox bug 404013.
use libzfs && addpredict /etc/dfs:/dev/zfs
- multibuild_foreach_variant autotools-utils_src_compile
-
- use doc && multibuild_for_best_variant \
- autotools-utils_src_compile -C docs html
+ grub_do emake
+ use doc && grub_do_once emake -C docs html
}
src_test() {
# The qemu dependency is a bit complex.
# You will need to adjust QEMU_SOFTMMU_TARGETS to match the cpu/platform.
- multibuild_foreach_variant autotools-utils_src_test
+ grub_do emake check
}
src_install() {
- multibuild_foreach_variant autotools-utils_src_install \
- bashcompletiondir="$(get_bashcompdir)"
+ grub_do emake install DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)"
+ use doc && grub_do_once emake -C docs install-html DESTDIR="${D}"
- use doc && multibuild_for_best_variant run_in_build_dir \
- emake -C docs DESTDIR="${D}" install-html
+ einstalldocs
if use multislot; then
mv "${ED%/}"/usr/share/info/grub{,2}.info || die
@@ -277,20 +271,6 @@ src_install() {
}
pkg_postinst() {
- mount-boot_mount_boot_partition
-
- if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" ]]; then
- ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
- ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
-
- if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
- mkdir -p "${ROOT%/}/boot/grub"
- ln -s ../grub2/grub.cfg "${ROOT%/}/boot/grub/grub.cfg"
- fi
- fi
-
- mount-boot_pkg_postinst
-
elog "For information on how to configure GRUB2 please refer to the guide:"
elog " https://wiki.gentoo.org/wiki/GRUB2_Quick_Start"
diff --git a/sys-devel/autogen/autogen-5.18.4.ebuild b/sys-devel/autogen/autogen-5.18.4.ebuild
index 8fa001bcea3f..04beaec880e3 100644
--- a/sys-devel/autogen/autogen-5.18.4.ebuild
+++ b/sys-devel/autogen/autogen-5.18.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="libopts static-libs"
RDEPEND=">=dev-scheme/guile-1.8
diff --git a/sys-fs/lvm2/lvm2-2.02.116-r4.ebuild b/sys-fs/lvm2/lvm2-2.02.116-r4.ebuild
index 5d54576bb187..5daa660f24e0 100644
--- a/sys-fs/lvm2/lvm2-2.02.116-r4.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.116-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )
systemd? ( udev )
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 8c65b49b6c64..6d944f8d40e5 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -11,4 +11,5 @@ DIST udev-222.tar.gz 4015599 SHA256 b49f51f9855127987adc98aad3b6d608e4e53eaa029b
DIST udev-224.tar.gz 3868075 SHA256 0d7ac1532a57639fbc828f8a5051a090883c6ad2908618a7a13ab386db831bfc SHA512 7717d340c6de11afd589234b7ec8952fe2ffcd05829622bd7ea8e008870c0e3b83eb1eaf20e85ffffa7adafc9c0c0b94fd93784510792109240e22e6b963f198 WHIRLPOOL 645b08ff0c20994b17b8ed585fb0eef682336961d7fedf25031fa4dc89a4d9a2b58c254e0f9baeedcb228435316fdfb562f9fefd21e5a63f94499d2f1040e093
DIST udev-225.tar.gz 3878442 SHA256 b2f576bb3688e9315f2f49b98e141ac6f964567370e98ebd8fd7332a0a6f9701 SHA512 35b3946509c7b01660da4370d3c51ff0e6a537dadd9dbb0a039c4f7ed552fd4e02ebac6eb8a788f61f1e3ba99444238d959051dd004c174b027729a80368ac19 WHIRLPOOL 47cd3b5690dafdf3c0ef6a9767e947666b1853541f8aefd17eb5c07eee1477daf32f3b249b04327b1c56d8ec430745725383750b97755bb6cf594d354a7ffdf8
DIST udev-228.tar.gz 4034401 SHA256 dd124ff561a07e6439ed2b3713f38ca914df7747f110ce86deea17b56d245ae6 SHA512 e54f282f550854dc082a4788709905e5767b75d2057e18d749b54821f2e44e0a8d1349b1a9180036cc854ecccaf5ff86b3b1dba4d3c2ce1b1fc766930ea4c0ea WHIRLPOOL 16b28367edc29a74f5b08691839da39a02d55bf5bcdffef55bfb1a2e8065eeecbe22a2b661e2d5f161f008d05baa000aff60d662d65db380d6c3fe0c1380eea1
+DIST udev-229-patches-1.tar.xz 996 SHA256 29fe3d2ebbbfed8d30237b79275865ab486ca636282bba40f499b624166e4d2d SHA512 1d6f80311049a441acc49fa88e316e83f4a22a4015e2bfc5b76b6b512ed35b431791acdb11d3bcc4a70913019bb23cfcfaeefcf38bdacace1412a9946cba1a74 WHIRLPOOL 580874fc492e84c66e8f1771d7d4da531f9358802e94b0e4bbbda21f0e08e987295553429c55adba56dcd4c333a231dc2ea2c0a2dc42ac999bb018168f200549
DIST udev-229.tar.gz 4319173 SHA256 b51b0a48d1beb388d95bd6a98d62be05490335d4bb388aefecdcb576e91e0741 SHA512 d692c0c9fc82f2fce64a5ec1caa4a0f8cf9edaeb1bdaaa1c462669db8f78b3dd6b33c87ef926ff21823582d0460f7b63aa3755792f9ae2cd6fb813ba08a35c39 WHIRLPOOL aa44f7161d80cc680226f19755579ba72c52cfe7bd671aefb09c414981f3a5a5c852f07d3449ac6f96d4ca91120cfb1464225d995b1637f1e2c108baf3c4a392
diff --git a/sys-fs/udev/udev-229-r1.ebuild b/sys-fs/udev/udev-229-r1.ebuild
new file mode 100644
index 000000000000..192a130f3785
--- /dev/null
+++ b/sys-fs/udev/udev-229-r1.ebuild
@@ -0,0 +1,440 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools bash-completion-r1 eutils linux-info multilib multilib-minimal toolchain-funcs udev user versionator
+
+if [[ ${PV} = 9999* ]]; then
+ EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
+ inherit git-r3
+else
+ patchset=
+ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ if [[ -n "${patchset}" ]]; then
+ SRC_URI+="
+ https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz
+ https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz"
+ fi
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux static-libs"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}]
+ sys-libs/libcap[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl )
+ 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(-)]
+ )"
+# Force new make >= -r4 to skip some parallel build issues
+DEPEND="${COMMON_DEPEND}
+ dev-util/gperf
+ >=dev-util/intltool-0.50
+ >=sys-apps/coreutils-8.16
+ virtual/os-headers
+ virtual/pkgconfig
+ >=sys-devel/make-3.82-r4
+ >=sys-kernel/linux-headers-3.9
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt"
+RDEPEND="${COMMON_DEPEND}
+ !<sys-fs/lvm2-2.02.103
+ !<sec-policy/selinux-base-2.20120725-r10"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+ >=sys-fs/udev-init-scripts-26"
+
+S=${WORKDIR}/systemd-${PV}
+
+# 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() { :; }
+
+check_default_rules() {
+ # Make sure there are no sudden changes to upstream rules file
+ # (more for my own needs than anything else ...)
+ local udev_rules_md5=b8ad860dccae0ca51656b33c405ea2ca
+ MD5=$(md5sum < "${S}"/rules/50-udev-default.rules)
+ MD5=${MD5/ -/}
+ if [[ ${MD5} != ${udev_rules_md5} ]]; then
+ eerror "50-udev-default.rules has been updated, please validate!"
+ eerror "md5sum: ${MD5}"
+ die "50-udev-default.rules has been updated, please validate!"
+ fi
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER"
+ linux-info_pkg_setup
+
+ # CONFIG_FHANDLE was introduced by 2.6.39
+ local MINKV=2.6.39
+
+ if kernel_is -lt ${MINKV//./ }; then
+ eerror "Your running kernel is too old to run this version of ${P}"
+ eerror "You need to upgrade kernel at least to ${MINKV}"
+ fi
+
+ if kernel_is -lt 3 7; then
+ ewarn "Your running kernel is too old to have firmware loader and"
+ ewarn "this version of ${P} doesn't have userspace firmware loader"
+ ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+ fi
+ fi
+}
+
+src_prepare() {
+ if ! [[ ${PV} = 9999* ]]; then
+ # secure_getenv() disable for non-glibc systems wrt bug #443030
+ if ! [[ $(grep -r secure_getenv * | wc -l) -eq 26 ]]; then
+ eerror "The line count for secure_getenv() failed, see bug #443030"
+ die
+ fi
+ fi
+
+ # backport some patches
+ if [[ -n "${patchset}" ]]; then
+ EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
+ fi
+
+ cat <<-EOF > "${T}"/40-gentoo.rules
+ # Gentoo specific floppy and usb groups
+ ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+ ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+ EOF
+
+ # change rules back to group uucp instead of dialout for now wrt #454556
+ sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+ # stub out the am_path_libcrypt function
+ echo 'AC_DEFUN([AM_PATH_LIBGCRYPT],[:])' > m4/gcrypt.m4
+
+ # apply user patches
+ epatch_user
+
+ eautoreconf
+
+ if ! [[ ${PV} = 9999* ]]; then
+ check_default_rules
+ fi
+
+ # Restore possibility of running --enable-static wrt #472608
+ sed -i \
+ -e '/--enable-static is not supported by systemd/s:as_fn_error:echo:' \
+ configure || die
+
+ if ! use elibc_glibc; then #443030
+ echo '#define secure_getenv(x) NULL' >> config.h.in
+ sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
+ fi
+}
+
+src_configure() {
+ # Prevent conflicts with i686 cross toolchain, bug 559726
+ tc-export AR CC NM OBJCOPY RANLIB
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ tc-export CC #463846
+ export cc_cv_CFLAGS__flto=no #502950
+ export cc_cv_CFLAGS__Werror_shadow=no #554454
+ export cc_cv_LDFLAGS__Wl__fuse_ld_gold=no #573874
+
+ # Keep sorted by ./configure --help and only pass --disable flags
+ # when *required* to avoid external deps or unnecessary compile
+ local econf_args
+ econf_args=(
+ --libdir=/usr/$(get_libdir)
+ --docdir=/usr/share/doc/${PF}
+ $(multilib_native_use_enable static-libs static)
+ --disable-nls
+ --disable-dbus
+ $(multilib_native_use_enable kmod)
+ --disable-xkbcommon
+ --disable-seccomp
+ $(multilib_native_use_enable selinux)
+ --disable-xz
+ --disable-lz4
+ --disable-pam
+ $(multilib_native_use_enable acl)
+ --disable-gcrypt
+ --disable-audit
+ --disable-libcryptsetup
+ --disable-qrencode
+ --disable-microhttpd
+ --disable-gnuefi
+ --disable-gnutls
+ --disable-libcurl
+ --disable-libidn
+ --disable-quotacheck
+ --disable-logind
+ --disable-polkit
+ --disable-myhostname
+ $(multilib_is_native_abi || echo "--disable-manpages")
+ --enable-split-usr
+ --without-python
+ --with-bashcompletiondir="$(get_bashcompdir)"
+ --with-rootprefix=
+ $(multilib_is_native_abi && echo "--with-rootlibdir=/$(get_libdir)")
+ --disable-elfutils
+ )
+
+ if ! multilib_is_native_abi; then
+ econf_args+=(
+ MOUNT_{CFLAGS,LIBS}=' '
+ )
+ fi
+
+ ECONF_SOURCE=${S} econf "${econf_args[@]}"
+}
+
+multilib_src_compile() {
+ echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
+ emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
+
+ # Most of the parallel build problems were solved by >=sys-devel/make-3.82-r4,
+ # but not everything -- separate building of the binaries as a workaround,
+ # which will force internal libraries required for the helpers to be built
+ # early enough, like eg. libsystemd-shared.la
+ if multilib_is_native_abi; then
+ local lib_targets=( libudev.la )
+ emake "${lib_targets[@]}"
+
+ local exec_targets=(
+ systemd-udevd
+ udevadm
+ )
+ emake "${exec_targets[@]}"
+
+ local helper_targets=(
+ ata_id
+ cdrom_id
+ collect
+ scsi_id
+ v4l_id
+ mtd_probe
+ )
+ emake "${helper_targets[@]}"
+
+ local man_targets=(
+ man/udev.conf.5
+ man/systemd.link.5
+ man/udev.7
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ )
+ emake "${man_targets[@]}"
+ else
+ local lib_targets=( libudev.la )
+ emake "${lib_targets[@]}"
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ local lib_LTLIBRARIES="libudev.la" \
+ pkgconfiglib_DATA="src/libudev/libudev.pc"
+
+ local targets=(
+ install-libLTLIBRARIES
+ install-includeHEADERS
+ install-rootbinPROGRAMS
+ install-rootlibexecPROGRAMS
+ install-udevlibexecPROGRAMS
+ install-dist_udevconfDATA
+ install-dist_udevrulesDATA
+ install-pkgconfiglibDATA
+ install-pkgconfigdataDATA
+ install-dist_docDATA
+ libudev-install-hook
+ install-directories-hook
+ install-dist_bashcompletionDATA
+ install-dist_networkDATA
+ )
+
+ # add final values of variables:
+ targets+=(
+ rootlibexec_PROGRAMS=systemd-udevd
+ rootbin_PROGRAMS=udevadm
+ lib_LTLIBRARIES="${lib_LTLIBRARIES}"
+ pkgconfiglib_DATA="${pkgconfiglib_DATA}"
+ pkgconfigdata_DATA="src/udev/udev.pc"
+ INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
+ $(sysconfdir)/udev/hwdb.d \
+ $(sysconfdir)/systemd/network'
+ dist_bashcompletion_DATA="shell-completion/bash/udevadm"
+ dist_network_DATA="network/99-default.link"
+ )
+ emake -j1 DESTDIR="${D}" "${targets[@]}"
+ doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8}
+ else
+ local lib_LTLIBRARIES="libudev.la" \
+ pkgconfiglib_DATA="src/libudev/libudev.pc" \
+ include_HEADERS="src/libudev/libudev.h"
+
+ local targets=(
+ install-libLTLIBRARIES
+ install-includeHEADERS
+ install-pkgconfiglibDATA
+ )
+
+ targets+=(
+ lib_LTLIBRARIES="${lib_LTLIBRARIES}"
+ pkgconfiglib_DATA="${pkgconfiglib_DATA}"
+ include_HEADERS="${include_HEADERS}"
+ )
+ emake -j1 DESTDIR="${D}" "${targets[@]}"
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc TODO
+
+ prune_libtool_files --all
+ rm -f \
+ "${D}"/lib/udev/rules.d/99-systemd.rules \
+ "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h}
+
+ # see src_prepare() for content of 40-gentoo.rules
+ insinto /lib/udev/rules.d
+ doins "${T}"/40-gentoo.rules
+
+ # maintainer note: by not letting the upstream build-sys create the .so
+ # link, you also avoid a parallel make problem
+ mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8
+}
+
+pkg_postinst() {
+ mkdir -p "${ROOT%/}"/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 "${ROOT%/}"/dev/loop 2>/dev/null
+ if [[ -d ${ROOT%/}/dev/loop ]]; then
+ ewarn "Please make sure your remove /dev/loop,"
+ ewarn "else losetup may be confused when looking for unused devices."
+ fi
+
+ local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
+ while read -r dev path fstype rest; do
+ if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
+ ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
+ ewarn "filesystem. Otherwise udev won't be able to boot."
+ ewarn "See, https://bugs.gentoo.org/453186"
+ fi
+ done < "${fstab}"
+
+ if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
+ ewarn
+ ewarn "Please re-emerge all packages on your system which install"
+ ewarn "rules and helpers in /usr/lib/udev. They should now be in"
+ ewarn "/lib/udev."
+ ewarn
+ ewarn "One way to do this is to run the following command:"
+ ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
+ ewarn "Note that qfile can be found in app-portage/portage-utils"
+ fi
+
+ local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
+ local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
+ for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
+ if [[ -f ${old_rules} ]]; then
+ ewarn
+ ewarn "File ${old_rules} is from old udev installation but if you still use it,"
+ ewarn "rename it to something else starting with 70- to silence this deprecation"
+ ewarn "warning."
+ fi
+ done
+
+ elog
+ elog "Starting from version >= 197 the new predictable network interface names are"
+ elog "used by default, see:"
+ elog "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+ elog "http://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
+ elog
+ elog "Example command to get the information for the new interface name before booting"
+ elog "(replace <ifname> with, for example, eth0):"
+ elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
+ elog
+ elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
+ elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
+ elog "to disable the feature."
+
+ if has_version 'sys-apps/biosdevname'; then
+ ewarn
+ ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
+ ewarn "detected to be installed with the new predictable network interface names."
+ fi
+
+ ewarn
+ ewarn "You need to restart udev as soon as possible to make the upgrade go"
+ ewarn "into effect."
+ ewarn "The method you use to do this depends on your init system."
+ if has_version 'sys-apps/openrc'; then
+ ewarn "For sys-apps/openrc users it is:"
+ ewarn "# /etc/init.d/udev --nodeps restart"
+ fi
+
+ elog
+ elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
+ elog "fixing known issues visit:"
+ elog "https://wiki.gentoo.org/wiki/Udev"
+ elog "https://wiki.gentoo.org/wiki/Udev/upgrade"
+
+ # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+ # do the same for 80-net-setup-link.rules to keep the old behavior
+ local net_move=no
+ local net_name_slot_sym=no
+ local net_rules_path="${ROOT%/}"/etc/udev/rules.d
+ local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+ local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+ if [[ ! -e ${net_setup_link} ]]; then
+ [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
+ if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+ net_move=yes
+ net_name_slot_sym=yes
+ fi
+ fi
+ if [[ ${net_move} == yes ]]; then
+ ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+ if [[ ${net_name_slot_sym} == yes ]]; then
+ ln -nfs /dev/null "${net_setup_link}"
+ else
+ cp "${net_name_slot}" "${net_setup_link}"
+ fi
+ eend $?
+ fi
+
+ # 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
+ # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+ [[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+ fi
+}
diff --git a/sys-fs/udev/udev-229-r2.ebuild b/sys-fs/udev/udev-229-r2.ebuild
new file mode 100644
index 000000000000..4e973d236b95
--- /dev/null
+++ b/sys-fs/udev/udev-229-r2.ebuild
@@ -0,0 +1,440 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools bash-completion-r1 eutils linux-info multilib multilib-minimal toolchain-funcs udev user versionator
+
+if [[ ${PV} = 9999* ]]; then
+ EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
+ inherit git-r3
+else
+ patchset=1
+ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ if [[ -n "${patchset}" ]]; then
+ SRC_URI+="
+ https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz
+ https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz"
+ fi
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux static-libs"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}]
+ sys-libs/libcap[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl )
+ 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(-)]
+ )"
+# Force new make >= -r4 to skip some parallel build issues
+DEPEND="${COMMON_DEPEND}
+ dev-util/gperf
+ >=dev-util/intltool-0.50
+ >=sys-apps/coreutils-8.16
+ virtual/os-headers
+ virtual/pkgconfig
+ >=sys-devel/make-3.82-r4
+ >=sys-kernel/linux-headers-3.9
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt"
+RDEPEND="${COMMON_DEPEND}
+ !<sys-fs/lvm2-2.02.103
+ !<sec-policy/selinux-base-2.20120725-r10"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+ >=sys-fs/udev-init-scripts-26"
+
+S=${WORKDIR}/systemd-${PV}
+
+# 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() { :; }
+
+check_default_rules() {
+ # Make sure there are no sudden changes to upstream rules file
+ # (more for my own needs than anything else ...)
+ local udev_rules_md5=b8ad860dccae0ca51656b33c405ea2ca
+ MD5=$(md5sum < "${S}"/rules/50-udev-default.rules)
+ MD5=${MD5/ -/}
+ if [[ ${MD5} != ${udev_rules_md5} ]]; then
+ eerror "50-udev-default.rules has been updated, please validate!"
+ eerror "md5sum: ${MD5}"
+ die "50-udev-default.rules has been updated, please validate!"
+ fi
+}
+
+pkg_setup() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER"
+ linux-info_pkg_setup
+
+ # CONFIG_FHANDLE was introduced by 2.6.39
+ local MINKV=2.6.39
+
+ if kernel_is -lt ${MINKV//./ }; then
+ eerror "Your running kernel is too old to run this version of ${P}"
+ eerror "You need to upgrade kernel at least to ${MINKV}"
+ fi
+
+ if kernel_is -lt 3 7; then
+ ewarn "Your running kernel is too old to have firmware loader and"
+ ewarn "this version of ${P} doesn't have userspace firmware loader"
+ ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+ fi
+ fi
+}
+
+src_prepare() {
+ if ! [[ ${PV} = 9999* ]]; then
+ # secure_getenv() disable for non-glibc systems wrt bug #443030
+ if ! [[ $(grep -r secure_getenv * | wc -l) -eq 26 ]]; then
+ eerror "The line count for secure_getenv() failed, see bug #443030"
+ die
+ fi
+ fi
+
+ # backport some patches
+ if [[ -n "${patchset}" ]]; then
+ EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
+ fi
+
+ cat <<-EOF > "${T}"/40-gentoo.rules
+ # Gentoo specific floppy and usb groups
+ ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+ ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+ EOF
+
+ # change rules back to group uucp instead of dialout for now wrt #454556
+ sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+ # stub out the am_path_libcrypt function
+ echo 'AC_DEFUN([AM_PATH_LIBGCRYPT],[:])' > m4/gcrypt.m4
+
+ # apply user patches
+ epatch_user
+
+ eautoreconf
+
+ if ! [[ ${PV} = 9999* ]]; then
+ check_default_rules
+ fi
+
+ # Restore possibility of running --enable-static wrt #472608
+ sed -i \
+ -e '/--enable-static is not supported by systemd/s:as_fn_error:echo:' \
+ configure || die
+
+ if ! use elibc_glibc; then #443030
+ echo '#define secure_getenv(x) NULL' >> config.h.in
+ sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die
+ fi
+}
+
+src_configure() {
+ # Prevent conflicts with i686 cross toolchain, bug 559726
+ tc-export AR CC NM OBJCOPY RANLIB
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ tc-export CC #463846
+ export cc_cv_CFLAGS__flto=no #502950
+ export cc_cv_CFLAGS__Werror_shadow=no #554454
+ export cc_cv_LDFLAGS__Wl__fuse_ld_gold=no #573874
+
+ # Keep sorted by ./configure --help and only pass --disable flags
+ # when *required* to avoid external deps or unnecessary compile
+ local econf_args
+ econf_args=(
+ --libdir=/usr/$(get_libdir)
+ --docdir=/usr/share/doc/${PF}
+ $(multilib_native_use_enable static-libs static)
+ --disable-nls
+ --disable-dbus
+ $(multilib_native_use_enable kmod)
+ --disable-xkbcommon
+ --disable-seccomp
+ $(multilib_native_use_enable selinux)
+ --disable-xz
+ --disable-lz4
+ --disable-pam
+ $(multilib_native_use_enable acl)
+ --disable-gcrypt
+ --disable-audit
+ --disable-libcryptsetup
+ --disable-qrencode
+ --disable-microhttpd
+ --disable-gnuefi
+ --disable-gnutls
+ --disable-libcurl
+ --disable-libidn
+ --disable-quotacheck
+ --disable-logind
+ --disable-polkit
+ --disable-myhostname
+ $(multilib_is_native_abi || echo "--disable-manpages")
+ --enable-split-usr
+ --without-python
+ --with-bashcompletiondir="$(get_bashcompdir)"
+ --with-rootprefix=
+ $(multilib_is_native_abi && echo "--with-rootlibdir=/$(get_libdir)")
+ --disable-elfutils
+ )
+
+ if ! multilib_is_native_abi; then
+ econf_args+=(
+ MOUNT_{CFLAGS,LIBS}=' '
+ )
+ fi
+
+ ECONF_SOURCE=${S} econf "${econf_args[@]}"
+}
+
+multilib_src_compile() {
+ echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
+ emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
+
+ # Most of the parallel build problems were solved by >=sys-devel/make-3.82-r4,
+ # but not everything -- separate building of the binaries as a workaround,
+ # which will force internal libraries required for the helpers to be built
+ # early enough, like eg. libsystemd-shared.la
+ if multilib_is_native_abi; then
+ local lib_targets=( libudev.la )
+ emake "${lib_targets[@]}"
+
+ local exec_targets=(
+ systemd-udevd
+ udevadm
+ )
+ emake "${exec_targets[@]}"
+
+ local helper_targets=(
+ ata_id
+ cdrom_id
+ collect
+ scsi_id
+ v4l_id
+ mtd_probe
+ )
+ emake "${helper_targets[@]}"
+
+ local man_targets=(
+ man/udev.conf.5
+ man/systemd.link.5
+ man/udev.7
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ )
+ emake "${man_targets[@]}"
+ else
+ local lib_targets=( libudev.la )
+ emake "${lib_targets[@]}"
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ local lib_LTLIBRARIES="libudev.la" \
+ pkgconfiglib_DATA="src/libudev/libudev.pc"
+
+ local targets=(
+ install-libLTLIBRARIES
+ install-includeHEADERS
+ install-rootbinPROGRAMS
+ install-rootlibexecPROGRAMS
+ install-udevlibexecPROGRAMS
+ install-dist_udevconfDATA
+ install-dist_udevrulesDATA
+ install-pkgconfiglibDATA
+ install-pkgconfigdataDATA
+ install-dist_docDATA
+ libudev-install-hook
+ install-directories-hook
+ install-dist_bashcompletionDATA
+ install-dist_networkDATA
+ )
+
+ # add final values of variables:
+ targets+=(
+ rootlibexec_PROGRAMS=systemd-udevd
+ rootbin_PROGRAMS=udevadm
+ lib_LTLIBRARIES="${lib_LTLIBRARIES}"
+ pkgconfiglib_DATA="${pkgconfiglib_DATA}"
+ pkgconfigdata_DATA="src/udev/udev.pc"
+ INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
+ $(sysconfdir)/udev/hwdb.d \
+ $(sysconfdir)/systemd/network'
+ dist_bashcompletion_DATA="shell-completion/bash/udevadm"
+ dist_network_DATA="network/99-default.link"
+ )
+ emake -j1 DESTDIR="${D}" "${targets[@]}"
+ doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8}
+ else
+ local lib_LTLIBRARIES="libudev.la" \
+ pkgconfiglib_DATA="src/libudev/libudev.pc" \
+ include_HEADERS="src/libudev/libudev.h"
+
+ local targets=(
+ install-libLTLIBRARIES
+ install-includeHEADERS
+ install-pkgconfiglibDATA
+ )
+
+ targets+=(
+ lib_LTLIBRARIES="${lib_LTLIBRARIES}"
+ pkgconfiglib_DATA="${pkgconfiglib_DATA}"
+ include_HEADERS="${include_HEADERS}"
+ )
+ emake -j1 DESTDIR="${D}" "${targets[@]}"
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc TODO
+
+ prune_libtool_files --all
+ rm -f \
+ "${D}"/lib/udev/rules.d/99-systemd.rules \
+ "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h}
+
+ # see src_prepare() for content of 40-gentoo.rules
+ insinto /lib/udev/rules.d
+ doins "${T}"/40-gentoo.rules
+
+ # maintainer note: by not letting the upstream build-sys create the .so
+ # link, you also avoid a parallel make problem
+ mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8
+}
+
+pkg_postinst() {
+ mkdir -p "${ROOT%/}"/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 "${ROOT%/}"/dev/loop 2>/dev/null
+ if [[ -d ${ROOT%/}/dev/loop ]]; then
+ ewarn "Please make sure your remove /dev/loop,"
+ ewarn "else losetup may be confused when looking for unused devices."
+ fi
+
+ local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
+ while read -r dev path fstype rest; do
+ if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
+ ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
+ ewarn "filesystem. Otherwise udev won't be able to boot."
+ ewarn "See, https://bugs.gentoo.org/453186"
+ fi
+ done < "${fstab}"
+
+ if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
+ ewarn
+ ewarn "Please re-emerge all packages on your system which install"
+ ewarn "rules and helpers in /usr/lib/udev. They should now be in"
+ ewarn "/lib/udev."
+ ewarn
+ ewarn "One way to do this is to run the following command:"
+ ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
+ ewarn "Note that qfile can be found in app-portage/portage-utils"
+ fi
+
+ local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
+ local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
+ for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
+ if [[ -f ${old_rules} ]]; then
+ ewarn
+ ewarn "File ${old_rules} is from old udev installation but if you still use it,"
+ ewarn "rename it to something else starting with 70- to silence this deprecation"
+ ewarn "warning."
+ fi
+ done
+
+ elog
+ elog "Starting from version >= 197 the new predictable network interface names are"
+ elog "used by default, see:"
+ elog "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+ elog "http://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
+ elog
+ elog "Example command to get the information for the new interface name before booting"
+ elog "(replace <ifname> with, for example, eth0):"
+ elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
+ elog
+ elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
+ elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
+ elog "to disable the feature."
+
+ if has_version 'sys-apps/biosdevname'; then
+ ewarn
+ ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
+ ewarn "detected to be installed with the new predictable network interface names."
+ fi
+
+ ewarn
+ ewarn "You need to restart udev as soon as possible to make the upgrade go"
+ ewarn "into effect."
+ ewarn "The method you use to do this depends on your init system."
+ if has_version 'sys-apps/openrc'; then
+ ewarn "For sys-apps/openrc users it is:"
+ ewarn "# /etc/init.d/udev --nodeps restart"
+ fi
+
+ elog
+ elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
+ elog "fixing known issues visit:"
+ elog "https://wiki.gentoo.org/wiki/Udev"
+ elog "https://wiki.gentoo.org/wiki/Udev/upgrade"
+
+ # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+ # do the same for 80-net-setup-link.rules to keep the old behavior
+ local net_move=no
+ local net_name_slot_sym=no
+ local net_rules_path="${ROOT%/}"/etc/udev/rules.d
+ local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+ local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+ if [[ ! -e ${net_setup_link} ]]; then
+ [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
+ if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+ net_move=yes
+ net_name_slot_sym=yes
+ fi
+ fi
+ if [[ ${net_move} == yes ]]; then
+ ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+ if [[ ${net_name_slot_sym} == yes ]]; then
+ ln -nfs /dev/null "${net_setup_link}"
+ else
+ cp "${net_name_slot}" "${net_setup_link}"
+ fi
+ eend $?
+ fi
+
+ # 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
+ # http://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+ [[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+ fi
+}
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 97854d0cc4ae..4adb23f45030 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,3 +1,4 @@
DIST udisks-1.0.5.tar.gz 736221 SHA256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 SHA512 bdf4970113975221ff0e17866db18fd969ff9c8e1e851c8ad7572630814ab0c46b59df59433edcb2e7cc41cc8152afd35807f45e07f6d0fa87b21b5a77d0965a WHIRLPOOL 4698911bf53532b5149a71ab1a031fa836193476114ba26f0cde588c3095661f21492feb855e1eb3aa8f1c87ad8125bdc32b7cf56ac43f2de84073f3085f39eb
DIST udisks-2.1.4.tar.bz2 901364 SHA256 a4e148dd3a4a209160452a12cfe770382836027002f6c84f2e6c17eb5be519bb SHA512 782e94d27cdacf4178fc7c39ad300168d3280be6cd434f067c6e329efe91544d5bbfe9a2499483e3f4bdce16c55a061be53d9c592943b693441db8f9cfacee12 WHIRLPOOL fbb2487dce06f241112f2ba7dadcd384dd2b448a0f15688381331d01a8f954231f1794d7e26667b30ee6f899ec516dad620082caf4b0292d6a5bc91faf52231d
DIST udisks-2.1.6.tar.bz2 908987 SHA256 dec5f5c85fa0f74f39336acbfba1770f9988c096be23873714543c304b09f46a SHA512 33badcf87986504cf13926f23f1ac0386d732920918871e5bdbcbd704bfcee17d9d3c5002bbdd497bf88a47f844595ad06fc2049bc805099c052943ba3750770 WHIRLPOOL 798cfae910b4cc85ebbd0b60aa987fda6bc6009fb37bba8ad3644bca497f1bb5dde04d574aab97f323dd4c4ae8dcbbc3de9fa09cbdbee45ff19a0b1fbf22b797
+DIST udisks-2.1.7.tar.bz2 920042 SHA256 abae2bb3bdc691ca13c1e4c244630b8c881c4f3b35c207299f1b39b7bec83785 SHA512 d32ec0741b4c55e863587a27095f69cf0375e0c80db70f2540cde70382dcafdce07a098a55b52a450c2014a6e09a4af0b70192bbc5b92ffd57b05a3bf3ab3111 WHIRLPOOL 54a222e4b526795466789a86679c243133c0b303acfc1208fde162a6f8b975d731eb8669672c2846b830ad32dcb9cc778b59746bc5f5ede27ee9b1d1ad4c9f73
diff --git a/sys-fs/udisks/udisks-2.1.7.ebuild b/sys-fs/udisks/udisks-2.1.7.ebuild
new file mode 100644
index 000000000000..6220d85b5633
--- /dev/null
+++ b/sys-fs/udisks/udisks-2.1.7.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit bash-completion-r1 eutils linux-info systemd udev
+
+DESCRIPTION="Daemon providing interfaces to work with storage devices"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks"
+SRC_URI="http://udisks.freedesktop.org/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="acl debug cryptsetup +gptfdisk +introspection selinux systemd"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.36:2
+ >=dev-libs/libatasmart-0.19
+ >=sys-auth/polkit-0.110
+ >=virtual/libgudev-165:=
+ virtual/udev
+ acl? ( virtual/acl )
+ introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+ systemd? ( >=sys-apps/systemd-209 )
+"
+# gptfdisk -> src/udiskslinuxpartition.c -> sgdisk (see also #412801#c1)
+# util-linux -> mount, umount, swapon, swapoff (see also #403073)
+RDEPEND="${COMMON_DEPEND}
+ >=sys-apps/util-linux-2.20.1-r2
+ >=sys-block/parted-3
+ virtual/eject
+ cryptsetup? (
+ sys-fs/cryptsetup[udev(+)]
+ sys-fs/lvm2[udev(+)]
+ )
+ gptfdisk? ( >=sys-apps/gptfdisk-0.8 )
+ selinux? ( sec-policy/selinux-devicekit )
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ >=dev-util/gdbus-codegen-2.32
+ >=dev-util/gtk-doc-am-1.3
+ dev-util/intltool
+ >=sys-kernel/linux-headers-3.1
+ virtual/pkgconfig
+"
+
+QA_MULTILIB_PATHS="usr/lib/udisks2/udisksd"
+
+DOCS="AUTHORS HACKING NEWS README"
+
+pkg_setup() {
+ # Listing only major arch's here to avoid tracking kernel's defconfig
+ if use amd64 || use arm || use ppc || use ppc64 || use x86; then
+ CONFIG_CHECK="~!IDE" #319829
+ CONFIG_CHECK+=" ~TMPFS_POSIX_ACL" #412377
+ CONFIG_CHECK+=" ~SWAP" # https://forums.gentoo.org/viewtopic-t-923640.html
+ CONFIG_CHECK+=" ~NLS_UTF8" #425562
+ kernel_is lt 3 10 && CONFIG_CHECK+=" ~USB_SUSPEND" #331065, #477278
+ linux-info_pkg_setup
+ fi
+}
+
+src_prepare() {
+ use systemd || { sed -i -e 's:libsystemd-login:&disable:' configure || die; }
+
+ epatch_user
+}
+
+src_configure() {
+ econf \
+ --localstatedir="${EPREFIX}"/var \
+ --disable-static \
+ $(use_enable acl) \
+ $(use_enable debug) \
+ --disable-gtk-doc \
+ $(use_enable introspection) \
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ --with-udevdir="$(get_udevdir)" \
+ "$(systemd_with_unitdir)"
+}
+
+src_install() {
+ default
+ prune_libtool_files
+ keepdir /var/lib/udisks2 #383091
+
+ rm -rf "${ED}"/usr/share/bash-completion
+ dobashcomp data/completions/udisksctl
+
+ local htmldir=udisks2
+ if [[ -d ${ED}/usr/share/doc/${PF}/html/${htmldir} ]]; then
+ dosym /usr/share/doc/${PF}/html/${htmldir} /usr/share/gtk-doc/html/${htmldir}
+ fi
+}
+
+pkg_postinst() {
+ mkdir -p "${EROOT}"/run #415987
+
+ # See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
+ if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
+ echo
+ ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+ fi
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 45ff056fdcde..582c14f51ade 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -54,6 +54,9 @@ DIST genpatches-3.18-27.extras.tar.xz 16200 SHA256 78a1358e063256533eda9c283de9a
DIST genpatches-3.18-28.base.tar.xz 820540 SHA256 def3cdebe118e6381465c7d61b4aeedbc55c63ffa5196f62afc40df6c1cf60d5 SHA512 dd48643fb5aa48539da83fabcc9423186e80ed7beabcb33a519eda876c5d925d910e0955f9b7d7592fbbec175a7948c11a9065a280e4f576b2618f156bbe00ec WHIRLPOOL cf7b3eb5635f0e1f7438cf87db2762471d78d2a4eb85d493ed2196c29df035ddbe6912fffe5cf126e81fbde5687aad11b1f3cae6c0d285468571ea01798fbcc0
DIST genpatches-3.18-28.experimental.tar.xz 61612 SHA256 4ef8ff2340d16145f2177ef2f5e8ac43b37e57c9d9ac730bd0c992e99209a71e SHA512 94fd26d41de8a6a4d0ef82d9c261b3dd5b54ad58bfcf054e011f6495be788d687e589ae39e3012707cd48e836e678d237ccdd3dba6985c3f2086ae923616f2d0 WHIRLPOOL a325ec94646c9c05c33cb0338e9f3892804b1dc0277a2d80b1b1248c40f6ad6fe8de170f01639b8e79e86a9fe540ac1c8bf22c138dab85684dc76cbf7db5bbb3
DIST genpatches-3.18-28.extras.tar.xz 16184 SHA256 7fe110961bc2fc65f0721d89af43d533a556f0ec567d84d40269549bdea089bb SHA512 5971522cdc227029414cd2b8e385dd857d7ce113c85c3bc18b575f97ac616fc1f586dbfe7a933ba4bcfff00e3c711d42b0e29289ba725c646bdee0efb4c1046f WHIRLPOOL 61d2bb69908c9458a03e25aeaabb5dc8b4129a0b8385199a51ba345a6e8af0994d60fe09e33b12e7fdf02ae83c1a31af9b7758ebf9d1c6c9e5527bee7e3e1f81
+DIST genpatches-3.18-29.base.tar.xz 852488 SHA256 4ed8283703e5e04ea37a78d6963fea7cef64a0fd597a317243198458a04bd834 SHA512 7c5c64af789d34657ebbd1a935fc4cb8776abbc553464f7c1db8d37f40f5ab98353b0059680ca3b0ba8818ee17bf1f92762007be7dde9b46b200c4121af5c024 WHIRLPOOL 4fe7604db3f46afde79d97ebcb6a6aebd8c26351906d5f24d171a8677b500ebe588d36bc435f033cb20b740e145bf73ea543371b79b70c77347d3f8df2ee6da9
+DIST genpatches-3.18-29.experimental.tar.xz 61616 SHA256 b8e29b1b0c5fa2296c19d97c6ac8120ab0c82f1b1757a6108237bc1828cbe1d4 SHA512 03bf2c10db34bf5d9272bc2a67ca9a44accca88c6cf95ad9048fa327ce6e0dd1f287c1cec67aa6328947c5e4c76230ba4651105142e7c8622d085777227846b2 WHIRLPOOL f43ed71e0974cd6f7377bbd3841d7ab7c2c474beb5fe243371bf7a676a3748fb468dd8d8de72923ef5e81dda455e67b073de737f1a82ebd2ee0a2ea2a68ddd23
+DIST genpatches-3.18-29.extras.tar.xz 16188 SHA256 c61b357d33623eb5f7ab23d5f7bb6723fd57f088f7d9d1ab7b5d17b7d3272a2a SHA512 3067d8a224f347d77ba62b938217cfabe5d4991cbcaf52602ecef939ada9dd723126088c92c232f1bb73f81d0f4480cbcf2fab11bd109b2bc4a59afad7558965 WHIRLPOOL 0540b005c4ec987ebae1a0e74eb5d8c38388c4c86483f819b26b82bafa90474d6c24dc903038af1d021889bb41a3077d506a5983c0a99eb9a40b884dfe77e5eb
DIST genpatches-3.4-93.base.tar.xz 1412220 SHA256 dce2f6bce8058560fb4f005729a29fee9c6846147bca986b8b44d1554b78f0eb SHA512 0f0cf52185a8a49f639a1f9d3ff302a72fd7cbf4403f7f5626c9f39c3f4e2e5ea69f402df429b0b3341655d9b7a4779b738f5d5fc6ecde3799861e0b6efb8cf4 WHIRLPOOL ac2b82b6e749b945b79d2c21dc3081eaf399aafef80a3fc49ee71dc1f7ee753bf406d6e93bf2142ee4b25447e0304800de0adb9911274dc37172a9a9c63d624f
DIST genpatches-3.4-93.extras.tar.xz 18236 SHA256 c59bbc018e3c7e71fb655c5e33cbbcc3077dedee08553c287624b175c83d0811 SHA512 61e74164a8de8646d4d0c1cd1592eaeb8f5747f0e03557a78349d8cd2df7e924f012ae4904e14210ab56eb3f1f04e8610818ee05e4b5a51b325a42ded9876e66 WHIRLPOOL 42876d70dadac671875e7dc129020ed04c91ea99f40972cf87554accbe1d5e1651cca02f5e16e30654dabdfc1d15771eab8908a64376402c3b1639164b10258f
DIST genpatches-4.0-11.base.tar.xz 234968 SHA256 49cfd38bb97a92984c0d8b955c2f795701897544a4bfea4d2d2932543abca31a SHA512 059a049248c2eaaae4c4201235586306f846b12503fa1aa3bdea9ad31b4522f030beb057926cf79ffa9468e2940a68b6f6089511a60005dd339e4775c8a682cd WHIRLPOOL a5a31fa2a1db39fd01ed72e9917481a7c4f406c8168a2dac078df5a46c41d0be69df6ef532aae0f06fbf81a5a5e2262a9ba4785bdb13c48b21e338347d6be1ee
@@ -77,6 +80,9 @@ DIST genpatches-4.1-22.extras.tar.xz 16180 SHA256 c45029f048af2ef0a90db03f800f76
DIST genpatches-4.1-23.base.tar.xz 572288 SHA256 8a46e42e2fa5e8a530bae36f330ec5e03886784228c649276e2d530b738d4f25 SHA512 176f6db507ffc7e8ccfec3c4af28a7dad4118b5b145490c4c0efa24a4b6e056cad9923aed69acf8a90a0e42626c437d54c3eac18285dca1fe7e067eea63ee178 WHIRLPOOL df45ea7924444b58b8aadeb2ceff448b29c9dc0f98b911eaf4051bbb9d18edaa283e684c2e471722f77b57d7a786a0c617108b7aa0ad72a18677153083481a36
DIST genpatches-4.1-23.experimental.tar.xz 61656 SHA256 99f83b19eaae65c2a7f36721533e0dc229d3c319afa18a66629d1c9ba4780ca6 SHA512 4be89a9aea2269dc0d77e92921df66c429eb7bed808663a511d08cab20fded79175c6c2f8874844c2d85c77ab726459f86d3682cbcfe4604a3fdb5929a42cbd9 WHIRLPOOL 2d29b6b08edf7a34f5629f75a3d5b62be691bbf518d0482d1d92e7b15551139ca353df120fbe8c9a9ef47fed1060d19f6606aa4450ca823a39a6e9134dc40416
DIST genpatches-4.1-23.extras.tar.xz 16172 SHA256 60de73d8aef3fc161d5f8fc69ea8d355c7876ff4a75dd30c486a8ec334f84df2 SHA512 ed74a9ab953dbacc10b6c246578c78681d36544497a296f9cf76e4e43d447b4f9a6d4354ae9074fd081e748fec0b3769b193e0ccff3953070eeeccf0ed2820ec WHIRLPOOL 6a978a5093c0258d65c511b53f42ce28ed7d19fea2f9171b5265a1050d977de9855501869a98bf5f96615bcd7b39e3522835b4876d7c5d43f80646688e5772d5
+DIST genpatches-4.1-24.base.tar.xz 620668 SHA256 14d5324609a89e6636a3aab39a95f81b26e701f63fa4beb54220ca8f3549dadd SHA512 a4e8c4edf15b478af710e782ea3ac96cfae866cc48620577d9f9e54749927b9c2c8292d9340fc4ee48b8da2454c113075f9769507d045a7ca1f49096eeabef96 WHIRLPOOL 0bd26706d679d061f4c3b198d24f25b419da6f3205f9a773d421b701a59ee706e724c142e720d5714e80ca9d452c969832f7b70ee2e7673d445bf629b6665329
+DIST genpatches-4.1-24.experimental.tar.xz 61620 SHA256 0f831673b641250e8d0476b9929585d4c7d026a57e116ebb33d6468142bb069a SHA512 e8af23ee0e311f5318a7154fc21115d4317874ce432e3e81a15864dfe63df4c2a91e952978137b66f29c6e0e8ab55ba263f11dc373df67cc5dd42c3b6b11a256 WHIRLPOOL 5991370e7b3b9cc0572e70ed16383bb54673a058c0c5da33aef01c2d404847bbc8f7b14cc5a21cd42ad3e9430ba59e13d8607c6792a9636ad1845ed60480f04f
+DIST genpatches-4.1-24.extras.tar.xz 16168 SHA256 90240374d40cb005f497b93a4417b849911a4006767caf8e75c5629864d101c2 SHA512 144cdb740f1d35dd5b61628081c29fe7fa7a1655192fdfbce1aeb279583dfcb532134f64e4a4daaffed782d1bebec04ba9838e624a59dac8d78776bcdeccf8ba WHIRLPOOL 1a265e06d2707c222fd7f36938374afba695b7938cbeccf50646f9a036253b478495fdd22ae052e4bc5e9afabf9de9bbdc35e6a453ee43abfc064047ef0f63ee
DIST genpatches-4.3-5.base.tar.xz 76536 SHA256 ef0d2bf2101d848ef6ef97ebb680dfb546aec91efdc17acb45bd234e4e7d2fe4 SHA512 635008532fc56f68e5867143367ecd7f3e277dda796d2c311e61459b6b1e454f0822664bfae02f59cce691246ba9a7d0f6ed6a5817230e512632c80b71ab6b7b WHIRLPOOL b467abff1276bb5884fcdeaed9d15ef7dd0a31f37e44b77c98214758bf406b21a5143b516a1c15056146af426122ec255736a33a643ad3bf10afd6d052070ccf
DIST genpatches-4.3-5.experimental.tar.xz 61640 SHA256 487bb6919e05409308db7cbce48f0c059aa426e843cc92f92fee485b1b960d54 SHA512 a62b720a233628e593902fed82c7d60eee5b079e33bc313599f93228dfcee12159987cef8852a391aad2971252f728af914a8c7118ff8484393aab1193c2ffab WHIRLPOOL bcf996a05e20bd611382181b88b9ffa789b0d6665e48bb7e0f398e5f386598dd37ff39e33af0a4bcdb873cacf2b40a032e587adc5acd9117bf5f9e99ea18480c
DIST genpatches-4.3-5.extras.tar.xz 16284 SHA256 79a6d10fba5a62519d4818cb16065476ae3ed6667012e77c84d4a5d61df2f26a SHA512 cfb85a6b475b1e53eec42b5fdde16372eaba7502f8ea783b3d7bffe369ea2bee6d4f65f5a7f32e8a485a0102090b7f0d9bd026c1c68fde1bca7190bd6647de61 WHIRLPOOL 90c1ff6e3a1d97d695f69e08d0a0fd8f7e48d215b74b3c98febc32b05333ab7bdc53c8f843f2371e1d0d7825d25eb12ebe5fd3f1c392415b5dfae45223458db6
@@ -101,6 +107,9 @@ DIST genpatches-4.4-4.extras.tar.xz 16280 SHA256 6752a91afa4c10417ab561e8b93c92c
DIST genpatches-4.4-5.base.tar.xz 103432 SHA256 ff3ab9884b3069ab092511aef891c8300668461b768f728bff067dc98fc0dfb9 SHA512 ba36f0f9a87a66534281a17a1bd83aa3271e41f8857ef4f27692b322bff9ef705f9d88e78699ba63055410cfb2b3c2a73c2e40c8599e74b60581bfb0d85b293b WHIRLPOOL c38af636ee6bf5bf5d2b0c5d7d3132c02efa879925b3656355e3b70d51ee253b001328225a862f68cd1a5706eaa3529231bd8cb8ed5af3baba7b072da2d2a319
DIST genpatches-4.4-5.experimental.tar.xz 62624 SHA256 c5053b6a78375e394e099c51671fc7f83c041a3e1d6714e635df12adc4413b72 SHA512 895e0b9f2ea0839bca490ec60cccac666e51a9fd46a8a5146241329b46e4ea473af83045b876580176783b2bcf8a965235a55abb9905a5e09a5662662a2fca7e WHIRLPOOL 5a09f5f1dbf0943da25c015520579d37985a727296a8b3e0f51a4879d9fd6146be6730fd0631e0220508d3ddf90be0441848077d211f06a8fdced97b182aac8f
DIST genpatches-4.4-5.extras.tar.xz 16280 SHA256 dae9548e0a35250210f9d0c6dc3289864e4e173ff9236fdb2735ff349daec56c SHA512 c719030098d67819c8d402ac6d2c08423275bf3ae9f705932c4d22272db2d1826cd8749e26328bc59b611cc7ee3e7ab095b1005fe1fc6622d96e06dc8374d110 WHIRLPOOL 1a7437dc46838690e3d31746bb64251e5699117cdb9aa8ea2290949e31f2f284be3dc266985fd16888b68191cf075d042b9abae7e872d3b67b120020e3b0fc49
+DIST genpatches-4.4-6.base.tar.xz 205640 SHA256 91730945fc172ef6bf7f0c1484904ba657dddbd32bb9c08f38266ee9c426df8e SHA512 6114051664a6aa3d231a05c4b49bc8397a7d7d6951e52cb0b04a9487f9e6e241d5b8d27701171cceaffd45b28f7c5367fc07e7bfe1110fc0cad97b92429c943f WHIRLPOOL e30ea9755988da903b84d112ffe7e2eb1e8ffe625cd108812eb78c888a5f32b0ff9fde07b99a272d57b431dee16916ef1172485395f75cc4be9bce6d283d3b71
+DIST genpatches-4.4-6.experimental.tar.xz 62604 SHA256 83b32fc176ac235d07d95b3bfbc440ed87d6cf5ee86801c0614d3024c001b0df SHA512 f9ad222f025d5943bb56d47132781f02ddd83ae428fba55b9ce259daf14bc2bbbee810f634d952de218a2573579251e3c7d73b1cfae2d4ee4af0489531434bd6 WHIRLPOOL 2b1430eca685cdde4860441c89b9b5f497c51fea2902d5d850a4c5b26b7743329c034e05fec59bd3b25b4d25b72e7cec64f25af95de41aa1380a6323f046b3e4
+DIST genpatches-4.4-6.extras.tar.xz 16284 SHA256 7e4abcd949a72f0f9566812790b5d7981e8171cb606ca2345c136eb917ae571f SHA512 c66338201622ea2361275d9cb8ef25fb652a53180f72aed9546ef9e91a427ad33cf1ceda1c707169ed4a2460d07946406920a659c2fc052f440c706827a81cee WHIRLPOOL b05761b783b4c92539fd3509816d30e5afeb3f77b752bd547705dd0d7e4f6231792aa09c7d4b05074657f8181ebc55bcfc04272157f557c044ffaa86acd5759c
DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.18.28.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.18.28.ebuild
new file mode 100644
index 000000000000..21fc2a84e6ec
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.18.28.ebuild
@@ -0,0 +1,29 @@
+# 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="29"
+K_DEBLOB_AVAILABLE="0"
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.19.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.19.ebuild
new file mode 100644
index 000000000000..24ec6292281a
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.1.19.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 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="24"
+K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.4.ebuild
new file mode 100644
index 000000000000..de88aa5e1ec5
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 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"
+K_KDBUS_AVAILABLE="0"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ einfo "For more info on this patchset, and how to report problems, see:"
+ einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+ kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index 7673b412cd59..b06e801507eb 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -5,3 +5,4 @@ DIST patch-4.5-rc3.xz 8339492 SHA256 151b54060f1c1be5236f5effc8668ad1812fe2eb9bc
DIST patch-4.5-rc4.xz 8397260 SHA256 d3f536316fd51162a0f67013821737fb7f724f27b2574241f11ed7513d54853c SHA512 6d4ec1ccfdcbd7187535b3440f7f3c3f25585e2e9b2759d38967e56880963b0b1da4e23512d940ef603cacb1f560b613e760c9fcc4d8f96de07627894f35545f WHIRLPOOL 03c445cbc3b356a89d60d93c3b4361cd4658174c80ece3add646ff734117130690ee0e4b4c9b118520a5c933bf9aa5ff1a863a785414a4b06b294d106cd6957d
DIST patch-4.5-rc5.xz 8430188 SHA256 2625ae21341a70c4208a380cbfac96602b44c59ec8ab6eef7e4a5a0e97528f05 SHA512 a354900d29855dc8e9a1be629f06c7ef7875764eb4cb930a826306278d9e963941eeb3c393798314bf80b415645f881c8dd2b555da808388bfe54ff7551651f3 WHIRLPOOL 057349165c0680526fa0f14dc53faefb5a999e58ad0ebe8daa0e40a193f6f0c699377483ff9547b4e3da854c46618001c66650c42d8c5d7c95ab2d630912c414
DIST patch-4.5-rc6.xz 8495892 SHA256 b24869f3e64369b347cdc18c932d9194c2b5568f84d592ef17dace75ae8ecdb4 SHA512 116a72f3c07fc73d2bc51e09a11295d1cf5b0a8a3213fbbd14220fc0583131b6103928948a10a7c091dbef98b05d69c29206423254a971e07cdeae4609e00d45 WHIRLPOOL bf57e3ddbce14082d28d17afc65b3f56ab31357b703a45321e0dec1f08098a2dfa8626c90ba8547b8d6ffe3f2e540279509ef90993ad72b690c00dd765a60cf7
+DIST patch-4.5-rc7.xz 8518192 SHA256 9c83bd2abbba36c4798972801ff82ae3105643fb7835bec4ffcdb5f4d3cf7d05 SHA512 e634841f44fa5bbb1a605fa5d578a8946153da7286a6bd348af0c5e221c36e68204a167dc71c6b8a6aaf588134030ac8440d4c6a7814591f0aee5392103c8a3e WHIRLPOOL e387b890e8dbb1965f73f4984b7dfd0d485f7377cb300b09c822a05546ad32b0b15a3b50a1e9c36370fa272cb63ff5d7a2f475122343fcd6c8486cf5a62a68e5
diff --git a/sys-kernel/git-sources/git-sources-4.5_rc7.ebuild b/sys-kernel/git-sources/git-sources-4.5_rc7.ebuild
new file mode 100644
index 000000000000..cedf6831acf4
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.5_rc7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 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.4"
+K_EXP_GENPATCHES_NOUSE="1"
+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/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 48b9c0776b82..935e269339cf 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -46,6 +46,8 @@ DIST linux-3.9.tar.xz 72104164 SHA256 60bc3e64ee5dc778de2cd7cd7640abf518a4c9d4f3
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
DIST linux-4.2.tar.xz 85507784 SHA256 cf20e044f17588d2a42c8f2a450b0fd84dfdbd579b489d93e9ab7d0e8b45dbeb SHA512 a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee WHIRLPOOL 2058e664ee287cc03119ff3dd0155b7018b9c789a13a1012f190e516172f845dcb2d977c8e6a6951e9bd720e5e8cdfa3b888cce392c9b02780520e77475870d0
+DIST linux-4.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
+DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
DIST patch-2.6.31-pf9.bz2 358306 SHA256 55106f8f17d7987e8789254d52f44e093a2ab520292d0106288d14ea4f3a1e9c SHA512 97edc491768686b868f0cb0bac5fbbec365629dc883a60a9419d34f6be2f9a7bc445d51cf935f8c54fb6f0ba1699e7b6a6d1c9a13e3145718e565802930f5bf6 WHIRLPOOL fbeb6b18e677c1e27e1c9bb894409e1b7fb6bab8d4c00d91979911616233fb5391be9a3b9a43124df7b3adc2512d2dba9ebc7118fd4385637f61b2304a507a35
DIST patch-2.6.32-pf16.bz2 445921 SHA256 72ba0a9eb0c0dda1e553b9d0d7e450eec96cbfa625f3a3c2a8397d1ce12f7f20 SHA512 e90f12ea8527d68a96d27bcb53bc7a34a907f43dc42b60f3e09139a9b6ecd9da493f737b1a188c6e0fbd2e1d5183a653f4cf6c7045b648d9bb1d2dfdabd36721 WHIRLPOOL 442306ef06f20cabfe7b35b672f413060154ba160c5921a60200a87617e5f750ba835c239877d4899c5457c9c01e59d2027555571ca40271b86e97e764ef0369
DIST patch-2.6.33-pf4.bz2 378325 SHA256 4b6b641746e30983ac51a20b3098053f69591861bdf0b43e3bed9df8ccf6ff70 SHA512 8769e24b55539e95b570ba933bd80edf37da0eb18e00bd290c3a793871fa7f465a14f8a763201fb24c0d9e6185722dade5d63f66da170e6a38422add84a2f057 WHIRLPOOL 32fcc05977365019473de700579a3858592e6a94e7d3baa88850722de7a57c36f17860e11c5e6fc065cc3cb0158ca49ded48562b13de77b1e2fd5d446dc41e2b
@@ -77,3 +79,5 @@ DIST patch-3.9.5-pf.bz2 607797 SHA256 b6e8976003e7c4ffa603200dda8326bbac68601489
DIST patch-4.0-pf6.xz 463504 SHA256 e45747d19034cab60928fe5c90c570ef0d6a8a95b34b2026d9fcf94efafccd25 SHA512 2858874c1d29c8e54277085c1ba0dc1d6b144231db43dfc57ab4fb8689498e447922082853138b14664334cf566bbe58c36b8fd52df631f219856abba29bcf3f WHIRLPOOL 7fc0b016559688dd32638f5aaf481d997b1ef6e4c35a5970d6abece682ba1f23b772c7a2c2ad713fad7c0f9e6dcec4a377c1623477c3bc82a425d9c3aecce3c7
DIST patch-4.1-pf1.xz 341256 SHA256 68d466f1ac76bb1c5faae2dd01eaea83ed2f1790800eefb9d3aaf2c891569670 SHA512 6d97975a9fbdaf5046f274a8c739e7fe6edd55d69583b593483f6867222f3c3dc5793129041149e633a4fb0d0cbff867721fa4c2c66c1304c96a4e8d5d3aba6d WHIRLPOOL 60edd299461d78a451def90e026971eec6eb19e9257ea9797f54d593628fa9bd8eddc9ff0558735438437b5b45ff9d8822b0610e8b0f8db9bbfbb27c220120de
DIST patch-4.2-pf3.xz 498772 SHA256 31242418714f70936522a6fb3003368bbf9058843007cab5031614b3bb8542ca SHA512 16c68f96cf0290369320e5bc4425504a729e7f41140d66e23f1f724e0bc3683ff2ad4a1b00872a663e9be35ccd33448ff2153c6292a637a7269494f1e84e3b7d WHIRLPOOL feaa61475c585e2a7e455a1507bf89d5ed2958748557b632a7642100c327d6f774b9e3e07834761ee1e6dbd1dc99bc0fa15ff709faa017fdae4367c36eacf313
+DIST patch-4.3-pf4.xz 360620 SHA256 70bc512d6bb05591944d6a17a8a82265436a6fad1597be59bab87cabb4644d5e SHA512 2e70530a17a2308cdcc232db985b4dd3612794603bbfb37d961ec30cb8bdf8ff2ed68f922af3af7489fd953f015e20541f173140deb45d64891c551f3b593373 WHIRLPOOL 822c73f7db09d1bcc710b420b68a33454ce9b35af2d54e25cb00c6dc3a0ef96df8c5f2802b9536a3e330c6dcaab2ce41e8fa033fc8762d11ae013c5dc9d331eb
+DIST patch-4.4-pf5.xz 351600 SHA256 c1edc12b4484834fb59707cf68cd4e5d4fb75ec5e05545bef36e085ee5ddbed2 SHA512 3a372383d8d9b6879015c8b60d02d3620752cfd0523a390301cad9c4afca5cbbd3b819c09d31fcb9e7d9077443822efd91d8106a7332368f050ced32d226aab4 WHIRLPOOL 8c69386e7d79ae057ba4c43ff27a024a857fbf15807ac8c7b39df95ffbc1bdad6cd753486a6c22411a3df9f2a80cab0a92615bbf453f113d84c709eacd8e02d8
diff --git a/sys-kernel/pf-sources/pf-sources-4.3_p4.ebuild b/sys-kernel/pf-sources/pf-sources-4.3_p4.ebuild
new file mode 100644
index 000000000000..071e43eaa517
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-4.3_p4.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 readme.gentoo toolchain-funcs versionator
+
+COMPRESSTYPE=".xz"
+K_USEPV="yes"
+UNIPATCH_STRICTORDER="yes"
+K_SECURITY_UNSUPPORTED="1"
+
+CKV="$(get_version_component_range 1-2)"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+K_NOSETEXTRAVERSION="don't_set_it"
+
+DESCRIPTION="Linux kernel fork with new features, including the -ck patchset (BFS), BFQ, TuxOnIce and UKSM"
+HOMEPAGE="https://pf.natalenko.name/"
+
+PF_VERS="1"
+PF_FILE="patch-${PV/_p*/}-pf${PV/*_p/}${COMPRESSTYPE}"
+PF_URI="https://pf.natalenko.name/sources/$(get_version_component_range 1-2)/${PF_FILE}"
+SRC_URI="${KERNEL_URI} ${PF_URI}" # \${EXPERIMENTAL_URI}
+
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+KV_FULL="${PVR}-pf"
+S="${WORKDIR}"/linux-"${KV_FULL}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${P} has the following optional runtime dependencies:
+- sys-apps/tuxonice-userui: provides minimal userspace progress
+information related to suspending and resuming process.
+- sys-power/hibernate-script or sys-power/pm-utils: runtime utilities
+for hibernating and suspending your computer."
+
+pkg_pretend() {
+ # 547868
+ if [[ $(gcc-version) < 4.9 ]]; then
+ eerror ""
+ eerror "${P} needs an active GCC 4.9+ compiler"
+ eerror ""
+ die "${P} needs an active sys-devel/gcc >= 4.9"
+ fi
+}
+
+pkg_setup(){
+ ewarn
+ ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+ ewarn "If you need support, please contact the pf developers directly."
+ ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+ ewarn "the ebuilds. Thank you."
+ ewarn
+ kernel-2_pkg_setup
+}
+
+src_prepare(){
+ epatch "${DISTDIR}"/"${PF_FILE}"
+}
+
+src_install() {
+ kernel-2_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ readme.gentoo_print_elog
+}
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+see: ${HOMEPAGE}."
diff --git a/sys-kernel/pf-sources/pf-sources-4.4_p5.ebuild b/sys-kernel/pf-sources/pf-sources-4.4_p5.ebuild
new file mode 100644
index 000000000000..071e43eaa517
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-4.4_p5.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 readme.gentoo toolchain-funcs versionator
+
+COMPRESSTYPE=".xz"
+K_USEPV="yes"
+UNIPATCH_STRICTORDER="yes"
+K_SECURITY_UNSUPPORTED="1"
+
+CKV="$(get_version_component_range 1-2)"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+K_NOSETEXTRAVERSION="don't_set_it"
+
+DESCRIPTION="Linux kernel fork with new features, including the -ck patchset (BFS), BFQ, TuxOnIce and UKSM"
+HOMEPAGE="https://pf.natalenko.name/"
+
+PF_VERS="1"
+PF_FILE="patch-${PV/_p*/}-pf${PV/*_p/}${COMPRESSTYPE}"
+PF_URI="https://pf.natalenko.name/sources/$(get_version_component_range 1-2)/${PF_FILE}"
+SRC_URI="${KERNEL_URI} ${PF_URI}" # \${EXPERIMENTAL_URI}
+
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+KV_FULL="${PVR}-pf"
+S="${WORKDIR}"/linux-"${KV_FULL}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${P} has the following optional runtime dependencies:
+- sys-apps/tuxonice-userui: provides minimal userspace progress
+information related to suspending and resuming process.
+- sys-power/hibernate-script or sys-power/pm-utils: runtime utilities
+for hibernating and suspending your computer."
+
+pkg_pretend() {
+ # 547868
+ if [[ $(gcc-version) < 4.9 ]]; then
+ eerror ""
+ eerror "${P} needs an active GCC 4.9+ compiler"
+ eerror ""
+ die "${P} needs an active sys-devel/gcc >= 4.9"
+ fi
+}
+
+pkg_setup(){
+ ewarn
+ ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+ ewarn "If you need support, please contact the pf developers directly."
+ ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+ ewarn "the ebuilds. Thank you."
+ ewarn
+ kernel-2_pkg_setup
+}
+
+src_prepare(){
+ epatch "${DISTDIR}"/"${PF_FILE}"
+}
+
+src_install() {
+ kernel-2_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ kernel-2_pkg_postinst
+ readme.gentoo_print_elog
+}
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+see: ${HOMEPAGE}."
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 12d4a9043535..d9a6e70fd758 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -7,12 +7,12 @@ 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.3.tar.xz 86920812 SHA256 4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae SHA512 d25812043850530fdcfdb48523523ee980747f3c2c1266149330844dae2cba0d056d4ddd9c0f129f570f5d1f6df5c20385aec5f6a2e0755edc1e2f5f93e2c6bc WHIRLPOOL e3f131443acc14d4f67bbd3f4e1c57af3d822c41c85a112564d54667a591c8619dce42327fd8166d30a2d7adfaf433c2e2134d4995c91c08f65ac0cc2190f935
DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
-DIST patch-3.10.98.xz 1241140 SHA256 28532b12b1224c182ce2aa0201d31603694ae6459cd5939667b9f4d5d04f0c1a SHA512 819fe89cee6812ad059ccd53bcd88255e628bd8ef294abe643b55333f37c5c0e666cfe5f7c09a6fb4b461ee18cfefc623ad60e15e86db8b29ea59286e6881814 WHIRLPOOL 0546e8198144984c668de8540c0163511eb2f8b199b3b0065813cee0bc62332c6b1b45b33094ec63055fe581e131f8e140cde3bdee766133a5d67870c415e99c
+DIST patch-3.10.99.xz 1256116 SHA256 b8c491925bb9ee2cb686696fc035626219ef43a0dcb313edc21b3d51c719b49f SHA512 79c77136298c17d473d5761d889dc1c533145dcb07631a040fd2f88d2ba52041201f080114c2cd6649fcedf220d3dde1b1d43d7bb12b886a921596445d9d3c08 WHIRLPOOL 6bcd83b7693f52b82beb6091aa20f539b7f2c0185b2ed9ccdbba258300c882b27c4ed56320fde5c660165c434f634c761397e9d14e4f717cae0c9c4a9c317458
DIST patch-3.12.55.xz 1467808 SHA256 985f4d60bab6b29e75e8b8cb6bd8c259728033b6535f53c9b63352a97b01d8de SHA512 b9d89d406059e64ba98beaeeaaaa3317f550ace7aa9d44991ba9ecf3d84322f8955129c806563db14882c65b6b434c7a8f92d0ad440524152d8de0f470a64e25 WHIRLPOOL 2e6531117bbf610f548a8f3a53fcf39ebd3e90beba36bbf5317601e8bc47f42e17d15e745c13df3bc2ab697f1901eebdceb01a7775adb0ec4a50d023c3d77d50
-DIST patch-3.14.62.xz 1086096 SHA256 5a8f4a2de164edb4d921d725d6df81f26a106248536317d0b71ba30da38b1da2 SHA512 f9cbe304d7bbd85d0cdaf763a8f594fefdbd851302d66a463682d36fbcc3fd1b4e1bf71fdc57be9b88505d620dc88ceb754b7bf048a5433a2bea6f94a50dca9e WHIRLPOOL 2c8c45ed0188655f95c73389404b61bc7b3a09ccf9d807e733450d602851e0f3d705aefbdf6e51fb1ab81d5d345537acfb9df49c08924b9f2a7b2fda63accbac
-DIST patch-3.18.27.xz 780340 SHA256 5ab0f1f24a494fc8d208d9d1efb2d7d516f99a320b05a3201fa39706fd33473e SHA512 a0ddeda9fe9905743afd3475dcb8eed6602d959afaa50684c585ba0e84a34ecd66a3cdeeebdbf61094c32b731cf3f98cd0e96904c3327ed8be20982a1bcc3208 WHIRLPOOL f75e9c2c678b4e8cb71a53b1c14774c454e4c2a941f9b597b27b09649ed8958bdef872a4b542096c9388283cd8722541acba03646ce2787c4e48c27d1e43009f
+DIST patch-3.14.63.xz 1110620 SHA256 0b67d12755af93b0dae8b6beba60a35eed3a80dc0628cb90c8a42f44f43c69c3 SHA512 e196d224dd242dc1c2dc6ddda9266a9a9952002597a9ba355a0d2f9c805341810a0a43b1290191f3b91072853777570649a395c232870074a5781e243e125d04 WHIRLPOOL 9e9addb01250a30a2a5ccdf8628fe2e09f16091697b3c4c7ad1530bd74bc48d030a4378fa2a157d5faf4c8a52cf7b76c4820434d64819a17e5c9eb4f59211a29
+DIST patch-3.18.28.xz 810736 SHA256 9232d49b92b822710eae5efa77a53477a2b180da74c30aed3439561eef681cb6 SHA512 73eca0825bcc5764ee7bb25c0d1f38d6abdd0acda8613814b505a7898528cbf708c743403269479a12083b09f06dcb861c70347bd41d4947613c4225558d9201 WHIRLPOOL 6fbda4e7363aab2f6ce2865b1f9b17b09089b70cc8dc948ccb6210263df57bbeda8d2b31c6691690799c64cc3ed6d1fda4c3ec4ec7ee4ec24545015e88799899
DIST patch-3.2.78.xz 1562744 SHA256 5ad9712f9a46b184e96524d3048f022da7c09045a37b0434a2f0ecb54cba5b2c SHA512 c3fce0adf191e37ce61d4061be77374dfda255764775a434135108cc2b3498496aab8790a27ab7022a7db81f27921bf4e239658f23c3912c0ad4455a0fa92752 WHIRLPOOL 05d201c22dae6f0202f6ef66db8ef39dabf986ea7517bdbe2a064e3dd9ea13c6f36de4d6ef65722bd6b0513c5b4ae7a756259c451651595eef1b670c51903b5a
DIST patch-3.4.110.xz 1293116 SHA256 132362637b7ba272d58acbedb172a7233c238ec1d794af111af55ee8a406e12d SHA512 fc3f95dbf831b8edf9626632983b2d38dc017ff9db8718a79c9c3f714d1114c4fc8c6673854218c5230b3f71667b735945f6f80ae11e424894570941e7431b4a WHIRLPOOL 9f1ec18591c043ba103856d2667c776bebc3369aafcb27d75174aac9d7e00653c571b245dcc8aca735838117cab62178e7a2f63a616a594fc9a508e85a997cca
-DIST patch-4.1.18.xz 547140 SHA256 c69cbff479740d6bbd452d2264ba0afefa99ae51bb7ae52bfbde348ea8d8b20c SHA512 b95b82452206c2ef19e9fb1b01dcd6880c74f1b1fb9d8e1f209add734ba342d7c65401f3a4a2101eaa6b20b653b265ebc863052de71e01fa886ff7d7b1c1ad17 WHIRLPOOL 3a47222b9349ebfe8820e79b70c50c145283a31c01d3a63b6ae08ee0a008ee85a408c44aa1711fc1dd808d9c7ccf090fee35b23abe9d85bc34650e7db39986e7
+DIST patch-4.1.19.xz 592092 SHA256 be12d828fd185db6f51c261dd41b2bf30e866ee85d2e2c166c3035d8084f7b8e SHA512 24617e34a5947b183b2203ecb24fb9002b5da4bd957df783c312bc9d109a406ce577e9fa9cddb1f1e165ef9e7db8a8979172886c5d5516e37c6ce9bcfd151fac WHIRLPOOL 27da67cdcd47335efe54b2916590061c3cf49ab0a076aba1575356b8d45e924da4fa97185848680abbb6f8072233ff7ca7b70437f03fe49d501ede5bbef7f7e5
DIST patch-4.3.6.xz 190488 SHA256 a68b16b1f6841e2be6d492c8502cb0d0a709097b55c400ad7d90b60fa4355d6b SHA512 d0b8c278a0c7b4e829d4e98884d9c2ed6cbc4bbd6e21f3d7b6fc0f1e50a267ad871a0b82723fc4bc5e560748af4ba07e8af8f9c28a0b01307d8e6f8fcdbff0d7 WHIRLPOOL bc0323e041c666243312737b0eee284636d783acbdf36ee2ba831fa9a20396a386a772f0a2e2a41efec1df802fa241f77cf5a6e6ece04962c8389e209469c833
-DIST patch-4.4.3.xz 99576 SHA256 4a24c79c40b2cb820ce9f22d44f31edcbde5971432753ab0289772946ed05b7b SHA512 8477ecd07d06bc6c6d75dc95027920e1f41128fa8a6b382377d7a0a64ccbca719a464ef64397a3715e7ffe400640c6590ab5da691690472d1f9311ed82041d50 WHIRLPOOL 8f2c775d79731e32ed5ed3f50f3a5dd5a2a81e991a11e1d2234622bd20ccd9df3f8dcf1049f36f555238af7d7b457df738bb30e9766ff8ae5f3f4153e8078773
+DIST patch-4.4.4.xz 200972 SHA256 9061d8f57cc25d760387c4e6b7d5cceacaa808e8784a3e478012e7c2949853c8 SHA512 c206af7803cb0915fbe2bd27ed33282452db3fbd3070c73e4c7147443efd3c7588fb3be12d0abc08742381fbe892190602b29147684630aa9e6ff5e9efa49dbc WHIRLPOOL e6a004e32eecca1507354f97d3de85a07c1b9512fe3d4d87173e6d39c02ef1c2411abd0c26b6a077cd5eaefde11dd201445f72b9a0cf185e76635bdcc36df8dd
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.10.98.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.10.99.ebuild
index d8dab37130e2..d8dab37130e2 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.10.98.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.10.99.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.14.62.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.14.63.ebuild
index d8dab37130e2..d8dab37130e2 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.14.62.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.14.63.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-3.18.27.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-3.18.28.ebuild
index d8dab37130e2..d8dab37130e2 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-3.18.27.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-3.18.28.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.1.18.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.1.19.ebuild
index d8dab37130e2..d8dab37130e2 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.1.18.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.1.19.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.4.3.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.4.4.ebuild
index d8dab37130e2..d8dab37130e2 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-4.4.3.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-4.4.4.ebuild
diff --git a/sys-libs/libosinfo/libosinfo-0.3.0.ebuild b/sys-libs/libosinfo/libosinfo-0.3.0.ebuild
index 2d6eabbe791d..931eb09df01c 100644
--- a/sys-libs/libosinfo/libosinfo-0.3.0.ebuild
+++ b/sys-libs/libosinfo/libosinfo-0.3.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
IUSE="+introspection +vala test"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
RDEPEND="
>=dev-libs/glib-2:2
diff --git a/sys-libs/libseccomp/libseccomp-2.2.3.ebuild b/sys-libs/libseccomp/libseccomp-2.2.3.ebuild
index 14070de3a99f..6b04d1b92b1e 100644
--- a/sys-libs/libseccomp/libseccomp-2.2.3.ebuild
+++ b/sys-libs/libseccomp/libseccomp-2.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/seccomp/libseccomp/releases/download/v${PV}/${P}.tar
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~x86"
+KEYWORDS="-* amd64 ~arm ~arm64 ~mips ~x86"
IUSE="static-libs"
# We need newer kernel headers; we don't keep strict control of the exact
diff --git a/www-apps/trac/trac-1.0.9.ebuild b/www-apps/trac/trac-1.0.9.ebuild
index d9602aa483b7..51f3bc21d6fa 100644
--- a/www-apps/trac/trac-1.0.9.ebuild
+++ b/www-apps/trac/trac-1.0.9.ebuild
@@ -20,7 +20,7 @@ SRC_URI="http://ftp.edgewall.com/pub/trac/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion test"
REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/www-client/chromium/chromium-49.0.2623.75.ebuild b/www-client/chromium/chromium-49.0.2623.75.ebuild
index ec85e3ac0cc4..536adb032773 100644
--- a/www-client/chromium/chromium-49.0.2623.75.ebuild
+++ b/www-client/chromium/chromium-49.0.2623.75.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD hotwording? ( no-source-code )"
SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="cups gn gnome gnome-keyring gtk3 +hangouts hidpi hotwording kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine"
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
@@ -460,6 +460,9 @@ src_configure() {
elif [[ $myarch = x86 ]] ; then
target_arch=ia32
ffmpeg_target_arch=ia32
+ elif [[ $myarch = arm64 ]] ; then
+ target_arch=arm64
+ ffmpeg_target_arch=arm64
elif [[ $myarch = arm ]] ; then
target_arch=arm
ffmpeg_target_arch=$(usex neon arm-neon arm)
diff --git a/www-client/epiphany/epiphany-3.18.4.ebuild b/www-client/epiphany/epiphany-3.18.4.ebuild
index d35f280ec046..400817e0ea0e 100644
--- a/www-client/epiphany/epiphany-3.18.4.ebuild
+++ b/www-client/epiphany/epiphany-3.18.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Web"
LICENSE="GPL-2"
SLOT="0"
IUSE="nss test"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
COMMON_DEPEND="
>=app-crypt/gcr-3.5.5
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 6030a1652de0..c053db49f4ef 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,4 +1,4 @@
-DIST opera-beta_35.0.2066.35_amd64.deb 45196244 SHA256 fffa77b114ce8434d4b48987042f26a919e319a40ad61250af891e6119fa9d0e SHA512 c75798d17f59aff11e5e58f21d5606f9d92b1136bcddc901662f5adba1ddc400729a653c12e39d2cf7754e741834f46f82ba44c39220371c037c73964e72d539 WHIRLPOOL f6b8b7133d701a60baca44f93160e4d67bbe65aa45643fed6b84e337926582b784e488e4287806dd88b03dbd46abd673eefa9d880ef71e5d775b81d4732697d7
DIST opera-beta_36.0.2130.21_amd64.deb 47382256 SHA256 3ac3a2a9b8f6d69ad1de88859405115acb83269447697f758b6e713ba647a766 SHA512 2de58ea2f48c17007abd945bb8f7dc4f0552a2ddf9136707f8c3fadcaa7be02ead018108f34e1e6886c50e2d6698f4038cc13b5ed1a15ae721cc111e571701d2 WHIRLPOOL abf6a9d6b25c530f74daeeff2136af7556e0b7a701b0780d38b87ba5addc801eaaae14abe5373243ed344e984ec8c558a945c887cdcaa64d0bb0096910b19cd4
DIST opera-beta_36.0.2130.21_i386.deb 48429050 SHA256 7f799a406689bba3ccfc34f632257c2f3632e857872d5de835f356b5dc0f9da0 SHA512 5c92180cd9416586fa811c620e4a985de6fe7072c0f2677e6d48c7fbd44665ec11b93f20d689811febc135899487a30ab03f241f4bf714052575f6987750bdc9 WHIRLPOOL 80c22311d869ab033f784756ad702e45a4d44101ba0d7199e5c533bc3b85d85df009683a98ad37e921394567186bdfd6c6244bbbf80d7f3e05bb5bb8830d3c84
-DIST opera-beta_36.0.2130.2_amd64.deb 46519260 SHA256 ce314768010d605e1a365dabea5b8cd02c0c9bd33abca6e94515f8ff39299295 SHA512 c5502bbbacbd501408b0502d656053ef429cd1e25124438fb68e1615c8a7f367b7efe6d56124d8c8a2d8a702215523027d739fe40bad74e9196a618f02dfacba WHIRLPOOL abfa182bb930fa853f5df3a9d484c305bf7be5bb0ae695470d8b66aa18c74fbafe6408d98699a68417870c53b025b87d6de3712fbad9860ca399f732284216a6
+DIST opera-beta_36.0.2130.26_amd64.deb 47417194 SHA256 b1c90473be797a9f4e9f949555537f926cc4019376e2b5e5b82324e17b5b8b5b SHA512 8f3eec0abd1cae69612bc336f0cd8fcecd83f378d13a48a9d47a2c7b816bbc661c0ae308a3a99aac3410a70244192e9ea27ff3bd90e03d88d7087dee469c0406 WHIRLPOOL a0fa4e430db43daf0682e88bd180159375a9b0f8339c89dd2a2421b830351403a50f976d7fea568699e7b5ac3b0b2f86569a4552e18b39308e5c1e4bbaded74c
+DIST opera-beta_36.0.2130.26_i386.deb 48533934 SHA256 33b0471daa6f33524b1948beab5cffe3c3d2b78d0adc35df25f3541dcca4afc6 SHA512 5384f67c190e12d2dac97192edb5b0dfbdb0c0137d2bdd1e2556f46b40f4ce8d84e333c307acd7085544456827163946bb8afece7dfce59477498abe3194c0ce WHIRLPOOL 53a02e8fe25cccbb6b46915b1d499bf9a7f508583226901440a6da4f7a5a0e5bfabe7d7b26810588007088e0dfb825d56cb8e2838c7cdf1bddedf96e6c84a89d
diff --git a/www-client/opera-beta/opera-beta-35.0.2066.35.ebuild b/www-client/opera-beta/opera-beta-35.0.2066.35.ebuild
deleted file mode 100644
index 85938b5f48ae..000000000000
--- a/www-client/opera-beta/opera-beta-35.0.2066.35.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CHROMIUM_LANGS="
- af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
- he hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru
- sk sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
-"
-inherit chromium multilib unpacker
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="http://get.geo.opera.com/pub/"
-SRC_URI="
- amd64? ( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
-"
-KEYWORDS="~amd64"
-
-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/libnotify
- x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
- unpack_deb ${A}
-}
-
-src_prepare() {
- mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
- rm -r usr/lib || die
-
- rm usr/bin/${PN} || die
-
- rm usr/share/doc/${PN}/copyright || die
- mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
- pushd "${OPERA_HOME}/localization" > /dev/null || die
- chromium_remove_language_paks
- popd > /dev/null || die
-
- sed -i \
- -e 's|^TargetEnvironment|X-&|g' \
- usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
- mv * "${D}" || die
- dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
- fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
diff --git a/www-client/opera-beta/opera-beta-36.0.2130.2.ebuild b/www-client/opera-beta/opera-beta-36.0.2130.2.ebuild
deleted file mode 100644
index 85938b5f48ae..000000000000
--- a/www-client/opera-beta/opera-beta-36.0.2130.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-CHROMIUM_LANGS="
- af az be bg bn ca cs da de el en_GB en_US es_419 es fil fi fr_CA fr fy gd
- he hi hr hu id it ja kk ko lt lv me mk ms nb nl nn pa pl pt_BR pt_PT ro ru
- sk sr sv sw ta te th tr uk uz vi zh_CN zh_TW zu
-"
-inherit chromium multilib unpacker
-
-DESCRIPTION="A fast and secure web browser"
-HOMEPAGE="http://www.opera.com/"
-LICENSE="OPERA-2014"
-SLOT="0"
-SRC_URI_BASE="http://get.geo.opera.com/pub/"
-SRC_URI="
- amd64? ( "${SRC_URI_BASE}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb" )
-"
-KEYWORDS="~amd64"
-
-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/libnotify
- x11-libs/pango[X]
-"
-
-QA_PREBUILT="*"
-S=${WORKDIR}
-OPERA_HOME="usr/$(get_libdir)/${PN}"
-
-src_unpack() {
- unpack_deb ${A}
-}
-
-src_prepare() {
- mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
- rm -r usr/lib || die
-
- rm usr/bin/${PN} || die
-
- rm usr/share/doc/${PN}/copyright || die
- mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
- pushd "${OPERA_HOME}/localization" > /dev/null || die
- chromium_remove_language_paks
- popd > /dev/null || die
-
- sed -i \
- -e 's|^TargetEnvironment|X-&|g' \
- usr/share/applications/${PN}.desktop || die
-}
-
-src_install() {
- mv * "${D}" || die
- dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
- fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
-}
diff --git a/www-client/opera-developer/opera-developer-36.0.2120.0.ebuild b/www-client/opera-beta/opera-beta-36.0.2130.26.ebuild
index bfeded8ebfc9..bfeded8ebfc9 100644
--- a/www-client/opera-developer/opera-developer-36.0.2120.0.ebuild
+++ b/www-client/opera-beta/opera-beta-36.0.2130.26.ebuild
diff --git a/www-client/opera-developer/Manifest b/www-client/opera-developer/Manifest
index 2b0efb89bee9..96b1f817ef22 100644
--- a/www-client/opera-developer/Manifest
+++ b/www-client/opera-developer/Manifest
@@ -1,6 +1,4 @@
-DIST opera-developer_36.0.2120.0_amd64.deb 46346306 SHA256 2e572f3b8a3571c9f4c793f91db4f80c73c27e50a23fcb9901863e97c31d7141 SHA512 1897b0f25bcdf51cb2f3308eab374e20cc719fc8f3f7bac69108de601663b2ec15baf4f59be2b0b0f7954036d5d7f1af286e4d92458e312965c3a7be7abb92a3 WHIRLPOOL a3637c3b38532713ca73fe5edd9574c62e7a5248e0977750af215c412bb5e53d3344726cc04c5fd93d4d63345a35505047976c306def917fdbbac0296ae3f236
-DIST opera-developer_36.0.2120.0_i386.deb 46568196 SHA256 7d7561c4d46746203f456c560aa74cd385b500b44f8779712ad265797d9187ad SHA512 b09f5045f4b053734b1773d879bbef273545bb0662bbc01ffa609274f06363ba6037f374c6af0f5547680db986f3e318b63cde734a4f5b6a034c80a3e834953b WHIRLPOOL c1febbc4210328e514ecf945e1bbab988834ecdd68a79cc43f037e8f3b8f429e96bcb611aac3680de0286ba43d0717aa391d4cbcbc6706dca87ffa1c8e8103e6
-DIST opera-developer_36.0.2129.0_amd64.deb 46667976 SHA256 b549b232a0565fcc4f2a0f338f50f57545efbeaa8c40c8cfd64aff47955f8c46 SHA512 9f0b8a21fbd7ff8b8c0db65d5b2a98704ef458893cbf584411db26b6fda1fd8286d1fba287d7826105dcae582566c9e8a074e639c308dd5b3684c0c8c94542d6 WHIRLPOOL c0d8e8793bfe86ce82f2b76114c8d37b6edef3a2a6cae52f41af191e9eaf79901ba16d52c59bccc3a4a3069f05e2f6e218899c4d1713328ba82a59d50ee3fe0e
-DIST opera-developer_36.0.2129.0_i386.deb 48143050 SHA256 529d5bf6732c44fc5d23845f07d7b8e0a6922145f0389cb1858db8636cfead2e SHA512 7e3a7ee1d31f014f10a34d1ff728ad65bf52a66e5f201b38eac3a95dd499650b7e6fc911b0e507cec34562d7e6e0ea0e0298ca2bd5cfad256acb258e985c1776 WHIRLPOOL 8e3cfbfb2f2e9473ed864ca41f5cd05775b25f23d849b2ef94a6a2396b0a8efef3714d696e88e01b95d9f67ef81bf38827aa8146c850c67fd23e2ddb8ae1f78e
DIST opera-developer_37.0.2142.0_amd64.deb 47534832 SHA256 bad16537194760f3be744163c2d88d5f228eae142865b704766de4b6c3d8f4f6 SHA512 6be695ad20b0d0bd0a2f567b4853c15d63523195136040e276ce07fd18a08cb369e63793c70fa735e332ae1d9c916f80502be18f3c1f4bc8fe343e1394b69281 WHIRLPOOL 9f797f0a3abae394d8ed1785d9a8c752521e5b63fecc73d580f6bb6837c3a15e951fb191480e2e1d2a74ee789de16299cbd9d8afeb7c3a80ebcfbee0923e6cab
DIST opera-developer_37.0.2142.0_i386.deb 49027934 SHA256 db74f4b3159e5e8ed604b9d253f68dde1a430b303e520f8b3c11dc238dbc8737 SHA512 8174eddfa5d50151055fcbd39b2136bcdebfd0b043109b312d17470ffbd1d83bae6bf7cd857137ceaa0e415bd9330138c7e367d43da9f8a5f7caae9f45f1dba9 WHIRLPOOL 84f05191d55509f734a38adbf2b7850ec6b5c8f05ad5d15a1220d6d367a093de426d35f8f522562f5673274eae581164e811ca38b31a7e76a36d59ff2757b6e4
+DIST opera-developer_37.0.2157.0_amd64.deb 48283416 SHA256 aa664cddbbb9bd5802e2e07f4b7f5d9b9510bec6af7eba785f589fdc395ecd35 SHA512 c9839de6e14b8bce49dce0a721c2d3595fce638a2b207d2e40658d02d1aad4576f10f5ae8712d89c1fd089860b98a96a3bd013e141619956880ef23cbf110e57 WHIRLPOOL 6872d2e386b7782bbf1e1195df6e4c234f254f843a897c896b1f897b9875a6ff65ecb481694250a307548259ceccc925d95616f285ac8fc1a70fcf0d9d15a194
+DIST opera-developer_37.0.2157.0_i386.deb 49518890 SHA256 aace6b943dbd0ab06bfa5d237435619259f2d94b726e658eb565361d82b92465 SHA512 59f4424d7700222b002a360209a6b9c3f42d0d312aacd2ab84c369f8080272f93916cf9f429d8519ba68328ce6c21bceb627550c0ab8e119221cb7a58f5ccdb1 WHIRLPOOL d481577974a1296d6066fe91f02213feb8179a79d4d79b69c779a3e50b8ff96011996bc2d9158a46cc352f6a0565f93ab52df659e63315e5315b253c701cdcc4
diff --git a/www-client/opera-developer/opera-developer-36.0.2129.0.ebuild b/www-client/opera-developer/opera-developer-37.0.2157.0.ebuild
index bfeded8ebfc9..bfeded8ebfc9 100644
--- a/www-client/opera-developer/opera-developer-36.0.2129.0.ebuild
+++ b/www-client/opera-developer/opera-developer-37.0.2157.0.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index bb7a0c27c041..d90ecd29b29d 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,5 +2,5 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 SHA256 ecc001605c45baa4acf60
DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 SHA256 dcd80ea7a8f090a47007fc630495817feeb167220b9a9bbffbf349687f3e29d3 SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844 WHIRLPOOL 5703b2c736694cf6ffcf808872e72585b81c7fed9d2263d5679ee54f667f4eb6b9d34a73b80c8efc0a8640daf03da60dafa0defe0c560d3ef78f2a8a68cbb960
DIST opera-12.16-1860.i386.linux.tar.xz 13154668 SHA256 df640656a52b7c714faf25de92d84992116ce8f82b7a67afc1121eb3c428489d SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613 WHIRLPOOL ae1af6858847fe51dcac8cb076a67099846ad66b734ecf92780e953daec963754c9e4352e979a636eac70e785a62bd94e084124080d7fe0f59b420a99a2133cc
DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 SHA256 b3b5cada3829d2b3b0e2da25e9444ce9dff73dc6692586ce72cfd4f6431e639e SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b WHIRLPOOL 539cdf43b4c8175c664fbf786b27ede1d33e58c44f75229a1a50612951136f526d646f3e0444b6cc69961259c3e3ef7dbf722b520abb4d4dbb98032c4de335d1
-DIST opera-stable_35.0.2066.68_amd64.deb 45320262 SHA256 20805cc8832e1dfa961ae9f8917cb8099e62a5ea829224053927b24e2e2ceeb4 SHA512 673ccdbac2a8cbf98f5efbfb9e44be66ab886aedee1358e84f9c3b91dc23a5f724cb46b494585a85c672b74942b138697ce47786fed13018472b9a59eb2923e3 WHIRLPOOL 0af64f4313576db6d731d801702b63e54e37dd58dace8a351ede5062c787411a1124704e10101724d07999032fcd8c1548e8c37034b204ba9e590c9db69a940f
DIST opera-stable_35.0.2066.82_amd64.deb 45190134 SHA256 5748675db2490b6d267b622db33f51a0b7d4f30af810642d562a68ba27600dff SHA512 68caa06089745c8069df87c00823b0e64931da681438c6c6ff75553467d3763d95c93ffe8c3bd857dd32f19ea91d5116d0eb7b58ec1a7216c8f59bd883c4a3e0 WHIRLPOOL 5c5202cdd8630f2b00504d5ab1a5ef323adcd6b8f6dc0c5793a7676877154402e742fbb0b2d48a10dbd18a939fde75a23437fa2a464efbf2558ea6b63f471562
+DIST opera-stable_35.0.2066.92_amd64.deb 45185254 SHA256 e0a096af6ff4f8ca43954ce63a9150339ffcd27be85d8766d3d5ea41d000cc79 SHA512 8427e9d0a2651b3b6957b7704d98c68c2a508f481874fe80bf1e14eabadf0180a4321da12cadc9f46cc21b9b68b5c82009608987bdfaa9980ce1422d700fef1d WHIRLPOOL d9d13b69de7265c6632f3fa99fc970006834f7928d789d609f16b095d710ee4325357a754daa4674873a43eca529902294fea342cfedeb37270b04e7e9644158
diff --git a/www-client/opera/opera-35.0.2066.68.ebuild b/www-client/opera/opera-35.0.2066.92.ebuild
index ec547a8df4ce..ec547a8df4ce 100644
--- a/www-client/opera/opera-35.0.2066.68.ebuild
+++ b/www-client/opera/opera-35.0.2066.92.ebuild
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 50097ceda4a9..726ae56fc282 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,6 +1,8 @@
DIST enigmail-1.8.2.tar.gz 1604159 SHA256 1d2700799bc52aaa8e8c9f7a0f5111281ff9fbdffc093cdff070657d574eb2a6 SHA512 51eece988f466aeb4a343719a86dc7d95ec41dfc3ec7e3d8d2f360528675c605f8f2154f10aeea6ef82ed87c784f1d13bfc978e052a9ede0072b5137f6294b11 WHIRLPOOL e12a703899e0e4c98adc58b5f4bf1f74e24a2cf09c1a706a6edca6aca06140041b293f23e6e5b05c507177b4148533ebc3431fb75592aae07d791a899ba2c45c
DIST firefox-41.0-patches-01.tar.xz 6328 SHA256 408f9a577d698b3713a112d04552e396ff2af7cb9756f87800efef7cc55dcdba SHA512 a9476a658731b5fdd51bb9855bf4292afc8cfb8e4475250b4fac75cb5166a1e9d384a8fd2ceb38d6f2044759bcb895f956c0cfcb361eb4a60d38481a93c546b0 WHIRLPOOL 9420e7757a0f45889dec228ce3d1fedd23ed6ff9cde1f3461ffef577ccd43bc6cdb5ce3a3200f067bfe9203111067467a91bd90c0861bf81d490b022baf087eb
+DIST firefox-42.0-patches-0.3.tar.xz 13360 SHA256 8f1b592454695a27cd8ab6a234705d73363af0a5ecc5e64c30072def05fd5fc8 SHA512 4aa1ab7b8482b2d6af35cc293443678eb3c33a6eb2577fc0553ec94b3c3a3cbd7c322d50c004ac646296491fe1f67f5d199635750b0c50cc4f0742af704a9cac WHIRLPOOL e755b9fd4da821e8d0490e138531dcc55e9c9dd6ebbbf33771fffda9fe932df79c1d26dc8ad6b6dc9e8a444ee47659f7ef90846dc076299793db4726be06b94e
DIST firefox-42.0-patches-02.tar.xz 6424 SHA256 6c8a89c75ea4a359bf720f011e1bb856b653cd6676767b33ccb9d2f807a089e3 SHA512 d40266c98aa5bfeed243e3bd42f9146bc73492bd20bd07ac4941df83793a7e3a832220b65fc8c9eeb5f3a00089087251a2b758df5fc0d3dd3403468ec0b9eb53 WHIRLPOOL 93356507e31a5dca653a5fcc844c24acc1de6b2a01f3dbd7227c1e23eda4e8799a59cf1a50bb49b721249cb82c744d49f4671bfb7188275101c6de955afdb149
+DIST mozilla-graphite2-1.3.5-upgrade_patches.tar.xz 92916 SHA256 6314600c4d19112a51fba1f406eaef34b50df78405aa7cb0080550322d9b9ff9 SHA512 7fa37fe27587b80aaf4a2625abf7a28553286ecfa837b4c7c7d5a217abf8cf01a2446471f7c320d484325c2f7461161b00df75ff9a5d9efc70140e9723f5ac2f WHIRLPOOL 749ba5919850945f0fe36dfac912206cd38c50ae244703d07e37ea8a99a6b0c4300d0dd443db6c7a7fea22792ac7ccc8f839d598260e3e9f044e03431513f5c8
DIST seamonkey-2.33-patches-01.tar.xz 944 SHA256 1612d94dddbd37fa4ce8307c1ba565c8439d082609b63c12b4971e361895566c SHA512 0132e7d06a1ea5d6c059f23e5b8a20016a1e911e8aa40ae15eaefcd141030b4d245297f1e13e508827d91bab5988db4775c8425e737654afba2ede9c2dee8392 WHIRLPOOL 4520c4eaa7e6a25f5c32e9cd1d46472e181fbd769a1c5a59c913834cec5556100eac01423b4abf4a47543d0fbae4bf83b0f4a4d6cec7a058587e2705043bf507
DIST seamonkey-2.38-be.xpi 843477 SHA256 468cf5442f0847bbd5f8b0863fe63a6cfcdf3e6dc973f5815bcf74db54dd9dad SHA512 13c525fc424c65ebe3deb58069b0e427fe7386a736ccd40ef3f1c90616a1656fab569202b4ab7f86ef1fce3ca0d1b2583bf1c11e5c92344ea1b8e45eec5b0892 WHIRLPOOL a663b04ba4ecc9591c1151e02bd6a6b2e1bbb8f55cacf707e40190a48ded86dacc461c3c80a6a3b268ef2e2e3cf2e78cbf45a594ef3d062c801c427401c20725
DIST seamonkey-2.38-ca.xpi 835381 SHA256 79e2b20e71f59b23a86663f411008e38df1fb43216ed26e9172e04ea5550d772 SHA512 a636adf34cce6af488156b7400f6f32fba61bd7bf098d1acd25ab5b2ed6ffa235290dae37d090e80af1a819dbef40eafc47802f5a127253a5bed432243755a99 WHIRLPOOL 6c53e991fbb862fe7c9205a2dafdb94b1649ed86ade5dcf247c1872347f3c325345614f83fc24612f2881d02d9d3483559dae4340c787803e34904e50aaf7d5d
@@ -54,3 +56,29 @@ DIST seamonkey-2.39-uk.xpi 875396 SHA256 6b4bed5fd385b1666579cf69cf094f7f81e4533
DIST seamonkey-2.39-zh-CN.xpi 838756 SHA256 7cdb2dc31da908a506fca78c93008cf1b6ce9ef3dddb0fcb38b383bf9e5be556 SHA512 6e1e98f2872b7b188a5db62d96ef0e21afd8b2502ef1fa35a6a59096d8d6c861253c6192a55e8bee93a6c4e746e418900257f01efeaf4f1c5a43c22c89168533 WHIRLPOOL d8d547e796b21ff5876e0dd25f5e1aea1a380a37a5c825cab4dae899dc17b191cc1783a0ca14c833df989c2338b7c55478727efaa9361fa9b26098396f9eea49
DIST seamonkey-2.39-zh-TW.xpi 860307 SHA256 a3ae379666ff757e0424918491ae1aa710d08aa586d0fd4526bf4dd838c1461c SHA512 f26db467a96ae59e2b9b6d9f072108dc8a6686ce7f6da9c8451a02026cb46f37e86d578d44ec0557efe3f36603874dd970b76c95ed01b7e8fe1024b06b829abe WHIRLPOOL e80a726158c8ffb96ee69e4166877d133683ede68891ae570819fc1a26538828efc3c14bd30f540620286424aa49e1b6e4fc8ecf91273048b1f595325de86e03
DIST seamonkey-2.39.source.tar.xz 182627632 SHA256 c871de0a64cb60acf785df0ea3859b729353e5d1e3274947840386766859930e SHA512 1ea912cff4ae305b6fe7237f0873220343134ae4fd0ff54e8472a388ed61dcd249a5961158520bde7838b27a9cee782fa0d4e1c35d22c7fb7a30145dde9f6dc9 WHIRLPOOL 93bf7658e0fcc634fd4022f17e882d066969844167fd6f6f4b8edcdf6dc3a15dec2e83ca2ce185c6090e021f68b48e98597ae7b179e38a6ee35aefe6ff14f5d2
+DIST seamonkey-2.40_pre4-be.xpi 846940 SHA256 257bd56c3db3d62600e8fcb4e621df1cb3cede2e73354a0f588516152598e9b8 SHA512 8e4bde61cd4cd844a20cf48154ab527355b5320512bfa0515c9a25766891fdee515f8ed2f364cdfbaa6356a4480600b327d7b0a084f0ace017ff5acfdef2f6ee WHIRLPOOL 60b95d337e4838b82b2c458ef9c9d6ba1e40f4e1d337f545d798ac468ae145d2530993d0601e600b03a015918116403e95dd6b3a3e1a55ebe4d245162b673ff3
+DIST seamonkey-2.40_pre4-ca.xpi 838972 SHA256 06d423fc182c0d6b674572a94c0628febbe314883dc0be7f481583ae21ce9485 SHA512 a2b0f6f44c7f9391c6c357cdb1bf8396e43e7385209204d6f56c31ef01cba1ebd9391e876611d218e33a1e06ab9f3b921a0839f223c41c791d9275ab1fa7da04 WHIRLPOOL 6c4aa52805c47b5e5c27f7a31cff26c4dabd1244df85ab5695f8e40043ecc037c630edc4e9a9eae0eaa21e19396e4445f72224685c8b1d2ca452aedc72805429
+DIST seamonkey-2.40_pre4-cs.xpi 831462 SHA256 b2485aaed83ad46edb565fd6d35b785fc350ae96a7c32df91eb028807d8f442e SHA512 07aecf26c368c368305194b92342b76db1f19fcdf1b81c61227f8dfd8af4c7c7fcd4ef010d635fed9db34081c34c10a60a1a82cf9c034d0f1dc02589f0321944 WHIRLPOOL f9bdfcbb51e75c5a4cd64f9fef07b8d314f12bae5252a9a24f58fa82a1d4916c372ef0a5d3fef7861bba049941a7a554e4ce530d45ead0a5e9b549c684bc1be5
+DIST seamonkey-2.40_pre4-de.xpi 839670 SHA256 8d72d02bcec01e63a6b4630bcfd092fa1dcdf21b8424f4de878d4460e6ba1865 SHA512 bd900cdd5dcdf96b8ca13accd732129e9ebb80f002986ac7a90e895338f7893265aa1abc64f4b90a34deee290981caf4b861232dde249ba6f306b964e9db3410 WHIRLPOOL 238b2b961f945f3ccdcc76980b6a6e8d5de34b2e4c23b336fe7ec73affd14f702831984100d292f9838dc11f61dca440a069f4cf730a06cd0dcbaa731e47de3c
+DIST seamonkey-2.40_pre4-en-GB.xpi 801900 SHA256 b19890d7c446ffd98a9c94f95986cbbed9842f4149ce549d3463128957f1ed9f SHA512 7fa9dc9202123646cc243322706310b1c60f04d29b5589ade9abb56a1beae64df3268e19e5e828b913a4aa39a472e4c9e9758a4fa8e600eb17b6f8d5f483d2fb WHIRLPOOL dbc9b894d0fb365d19735867464748d4fdbdfb88a0d229e905eb22147635fb3ff45e1037681c58c3820bc9e718b3c94479ffd3fc42f5e126041d49249715c7d2
+DIST seamonkey-2.40_pre4-es-AR.xpi 850745 SHA256 096bfcbd124463398d1776955587036f7d8d969582053d8980dde18e34e21738 SHA512 398085a2bf83aa5a29c18f3d7bde40d49637311e39f7e32bc6b4905fbc45651b657a89c3d7351aeb3772cd05491ff7b9a706db68cd30fcb50fd2491f8b55b107 WHIRLPOOL 3563d7b2bcf11b7413546df447114fa0174b0d00b843a7b0e8bade51716cb8f44630d1d4013ed9191ab29eff274b70cc9d12cc6b54ae923c0e6cc23ee3fa34d8
+DIST seamonkey-2.40_pre4-es-ES.xpi 819863 SHA256 8d95036953298f880de663961a4b686bed9b233dfdc247a5107465d97d671b68 SHA512 6c3c755cb9fea83cc82078fa636354ff0d2ab5893e986d38a913d92c50e39f20faa5aa31184b59670e2d32acb914e3147230edbb6aff563d566abe864fef2ee2 WHIRLPOOL 6a89fc9eed79568dc0f2df3643e9f242c55f12c41d0e12d1439ee662edc535ed9d9be39380d3fb360515356543db50d0a87964af8c26b534bc756ede4610c0b6
+DIST seamonkey-2.40_pre4-fi.xpi 806026 SHA256 fbbca3abdc2fca3a7d18500e606ef75e3ee4ecbaefce3fc6bec211422521ac0e SHA512 b327556234be661256354d149dad729c8471c395343115515e5ec21e69b735798a898922baf7aa5d58491de0cb14ae7de8554bc4b1175c6879da0baf16ed3698 WHIRLPOOL 8fb485abe9848ffdac35e641d79b2990012f86e42d3a142e0620758cfda21b62fccf9e2dcac024e30d6022c2ca499024ded6eab29ec597f83daf4d9054a9957f
+DIST seamonkey-2.40_pre4-fr.xpi 812115 SHA256 faed1301c6f7eebf6999521feb7a8161f4ec5c6dab01ae717f9bb7df360a6382 SHA512 3db0551d3762779e60a111a10f62ce6eb49e0b1e769efd76aff1cff33963bc7c699ab373b3579775e83d49c79d49050c5da8f985dcd280121813897584e2d4ad WHIRLPOOL 738861bb48757a391c9b81e02fb3e2b25700c8e9f5856d067d71086d57f85ace1d7c0d63b612e5e23985baa7041d57d15438b5e635f07a2c6555e62067f945aa
+DIST seamonkey-2.40_pre4-gl.xpi 817071 SHA256 36d8a69aa1a526dd8ecc6a2fe2da55b5b4d3e4bcbbd2d13af0f76fa79ae21fc4 SHA512 942a60820c5b29d5cb42aedf22b00ae89a868c6b4a4f7972d958700532b364318c37d8524bd16040574133cea756bb1fb66c5d44901238877cc8779559100e7b WHIRLPOOL 2bbc3620a28541a3614113d091035c767ce14b4b34575a3eb0fca4f6e729249454fe95ab634f3eea2780755d85b5d09c8e02ecc8814ce6ac7880302c613faab5
+DIST seamonkey-2.40_pre4-hu.xpi 849367 SHA256 b259e45414ea7247c586605797064743efd203ad22ef4a6ca734d9d39ea0ddcd SHA512 17d4ce76f405eaa282d86dabd5969d579a41a2f6a4ef69721078d4284140a8dcc8d94d9c79f41868b35108f63d10caded0003d3c7f1353b6a2628de58656653e WHIRLPOOL 7bf9fff4fd2c02010edf4993774d2a4775ceebe5769dab9a18a2cfab560df0db2dc6ec4dd56e2d439d1ba30968b6a0e12ed7f8e7d34710c4166a8e7dd573062e
+DIST seamonkey-2.40_pre4-it.xpi 730855 SHA256 6818ac8634aa959c049791bd96e228ee68fb4af214d73b2ded67cdf9e8fba159 SHA512 382e45ea601f54af541b661724ad93db3f2e1ea4aad5c19a107f46c4c662442edab554580c9bea1c81503d0252d94f9e998e97c294b982347455d754477bc9a0 WHIRLPOOL fd59e72f1c0cda614e8ed6650207d403f1ebefcb057de63fe97c4acf3907f096fc1385f956071efabe698255b4085fbf514f12597bd576ee57c307ab11d0474c
+DIST seamonkey-2.40_pre4-ja.xpi 888099 SHA256 73c868aad2fdcc3ddf3cbb84bdca2ec7e43c7fcf0ac1d5ec243717123dcaf353 SHA512 59c7045deaf5e8c999c700fb52169a3494cbccd0fb022029f52c67ec749fee997c36a2eb5794e464e896ddb9f5305c1e2eead350a85f45447557fcc1b8bbbada WHIRLPOOL dd4fdf43e968e0b2fdded3e77a0afc76b0e278e650f884f4a4a0eaec1ed8d9d15283c2ba36aa6aa219ba37c80cd811ab5593e7545601a9e5925352b871b41652
+DIST seamonkey-2.40_pre4-lt.xpi 858221 SHA256 eb99109e0b25415e460c31fe6be35d41ada6040ca91bb90fb29af951f0b21b6a SHA512 e9deab61952a716923461944028fe31d22b911ce7812a7bd6a8d9c7c254b6e1c22fffc1b352b9774c6bb534acd67b18e988a528d0741d925d871be78de084230 WHIRLPOOL 06959f2147a7b4842f3acdf71b358ac43ef2db5536ccbcc01b9a37b5c3ac42a4c6ad9e605d2106827550ca138247408b24bf57de714b9cd0d480b2b3767e9b23
+DIST seamonkey-2.40_pre4-nb-NO.xpi 829131 SHA256 2762bcddb6b4d36b2d14bb961e6b3604420e099216d5efc60b8835bc2709251d SHA512 6186287fc7cfbea2e761eb188d68c0880feeb5380163137dbb6fc78c1b2768e9d1b54a4fdc7244a1db043afcdf8ae0a89249246f4ee4db197b62f6c4fa4b84f9 WHIRLPOOL 8e848fd2d25561c5173360e4423ce872d6a063a2c73dba2f5a58196507be9482b792d08fa3bd5af4b5b431aa8f5cb475c2124f60288cfe694c1f66b2e1748fe6
+DIST seamonkey-2.40_pre4-nl.xpi 796595 SHA256 fa6f780f2fec5b43c75bc46778ddcfa983c989fe16a0c1995c0bc65a375188f9 SHA512 0e948bab11625f92edaaba5a1479bcca90a23e54b277390bec763f12d2579778bb86f06a5bd1de4e4e4a8c799095d43e453f8e72b77b73cda63f63488b8338dd WHIRLPOOL e31c9a4032c0efe336865daa342daa770198f9ab23e13a72d12b5ecec2a8708eb93d01c52bb508789077a31b5c412a9f1366aabdcaf12f1f67f0b2a8ee2ba177
+DIST seamonkey-2.40_pre4-pl.xpi 861834 SHA256 96d1eaf1bafce2a4b11abfc7b3cccc3409b073e7353416ec7eaec48f61d0ed83 SHA512 a781d7060de7d29ab26a18228cbd7613723771bf4be4e87b5c553178ba38b977c64ea87e1c48cd75a06310461cf4feefa63b716d2c30442ce6130f21b3f12172 WHIRLPOOL d06c24eed927720a720dff727126c0a4bb888ab5cf5db1fd0597b2a18b8572cdc784e746ffb76db3d48b3cd03a703f498bae98c20ace374697daf37b91c3543f
+DIST seamonkey-2.40_pre4-pt-PT.xpi 831873 SHA256 1ef665be4063a864564ac13d6cf87892bc5c3c57a9e4115efd03403382e14b8b SHA512 d70f1a5e8aa87c55c36ccf3099e2fbe61f2f8aeab918e38e40811ef59ae14dbfa98fef15555720e63a90fddb7844bd260f752de70a97db4d1660f1a90cb95617 WHIRLPOOL fbe6acdb29b3e2542f585fed665df4fac6444a9b53b126647a587fa602a23b36ca8be4c172afe4ccd3035b820dfa97cab21fabbcc246387c4c31efa97ee17540
+DIST seamonkey-2.40_pre4-ru.xpi 892052 SHA256 68f6ca318be2cd1f78245db311ac9c0e0ae877697c0e310284615b352338a61e SHA512 53144afa2e719d9eb4a9bd512a7476cba4143fbf1a051fdfec57ec3974f3a0546d7cb72999b4a768db9b67e0a3682379bdd47c288ddd10cf89d7051df62f28f3 WHIRLPOOL ebb85760b704108ebe6f7014a62fa3376bc20c63cb158a8ed82157d435624cfe4c72526e17893920be726200b197471c93f3653eeaca2c8e93dcf6c364840394
+DIST seamonkey-2.40_pre4-sk.xpi 858148 SHA256 af8c126fe02cb3a8b9783c4a1f8d4bdec8b684195a2a8b5be537df88e2ec2861 SHA512 ef1e1dc1e0088eb9c1fdae40df50f854de21488af540818305531f973c1b0ad7a503c744c61c74a4028feb10b7c4357ffbbaada151605769b311273bfa52316a WHIRLPOOL 6b00b0f9dd022726f193714a116d51f3758dbf3c151ff592c7981ea11cf57cfd577ec70974dfe44a07a927146561f790f8bff98ce52b792119ef6edfa9b6bd25
+DIST seamonkey-2.40_pre4-sv-SE.xpi 824804 SHA256 fc970bfc8b52119c147d564076904df9b3722fb922bc9703709ceb5be2bd6144 SHA512 60b2601de7c274e9dd233e2fa3ba05eda570b28cfbcef85c6064650ae5cf86461266d8f1d322f0445c60fc4dc284c5c6e2030aecef50b48a85689c92dc25a95b WHIRLPOOL b9a7cc136b311d06331e6f172d880274b0d054c451183499f5c98f4e2a9d48cbd3e1f332328f707d0e378152659f27c76eaed3dbb804c41d47d1eb085357a942
+DIST seamonkey-2.40_pre4-tr.xpi 814264 SHA256 c5dce74507307008127e3402e0c9a877f333f2b1085b1c912c77969f4a433632 SHA512 5623b0dc59023e2a86f85198585ca33681071c9e9cc5aaa3666f43a38ee385df51cef30fb518cfc1398d41d94c42b54b88f908efb4730325837e24416bbd0d23 WHIRLPOOL 1f1c78bc701b5bdce93a30d4e1f8ca266407259595bdff30b913b6f688a2681b86b5757570aa1cf29c18b8b511fbb3926d26d4c54319e6f1a09a4e0d63cf81a0
+DIST seamonkey-2.40_pre4-uk.xpi 875815 SHA256 9932ca0ac00312a9fd9bab3199f7e55564beb6f5f339647c7a6c0cdd4cd82241 SHA512 2113ba85951dbd1215dc99eb26dc40a3d4792916ca692c614197b0f9514aa8506547c170dd9e4ce892591bcc3681868b13e80ba2d4460e5b2421434a13029a14 WHIRLPOOL d5f37ec99359c5589818ff8aef5b55ae07e9bf0b20e0822971f18574d1057395904331add02753160d4b8e825895aa1306ff69826a6a3c33d7f5bf456fbc06bd
+DIST seamonkey-2.40_pre4-zh-CN.xpi 839892 SHA256 28f634be2ed10526dbf6bf310b28f4da921d5809bce8216418c34ad07ac75443 SHA512 743e34a2aa6776ff665e4b0a6d763acbfd96cce6d51ee1cf6cc4b10cc999f0d63d10435040f57950433574828c8cc77feab56a9b640dce99643ee6c18a9a9a72 WHIRLPOOL b539345deee6aa8ca6b3f3017e9fba5737131928e8b2e47a188d5a01ef0d9202baa75591a4b4c9d1d1b95b28b9893f41d6ae47a7121cb42e8395568495382c49
+DIST seamonkey-2.40_pre4-zh-TW.xpi 861767 SHA256 eaec998d922789be13cfc42660ab96abd0b1ec47cb4394b8a9f725969141ba89 SHA512 7ab516753547aba8fbe48cf147082f1f282ecd6fceac0deb9795dbbd1b2962cdf82bc02128a04527a664e3cd00a4b529bff6e33a4f9fff4cbe998e2ec302ffbc WHIRLPOOL d0eb50f6990acfae199ff0e21b6d738271e8e30d91b8d0678e00e4871be69779f57b7642979485c6b2bcfbabc22c9002bff76a3b3a702fb1b747ceb10bbeb134
+DIST seamonkey-2.40_pre4.source.tar.xz 193702432 SHA256 7ecccc039d03f38d197b123b59ea42eac4c0c10e4bdec779b3665d79b435fa01 SHA512 5a81a25c75af254f1508aa615a082f013d7d06950859822a134c51a0f4c12918081f69e7835dc85114e4285a67bc4be4d509db8374dec848f6381dfce447b696 WHIRLPOOL efeaaab91980fa98d3c13c2c99d5ca3f8a265ab2d978cbb3ebfdad87df481d97be9105decbf44e1bac2d8214e753eb9bdb78d1c2f64eaedef0c8cfa0f251db01
diff --git a/www-client/seamonkey/seamonkey-2.40_pre4.ebuild b/www-client/seamonkey/seamonkey-2.40_pre4.ebuild
new file mode 100644
index 000000000000..8cade39c8104
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.40_pre4.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WANT_AUTOCONF="2.1"
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+MOZ_LANGS=(be ca cs de en en-GB en-US es-AR es-ES fi fr gl hu it ja lt nb-NO nl
+ pl pt-PT ru sk sv-SE tr uk zh-CN zh-TW)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+ MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+ MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+ # And the langpack stuff stays at eclass defaults
+else
+ MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+ MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
+ MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+fi
+
+MOZCONFIG_OPTIONAL_WIFI=1
+MOZCONFIG_OPTIONAL_JIT="enabled"
+inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.42 multilib pax-utils fdo-mime autotools mozextension nsplugins mozlinguas
+
+PATCHFF="firefox-42.0-patches-0.3"
+PATCH="${PN}-2.33-patches-01"
+EMVER="1.8.2"
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="http://www.seamonkey-project.org"
+
+#[[ ${PV} != *_pre* ]] && \
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+chatzilla +crypt +gmp-autoupdate +ipc minimal pulseaudio +roaming selinux test"
+
+SRC_URI="${SRC_URI}
+ ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
+ https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
+ https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz
+ https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+ https://dev.gentoo.org/~polynomial-c/mozilla/mozilla-graphite2-1.3.5-upgrade_patches.tar.xz
+ crypt? ( https://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz )"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND=">=dev-libs/nss-3.20.1
+ >=dev-libs/nspr-4.10.10
+ crypt? ( || (
+ ( >=app-crypt/gnupg-2.0
+ || (
+ app-crypt/pinentry[gtk]
+ app-crypt/pinentry[qt4]
+ )
+ )
+ =app-crypt/gnupg-1.4* ) )"
+
+DEPEND="${RDEPEND}
+ !elibc_glibc? ( !elibc_uclibc? ( dev-libs/libexecinfo ) )
+ crypt? ( dev-lang/perl )
+ amd64? ( ${ASM_DEPEND}
+ virtual/opengl )
+ x86? ( ${ASM_DEPEND}
+ virtual/opengl )"
+
+S="${WORKDIR}/${PN}-${MOZ_PV}"
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+pkg_setup() {
+ if [[ ${PV} == *_pre* ]] ; then
+ ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+ ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+ ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+ fi
+
+ moz_pkgsetup
+}
+
+pkg_pretend() {
+ # Ensure we have enough disk space to compile
+ if use debug || use test ; then
+ CHECKREQS_DISK_BUILD="8G"
+ else
+ CHECKREQS_DISK_BUILD="4G"
+ fi
+ check-reqs_pkg_setup
+}
+
+src_unpack() {
+ unpack ${A}
+
+ # Unpack language packs
+ mozlinguas_src_unpack
+}
+
+src_prepare() {
+ # Apply our patches
+ EPATCH_EXCLUDE="2001_ldap_respect_cflags.patch" \
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}/seamonkey"
+
+ # browser patches go here
+ pushd "${S}"/mozilla &>/dev/null || die
+ EPATCH_EXCLUDE="2000-firefox_gentoo_install_dirs.patch
+ 8002_jemalloc_configure_unbashify.patch
+ 8011_bug1194520-freetype261_until_moz43.patch" \
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}/firefox"
+
+ # graphite2 fixes (bug #574968)
+ EPATCH_EXCLUDE="0001-mozilla-graphite2-1.3.0.patch
+ 0002-mozilla-graphite2-1.3.2.patch
+ 0003-mozilla-graphite2-gr_nobidi-flag.patch
+ 0004-mozilla-graphite2-1.3.3.patch
+ 0005-mozilla-graphite2-1.3.4.patch
+ 0006-mozilla-graphite2-post-1.3.4-bugfixes.patch
+ 0007-mozilla-graphite2-always_call_ReleaseGrFace.patch" \
+ EPATCH_SUFFIX="patch" \
+ EPATCH_FORCE="yes" \
+ epatch "${WORKDIR}/mozilla-graphite2"
+ popd &>/dev/null || die
+
+ # Shell scripts sometimes contain DOS line endings; bug 391889
+ grep -rlZ --include="*.sh" $'\r$' . |
+ while read -r -d $'\0' file ; do
+ einfo edos2unix "${file}"
+ edos2unix "${file}"
+ done
+
+ # Allow user to apply any additional patches without modifing ebuild
+ epatch_user
+
+ local ms="${S}/mozilla"
+
+ # Enable gnomebreakpad
+ if use debug ; then
+ sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+ "${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
+ fi
+
+ # Ensure that are plugins dir is enabled as default
+ sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+ "${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+ sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+ "${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+ # Don't exit with error when some libs are missing which we have in
+ # system.
+ sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+ -i "${S}"/suite/installer/Makefile.in || die
+ # Don't error out when there's no files to be removed:
+ sed 's@\(xargs rm\)$@\1 -f@' \
+ -i "${ms}"/toolkit/mozapps/installer/packager.mk || die
+
+ eautoreconf
+ cd "${S}"/mozilla || die
+ eautoconf
+ cd "${S}"/mozilla/js/src || die
+ eautoconf
+ cd "${S}"/mozilla/memory/jemalloc/src || die
+ WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+ MEXTENSIONS="default"
+ # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+ # Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+ # get your own set of keys.
+ _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+ ####################################
+ #
+ # mozconfig, CFLAGS and CXXFLAGS setup
+ #
+ ####################################
+
+ mozconfig_init
+ mozconfig_config
+
+ # We want rpath support to prevent unneeded hacks on different libc variants
+ append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}"
+
+ # It doesn't compile on alpha without this LDFLAGS
+ use alpha && append-ldflags "-Wl,--no-relax"
+
+ if ! use chatzilla ; then
+ MEXTENSIONS+=",-irc"
+ fi
+ if ! use roaming ; then
+ MEXTENSIONS+=",-sroaming"
+ fi
+
+ # Setup api key for location services
+ echo -n "${_google_api_key}" > "${S}"/google-api-key
+ mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+ mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+ mozconfig_annotate '' --enable-jsd
+ mozconfig_annotate '' --enable-canvas
+
+ # Other sm-specific settings
+ mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+ mozconfig_annotate '' --enable-safe-browsing
+
+ # Use an objdir to keep things organized.
+ echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" \
+ >> "${S}"/.mozconfig
+
+ # Finalize and report settings
+ mozconfig_final
+
+ if use crypt ; then
+ pushd "${WORKDIR}"/enigmail &>/dev/null || die
+ econf
+ popd &>/dev/null || die
+ fi
+
+ # Work around breakage in makeopts with --no-print-directory
+ MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+ if [[ $(gcc-major-version) -lt 4 ]] ; then
+ append-cxxflags -fno-stack-protector
+ elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+ if use amd64 || use x86 ; then
+ append-flags -mno-avx
+ fi
+ fi
+
+ emake V=1 -f client.mk configure
+}
+
+src_compile() {
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+ emake V=1 -f client.mk
+
+ # Only build enigmail extension if conditions are met.
+ if use crypt ; then
+ einfo "Building enigmail"
+ pushd "${WORKDIR}"/enigmail &>/dev/null || die
+ emake -j1
+ emake xpi
+ popd &>/dev/null || die
+ fi
+}
+
+src_install() {
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+ DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+ local emid
+ cd "${BUILD_OBJ_DIR}" || die
+
+ # Pax mark xpcshell for hardened support, only used for startupcache creation.
+ pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
+
+ # Copy our preference before omnijar is created.
+ sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+ "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+ || die
+
+ # Set default path to search for dictionaries.
+ echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+ >> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+ || die
+
+ echo 'pref("extensions.autoDisableScopes", 3);' >> \
+ "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+ || die
+
+ local plugin
+ if ! use gmp-autoupdate ; then
+ for plugin in gmp-gmpopenh264 ; do
+ echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+ "${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+ || dir
+ done
+ fi
+
+ MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+ emake DESTDIR="${D}" install
+ cp "${FILESDIR}"/${PN}.desktop "${T}" || die
+
+ if use crypt ; then
+ local em_dir="${WORKDIR}/enigmail/build"
+ pushd "${T}" &>/dev/null || die
+ unzip "${em_dir}"/enigmail*.xpi install.rdf || die
+ emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf)
+ #'
+ dodir ${MOZILLA_FIVE_HOME}/extensions/${emid}
+ cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die
+ unzip "${em_dir}"/enigmail*.xpi || die
+
+ popd &>/dev/null || die
+ fi
+
+ sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+ -i "${T}"/${PN}.desktop || die
+ sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+ || die
+
+ # Install language packs
+ mozlinguas_src_install
+
+ # Add StartupNotify=true bug 290401
+ if use startup-notification ; then
+ echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die
+ fi
+
+ # Install icon and .desktop for menu entry
+ newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
+ domenu "${T}"/${PN}.desktop
+
+ # Required in order to use plugins and even run seamonkey on hardened.
+ pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+ if use minimal ; then
+ rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
+ fi
+
+ # Handle plugins dir through nsplugins.eclass
+ share_plugins_dir
+
+ #doman "${BUILD_OBJ_DIR}/suite/app/${PN}.1"
+
+ # revdep-rebuild entry
+ insinto /etc/revdep-rebuild
+ echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
+ doins "${T}"/11${PN}
+}
+
+pkg_preinst() {
+ MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
+
+ if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
+ rm ${MOZILLA_FIVE_HOME}/plugins -rf
+ fi
+}
+
+pkg_postinst() {
+ MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+ # Update mimedb for the new .desktop file
+ fdo-mime_desktop_database_update
+
+ if use chatzilla ; then
+ elog "chatzilla is now an extension which can be en-/disabled and configured via"
+ elog "the Add-on manager."
+ fi
+}
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 9a17289b021b..b200295d2478 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -1,6 +1,4 @@
-DIST vivaldi-1.0.390.3_p1-amd64.deb 44041614 SHA256 18e976f4a500ca069ac85520562f1c19b6e3047e0bd50af5d8e2ab1892b7a15a SHA512 cf41e3f69fb7435324a6fe1174bf3d0f4ddc4bd7567b5ff9a49d782649fe4a2882533b162e2b17fcda3cb0c3fdab4e63b278046d5b5ad2affb02015db4906a52 WHIRLPOOL 684fa392bf815bfa047674f020e0e3dcddb172cdb2fd7a952e49ae646b6a84bdc9ab2ec34f414a33804cf561acdafa08c52c1a4fed396d4248ed082625aedf5a
-DIST vivaldi-1.0.390.3_p1-i386.deb 44459070 SHA256 9fb5a5e468a04021d01f28ad08ac8df5c61edf7f0e01b02e73e7b57b2d1dd5c8 SHA512 56782ea9767a7e44872548ee8a4aa5d3f5a6073bd2ae533b175a4943b6c7c73b353a42aca9b239a9af52825df6cb83842ee5267e7a9177d1c5202ef8a4c1808e WHIRLPOOL 0272db44cbab2af8b37f4fffde1ad026cf9ba5686522a77f509c7a0b745d7d632e472a2a77a488b58edb4e1eef1e38d087e7586902035d839cf4982c11cb076f
-DIST vivaldi-1.0.403.15_p1-amd64.deb 43941722 SHA256 757553335e53334d378c67775221447b350214638e368a7c8a7bf3fcc3fa43d5 SHA512 96ab3eb2bcbbf51f3c5c730774e0f08c642a90fe89c34ad559bcad85f0a9efb1c24e2dfdf6ff82f06a981a6fe733f46033311ecbcdf72d2a358b7d1dd709e350 WHIRLPOOL 056cdc318f3e0cd6df59e0421d820a9b80f3fe2eec47e71cb5bc3a15ac239d4ff53417be51558c6fda0b37dfb2c5841b1025bd9f2c82f485c3d017725d728c55
-DIST vivaldi-1.0.403.15_p1-i386.deb 44476594 SHA256 d0e108dd6d0f1405864239e2d15121fa1d8b7607bccc662b9517f9300aec8fa4 SHA512 9ba36227087f2c5935e9a7fecf5c0dcd659204e413ea70cfa1d27273e828badad41f4f9f97bbc78610406ff259f32535aeaf17e6e2e63849dd55d582a7c14110 WHIRLPOOL 1307a85fbca3f5b08c0ca46923f38e3d1ebda309f6f4f161ff13bd748e606c071f43c5a284aadab183345dc5fd5bc29245a9fb5b7d7196cf8dc9e363a1a47142
DIST vivaldi-1.0.403.17_p1-amd64.deb 44005668 SHA256 18a6b14f9340b00b61e4e1433a3fd4a91a0e42490d69cf38332385dfd0911191 SHA512 9646c0bf48f52ac1d9bd3ce54f4c12bad7731625cf50b47610b05d85fb12deeeeda2c0b148a002c8dbdf5880fb6dc7a82475f137fe4aaeaac04a7a0c9fd22565 WHIRLPOOL 6381a2e1d5cee119ade5c8364b83fa195397aa497e912f8236a6c831aae975cfb8a2ad785be602278df8e542dbaf324267ed0e8ada8295f7ae3a77343977f077
DIST vivaldi-1.0.403.17_p1-i386.deb 44537126 SHA256 30833b37178e57c061b63d85c63858329b2a67db68b4d3cb6e843780972d3f97 SHA512 3b7c03d8b6926cc5bf696ca2aeb19aa13b41b84487730c45f823303cac2704a1ccb8170479c4b0d9c08190c2b5adcb13391225f401f86d58b0d38ca3d20db5d5 WHIRLPOOL cc65888ceeb6caa57302172315750f9cac6788dadcb7a3bf835dcb9b6f29ac5ddfa7b4acd0b2a0ff68be64baf380d574222fd37c47f391c7974a64b71926ff4a
+DIST vivaldi-1.0.403.24_p1-amd64.deb 43946418 SHA256 43d3c487a65383cf1872ac84a54f21b3f1972a8bc124aa2f5d0bd176d51a8188 SHA512 5754b32d2b2def9e00131cc952b2a14f3baa0563c6aeb3c3d17daa8e30cf39f00ef2df046291ac5ec910b2e2d2ff4e55325e4f0fee05a05233921caac10050c4 WHIRLPOOL f400f04b58e8409a4efa12a30186f01608e9e267e28d4219bdce2811985acd50c03708b33094220cace6cf29b459c5f75d95e77db3f716cae7ecca8de42b3103
+DIST vivaldi-1.0.403.24_p1-i386.deb 44456202 SHA256 d05a3ee4803c88dd4fd7ecee63e3d4659554f6403590091d10f665396aed5139 SHA512 f6a0b280b88d43115af4950d0fed77f3fbc3f49c74f52b60f00722c5a3d042f7853ee3bbc4ce7b19b0cf42a2d5acf869a7cd1cc636162b7486ff88055fd8a063 WHIRLPOOL 5a23a6d1a04b68023031f7db980b7ec6049ecae1748a80900c66642d7d5e9851490102c3964550aca6bef0438f94658c57d2ad727e226e23ba4597d4f863b6b0
diff --git a/www-client/vivaldi/vivaldi-1.0.403.15_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.403.15_p1.ebuild
deleted file mode 100644
index f985379c7cbb..000000000000
--- a/www-client/vivaldi/vivaldi-1.0.403.15_p1.ebuild
+++ /dev/null
@@ -1,109 +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() {
- sed -i \
- -e "s|@LIBDIR@|$(get_libdir)|g" \
- opt/vivaldi-snapshot/vivaldi-snapshot || die
-
- sed -i \
- -e 's|vivaldi-snapshot|vivaldi|g' \
- usr/share/applications/${PN}-snapshot.desktop \
- usr/share/xfce4/helpers/${PN}-snapshot.desktop || die
-
- mv usr/share/doc/${PN}-snapshot usr/share/doc/${PF} || die
-
- rm \
- _gpgbuilder \
- etc/cron.daily/${PN}-snapshot \
- usr/bin/${PN}-snapshot \
- || die
- rmdir \
- etc/cron.daily/ \
- etc/ \
- || die
-
- local c d
- for d in 16 22 24 32 48 64 128 256; do
- mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
- cp \
- ${VIVALDI_HOME}/product_logo_${d}.png \
- usr/share/icons/hicolor/${d}x${d}/apps/vivaldi.png || die
- done
-
- pushd "${VIVALDI_HOME}/locales" > /dev/null || die
- chromium_remove_language_paks
- popd > /dev/null || die
-
-}
-
-src_install() {
- mv * "${D}" || die
- dosym /${VIVALDI_HOME}/${PN}-snapshot /usr/bin/${PN}
-
- fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}
diff --git a/www-client/vivaldi/vivaldi-1.0.390.3_p1.ebuild b/www-client/vivaldi/vivaldi-1.0.403.24_p1.ebuild
index f985379c7cbb..50d1d03a1a9a 100644
--- a/www-client/vivaldi/vivaldi-1.0.390.3_p1.ebuild
+++ b/www-client/vivaldi/vivaldi-1.0.403.24_p1.ebuild
@@ -12,7 +12,7 @@ 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/-}_"
+VIVALDI_BASE_URI="${HOMEPAGE}download/stable/${PN}-beta_${PV/_p/-}_"
SRC_URI="
amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
@@ -59,7 +59,7 @@ RDEPEND="
QA_PREBUILT="*"
S=${WORKDIR}
-VIVALDI_HOME="opt/${PN}-snapshot"
+VIVALDI_HOME="opt/${PN}-beta"
src_unpack() {
unpack_deb ${A}
@@ -68,19 +68,19 @@ src_unpack() {
src_prepare() {
sed -i \
-e "s|@LIBDIR@|$(get_libdir)|g" \
- opt/vivaldi-snapshot/vivaldi-snapshot || die
+ opt/vivaldi-beta/vivaldi-beta || die
sed -i \
- -e 's|vivaldi-snapshot|vivaldi|g' \
- usr/share/applications/${PN}-snapshot.desktop \
- usr/share/xfce4/helpers/${PN}-snapshot.desktop || die
+ -e 's|vivaldi-beta|vivaldi|g' \
+ usr/share/applications/${PN}-beta.desktop \
+ usr/share/xfce4/helpers/${PN}-beta.desktop || die
- mv usr/share/doc/${PN}-snapshot usr/share/doc/${PF} || die
+ mv usr/share/doc/${PN}-beta usr/share/doc/${PF} || die
rm \
_gpgbuilder \
- etc/cron.daily/${PN}-snapshot \
- usr/bin/${PN}-snapshot \
+ etc/cron.daily/${PN}-beta \
+ usr/bin/${PN}-beta \
|| die
rmdir \
etc/cron.daily/ \
@@ -103,7 +103,7 @@ src_prepare() {
src_install() {
mv * "${D}" || die
- dosym /${VIVALDI_HOME}/${PN}-snapshot /usr/bin/${PN}
+ dosym /${VIVALDI_HOME}/${PN}-beta /usr/bin/${PN}
fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
}
diff --git a/www-servers/apache/apache-2.4.18.ebuild b/www-servers/apache/apache-2.4.18.ebuild
index 018650f3f481..2577d32e1113 100644
--- a/www-servers/apache/apache-2.4.18.ebuild
+++ b/www-servers/apache/apache-2.4.18.ebuild
@@ -125,7 +125,7 @@ HOMEPAGE="http://httpd.apache.org/"
# some helper scripts are Apache-1.1, thus both are here
LICENSE="Apache-2.0 Apache-1.1"
SLOT="2"
-KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris"
DEPEND+="apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 )"
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 3888afd5f52a..b0dd032220e0 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,9 +1,7 @@
DIST modsecurity-2.9.0.tar.gz 4246467 SHA256 e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434 SHA512 1af04f29bf23c51d03cdd3795c530f88b523a645aa02d776a6b23dcbc31decec7cd574919e5c7c7cf82684df2774062de5e465bddbbaf4c01a442c6d49401d3d WHIRLPOOL 1167ba6048a3ca05dcdabf03c67ae12720cca0cec74547fc223ee92ff76b6d5131785fa77b5f16da180e56590c851c192eaf02817b798e4d6f41fa6bfb2735a6
DIST nginx-1.8.1.tar.gz 833473 SHA256 8f4b3c630966c044ec72715754334d1fdf741caa1d5795fb4646c27d09f797b7 SHA512 546eba1749af0034cb8b924d2432be2f0e82a75c545aa929391ef7234103c3f29376235a2ef1363b120e1825cda15aeb085a05f9ce3596c88466e112e82aa882 WHIRLPOOL cd399083fb14bdb3498f1cd91a1cb59a73d37f323ce7c2a32500c9443f654cb5449137708cf149a0126aedb77abec9d1eb3dce3121f0b378d7d70e8eb18062af
-DIST nginx-1.9.10.tar.gz 889267 SHA256 fb14d76844cab0a5a0880768be28965e74f9956790f618c454ef6098e26631d9 SHA512 60a736afe98e46abeb572c938702b09b0098164584bf8b5c1978c2b83269b6c2b99a60b7c8c9482230c26eebaeeb684f3aa7db52af4d7a3c18434542730873e0 WHIRLPOOL 8f285f6d4c4f7e312791d7dc6fc072dbb1207315fcb7facac0ce958389473641de2f2c2cd03cfd11c0df3a16abd84522bb150090b561a46752e8b6317363fbeb
DIST nginx-1.9.12.tar.gz 899183 SHA256 1af2eb956910ed4b11aaf525a81bc37e135907e7127948f9179f5410337da042 SHA512 b5f4cae48c85cdc9a95006b6a321834de9d18981cb1a25670c9fc948d86b9a8906d25a1ca174626eb418b0afdb3f2e1df3cbb6f5a48bd781e39e2470a4d52520 WHIRLPOOL 0b6300528ae1c29e4f7647cdbe0ea6254b1bccbdcd7f0185b2bff25409aba093c089e5fa3c1a828e2cf7f55fa6d9d2f8b818f85014f37ccbf335a71cb2e93e32
DIST nginx-auth-ldap-8517bb05ecc896b54429ca5e95137b0a386bd41a.tar.gz 16950 SHA256 2f0b1a65847ea1da801a99b654f132e1c814d2fa49a43a324d8fc4ce6327935f SHA512 65b0aec3a4b28625ef93d166f659d63b9ef7d971dea78b09987eaa02f632bf5b8f6c9afdb6ef444afa466dba7ff67180cad27e138e6818c2ba80bc804f140ca6 WHIRLPOOL 9ef896fa3501415e2c7022448783626af256c6c3878fcca5d6cc042a9789937147eb4c3743f92002ab8d09e4ce828532b9ae321dc284ef2560801da98153d146
-DIST nginx-auth-ldap-d0f2f829f708792ee97a9241c9c6ffd33c47c7c1.tar.gz 16349 SHA256 7c1628d7e6ebb3a41ec916334014b74acc32dd09a0830752a2d03be0be3223c8 SHA512 2929f2b1170eef0ede4888beb8d5c0d0d45095fc1a3358dbe81b55bfc7468e53b981b1784a5fb9257a5888645d5fc3ae4fab950e6b4525f6dd0bb4d96076f0f6 WHIRLPOOL 626d88396af16373622532a349a2f21418191ad4073bb4b56980cbc5f219e40cee8786f5233ced2d7c5de698537d5337698ecc4a49181c960fbd0ac4a4ab14be
DIST nginx_http_sticky_module_ng-1.2.5.tar.bz2 124072 SHA256 f975c033eb3c342f7247f6524774bbb727aaf630ed984576dbafe5de7a790c58 SHA512 d6ae723f739efb2f0548461931b1c395801684759962beda08067111426b1c9787ceaede91b0e984c023108fd17864c53c53925506f7e8e25ec8d2fc065585f6 WHIRLPOOL 1013c6a51f5989c8131392b3d9704d42c99f9727a673f6205878d0b7dfd265bb6042c1d30089603c9b38e339d48302e6873e77fe380b7e8edba25b71e9e84ba6
DIST nginx_http_sticky_module_ng-1.2.6.tar.bz2 124089 SHA256 e47b9fd435d7a5a3200f945a9745aaa7b9446495bda76df48f211129f88d6b26 SHA512 2632b04c94f523aa7c9726db182cba11d83e642c2db5798274e67fbef30de95d02e4e95cbfb98bc429d4244d630b5d9617405b43f728ae0117a5c134940c0ded WHIRLPOOL 1b754c02f834c6b4d4930e9c46b8c5accb6c9663718fb9296c92d79bc33206e66e49e4234ca4db9a5afcd42fa23273bdf0e675aa7b38927c4e46a85318c189eb
DIST ngx_devel_kit-0.2.19-r1.tar.gz 65029 SHA256 501f299abdb81b992a980bda182e5de5a4b2b3e275fbf72ee34dd7ae84c4b679 SHA512 915954acf16a27fbd3c93c154012d38e864f1d8dfd51cde401bba26e46eb3e3c778ec4c92f4f8ed83ac001e96cee72765554d0e4da06acf6a4be5184b23b3657 WHIRLPOOL 0ce6bffc0fe2cef28ee74f5862ca6d914ed18fdee18d900608ff2a9983594c707aab3e335957b79dd7e77ae1beed054d8f71965ca0f57fc5f1d41ac06106c5a4
@@ -15,12 +13,9 @@ DIST ngx_http_echo-0.58.tar.gz 64779 SHA256 190fe3977dd1910e82059f30f9baae3da2ee
DIST ngx_http_fancyindex-0.3.5.tar.gz 14837 SHA256 e0998e83be58bc5787fa9243a76a9d21de3cd01088d3cf63177ba88a562634a1 SHA512 ddb4ab3e8e47e1c49680db3e9f648f7cd582c07f963204105118e61432fa1e80c3f1bce69ed689db383011a9c155184bcc7e931eeae20bbd7cbdb5d4eb35a0a8 WHIRLPOOL a45db854d75f05a59c6f5e67c652850b5410162e7852abda20bb6720d29cc716f25ce7ea93ef52f9ff3f11d6d3a744c1fa4c7a6270fc1bd6d42f6743accb8e73
DIST ngx_http_fancyindex-0.3.6.tar.gz 17252 SHA256 e73f1f0444f8c53601b51da8684b174c5ffd3b4ed6eb7956dd57f8b95485b68f SHA512 ca2de16eef7d5e94104f44f180ebd98674c5799409d70d95fd6359512861efaa95d5242a9eb661363bcc5110032965f326e735a2b8fcfaaf29381023fd11a76e WHIRLPOOL 68c089a11a39685e3cb934c12daf12bd4c7176da6d17a26d4ec18f5bb44c480695e622c732925255c10af4bf819aa52da0dcf457ca40bffdc8a6673a10440823
DIST ngx_http_headers_more-0.26.tar.gz 28028 SHA256 d6bdc51f9e778a3b23e41a51cae542c1467a1e5e55c1329a7ffc454be084fb6f SHA512 842927de67d28f3cff596607f209d1004b6d49f1d45b861758405ed6fe6f7aab76ad63530ccdfff1c1947db1190dd65dee0a29f50026bfa7a39a9a051561cf88 WHIRLPOOL 0dc37c36717be40a07112388d913d20bc99d76f90604da618d5547f24d93c636c14c2cca18191ff5916b40ec0113da648cfc07e1c00b1853f2b15ce056d5f3d7
-DIST ngx_http_headers_more-0.28.tar.gz 26948 SHA256 67e5ca6cd9472938333c4530ab8c8b8bc9fe910a8cb237e5e5f1853e14725580 SHA512 ed39930ddb416ab3510c3649f296e55474584bf1e9c9855c2330c0ec04d208865d242f54c55dbac79a4871803197fd930c20396a3b70f0f5fb009318d3c12254 WHIRLPOOL 7c0455c6ac15a033e62126ff8bb246d3d0315a2b18c095bdb0867669daa2387a5dfa4fdfbf038b8392ac4ee42c671a49ac742bd28352b2f5fbcf6fee423df1a2
DIST ngx_http_headers_more-0.29.tar.gz 27144 SHA256 0a5f3003b5851373b03c542723eb5e7da44a01bf4c4c5f20b4de53f355a28d33 SHA512 50a45922f8d2d54fca345bf47df71035362a6868b86872528f2414386c15cdcdb5466ea2c0b7c7303dc85084f94ee05e7411da8836cde3cd549c576431c7ef14 WHIRLPOOL bfc3261b6b0a4add707069383ae1241b2bad02099c86985b87cdc595a49eb3eea0c5295d912f536c01110f7954f6738870ad72f1230a202824b5bc00293c7ddd
-DIST ngx_http_lua-0.10.0.tar.gz 569372 SHA256 cf31c64b107a54999fdf8b68e8b8d52d88a3c95d9307417f049c32c5687ed780 SHA512 8d1b07a040368e236a3473c5e9ed7aac6867743c08b57ffe7c708806ccee87e6dfca5412f37753f2576ca7a518acbd06fa0fd573c75e864c6bcfbed160f7221e WHIRLPOOL ec541230caf172802fb200fe11a185879a5c533cd41c3e3ba56b441aa4f82e2101f27156e8a17cda97960cc6ffa8814dc1005e7f1f8e4f7f86f0b847ed25220a
DIST ngx_http_lua-0.10.1rc1.tar.gz 574793 SHA256 7b741a45ba8c66972fc7261cd191bdc89179ad9cebbc5af59c899c56811b8838 SHA512 6d9ab941bd89b6a4effb6ccec8aca7058ae4d0f1baa712616222f2fc7d60d78c76c33113a04c5ef71d28cfe55b6247720bd902726f8e93ed64ae50a84f653c0f WHIRLPOOL c494bec5318590f2c1e9e2ed06d4e2d15eb88d6feecb1208a1f968f466309742445c5316bdfbc4170aa5468f654399657799f3ae8a85248a8daa8a0b0ddd0cdd
DIST ngx_http_lua-0.9.15.tar.gz 520190 SHA256 659fe4c201f4a4ae1007fa029cef472aaa837bf0904babb6158f83b86536c5b7 SHA512 1d809f873ced8e50422298bb4b730b8e7aaf442c11570cbe892fd73a414ff4f6d6eca7be8b2d2dbf57a136136b17d80596ee2f2f195dcb59776e78df5a94ae92 WHIRLPOOL caf128254f99d674eb370779c6e41c0b459be1c5a2baac7df1ff3498a38349bd2c140594eea3eb29c468a366e265421f90363886be73db0b3484cc6f386cb563
-DIST ngx_http_lua-0.9.19.tar.gz 542445 SHA256 2b41d4d2627fda76946f194aae6c2b4d89bb59afd792d397c6b481ee82c10eb4 SHA512 9467742c4f5ac164fd33263990bbc5719069a7549413486586406e007156719de77e95944db8201deb2f3e7fc4ce9aa4ada027f89f0e421117dc29018b2fed1c WHIRLPOOL 9853ee88a491fd3844975a8c920032e76f36ed8d7d34033f3a744acb7ed8116fd45efb75a37c918edb912d3c5d203f5c83111ec82b5ab8acdad13632e47df1e8
DIST ngx_http_naxsi-0.53-2.tar.gz 165690 SHA256 3eadff1d91995beae41b92733ade28091c2075a24ae37058f4d6aa90b0f4b660 SHA512 ada592f5e7f80a6d549cc435ee8720df01a788dc88cf27a7d55521bb7e4c66fa11b9ec28216aff7e13c70a5faf12cb745bd398b8a782ed4dea1eecd04b07e24c WHIRLPOOL c5b736dbe9bd66daf7e023f176a08f78225b61990781d7ad5a55d0f35391df7e05bf1b2623a6227e0355cf0204ef9eac1b9fa03aa62b3c0d6eac515f1213f270
DIST ngx_http_naxsi-0.54.tar.gz 163809 SHA256 9cc2c09405bc71f78ef26a8b6d70afcea3fccbe8125df70cb0cfc480133daba5 SHA512 91934bfd41495715269cc6e549d17f6da66f2bdd0c9a6821fa9096b694dd3927109c4aad2f8b327620ae7c34f76a0839ac16669cd8c65081bc01fa7f829c1d43 WHIRLPOOL ef68cfecc9849086527c3590744d3c0d73cec830c6cf1ebca63566a7444438757a85d0c79fa552c4763e0416a615f4cf8d99622e2f36d3713b7072138a82f5a8
DIST ngx_http_push_stream-0.4.1.tar.gz 166928 SHA256 553584f557a3faec73702550e7e1417cbc0021f4f98468cc83e61e9d94def5cc SHA512 3b2289cc3abe6df0ee39360816675a39de1669a284e23770aa04b29e1e5dc73f5d99f3db6c7e8e4895a4abad0602aa64024ec19a2e741e138a70191501f038be WHIRLPOOL 9d203d4a78a3bd189527ebeaf1ff98613ee6a3150ae433efa17ed45dd9f6cb263b2a4c329a6fc2d04c6583ac2beaf24e87e3263d71a910f720b80038c9bc09c2
diff --git a/www-servers/nginx/nginx-1.9.10-r3.ebuild b/www-servers/nginx/nginx-1.9.10-r3.ebuild
deleted file mode 100644
index 8aff379511f9..000000000000
--- a/www-servers/nginx/nginx-1.9.10-r3.ebuild
+++ /dev/null
@@ -1,761 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-# * alive upstream
-# * sane packaging
-# * builds cleanly
-# * does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.2.19"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.29"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.3.5"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.0"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.4"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.54"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.1.7"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="0.0.3"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/agentzh/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.58"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/agentzh/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.0"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.1"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-c78b7dd79d0d"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.16"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="d0f2f829f708792ee97a9241c9c6ffd33c47c7c1"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.org"
-SRC_URI="http://nginx.org/download/${P}.tar.gz
- ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
- nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
- nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
- nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
- nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
- nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
- nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
- nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
- nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
- nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
- nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
- rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
- nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
- nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
- nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
- nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
- nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
- nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
- nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
- nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
- nginx_modules_http_security? ( Apache-2.0 )
- nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
- fastcgi geo gzip limit_req limit_conn map memcached proxy referer
- rewrite scgi ssi split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
- gzip_static image_filter mp4 perl random_index realip secure_link
- slice stub_status sub xslt"
-NGINX_MODULES_STREAM="access limit_conn upstream"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
- http_upload_progress
- http_headers_more
- http_cache_purge
- http_slowfs_cache
- http_fancyindex
- http_lua
- http_auth_pam
- http_upstream_check
- http_metrics
- http_naxsi
- http_dav_ext
- http_echo
- http_security
- http_push_stream
- http_sticky
- http_ajp
- http_mogilefs
- http_memc
- http_auth_ldap"
-
-IUSE="aio debug +http +http2 +http-cache ipv6 libatomic libressl luajit +pcre
- pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
- IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
- IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM; do
- IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
- IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
- IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
- pcre? ( >=dev-libs/libpcre-4.2 )
- pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- http2? (
- !libressl? ( >=dev-libs/openssl-1.0.1c:0= )
- libressl? ( dev-libs/libressl:= )
- )
- http-cache? (
- userland_GNU? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- nginx_modules_http_geoip? ( dev-libs/geoip )
- nginx_modules_http_gunzip? ( sys-libs/zlib )
- nginx_modules_http_gzip? ( sys-libs/zlib )
- nginx_modules_http_gzip_static? ( sys-libs/zlib )
- nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
- nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
- nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
- nginx_modules_http_secure_link? (
- userland_GNU? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
- nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) )
- nginx_modules_http_auth_pam? ( virtual/pam )
- nginx_modules_http_metrics? ( dev-libs/yajl )
- nginx_modules_http_dav_ext? ( dev-libs/expat )
- nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache )
- nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-nginx )
- !www-servers/nginx:0"
-DEPEND="${CDEPEND}
- arm? ( dev-libs/libatomic_ops )
- libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
- nginx_modules_http_lua? ( nginx_modules_http_rewrite )
- nginx_modules_http_naxsi? ( pcre )
- nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
- nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
- nginx_modules_http_security? ( pcre )
- nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
- NGINX_HOME="/var/lib/nginx"
- NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
- ebegin "Creating nginx user and group"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
- eend $?
-
- if use libatomic; then
- ewarn "GCC 4.1+ features built-in atomic operations."
- ewarn "Using libatomic_ops is only needed if using"
- ewarn "a different compiler or a GCC prior to 4.1"
- fi
-
- if [[ -n $NGINX_ADD_MODULES ]]; then
- ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
- ewarn "This nginx installation is not supported!"
- ewarn "Make sure you can reproduce the bug without those modules"
- ewarn "_before_ reporting bugs."
- fi
-
- if use !http; then
- ewarn "To actually disable all http-functionality you also have to disable"
- ewarn "all nginx http modules."
- fi
-
- if use nginx_modules_http_ajp; then
- eerror "The AJP module currently doesn't build for nginx >1.8."
- eerror "It will be reintroduced with the 1.9 series when proven stable."
- eerror "Either disable it or stick with nginx 1.7.x."
- die "AJP module not supported"
- fi
-
- if use nginx_modules_http_mogilefs && use threads; then
- eerror "mogilefs won't compile with threads support."
- eerror "Please disable either flag and try again."
- die "Can't compile mogilefs with threads support"
- fi
-}
-
-src_prepare() {
- epatch_user
-
- epatch "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-
- if use nginx_modules_http_upstream_check; then
- epatch "${FILESDIR}/check-1.9.2".patch
- fi
-
- if use nginx_modules_http_lua; then
- sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || die
- fi
-
- find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
- # We have config protection, don't rename etc files
- sed -i 's:.default::' auto/install || die
- # remove useless files
- sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
- # don't install to /etc/nginx/ if not in use
- local module
- for module in fastcgi scgi uwsgi ; do
- if ! use nginx_modules_http_${module}; then
- sed -i -e "/${module}/d" auto/install || die
- fi
- done
-}
-
-src_configure() {
- # mod_security needs to generate nginx/modsecurity/config before including it
- if use nginx_modules_http_security; then
- cd "${HTTP_SECURITY_MODULE_WD}"
- if use luajit ; then
- sed -i \
- -e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
- configure || die
- fi
- ./configure \
- --enable-standalone-module \
- $(use_enable pcre-jit) \
- $(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
- fi
-
- cd "${S}"
-
- local myconf=() http_enabled= mail_enabled= stream_enabled=
-
- use aio && myconf+=( --with-file-aio )
- use debug && myconf+=( --with-debug )
- use http2 && myconf+=( --with-http_v2_module )
- use ipv6 && myconf+=( --with-ipv6 )
- use libatomic && myconf+=( --with-libatomic )
- use pcre && myconf+=( --with-pcre )
- use pcre-jit && myconf+=( --with-pcre-jit )
- use threads && myconf+=( --with-threads )
-
- # HTTP modules
- for mod in $NGINX_MODULES_STD; do
- if use nginx_modules_http_${mod}; then
- http_enabled=1
- else
- myconf+=( --without-http_${mod}_module )
- fi
- done
-
- for mod in $NGINX_MODULES_OPT; do
- if use nginx_modules_http_${mod}; then
- http_enabled=1
- myconf+=( --with-http_${mod}_module )
- fi
- done
-
- if use nginx_modules_http_fastcgi; then
- myconf+=( --with-http_realip_module )
- fi
-
- # third-party modules
- if use nginx_modules_http_upload_progress; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
- fi
-
- if use nginx_modules_http_headers_more; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
- fi
-
- if use nginx_modules_http_cache_purge; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
- fi
-
- if use nginx_modules_http_slowfs_cache; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
- fi
-
- if use nginx_modules_http_fancyindex; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
- fi
-
- if use nginx_modules_http_lua; then
- http_enabled=1
- if use luajit; then
- export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
- export LUAJIT_INC=$(pkg-config --variable includedir luajit)
- else
- export LUA_LIB=$(pkg-config --variable libdir lua)
- export LUA_INC=$(pkg-config --variable includedir lua)
- fi
- myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
- myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
- fi
-
- if use nginx_modules_http_auth_pam; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
- fi
-
- if use nginx_modules_http_upstream_check; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
- fi
-
- if use nginx_modules_http_metrics; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
- fi
-
- if use nginx_modules_http_naxsi ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_NAXSI_MODULE_WD} )
- fi
-
- if use rtmp ; then
- http_enabled=1
- myconf+=( --add-module=${RTMP_MODULE_WD} )
- fi
-
- if use nginx_modules_http_dav_ext ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
- fi
-
- if use nginx_modules_http_echo ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
- fi
-
- if use nginx_modules_http_security ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
- fi
-
- if use nginx_modules_http_push_stream ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
- fi
-
- if use nginx_modules_http_sticky ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
- fi
-
- if use nginx_modules_http_mogilefs ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
- fi
-
- if use nginx_modules_http_memc ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
- fi
-
- if use nginx_modules_http_auth_ldap; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
- fi
-
- if use http || use http-cache || use http2; then
- http_enabled=1
- fi
-
- if [ $http_enabled ]; then
- use http-cache || myconf+=( --without-http-cache )
- use ssl && myconf+=( --with-http_ssl_module )
- else
- myconf+=( --without-http --without-http-cache )
- fi
-
- # Stream modules
- for mod in $NGINX_MODULES_STREAM; do
- if use nginx_modules_stream_${mod}; then
- stream_enabled=1
- else
- # Treat stream upstream slightly differently
- if ! use nginx_modules_stream_upstream; then
- myconf+=( --without-stream_upstream_hash_module )
- myconf+=( --without-stream_upstream_least_conn_module )
- myconf+=( --without-stream_upstream_zone_module )
- else
- myconf+=( --without-stream_${stream}_module )
- fi
- fi
- done
-
- if [ $stream_enabled ]; then
- myconf+=( --with-stream )
- use ssl && myconf+=( --with-stream_ssl_module )
- fi
-
- # MAIL modules
- for mod in $NGINX_MODULES_MAIL; do
- if use nginx_modules_mail_${mod}; then
- mail_enabled=1
- else
- myconf+=( --without-mail_${mod}_module )
- fi
- done
-
- if [ $mail_enabled ]; then
- myconf+=( --with-mail )
- use ssl && myconf+=( --with-mail_ssl_module )
- fi
-
- # custom modules
- for mod in $NGINX_ADD_MODULES; do
- myconf+=( --add-module=${mod} )
- done
-
- # https://bugs.gentoo.org/286772
- export LANG=C LC_ALL=C
- tc-export CC
-
- if ! use prefix; then
- myconf+=( --user=${PN}" "--group=${PN} )
- fi
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
- --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
- --pid-path="${EPREFIX}"/run/${PN}.pid \
- --lock-path="${EPREFIX}"/run/lock/${PN}.lock \
- --with-cc-opt="-I${EROOT}usr/include" \
- --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
- --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
- --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
- --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
- --http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
- --http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
- --http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
- "${myconf[@]}" || die "configure failed"
-
- # A purely cosmetic change that makes nginx -V more readable. This can be
- # good if people outside the gentoo community would troubleshoot and
- # question the users setup.
- sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
- use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
- # https://bugs.gentoo.org/286772
- export LANG=C LC_ALL=C
- emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- emake DESTDIR="${D%/}" install
-
- cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
-
- newinitd "${FILESDIR}"/nginx.initd-r2 nginx
-
- systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
- doman man/nginx.8
- dodoc CHANGES* README
-
- # just keepdir. do not copy the default htdocs files (bug #449136)
- keepdir /var/www/localhost
- rm -rf "${D}"usr/html || die
-
- # set up a list of directories to keep
- local keepdir_list="${NGINX_HOME_TMP}"/client
- local module
- for module in proxy fastcgi scgi uwsgi; do
- use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
- done
-
- keepdir /var/log/nginx ${keepdir_list}
-
- # this solves a problem with SELinux where nginx doesn't see the directories
- # as root and tries to create them as nginx
- fperms 0750 "${NGINX_HOME_TMP}"
- fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
- fperms 0700 /var/log/nginx ${keepdir_list}
- fowners ${PN}:${PN} /var/log/nginx ${keepdir_list}
-
- # logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
- if use nginx_modules_http_perl; then
- cd "${S}"/objs/src/http/modules/perl/
- emake DESTDIR="${D}" INSTALLDIRS=vendor
- perl_delete_localpod
- fi
-
- if use nginx_modules_http_cache_purge; then
- docinto ${HTTP_CACHE_PURGE_MODULE_P}
- dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
- fi
-
- if use nginx_modules_http_slowfs_cache; then
- docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
- dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
- fi
-
- if use nginx_modules_http_fancyindex; then
- docinto ${HTTP_FANCYINDEX_MODULE_P}
- dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
- fi
-
- if use nginx_modules_http_lua; then
- docinto ${HTTP_LUA_MODULE_P}
- dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown}
- fi
-
- if use nginx_modules_http_auth_pam; then
- docinto ${HTTP_AUTH_PAM_MODULE_P}
- dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
- fi
-
- if use nginx_modules_http_upstream_check; then
- docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
- dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
- fi
-
- if use nginx_modules_http_naxsi; then
- insinto /etc/nginx
- doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
- fi
-
- if use rtmp; then
- docinto ${RTMP_MODULE_P}
- dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
- fi
-
- if use nginx_modules_http_dav_ext; then
- docinto ${HTTP_DAV_EXT_MODULE_P}
- dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README
- fi
-
- if use nginx_modules_http_echo; then
- docinto ${HTTP_ECHO_MODULE_P}
- dodoc "${HTTP_ECHO_MODULE_WD}"/{README.markdown,doc/HttpEchoModule.wiki}
- fi
-
- if use nginx_modules_http_security; then
- docinto ${HTTP_SECURITY_MODULE_P}
- dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
- fi
-
- if use nginx_modules_http_push_stream; then
- docinto ${HTTP_PUSH_STREAM_MODULE_P}
- dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
- fi
-
- if use nginx_modules_http_sticky; then
- docinto ${HTTP_STICKY_MODULE_P}
- dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
- fi
-
- if use nginx_modules_http_memc; then
- docinto ${HTTP_MEMC_MODULE_P}
- dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
- fi
-
- if use nginx_modules_http_auth_ldap; then
- docinto ${HTTP_LDAP_MODULE_P}
- dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
- fi
-}
-
-pkg_postinst() {
- if use ssl; then
- if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then
- install_cert /etc/ssl/${PN}/${PN}
- use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
- fi
- fi
-
- if use nginx_modules_http_spdy; then
- ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
- ewarn "Update your configs and package.use accordingly."
- fi
-
- if use nginx_modules_http_lua && use http2; then
- ewarn "Lua 3rd party module author warns against using ${P} with"
- ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg"
- fi
-
- # This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for
- # existing installations
- local fix_perms=0
-
- for rv in ${REPLACING_VERSIONS} ; do
- version_compare ${rv} 1.4.1-r2
- [[ $? -eq 1 ]] && fix_perms=1
- done
-
- if [[ $fix_perms -eq 1 ]] ; then
- ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had the following"
- ewarn "directories the world-readable bit removed (if set):"
- ewarn " ${EPREFIX}/var/log/nginx"
- ewarn " ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
- ewarn "Check if this is correct for your setup before restarting nginx!"
- ewarn "This is a one-time change and will not happen on subsequent updates."
- ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"
- chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
- fi
-
- # If the nginx user can't change into or read the dir, display a warning.
- # If su is not available we display the warning nevertheless since we can't check properly
- su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null
- if [ $? -ne 0 ] ; then
- ewarn "Please make sure that the nginx user or group has at least"
- ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)"
- ewarn "Otherwise you end up with empty log files after a logrotate."
- fi
-}
diff --git a/www-servers/nginx/nginx-1.9.10.ebuild b/www-servers/nginx/nginx-1.9.10.ebuild
deleted file mode 100644
index 6c88b32e49d6..000000000000
--- a/www-servers/nginx/nginx-1.9.10.ebuild
+++ /dev/null
@@ -1,695 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-# * alive upstream
-# * sane packaging
-# * builds cleanly
-# * does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.2.19"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.1"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.28"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.3.5"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.9.19"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.4"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="0.3.0"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/v${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.54"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.1.7"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="0.0.3"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/agentzh/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.58"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/agentzh/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.0"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.1"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-c78b7dd79d0d"
-
-# mogilefs-module (http://www.grid.net.ru/nginx/mogilefs.en.html, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="http://www.grid.net.ru/nginx/download/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.16"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-inherit eutils ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="http://nginx.org"
-SRC_URI="http://nginx.org/download/${P}.tar.gz
- ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
- nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
- nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
- nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
- nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
- nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
- nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
- nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
- nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
- nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
- nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
- rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
- nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
- nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
- nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
- nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
- nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
- nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
- nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
- nginx_modules_http_security? ( Apache-2.0 )
- nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
-geo gzip limit_req limit_conn map memcached proxy referer rewrite scgi ssi
-split_clients upstream_ip_hash userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip gzip_static
-image_filter mp4 perl random_index realip secure_link stub_status sub xslt"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
- http_upload_progress
- http_headers_more
- http_cache_purge
- http_slowfs_cache
- http_fancyindex
- http_lua
- http_auth_pam
- http_upstream_check
- http_metrics
- http_naxsi
- http_dav_ext
- http_echo
- http_security
- http_push_stream
- http_sticky
- http_ajp
- http_mogilefs
- http_memc"
-
-IUSE="aio debug +http http2 +http-cache ipv6 libatomic luajit +pcre pcre-jit rtmp
-selinux ssl threads userland_GNU vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
- IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
- IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
- IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
- IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
- pcre? ( >=dev-libs/libpcre-4.2 )
- pcre-jit? ( >=dev-libs/libpcre-8.20[jit] )
- ssl? ( dev-libs/openssl:0= )
- http2? ( >=dev-libs/openssl-1.0.1c:0= )
- http-cache? ( userland_GNU? ( dev-libs/openssl:0= ) )
- nginx_modules_http_geoip? ( dev-libs/geoip )
- nginx_modules_http_gunzip? ( sys-libs/zlib )
- nginx_modules_http_gzip? ( sys-libs/zlib )
- nginx_modules_http_gzip_static? ( sys-libs/zlib )
- nginx_modules_http_image_filter? ( media-libs/gd[jpeg,png] )
- nginx_modules_http_perl? ( >=dev-lang/perl-5.8 )
- nginx_modules_http_rewrite? ( >=dev-libs/libpcre-4.2 )
- nginx_modules_http_secure_link? ( userland_GNU? ( dev-libs/openssl:0= ) )
- nginx_modules_http_xslt? ( dev-libs/libxml2 dev-libs/libxslt )
- nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) )
- nginx_modules_http_auth_pam? ( virtual/pam )
- nginx_modules_http_metrics? ( dev-libs/yajl )
- nginx_modules_http_dav_ext? ( dev-libs/expat )
- nginx_modules_http_security? ( >=dev-libs/libxml2-2.7.8 dev-libs/apr-util www-servers/apache )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-nginx )
- !www-servers/nginx:0"
-DEPEND="${CDEPEND}
- arm? ( dev-libs/libatomic_ops )
- libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
- nginx_modules_http_lua? ( nginx_modules_http_rewrite )
- nginx_modules_http_naxsi? ( pcre )
- nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
- nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
- nginx_modules_http_security? ( pcre )
- nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
- NGINX_HOME="/var/lib/nginx"
- NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
- ebegin "Creating nginx user and group"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
- eend $?
-
- if use libatomic; then
- ewarn "GCC 4.1+ features built-in atomic operations."
- ewarn "Using libatomic_ops is only needed if using"
- ewarn "a different compiler or a GCC prior to 4.1"
- fi
-
- if [[ -n $NGINX_ADD_MODULES ]]; then
- ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
- ewarn "This nginx installation is not supported!"
- ewarn "Make sure you can reproduce the bug without those modules"
- ewarn "_before_ reporting bugs."
- fi
-
- if use !http; then
- ewarn "To actually disable all http-functionality you also have to disable"
- ewarn "all nginx http modules."
- fi
-
- if use nginx_modules_http_ajp; then
- eerror "The AJP module currently doesn't build for nginx >1.8."
- eerror "It will be reintroduced with the 1.9 series when proven stable."
- eerror "Either disable it or stick with nginx 1.7.x."
- die "AJP module not supported"
- fi
-
- if use nginx_modules_http_mogilefs && use threads; then
- eerror "mogilefs won't compile with threads support."
- eerror "Please disable either flag and try again."
- die "Can't compile mogilefs with threads support"
- fi
-}
-
-src_prepare() {
- epatch_user
-
- epatch "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
-
- if use nginx_modules_http_upstream_check; then
- epatch "${FILESDIR}/check-1.9.2".patch
- fi
-
- if use nginx_modules_http_lua; then
- sed -i -e 's/-llua5.1/-llua/' "${HTTP_LUA_MODULE_WD}/config" || die
- fi
-
- find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
- # We have config protection, don't rename etc files
- sed -i 's:.default::' auto/install || die
- # remove useless files
- sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
- # don't install to /etc/nginx/ if not in use
- local module
- for module in fastcgi scgi uwsgi ; do
- if ! use nginx_modules_http_${module}; then
- sed -i -e "/${module}/d" auto/install || die
- fi
- done
-}
-
-src_configure() {
- # mod_security needs to generate nginx/modsecurity/config before including it
- if use nginx_modules_http_security; then
- cd "${HTTP_SECURITY_MODULE_WD}"
- if use luajit ; then
- sed -i \
- -e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
- configure || die
- fi
- ./configure \
- --enable-standalone-module \
- $(use_enable pcre-jit) \
- $(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
- fi
-
- cd "${S}"
-
- local myconf=() http_enabled= mail_enabled=
-
- use aio && myconf+=( --with-file-aio )
- use debug && myconf+=( --with-debug )
- use http2 && myconf+=( --with-http_v2_module )
- use ipv6 && myconf+=( --with-ipv6 )
- use libatomic && myconf+=( --with-libatomic )
- use pcre && myconf+=( --with-pcre )
- use pcre-jit && myconf+=( --with-pcre-jit )
- use threads && myconf+=( --with-threads )
-
- # HTTP modules
- for mod in $NGINX_MODULES_STD; do
- if use nginx_modules_http_${mod}; then
- http_enabled=1
- else
- myconf+=( --without-http_${mod}_module )
- fi
- done
-
- for mod in $NGINX_MODULES_OPT; do
- if use nginx_modules_http_${mod}; then
- http_enabled=1
- myconf+=( --with-http_${mod}_module )
- fi
- done
-
- if use nginx_modules_http_fastcgi; then
- myconf+=( --with-http_realip_module )
- fi
-
- # third-party modules
- if use nginx_modules_http_upload_progress; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
- fi
-
- if use nginx_modules_http_headers_more; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
- fi
-
- if use nginx_modules_http_cache_purge; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
- fi
-
- if use nginx_modules_http_slowfs_cache; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
- fi
-
- if use nginx_modules_http_fancyindex; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
- fi
-
- if use nginx_modules_http_lua; then
- http_enabled=1
- if use luajit; then
- export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
- export LUAJIT_INC=$(pkg-config --variable includedir luajit)
- else
- export LUA_LIB=$(pkg-config --variable libdir lua)
- export LUA_INC=$(pkg-config --variable includedir lua)
- fi
- myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
- myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
- fi
-
- if use nginx_modules_http_auth_pam; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
- fi
-
- if use nginx_modules_http_upstream_check; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
- fi
-
- if use nginx_modules_http_metrics; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
- fi
-
- if use nginx_modules_http_naxsi ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_NAXSI_MODULE_WD} )
- fi
-
- if use rtmp ; then
- http_enabled=1
- myconf+=( --add-module=${RTMP_MODULE_WD} )
- fi
-
- if use nginx_modules_http_dav_ext ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
- fi
-
- if use nginx_modules_http_echo ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
- fi
-
- if use nginx_modules_http_security ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
- fi
-
- if use nginx_modules_http_push_stream ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
- fi
-
- if use nginx_modules_http_sticky ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
- fi
-
- if use nginx_modules_http_mogilefs ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
- fi
-
- if use nginx_modules_http_memc ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
- fi
-
- if use http || use http-cache || use http2; then
- http_enabled=1
- fi
-
- if [ $http_enabled ]; then
- use http-cache || myconf+=( --without-http-cache )
- use ssl && myconf+=( --with-http_ssl_module )
- else
- myconf+=( --without-http --without-http-cache )
- fi
-
- # MAIL modules
- for mod in $NGINX_MODULES_MAIL; do
- if use nginx_modules_mail_${mod}; then
- mail_enabled=1
- else
- myconf+=( --without-mail_${mod}_module )
- fi
- done
-
- if [ $mail_enabled ]; then
- myconf+=( --with-mail )
- use ssl && myconf+=( --with-mail_ssl_module )
- fi
-
- # custom modules
- for mod in $NGINX_ADD_MODULES; do
- myconf+=( --add-module=${mod} )
- done
-
- # https://bugs.gentoo.org/286772
- export LANG=C LC_ALL=C
- tc-export CC
-
- if ! use prefix; then
- myconf+=( --user=${PN}" "--group=${PN} )
- fi
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
- --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
- --pid-path="${EPREFIX}"/run/${PN}.pid \
- --lock-path="${EPREFIX}"/run/lock/${PN}.lock \
- --with-cc-opt="-I${EROOT}usr/include" \
- --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
- --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
- --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
- --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
- --http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
- --http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
- --http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
- "${myconf[@]}" || die "configure failed"
-
- # A purely cosmetic change that makes nginx -V more readable. This can be
- # good if people outside the gentoo community would troubleshoot and
- # question the users setup.
- sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
- use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
- # https://bugs.gentoo.org/286772
- export LANG=C LC_ALL=C
- emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- emake DESTDIR="${D%/}" install
-
- cp "${FILESDIR}"/nginx.conf "${ED}"etc/nginx/nginx.conf || die
-
- newinitd "${FILESDIR}"/nginx.initd-r2 nginx
-
- systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
- doman man/nginx.8
- dodoc CHANGES* README
-
- # just keepdir. do not copy the default htdocs files (bug #449136)
- keepdir /var/www/localhost
- rm -rf "${D}"usr/html || die
-
- # set up a list of directories to keep
- local keepdir_list="${NGINX_HOME_TMP}"/client
- local module
- for module in proxy fastcgi scgi uwsgi; do
- use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
- done
-
- keepdir /var/log/nginx ${keepdir_list}
-
- # this solves a problem with SELinux where nginx doesn't see the directories
- # as root and tries to create them as nginx
- fperms 0750 "${NGINX_HOME_TMP}"
- fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
- fperms 0700 /var/log/nginx ${keepdir_list}
- fowners ${PN}:${PN} /var/log/nginx ${keepdir_list}
-
- # logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
- if use nginx_modules_http_perl; then
- cd "${S}"/objs/src/http/modules/perl/
- emake DESTDIR="${D}" INSTALLDIRS=vendor
- perl_delete_localpod
- fi
-
- if use nginx_modules_http_cache_purge; then
- docinto ${HTTP_CACHE_PURGE_MODULE_P}
- dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
- fi
-
- if use nginx_modules_http_slowfs_cache; then
- docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
- dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
- fi
-
- if use nginx_modules_http_fancyindex; then
- docinto ${HTTP_FANCYINDEX_MODULE_P}
- dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
- fi
-
- if use nginx_modules_http_lua; then
- docinto ${HTTP_LUA_MODULE_P}
- dodoc "${HTTP_LUA_MODULE_WD}"/{Changes,README.markdown}
- fi
-
- if use nginx_modules_http_auth_pam; then
- docinto ${HTTP_AUTH_PAM_MODULE_P}
- dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
- fi
-
- if use nginx_modules_http_upstream_check; then
- docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
- dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
- fi
-
- if use nginx_modules_http_naxsi; then
- insinto /etc/nginx
- doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
- fi
-
- if use rtmp; then
- docinto ${RTMP_MODULE_P}
- dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
- fi
-
- if use nginx_modules_http_dav_ext; then
- docinto ${HTTP_DAV_EXT_MODULE_P}
- dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README
- fi
-
- if use nginx_modules_http_echo; then
- docinto ${HTTP_ECHO_MODULE_P}
- dodoc "${HTTP_ECHO_MODULE_WD}"/{README.markdown,doc/HttpEchoModule.wiki}
- fi
-
- if use nginx_modules_http_security; then
- docinto ${HTTP_SECURITY_MODULE_P}
- dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
- fi
-
- if use nginx_modules_http_push_stream; then
- docinto ${HTTP_PUSH_STREAM_MODULE_P}
- dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
- fi
-
- if use nginx_modules_http_sticky; then
- docinto ${HTTP_STICKY_MODULE_P}
- dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
- fi
-
- if use nginx_modules_http_memc; then
- docinto ${HTTP_MEMC_MODULE_P}
- dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
- fi
-}
-
-pkg_postinst() {
- if use ssl; then
- if [ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]; then
- install_cert /etc/ssl/${PN}/${PN}
- use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
- fi
- fi
-
- if use nginx_modules_http_spdy; then
- ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
- ewarn "Update your configs and package.use accordingly."
- fi
-
- if use nginx_modules_http_lua && use http2; then
- ewarn "Lua 3rd party module author warns against using ${P} with"
- ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg"
- fi
-
- # This is the proper fix for bug #458726/#469094, resp. CVE-2013-0337 for
- # existing installations
- local fix_perms=0
-
- for rv in ${REPLACING_VERSIONS} ; do
- version_compare ${rv} 1.4.1-r2
- [[ $? -eq 1 ]] && fix_perms=1
- done
-
- if [[ $fix_perms -eq 1 ]] ; then
- ewarn "To fix a security bug (CVE-2013-0337, bug #458726) had the following"
- ewarn "directories the world-readable bit removed (if set):"
- ewarn " ${EPREFIX}/var/log/nginx"
- ewarn " ${EPREFIX}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
- ewarn "Check if this is correct for your setup before restarting nginx!"
- ewarn "This is a one-time change and will not happen on subsequent updates."
- ewarn "Furthermore nginx' temp directories got moved to ${NGINX_HOME_TMP}"
- chmod -f o-rwx "${EPREFIX}"/var/log/nginx "${EPREFIX}${NGINX_HOME_TMP}"/{,client,proxy,fastcgi,scgi,uwsgi}
- fi
-
- # If the nginx user can't change into or read the dir, display a warning.
- # If su is not available we display the warning nevertheless since we can't check properly
- su -s /bin/sh -c 'cd /var/log/nginx/ && ls' nginx >&/dev/null
- if [ $? -ne 0 ] ; then
- ewarn "Please make sure that the nginx user or group has at least"
- ewarn "'rx' permissions on /var/log/nginx (default on a fresh install)"
- ewarn "Otherwise you end up with empty log files after a logrotate."
- fi
-}
diff --git a/x11-drivers/xf86-video-virtualbox/Manifest b/x11-drivers/xf86-video-virtualbox/Manifest
index 712f840d25b6..a6ce5bceb248 100644
--- a/x11-drivers/xf86-video-virtualbox/Manifest
+++ b/x11-drivers/xf86-video-virtualbox/Manifest
@@ -1,5 +1,5 @@
-DIST VirtualBox-4.3.28.tar.bz2 100092002 SHA256 e157ab76d1958ae2c56b2a3875194fbff3de82486ad0e30032fd5bd772297c31 SHA512 b6e849a1420515b6dbda8cee0ab64940dd93296ec58cde76676ac257ff3dad0459aa1fd0bda7e1d0abc751d2d59f055465b198a546fdbb4e70e934a78654a8fc WHIRLPOOL 1b739f1f989032e07829a23ffadadd49e31109d70b0effbc44126a48a165218ff3ebafa576fa0e4f2af76a404033b60e5c9804ac43db5dd3024f1eca25ca70da
DIST VirtualBox-4.3.32.tar.bz2 98168101 SHA256 dc5bf4e6f9989792d31bac174d20d7fc9e638654fa5a99c02b20a60557927261 SHA512 856b36cd90647cdceb7e182d066e9e1489d2bae0b71ce8b2f6324cd2d9854806eaea0fe0aad2d4e8b84bd836c688e13258ae69e094320572729b7d886c8d35f0 WHIRLPOOL 441041947dcd190d73a9cc5007bc0001b6eeb36ba958f4a09fca775670faff690423095d334e258fc0d6dcbef01d74a085505c8549397ced5dbe75ca96724144
DIST VirtualBox-4.3.34.tar.bz2 98166680 SHA256 076507e924d3c5ae05c5e80a720b897da4a57a636a506a7d369b28f08b11d6c1 SHA512 1eeca08990d426155550d8920c159e41320bfedb53561b1752bd6816fa588588672ad364e73baf9b7b45e8352ae8feb1c649ba1748253da47586b55fe89e8fe3 WHIRLPOOL 1249e1d61aec38d439d1060457a1a0d0294a65d78dfa426026f3abe1882c429c628ea58f556bdeaf1a88d3cdd3b9095f1e4c6f1fae2176f39f8da5bb3d091809
-DIST VirtualBox-5.0.12.tar.bz2 111001547 SHA256 de0362b1d404d1ca0298db1984acb6f0f1c6210313aeb744fea345ad9201e86e SHA512 eef01d1a5121905d2fbfcd48081f18db06433187bfbfea6a006b3adea11cad8c8351025fd19fa115c132231592330b17bfeba033a3a168f3064176a3f7586d7a WHIRLPOOL bd73e67c83a524cb021ff92c4c3d655f6a1019e2d48f3ec97aee937543ca9da6f7ba2a1e70a6b75092dce3c8db8f3c7887300104fafa23432b94bc832c5e5447
+DIST VirtualBox-4.3.36.tar.bz2 98421624 SHA256 af0776df6d03b2709cb76a69f055487bf12bdb3b4163e2a82959860300283046 SHA512 179fd8c7d3562fd6c3c6815ef56a3dbda3fcbb841171f911a923ded06e627fb2e6e33f66124303b448a05c364343ec35e2fb264f462a48e52d66277dfd77bcfc WHIRLPOOL 0419c2baac6f07d729a35a54be872d7949cb6fa99a5ce0f2317df32f27e20e42f045811697e40255f240ec84b08a3a1f36a563841a341a528c37c9e63fda2e6d
DIST VirtualBox-5.0.14.tar.bz2 111033626 SHA256 69abac7255b2251a18fd73c0b7c200d5f8ce72a59fa019b53a5cdbf7f2843002 SHA512 5547da58b50c9cf5d096f81c005134e1f56c4fb55d4d40a6fbd1efe1fe1fbeebc0747f0903933da9238a24c63eeed2c6c15bfc5cae5ce6e3e2eb4a18511d6258 WHIRLPOOL 785e0fa7a0652825b977562a1febbd95463ce49a9257a004827725597e0fbd59f9bdf75cc31f5b04e0f04be3d0d68e90148c06dd5d03875063312f8a3cd5bc86
+DIST VirtualBox-5.0.16.tar.bz2 111062984 SHA256 f5a44d33a1db911f445b2eb2d22d9293a96a535cba488b5a235577ef868fa63c SHA512 3da3a227360fb50d299e99770378f65e8cb99525377343fa8faff2360be66643d46f68323d6a8b8d4d26182082f171bb35ab2497167bf6df18827a5ea7742074 WHIRLPOOL ea709057c588f28820790c2b193decba9ee0c57e0f82aa4361ca87aef661315182e18b5ee29558e47ed92f6037eb91befa5390680661a7b9f2248c7819b4a85c
diff --git a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch
index ad66ff20401d..b0779d42270a 100644
--- a/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch
+++ b/x11-drivers/xf86-video-virtualbox/files/xf86-video-virtualbox-2.2.0-enable-opengl.patch
@@ -1,5 +1,5 @@
---- configure.orig 2009-04-11 19:30:06.000000000 +0200
-+++ configure 2009-04-11 20:46:05.000000000 +0200
+--- a/configure
++++ b/configure
@@ -1955,8 +1955,8 @@
HEADLESS=1
WITH_SDL=0
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.32.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.32.ebuild
index 286454b4a761..14b3dec9fdbf 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.32.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.32.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="dri"
RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28-r1.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.36.ebuild
index 14b3dec9fdbf..8588cd5585a2 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.28-r1.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-4.3.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ SRC_URI="http://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
IUSE="dri"
RDEPEND=">=x11-base/xorg-server-1.7:=[-minimal]
diff --git a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.12.ebuild b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.16.ebuild
index 1fad4cc497f3..8b2d5d7385a0 100644
--- a/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.12.ebuild
+++ b/x11-drivers/xf86-video-virtualbox/xf86-video-virtualbox-5.0.16.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit eutils linux-mod multilib python-single-r1 versionator toolchain-funcs
@@ -49,6 +49,14 @@ BUILD_TARGETS="all"
BUILD_TARGET_ARCH="${ARCH}"
MODULE_NAMES="vboxvideo(misc:${WORKDIR}/vboxvideo_drm:${WORKDIR}/vboxvideo_drm)"
+PATCHES=(
+ # Ugly hack to build the opengl part of the video driver
+ "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
+
+ # unset useless/problematic checks in configure
+ "${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
+)
+
S="${WORKDIR}/${MY_P}"
QA_TEXTRELS_x86="usr/lib/VBoxOGL.so"
@@ -79,19 +87,16 @@ src_prepare() {
done
# Remove shipped binaries (kBuild,yasm), see bug #232775
- rm -rf kBuild/bin tools
+ rm -r kBuild/bin tools || die
# Disable things unused or splitted into separate ebuilds
cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
- # Ugly hack to build the opengl part of the video driver
- epatch "${FILESDIR}/${PN}-2.2.0-enable-opengl.patch"
-
- # unset useless/problematic checks in configure
- epatch "${FILESDIR}/${PN}-5.0.0_beta3-configure_checks.patch"
+ default
# link with lazy on hardened #394757
- sed -i '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' Config.kmk || die
+ sed '/^TEMPLATE_VBOXR3EXE_LDFLAGS.linux/s/$/ -Wl,-z,lazy/' \
+ -i Config.kmk || die
}
src_configure() {
diff --git a/x11-libs/goffice/goffice-0.10.27.ebuild b/x11-libs/goffice/goffice-0.10.27.ebuild
index 630e90fa6f8e..9093e1a260a3 100644
--- a/x11-libs/goffice/goffice-0.10.27.ebuild
+++ b/x11-libs/goffice/goffice-0.10.27.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/goffice/"
LICENSE="GPL-2"
SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="+introspection"
# Build fails with -gtk
diff --git a/x11-libs/gtk+/gtk+-2.24.29.ebuild b/x11-libs/gtk+/gtk+-2.24.29.ebuild
index 495153e00101..b828c7f1976e 100644
--- a/x11-libs/gtk+/gtk+-2.24.29.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.29.ebuild
@@ -18,7 +18,7 @@ REQUIRED_USE="
xinerama? ( !aqua )
"
-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"
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
COMMON_DEPEND="
diff --git a/x11-libs/gtk+/gtk+-3.18.7.ebuild b/x11-libs/gtk+/gtk+-3.18.7.ebuild
index 9b26ddf0d32a..b884c71c5acf 100644
--- a/x11-libs/gtk+/gtk+-3.18.7.ebuild
+++ b/x11-libs/gtk+/gtk+-3.18.7.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="
xinerama? ( X )
"
-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 ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# FIXME: introspection data is built against system installation of gtk+:3
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
diff --git a/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild b/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild
index cd4df794e4e8..9ffb2d2f251c 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.18.2.ebuild
@@ -18,7 +18,7 @@ SLOT="3.0/3"
IUSE="glade +introspection vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.44:2
diff --git a/x11-libs/libwnck/libwnck-3.14.1.ebuild b/x11-libs/libwnck/libwnck-3.14.1.ebuild
index c7a8e6608ae1..672179114e7c 100644
--- a/x11-libs/libwnck/libwnck-3.14.1.ebuild
+++ b/x11-libs/libwnck/libwnck-3.14.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
LICENSE="LGPL-2+"
SLOT="3"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="+introspection startup-notification tools"
diff --git a/x11-libs/pango/pango-1.38.1.ebuild b/x11-libs/pango/pango-1.38.1.ebuild
index 392a21fca6a0..38b97524ea38 100644
--- a/x11-libs/pango/pango-1.38.1.ebuild
+++ b/x11-libs/pango/pango-1.38.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pango.org/"
LICENSE="LGPL-2+ FTL"
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"
+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="X +introspection test"
diff --git a/x11-libs/vte/vte-0.42.4.ebuild b/x11-libs/vte/vte-0.42.4.ebuild
index 0fda0df0b591..c349c9062e38 100644
--- a/x11-libs/vte/vte-0.42.4.ebuild
+++ b/x11-libs/vte/vte-0.42.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
LICENSE="LGPL-2+"
SLOT="2.91"
IUSE="+crypt debug glade +introspection vala"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.40:2
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index ca8df97a2679..c0bada302761 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -1,2 +1,3 @@
DIST albert-0.7.7.tar.gz 4490918 SHA256 24fbe1f758eea8b8a0920413d2b7a3b44c0cfa88e3d98f302bd5604b4eb0acc3 SHA512 890bb0ba53be64b58090ad1b73152980c5f3e426fa2582a13bca081978253e792c1569857b01f71b3d2513d37bee7af79b9aef502881c30f0afa29cd6d9f0bdf WHIRLPOOL 924d24e1840eaab11aecaa82edf68c1b050a840b97393736b84601cab66b7914748206d6118b4a68668b8cb115408c6a63913637829d2eb9936ae14bf0416cd4
DIST albert-0.8.0.tar.gz 4556624 SHA256 1d0337d341f25e43486a40743e504f510e87e3cefeaff86cb2673ae7695015fa SHA512 75acd4e042e05452a4658ca61453e8afab41ac06c806919937caf5e84e98c0ec1c12bcdb6179797292c6835d0cba81833122677bebb350472ca18df3bcc78d19 WHIRLPOOL 08397f7f114ecc016bf34bcf3fc6998e9ebc022318af44b30cf842195bfb552f8dbd7f2309f033c716378778ca84f2071f8b26322ac071a0fe5ceb476ba461e9
+DIST albert-0.8.1.tar.gz 4558365 SHA256 20c50d90578d233338ae39bc5bc446188aab83d6b306f09e3c49f12f982d36df SHA512 6d145723ef7b65510945d24c0e977ad99d17f3c2b3e752c64eb599cbac8610379eb4320859658f15f9fdec58188f9d6012a90e84af95ca04d85776c1c12e0f76 WHIRLPOOL e2819097702eb0502c067f93bea4742149e23e9e8497a55df677ee5522e664ed68a7c636379fb305b0ecba3e7ddbb0b2e224b72c0d105c2558ecda35237710eb
diff --git a/x11-misc/albert/albert-0.8.1.ebuild b/x11-misc/albert/albert-0.8.1.ebuild
new file mode 100644
index 000000000000..ad3bd4b3313e
--- /dev/null
+++ b/x11-misc/albert/albert-0.8.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Desktop agnostic launcher"
+HOMEPAGE="https://github.com/manuelschneid3r/albert"
+SRC_URI="https://github.com/manuelschneid3r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+ dev-cpp/muParser
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+ dev-qt/qtsvg:5
+"
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild
index 5f3a4ff0508a..34a615b12364 100644
--- a/x11-misc/dmenu/dmenu-4.6.ebuild
+++ b/x11-misc/dmenu/dmenu-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://dl.suckless.org/tools/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="xinerama"
RDEPEND="
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 570bb97c2f88..d973210e92d7 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -4,5 +4,7 @@ DIST lightdm-1.12.3.tar.xz 473512 SHA256 c7dc90fde4f22762f38f06506b64f3b95cc3a1d
DIST lightdm-1.14.4.tar.xz 483304 SHA256 9d9c753e018c9fcba540141696b2da56f98dc21ae5af8146ebf96d6f61aaffab SHA512 152e5d4d6105f3f6a08695ab8d398fd82179ae289f12983e97c3d6a708ae482356aaaf7d4ff1ace1d125f441de6c1f05e9407b68b70d4f56f102f70f943ab00f WHIRLPOOL 22fa47e8d9a7ca38144374caa0bb98be9df1ca91af322998d909d5cfbf2f6f79adc6a0fd565bb2af493c60755f6798c17f035c25bc5283c6e7b62931f86dee0d
DIST lightdm-1.15.3.tar.xz 479432 SHA256 0670c6de84e9edfea3210b42aef688a848fa5366d150a71a67cdf83bc64bda5f SHA512 2fde5b1d01c8bbfa1fa74af9947c4ced9211d0f56d9590c9b5253a51774e2f927a4c6c2e76cde7d34351ae8474bf20e27cf71806c0a4e3a4dffc81b070384344 WHIRLPOOL a4765ee04e9faedfe397b561d17e6ac37ee1738358f7dd00f4be6e4fbabca6a83bd76fe845e4605345053350768363c2027a474a0087d5d37b819a0638c35f54
DIST lightdm-1.16.6.tar.xz 485820 SHA256 f8f5d38886fa3c1f52e92a51663c30aaf6de462a9e4df4407769a7b93bf22a6c SHA512 9a89bb224cb7f6ddc174cd42920ee3d88a205824da5ec4b46fd93fa6bd2cdf35b8127f7784131ac1bb97a9bc2349a0f41402561594ff6d0ec339787a44793c34 WHIRLPOOL a22efdc4823f44f0a9d0aab8eb8e89495ec0d156e9b8fd46a6b38c3704455050f0c65b7c8c4d6614a316ebb4eaa83df0f557730214c51b3206b128bbcfa160b4
+DIST lightdm-1.16.7.tar.xz 486692 SHA256 67b72a5dadf823ebc7df1bb523da59342271fcf67fcac9a2a2c30007ccb9ab32 SHA512 8ab35293e90653814ce877697d6cba335906f04129ba63d87e3dcb05efdca64c815023f75920a836064134d7c28dcf3949e993db67c85e93dc954ef48fe4984f WHIRLPOOL 9b3867e37cac072b2883b8621f7604cfda5e769157220aaf76d72c641b14c9c149bd989818d8880b845f569d1a55b80fe690435b4799ea487bbb504ac4f8887f
DIST lightdm-1.17.2.tar.xz 486492 SHA256 dbdcddc8257308198bc6b4b6bd6307753c2a244ddcd6c2637368f2243b3a1a5b SHA512 07fffab17a917e6d03eac1850c205342e8fe7f627abf3820ebfe3107ef827af4fc4443bcaa7ec447760dcf0de9c2b517472854f7562bb3dc915a23c9742ccb15 WHIRLPOOL 4d4b911565be26f98d10da219e6454f013324ef78a1c9a99c97e785355c53bd8cb0f922340453c514d3e1d019581adadec36ada2c91f37b0bfed2010bb346920
DIST lightdm-1.17.3.tar.xz 487176 SHA256 a9fcfb5edaad4f8c33dcdd695095791e952720d051eef695e07469ed87fa85b3 SHA512 0624fd994dbb0052c2e6092fa9e8ee3785d541d65c3baf911eff5a4f74e5689395a1079139ed6c30e4ad8db07355d9aede859a58718c873a9684c880efdbb6b0 WHIRLPOOL 988e77d998a843d9d168380d1aa5e16f2f491c52679732442e07b8a7b90ffea45fbf3b239f0f65acaac84626e5b9c933f86981250996c6a3524802953654c892
+DIST lightdm-1.17.5.tar.xz 488048 SHA256 4661ea0adb9e2fef9b447b604fc46f70821b8b1c271ac7e61ca6ba5d8f043d8d SHA512 6d3bc969978fe536d30882c26c9b5ab4fca4d8ece60d6705c5838032718b20edbeee1c87f75baeef9df4ebea99cecde1a3bfc706f56c44ee3ce94bc8ad3d7e46 WHIRLPOOL 8456bef0d972eca33f106ef177ccad765cc5ea5315866d807e31dd415f89e26b667acd3ea8b01e037429f9d0133177ca9c1b8f043b2708923cf977532cab7791
diff --git a/x11-misc/lightdm/lightdm-1.16.7.ebuild b/x11-misc/lightdm/lightdm-1.16.7.ebuild
new file mode 100644
index 000000000000..ce3a12abc242
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.16.7.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils pam readme.gentoo systemd versionator
+
+TRUNK_VERSION="$(get_version_component_range 1-2)"
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
+ mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="audit +gtk +introspection kde qt4 qt5 +gnome"
+REQUIRED_USE="|| ( gtk kde )"
+
+COMMON_DEPEND="audit? ( sys-process/audit )
+ >=dev-libs/glib-2.32.3:2
+ dev-libs/libxml2
+ gnome? ( sys-apps/accountsservice )
+ virtual/pam
+ x11-libs/libX11
+ >=x11-libs/libxklavier-5
+ introspection? ( >=dev-libs/gobject-introspection-1 )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ dev-qt/qtgui:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ )"
+RDEPEND="${COMMON_DEPEND}
+ >=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+ dev-util/gtk-doc-am
+ dev-util/intltool
+ gnome? ( gnome-base/gnome-common )
+ sys-devel/gettext
+ virtual/pkgconfig"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
+ kde? ( x11-misc/lightdm-kde )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+ sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+ sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+ einfo "Fixing the session-wrapper variable in lightdm.conf"
+ sed -i -e \
+ "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+ data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+ epatch_user
+
+ # Remove bogus Makefile statement. This needs to go upstream
+ sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+ if has_version dev-libs/gobject-introspection; then
+ eautoreconf
+ else
+ AT_M4DIR=${WORKDIR} eautoreconf
+ fi
+}
+
+src_configure() {
+ # Set default values if global vars unset
+ local _greeter _session _user
+ _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+ _session=${LIGHTDM_SESSION:=gnome}
+ _user=${LIGHTDM_USER:=root}
+ # Let user know how lightdm is configured
+ einfo "Gentoo configuration"
+ einfo "Default greeter: ${_greeter}"
+ einfo "Default session: ${_session}"
+ einfo "Greeter user: ${_user}"
+
+ # also disable tests because libsystem.c does not build. Tests are
+ # restricted so it does not matter anyway.
+ econf \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-tests \
+ $(use_enable audit libaudit) \
+ $(use_enable introspection) \
+ $(use_enable qt4 liblightdm-qt) \
+ $(use_enable qt5 liblightdm-qt5) \
+ --with-user-session=${_session} \
+ --with-greeter-session=${_greeter} \
+ --with-greeter-user=${_user} \
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ default
+
+ # Delete apparmor profiles because they only work with Ubuntu's
+ # apparmor package. Bug #494426
+ if [[ -d ${D}/etc/apparmor.d ]]; then
+ rm -r "${D}/etc/apparmor.d" || die \
+ "Failed to remove apparmor profiles"
+ fi
+
+ insinto /etc/${PN}
+ doins data/{${PN},keys}.conf
+ doins "${FILESDIR}"/Xsession
+ fperms +x /etc/${PN}/Xsession
+ # /var/lib/lightdm-data could be useful. Bug #522228
+ dodir /var/lib/lightdm-data
+
+ prune_libtool_files --all
+ rm -rf "${ED}"/etc/init
+
+ # Remove existing pam file. We will build a new one. Bug #524792
+ rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
+ pamd_mimic system-local-login ${PN} auth account password session #372229
+ pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+ dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+ readme.gentoo_create_doc
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/x11-misc/lightdm/lightdm-1.17.5.ebuild b/x11-misc/lightdm/lightdm-1.17.5.ebuild
new file mode 100644
index 000000000000..3d7e185de11a
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.17.5.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils pam readme.gentoo systemd versionator
+
+TRUNK_VERSION="$(get_version_component_range 1-2)"
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="https://launchpad.net/${PN}/${TRUNK_VERSION}/${PV}/+download/${P}.tar.xz
+ mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="audit +gtk +introspection kde qt4 qt5 +gnome"
+REQUIRED_USE="|| ( gtk kde )"
+
+COMMON_DEPEND="audit? ( sys-process/audit )
+ >=dev-libs/glib-2.32.3:2
+ dev-libs/libxml2
+ gnome? ( sys-apps/accountsservice )
+ virtual/pam
+ x11-libs/libX11
+ >=x11-libs/libxklavier-5
+ introspection? ( >=dev-libs/gobject-introspection-1 )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtdbus:4
+ dev-qt/qtgui:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ )"
+RDEPEND="${COMMON_DEPEND}
+ >=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+ dev-util/gtk-doc-am
+ dev-util/intltool
+ gnome? ( gnome-base/gnome-common )
+ sys-devel/gettext
+ virtual/pkgconfig"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )
+ kde? ( x11-misc/lightdm-kde )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+ sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+ sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+ einfo "Fixing the session-wrapper variable in lightdm.conf"
+ sed -i -e \
+ "/session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+ data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+ epatch_user
+
+ # Remove bogus Makefile statement. This needs to go upstream
+ sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+ if has_version dev-libs/gobject-introspection; then
+ eautoreconf
+ else
+ AT_M4DIR=${WORKDIR} eautoreconf
+ fi
+}
+
+src_configure() {
+ # Set default values if global vars unset
+ local _greeter _session _user
+ _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+ _session=${LIGHTDM_SESSION:=gnome}
+ _user=${LIGHTDM_USER:=root}
+ # Let user know how lightdm is configured
+ einfo "Gentoo configuration"
+ einfo "Default greeter: ${_greeter}"
+ einfo "Default session: ${_session}"
+ einfo "Greeter user: ${_user}"
+
+ # also disable tests because libsystem.c does not build. Tests are
+ # restricted so it does not matter anyway.
+ econf \
+ --localstatedir=/var \
+ --disable-static \
+ --disable-tests \
+ $(use_enable audit libaudit) \
+ $(use_enable introspection) \
+ $(use_enable qt4 liblightdm-qt) \
+ $(use_enable qt5 liblightdm-qt5) \
+ --with-user-session=${_session} \
+ --with-greeter-session=${_greeter} \
+ --with-greeter-user=${_user} \
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ default
+
+ # Delete apparmor profiles because they only work with Ubuntu's
+ # apparmor package. Bug #494426
+ if [[ -d ${D}/etc/apparmor.d ]]; then
+ rm -r "${D}/etc/apparmor.d" || die \
+ "Failed to remove apparmor profiles"
+ fi
+
+ insinto /etc/${PN}
+ doins data/{${PN},keys}.conf
+ doins "${FILESDIR}"/Xsession
+ fperms +x /etc/${PN}/Xsession
+ # /var/lib/lightdm-data could be useful. Bug #522228
+ dodir /var/lib/lightdm-data
+
+ prune_libtool_files --all
+ rm -rf "${ED}"/etc/init
+
+ # Remove existing pam file. We will build a new one. Bug #524792
+ rm -rf "${ED}"/etc/pam.d/${PN}{,-greeter}
+ pamd_mimic system-local-login ${PN} auth account password session #372229
+ pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+ dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+ readme.gentoo_create_doc
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.1.ebuild
index 149190eefe3e..4dfa91e6c342 100644
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.1.ebuild
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.8.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="
dev-libs/atk:0
diff --git a/x11-misc/spacefm/Manifest b/x11-misc/spacefm/Manifest
index eb8a9e7e5141..ced15f5b9eca 100644
--- a/x11-misc/spacefm/Manifest
+++ b/x11-misc/spacefm/Manifest
@@ -1,7 +1,2 @@
DIST 1.0.4.tar.gz 3487476 SHA256 b08df31894f48c43e38ce3f3d32acf0bec67c38164d20f7765a7e4af9e3af7a2 SHA512 bbb3d3048c62b0223799468e24abd8614a75d9118ad9d8493e7118882072fb3401f086239dc05a4a742b39b40520771de5bc9fe6735a2c5853ffb5aa961e6112 WHIRLPOOL 9a7af8a52c822b1024a0fbe45556b7c1c53995c827315d6b2fad6e506720abc93fa1e200428d39cf4788bed7f1e635dc883d37711583157be31b12796167d379
DIST 1.0.5.tar.gz 3491483 SHA256 d3f14fd1b1cfb51df98ebc341ab78ce741ba443ae2ce9e1662de39d01a95e0f3 SHA512 f32a59eac773df1bd9d36ba26cf7397bd205a2a8918e01f978c42ffb6aa2238a6f4dc871503a43f130c3b10d80f43364f54965d441f602ac895d0483fc073498 WHIRLPOOL 2e6f9a742032d04e863a7801b8707ada523be009d3c7abe8d54390af822653bab923783926082af28ad6a546f86035f50ec44a490e170186f395d6e5395b48bb
-DIST spacefm-0.9.3.tar.xz 1291540 SHA256 0072a6f2668ae6649e1cc410f1e7eec172a0297de8b225c963b9e29c6a0ed04d SHA512 02140d1915b77dcbe30c76f3666b8a2bf15f634026d27f059a47c567c5ac697ff1fe9ed95a9dcbed092eaafd9075974cd46a1d315c20e103ea97f0bac9c29df9 WHIRLPOOL 04804f65bafb5fbeb86743a183af3439f0b040d5301cc1b74abc7257a4889d9d16c9ddbe10284da7d1cd9e2b65afb01379835647e1a84e638b6c81778dde7256
-DIST spacefm-0.9.4.tar.xz 1283576 SHA256 75886cc93e6586753f01242ba883856567c3fdc90d240f112662ca3080e25955 SHA512 b7c3c92b4b6cb74f6c1d63a91beca9759af23fd3b7e5ffc10a895fc948f07aa5e28a0085820cae39bd5eb6e0489181369870fd760950dea26bf0b13c9f499a66 WHIRLPOOL ffb962e1c89125253368a2c40dde4dc7b02f54f365a77cd14a21a417ca40ace9d08e0603d52fd6b065e57e80c5f281d85f8b1644b883f683cfee2d1996afffd2
-DIST spacefm-1.0.0.tar.xz 1338824 SHA256 dc3025bd31ea235afaa55cf609d376dc8c79e63dcd127389085758a9b26b97b6 SHA512 b4306092069125608132c3c7a3f54ba33bcc39876ccb409d69795283c83a6eb7c58e9848c9b3b6dbda606886f1f9359fb96a6b9b1b8076bf585fde237b0e3402 WHIRLPOOL db78cbf76b4d151773412d7646055fa26e058b93107eb4b0d84fba369d277211fd4edbe3660bf5a26f3452e4e9ad6c84d724cee4658c7dda63e479d871a7ee3d
-DIST spacefm-1.0.2.tar.xz 1382356 SHA256 e7d0c5c034b68b7e3f74b14758b751051a7abd4fa7c65d29cfb9598a965f5b33 SHA512 0d82754344ca5421012d2328cbaa32f021bcdbecf12b24224e6be5890d27c1ea285b1cb2b5614d7350995df974f8af6a9958105c6215424425bc500210b9d79b WHIRLPOOL f59894666aa40a4a3d54b9ac56ac05f6e65f693a9bc65c6c407f0a84aab60048c1d612b2026a51996e9ed5d39e88bde734bf72c4aa67b4e10e5c2efe2ca548b2
-DIST spacefm-1.0.3.tar.xz 1420508 SHA256 1599a4556df4b7b1fd20a59aeffdabee990cc102b5cbed0846201f0345863279 SHA512 9e747dedeec49e31765ced28d930fe8fbbb4acf014ef565962605966e6afba383f4c970cd304d376e449bdefd13e272853d77ac084f72612817b6b0bff5eb319 WHIRLPOOL fa096c5a0c3c609ff1fa6d0655ebc1d0adabfd6649337bf333acf171a496ee182e13d973aa67c11b31a2daa60f9c8102e06e43d6a740d46e3ea3e8488c53ce5a
diff --git a/x11-misc/spacefm/spacefm-0.9.3.ebuild b/x11-misc/spacefm/spacefm-0.9.3.ebuild
deleted file mode 100644
index 923d0dd8b40b..000000000000
--- a/x11-misc/spacefm/spacefm-0.9.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit fdo-mime gnome2-utils linux-info
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="https://ignorantguru.github.com/spacefm/"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
- mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+startup-notification"
-
-RDEPEND="dev-libs/glib:2
- dev-util/desktop-file-utils
- >=virtual/udev-143
- virtual/freedesktop-icon-theme
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:3
- x11-libs/pango
- x11-libs/libX11
- x11-misc/shared-mime-info
- startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
- dev-util/intltool
- virtual/pkgconfig
- sys-devel/gettext"
-
-src_configure() {
- econf \
- --htmldir=/usr/share/doc/${PF}/html \
- $(use_enable startup-notification) \
- --disable-hal \
- --enable-inotify \
- --disable-pixmaps \
- --with-gtk3=yes
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
-
- einfo
- elog "To mount as non-root user you need one of the following:"
- elog " sys-apps/udevil (recommended, see below)"
- elog " sys-apps/pmount"
- elog " sys-fs/udisks:0"
- elog " sys-fs/udisks:2"
- elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
- elog " sys-apps/udevil"
- elog "To perform as root functionality you need one of the following:"
- elog " x11-misc/ktsuss"
- elog " x11-libs/gksu"
- elog " kde-apps/kdesu"
- elog "Other optional dependencies:"
- elog " sys-apps/dbus"
- elog " sys-process/lsof (device processes)"
- elog " virtual/eject (eject media)"
- einfo
- if ! has_version 'sys-fs/udisks' ; then
- elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
- elog "you may need to enable kernel polling for device media changes to be detected."
- elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
- has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
- kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
- einfo
- fi
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
-}
diff --git a/x11-misc/spacefm/spacefm-0.9.4.ebuild b/x11-misc/spacefm/spacefm-0.9.4.ebuild
deleted file mode 100644
index 923d0dd8b40b..000000000000
--- a/x11-misc/spacefm/spacefm-0.9.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit fdo-mime gnome2-utils linux-info
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="https://ignorantguru.github.com/spacefm/"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
- mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+startup-notification"
-
-RDEPEND="dev-libs/glib:2
- dev-util/desktop-file-utils
- >=virtual/udev-143
- virtual/freedesktop-icon-theme
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+:3
- x11-libs/pango
- x11-libs/libX11
- x11-misc/shared-mime-info
- startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
- dev-util/intltool
- virtual/pkgconfig
- sys-devel/gettext"
-
-src_configure() {
- econf \
- --htmldir=/usr/share/doc/${PF}/html \
- $(use_enable startup-notification) \
- --disable-hal \
- --enable-inotify \
- --disable-pixmaps \
- --with-gtk3=yes
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
-
- einfo
- elog "To mount as non-root user you need one of the following:"
- elog " sys-apps/udevil (recommended, see below)"
- elog " sys-apps/pmount"
- elog " sys-fs/udisks:0"
- elog " sys-fs/udisks:2"
- elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
- elog " sys-apps/udevil"
- elog "To perform as root functionality you need one of the following:"
- elog " x11-misc/ktsuss"
- elog " x11-libs/gksu"
- elog " kde-apps/kdesu"
- elog "Other optional dependencies:"
- elog " sys-apps/dbus"
- elog " sys-process/lsof (device processes)"
- elog " virtual/eject (eject media)"
- einfo
- if ! has_version 'sys-fs/udisks' ; then
- elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
- elog "you may need to enable kernel polling for device media changes to be detected."
- elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
- has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
- kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
- einfo
- fi
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
-}
diff --git a/x11-misc/spacefm/spacefm-1.0.0.ebuild b/x11-misc/spacefm/spacefm-1.0.0.ebuild
deleted file mode 100644
index 538eca39fa20..000000000000
--- a/x11-misc/spacefm/spacefm-1.0.0.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 fdo-mime gnome2-utils linux-info
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="https://ignorantguru.github.com/spacefm/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
-REQUIRED_USE="gtk2? ( !gtk3 )"
-
-RDEPEND="dev-libs/glib:2
- dev-util/desktop-file-utils
- >=virtual/udev-143
- virtual/freedesktop-icon-theme
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- gtk2? ( x11-libs/gtk+:2 )
- !gtk2? ( x11-libs/gtk+:3 )
- x11-libs/pango
- x11-libs/libX11
- x11-misc/shared-mime-info
- video-thumbnails? ( media-video/ffmpegthumbnailer )
- startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
- dev-util/intltool
- virtual/pkgconfig
- sys-devel/gettext"
-
-src_configure() {
- econf \
- --htmldir=/usr/share/doc/${PF}/html \
- $(use_enable startup-notification) \
- $(use_enable video-thumbnails) \
- --disable-hal \
- --enable-inotify \
- --disable-pixmaps \
- $(use_with gtk3 gtk3 "yes")
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
-
- einfo
- elog "To mount as non-root user you need one of the following:"
- elog " sys-apps/udevil (recommended, see below)"
- elog " sys-apps/pmount"
- elog " sys-fs/udisks:0"
- elog " sys-fs/udisks:2"
- elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
- elog " sys-apps/udevil"
- elog "To perform as root functionality you need one of the following:"
- elog " x11-misc/ktsuss"
- elog " x11-libs/gksu"
- elog " kde-apps/kdesu"
- elog "Other optional dependencies:"
- elog " sys-apps/dbus"
- elog " sys-process/lsof (device processes)"
- elog " virtual/eject (eject media)"
- einfo
- if ! has_version 'sys-fs/udisks' ; then
- elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
- elog "you may need to enable kernel polling for device media changes to be detected."
- elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
- has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
- kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
- einfo
- fi
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
-}
diff --git a/x11-misc/spacefm/spacefm-1.0.2.ebuild b/x11-misc/spacefm/spacefm-1.0.2.ebuild
deleted file mode 100644
index 538eca39fa20..000000000000
--- a/x11-misc/spacefm/spacefm-1.0.2.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 fdo-mime gnome2-utils linux-info
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="https://ignorantguru.github.com/spacefm/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
-REQUIRED_USE="gtk2? ( !gtk3 )"
-
-RDEPEND="dev-libs/glib:2
- dev-util/desktop-file-utils
- >=virtual/udev-143
- virtual/freedesktop-icon-theme
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- gtk2? ( x11-libs/gtk+:2 )
- !gtk2? ( x11-libs/gtk+:3 )
- x11-libs/pango
- x11-libs/libX11
- x11-misc/shared-mime-info
- video-thumbnails? ( media-video/ffmpegthumbnailer )
- startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
- dev-util/intltool
- virtual/pkgconfig
- sys-devel/gettext"
-
-src_configure() {
- econf \
- --htmldir=/usr/share/doc/${PF}/html \
- $(use_enable startup-notification) \
- $(use_enable video-thumbnails) \
- --disable-hal \
- --enable-inotify \
- --disable-pixmaps \
- $(use_with gtk3 gtk3 "yes")
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
-
- einfo
- elog "To mount as non-root user you need one of the following:"
- elog " sys-apps/udevil (recommended, see below)"
- elog " sys-apps/pmount"
- elog " sys-fs/udisks:0"
- elog " sys-fs/udisks:2"
- elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
- elog " sys-apps/udevil"
- elog "To perform as root functionality you need one of the following:"
- elog " x11-misc/ktsuss"
- elog " x11-libs/gksu"
- elog " kde-apps/kdesu"
- elog "Other optional dependencies:"
- elog " sys-apps/dbus"
- elog " sys-process/lsof (device processes)"
- elog " virtual/eject (eject media)"
- einfo
- if ! has_version 'sys-fs/udisks' ; then
- elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
- elog "you may need to enable kernel polling for device media changes to be detected."
- elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
- has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
- kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
- einfo
- fi
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
-}
diff --git a/x11-misc/spacefm/spacefm-1.0.3.ebuild b/x11-misc/spacefm/spacefm-1.0.3.ebuild
deleted file mode 100644
index 538eca39fa20..000000000000
--- a/x11-misc/spacefm/spacefm-1.0.3.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 fdo-mime gnome2-utils linux-info
-
-DESCRIPTION="A multi-panel tabbed file manager"
-HOMEPAGE="https://ignorantguru.github.com/spacefm/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk2 +gtk3 +startup-notification +video-thumbnails"
-REQUIRED_USE="gtk2? ( !gtk3 )"
-
-RDEPEND="dev-libs/glib:2
- dev-util/desktop-file-utils
- >=virtual/udev-143
- virtual/freedesktop-icon-theme
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- gtk2? ( x11-libs/gtk+:2 )
- !gtk2? ( x11-libs/gtk+:3 )
- x11-libs/pango
- x11-libs/libX11
- x11-misc/shared-mime-info
- video-thumbnails? ( media-video/ffmpegthumbnailer )
- startup-notification? ( x11-libs/startup-notification )"
-DEPEND="${RDEPEND}
- dev-util/intltool
- virtual/pkgconfig
- sys-devel/gettext"
-
-src_configure() {
- econf \
- --htmldir=/usr/share/doc/${PF}/html \
- $(use_enable startup-notification) \
- $(use_enable video-thumbnails) \
- --disable-hal \
- --enable-inotify \
- --disable-pixmaps \
- $(use_with gtk3 gtk3 "yes")
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
-
- einfo
- elog "To mount as non-root user you need one of the following:"
- elog " sys-apps/udevil (recommended, see below)"
- elog " sys-apps/pmount"
- elog " sys-fs/udisks:0"
- elog " sys-fs/udisks:2"
- elog "To support ftp/nfs/smb/ssh URLs in the path bar you need:"
- elog " sys-apps/udevil"
- elog "To perform as root functionality you need one of the following:"
- elog " x11-misc/ktsuss"
- elog " x11-libs/gksu"
- elog " kde-apps/kdesu"
- elog "Other optional dependencies:"
- elog " sys-apps/dbus"
- elog " sys-process/lsof (device processes)"
- elog " virtual/eject (eject media)"
- einfo
- if ! has_version 'sys-fs/udisks' ; then
- elog "When using SpaceFM without udisks, and without the udisks-daemon running,"
- elog "you may need to enable kernel polling for device media changes to be detected."
- elog "See /usr/share/doc/${PF}/html/spacefm-manual-en.html#devices-kernpoll"
- has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
- kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
- einfo
- fi
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- fdo-mime_mime_database_update
- gnome2_icon_cache_update
-}
diff --git a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r1.ebuild b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r1.ebuild
index cedc475347a1..145d8fa388fb 100644
--- a/x11-plugins/gkrelltop/gkrelltop-2.2.13-r1.ebuild
+++ b/x11-plugins/gkrelltop/gkrelltop-2.2.13-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://sourceforge.net/projects/gkrelltop"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="X"
PLUGIN_SERVER_SO=gkrelltopd.so
diff --git a/x11-terms/gnome-terminal/Manifest b/x11-terms/gnome-terminal/Manifest
index 9b56d98ad44c..08aee672dbac 100644
--- a/x11-terms/gnome-terminal/Manifest
+++ b/x11-terms/gnome-terminal/Manifest
@@ -1,2 +1,3 @@
DIST gnome-terminal-3.16.2.tar.xz 1798620 SHA256 9df7bab7bfd15ca9a3c60612e425baaf5c8b32ba181619f740b7129a0768f4e0 SHA512 06327569de64ec9d1a045ea191edaabfe80e62dc55b5b8722d36e9d419f8d0cdfda29503f4aec68ae61798d77269ad902864eee8609369da31315368a9ab254f WHIRLPOOL 559833e2080c784080e001260a732fa480f187d17a8d1d069253175b9afd053d4fbd1d7a557442c467b915d31432e50bb4f0f9a94699fb3ed95810fb5f32b56e
DIST gnome-terminal-3.18.2.tar.xz 1836144 SHA256 5e35c0fa1395258bab83952cfabe4c1828b8655bcd761f8faed70b452bd89efa SHA512 9fb3e15d90990e1c066a71a34657845a3a3531dcda928f5a61477528df3bd65125fcf28dfd278535e844ebf57fae738451cb5e6f0118bb75bedb98e92624ad41 WHIRLPOOL b8bfc15e37d7bc959057d0beff227f4724f046d3777f4e9111fae469891e37dce8bb6c296191822f55458b06b62dd84ba213b6345ff189861b0ddeddf2b3d14f
+DIST gnome-terminal-3.18.3.tar.xz 1845452 SHA256 14c2fce1c6a80a3fb0cc8666d7752228adcb60d199634ab69150de32e3c17d56 SHA512 3375038f69f3dbe2dee49c0835dd7ed8bd787e5a9ca59a905b737d6482d9a0ba27e4d98558b37bcb5561d143dfa8bed5613d4f9a46ae3a420e5a80803a88f756 WHIRLPOOL 04e0fdc12d18b14cfe41c50a43ca2a1d2107be2d23b17fc88189964e002b24ce812c0ec0a247c6eb8ade4bef89e537f475e7a318b26e4cbcb0f89a0fab4bdf52
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild
index 7b5a902ebd69..36ea0e643dbd 100644
--- a/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.18.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
LICENSE="GPL-3+"
SLOT="0"
IUSE="debug +gnome-shell +nautilus vanilla"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
# FIXME: automagic dependency on gtk+[X]
RDEPEND="
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.18.3.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.18.3.ebuild
new file mode 100644
index 000000000000..c96f62462c73
--- /dev/null
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.18.3.ebuild
@@ -0,0 +1,79 @@
+# 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 autotools eutils gnome2 readme.gentoo
+
+DESCRIPTION="The Gnome Terminal"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="debug +gnome-shell +nautilus vanilla"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux"
+
+# FIXME: automagic dependency on gtk+[X]
+RDEPEND="
+ >=dev-libs/glib-2.42:2[dbus]
+ >=x11-libs/gtk+-3.10:3[X]
+ >=x11-libs/vte-0.42.1:2.91
+ >=gnome-base/dconf-0.14
+ >=gnome-base/gsettings-desktop-schemas-0.1.0
+ sys-apps/util-linux
+ x11-libs/libSM
+ x11-libs/libICE
+ gnome-shell? ( gnome-base/gnome-shell )
+ nautilus? ( >=gnome-base/nautilus-3 )
+"
+# itstool required for help/* with non-en LINGUAS, see bug #549358
+# xmllint required for glib-compile-resources, see bug #549304
+DEPEND="${RDEPEND}
+ app-text/yelp-tools
+ dev-libs/libxml2
+ dev-util/desktop-file-utils
+ dev-util/gdbus-codegen
+ dev-util/itstool
+ >=dev-util/intltool-0.50
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+DOC_CONTENTS="To get previous working directory inherited in new opened
+ tab you will need to add the following line to your ~/.bashrc:\n
+ . /etc/profile.d/vte.sh"
+
+src_prepare() {
+ if ! use vanilla; then
+ # OpenSuSE patches, https://bugzilla.gnome.org/show_bug.cgi?id=695371
+ epatch "${FILESDIR}"/${PN}-3.18.2-transparency.patch
+ epatch "${FILESDIR}"/${PN}-3.18.2-transparency-fix-for-broken-themes.patch
+ epatch "${FILESDIR}"/${PN}-3.18.2-dark-theme.patch
+ eautoreconf
+ fi
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ --disable-migration \
+ $(use_enable debug) \
+ $(use_enable gnome-shell search-provider) \
+ $(use_with nautilus nautilus-extension) \
+ VALAC=$(type -P true)
+}
+
+src_install() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS"
+ gnome2_src_install
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ readme.gentoo_print_elog
+}
diff --git a/x11-terms/mate-terminal/mate-terminal-1.8.1.ebuild b/x11-terms/mate-terminal/mate-terminal-1.8.1.ebuild
index 2268495b7f7e..fce793a5f7e6 100644
--- a/x11-terms/mate-terminal/mate-terminal-1.8.1.ebuild
+++ b/x11-terms/mate-terminal/mate-terminal-1.8.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
RDEPEND="app-text/rarian:0
dev-libs/atk:0
diff --git a/x11-terms/pangoterm/Manifest b/x11-terms/pangoterm/Manifest
index 70a7bc6a9e94..329cbf4eb28f 100644
--- a/x11-terms/pangoterm/Manifest
+++ b/x11-terms/pangoterm/Manifest
@@ -1,3 +1,4 @@
DIST pangoterm-0.0_pre20150323.tar.gz 22053 SHA256 8df2bebdd70a77698803d3dd12472b313e29aa5e6387a7b926e0988e0689cf00 SHA512 c8614d51459c68bb03a95e1a59a31d5c199c94001995f880f23a369b9aa6ee72a6769790a8c4592d8829eb52ea246ef051fd36fd729f35c4a80931fd9e42b916 WHIRLPOOL 30adcf8098f3ef03c57f47e7f01ae996572058fc8318e4e31ac2d88ab2d8054c9d5e279bc5721a98bb66a5620356f7dde1aaf7d1a0eeca14c53069eef1126140
DIST pangoterm-0.0_pre20150913.tar.gz 22074 SHA256 9fcdaaaa572f0e5fb3ac7b1fe3119e724373ed0250518efd47601f902acd1335 SHA512 2efed960bde9378ea25d96e41460245925952d50f60a4f0580ffc71519acb278101cd16c3aedaa8037c2734f09d14a0590731a1a42fe2f357ef9222a8e0bd260 WHIRLPOOL f07e8f407a62fa3e55f312b89937d5b5d6adfd2a4ccdee8e21b0c1d301bdc6b9684bec03f6cc6b2cc222b6e154408116fbd92596bd44a97f42564871a07215e2
DIST pangoterm-0.0_pre20151022.tar.gz 22588 SHA256 bf0f1f3898aa3bf2533d94036a219fe57e8a9e85558b41e050692261a01b84a7 SHA512 716acd0c47fbca35961aff21a8dba886ec4cb152d89544f20d9752828f9e005a5561090959be64f1db864bde71db1d205d045b8a7baa36d23471e1a87c7fee14 WHIRLPOOL 5a5f5b4b6c34e758d0ac064a12872b45627e335100751cdca6362af990ff1b14dedbbad2ee3b1d75c47d15a9aaf32d2d1255b0249b64a1aa6e413955620f1bea
+DIST pangoterm-0.0_pre20160305.tar.gz 22802 SHA256 47225f8c445a930f22d3a975567dc18116796698657fab9cec15557de6ed8496 SHA512 570c8fe1f7233884a849aa9b9160930b77682a9c3ef6f9c26891eb604c861e01a3ce13d418c8febc92e1cdb2794d5a1cf0097c27183395098c505540146f8467 WHIRLPOOL e23ea7661141fb0f9b6efdc0b46b71d3cbf06d1ab3da5bb670d9077bf0f23f6625919b43fd44dc10268ede52ed116ec91ca38efe1443da89f03c97c92605638a
diff --git a/x11-terms/pangoterm/pangoterm-0.0_pre20160305.ebuild b/x11-terms/pangoterm/pangoterm-0.0_pre20160305.ebuild
new file mode 100644
index 000000000000..11312f77a1b2
--- /dev/null
+++ b/x11-terms/pangoterm/pangoterm-0.0_pre20160305.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="A GTK/Pango-based terminal that uses libvterm to provide terminal emulation"
+HOMEPAGE="http://www.leonerd.org.uk/code/pangoterm/"
+SRC_URI="https://dev.gentoo.org/~tranquility/distfiles/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-libs/libvterm-0.0_pre20151022"
+RDEPEND="${DEPEND}
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ x11-libs/pango
+"
+
+S=${WORKDIR}/pangoterm-0
+
+src_install() {
+ emake PREFIX="/usr" DESTDIR="${D}" install
+}
diff --git a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild
index 2db33448c18d..5ef49fca1ae7 100644
--- a/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild
+++ b/x11-themes/adwaita-icon-theme/adwaita-icon-theme-3.18.0.ebuild
@@ -19,7 +19,7 @@ LICENSE="
"
SLOT="0"
IUSE="branding"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
COMMON_DEPEND="
>=x11-themes/hicolor-icon-theme-0.10
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.0.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.0.ebuild
index fa041739be25..51937ce2d4a5 100644
--- a/x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.0.ebuild
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-3.18.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-backgrounds"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND="!<x11-themes/gnome-themes-standard-3.14"
diff --git a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.18.0.ebuild b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.18.0.ebuild
index d4cc9eab9ba4..57947c9f6592 100644
--- a/x11-themes/gnome-themes-standard/gnome-themes-standard-3.18.0.ebuild
+++ b/x11-themes/gnome-themes-standard/gnome-themes-standard-3.18.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-themes-standard/"
LICENSE="LGPL-2.1+"
SLOT="0"
IUSE="+gtk"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
COMMON_DEPEND="
gnome-base/librsvg:2[${MULTILIB_USEDEP}]
diff --git a/x11-themes/mate-themes/mate-themes-1.8.1.ebuild b/x11-themes/mate-themes/mate-themes-1.8.1.ebuild
index 3574d48f07d7..94637cd218be 100644
--- a/x11-themes/mate-themes/mate-themes-1.8.1.ebuild
+++ b/x11-themes/mate-themes/mate-themes-1.8.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://mate-desktop.org"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND=">=x11-libs/gdk-pixbuf-2:2
>=x11-libs/gtk+-2:2
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index b03e5151ae87..83e49a32e065 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,4 +1,2 @@
-DIST fluxbox-1.3.2.tar.bz2 787400 SHA256 e8aaf46c043eb6186383c6dde8bf98dbd62305b202ad4d8ebb39508b1b710167 SHA512 2624c337e85b98e39398319170cbf57f8ab031539844e62f2f61aefd5c2e307b8390261b9658073bcf557f7f006c9df95c72a4420f12fa7122742b4623a17d49 WHIRLPOOL 6f6fae12c265f2cf1e700a257fa89f291adea9838714f8bc861c2f37f3d036caa16e269e8b5ff18d687bf6f77a4f1661df864e9ec98f3d2d14e3d3186d2ebdde
-DIST fluxbox-1.3.5.tar.lzma 694672 SHA256 f4faf1fcb995dbe85d272e511e388de347ff07b69e9f8c5af0248cf330ee2a07 SHA512 55d1689660b9240851be55183f665efff281f8f344474ddd1bee089635cb34e343cca85743900675c21579cf9e58c7bd756932a30c2ff4e6384b500d7c4bdcd8 WHIRLPOOL 6f379f9f224478556c53e2585f76c28f29c20b1fce5ab24ed0d06a813e51ddb1e0eaea7658ec1fa5979b951613542dd47dad4fd7af17bbdf0530653b8583b18d
DIST fluxbox-1.3.6.tar.xz 793144 SHA256 fa09ad8d30841021a1e5147efa944eb509201fa3619da5b6608d94cbbf55bf33 SHA512 66257f00b3f92cb3b87990610e0b5d6c7191c75997bbcba6744d581ccec36da2d1724767575dcde81be4fdbf39e2e25c8530013ee52a28d4775230fdf04b2f9a WHIRLPOOL 198a3972a81287a1fa6346a708bf461cd9b5262adb7cb17504077e9d154c582947b05f7508d151363f36f78d822fa9fbf9797ee4cc6f7f76a8cc5b7a69db4c52
DIST fluxbox-1.3.7.tar.xz 786492 SHA256 fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0 SHA512 ab8adb8b5a5e396b6df814c93d7fe5aca3eaaa347ca45c1572ad7da0185dbe1e8981190af9b814112f9831b560e31ba0b7dec7e6af5e3e3e3d9d20f2bd463e01 WHIRLPOOL ebf8352dfd6a92ba589c0224a7b50a7a6b1692ca760b551959885e2bcaf59a82657598288ac14ed947763891d939f9c227a8a6fde3a6bd0684b7d9478026a727
diff --git a/x11-wm/fluxbox/fluxbox-1.3.2.ebuild b/x11-wm/fluxbox/fluxbox-1.3.2.ebuild
deleted file mode 100644
index 15c3db6f0fb4..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.3.2.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs prefix
-
-IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
-HOMEPAGE="http://www.fluxbox.org"
-
-RDEPEND="x11-libs/libXpm
- x11-libs/libXrandr
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXrender
- || ( x11-misc/gxmessage x11-apps/xmessage )
- xinerama? ( x11-libs/libXinerama )
- truetype? ( media-libs/freetype )
- bidi? ( >=dev-libs/fribidi-0.19.2 )
- imlib? ( >=media-libs/imlib2-1.2.0[X] )
- vim-syntax? ( app-vim/fluxbox-syntax )
- !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
- !!<=x11-misc/fluxconf-0.9.9
- !!<=x11-misc/fbdesk-1.2.1"
-DEPEND="bidi? ( virtual/pkgconfig )
- nls? ( sys-devel/gettext )
- x11-proto/xextproto
- ${RDEPEND}"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-
-src_prepare() {
- # We need to be able to include directories rather than just plain
- # files in menu [include] items. This patch will allow us to do clever
- # things with style ebuilds.
- epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
- eprefixify util/fluxbox-generate_menu.in
-
- epatch "${FILESDIR}"/osx-has-otool.patch
-
- # Add in the Gentoo -r number to fluxbox -version output.
- if [[ "${PR}" == "r0" ]] ; then
- suffix="gentoo"
- else
- suffix="gentoo-${PR}"
- fi
- sed -i \
- -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
- version.h.in || die "version sed failed"
-}
-
-src_configure() {
- use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
-
- econf \
- $(use_enable nls) \
- $(use_enable xinerama) \
- $(use_enable truetype xft) \
- $(use_enable imlib imlib2) \
- $(use_enable bidi fribidi ) \
- $(use_enable slit ) \
- $(use_enable toolbar ) \
- --sysconfdir="${EPREFIX}"/etc/X11/${PN} \
- --with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge \
- ${myconf}
-}
-
-src_compile() {
- default
-
- ebegin "Creating a menu file (may take a while)"
- mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
- MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
- CHECKINIT="no. go away." HOME="${T}/home" \
- "${S}/util/fluxbox-generate_menu" -is -ds \
- || die "menu generation failed"
- eend $?
-}
-
-src_install() {
- dodir /usr/share/fluxbox
- emake DESTDIR="${D}" STRIP="" install
- dodoc README* AUTHORS TODO* ChangeLog NEWS
-
- dodir /usr/share/xsessions
- insinto /usr/share/xsessions
- doins "${FILESDIR}/${PN}.desktop"
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}/${PN}.xsession" fluxbox
-
- dodir /usr/share/fluxbox/menu.d
-
- # Styles menu framework
- dodir /usr/share/fluxbox/menu.d/styles
- insinto /usr/share/fluxbox/menu.d/styles
- doins "${FILESDIR}/styles-menu-fluxbox"
- doins "${FILESDIR}/styles-menu-commonbox"
- doins "${FILESDIR}/styles-menu-user"
-}
diff --git a/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.5-r1.ebuild
deleted file mode 100644
index 537c6b189c8d..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.3.5-r1.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
-inherit eutils flag-o-matic toolchain-funcs prefix
-
-IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.lzma"
-HOMEPAGE="http://www.fluxbox.org"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-
-RDEPEND="
- !!<=x11-misc/fbdesk-1.2.1
- !!<=x11-misc/fluxconf-0.9.9
- !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
- bidi? ( >=dev-libs/fribidi-0.19.2 )
- imlib? ( >=media-libs/imlib2-1.2.0[X] )
- truetype? ( media-libs/freetype )
- vim-syntax? ( app-vim/fluxbox-syntax )
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrandr
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- || ( x11-misc/gxmessage x11-apps/xmessage )
-"
-DEPEND="
- ${RDEPEND}
- bidi? ( virtual/pkgconfig )
- nls? ( sys-devel/gettext )
- x11-proto/xextproto
-"
-
-src_prepare() {
- # We need to be able to include directories rather than just plain
- # files in menu [include] items. This patch will allow us to do clever
- # things with style ebuilds.
- epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
- # Fix the semantic issue of icon paths, bug #536370
- epatch "${FILESDIR}"/${PV}-generate_menu-printf-fix.patch
-
- eprefixify util/fluxbox-generate_menu.in
-
- epatch "${FILESDIR}"/osx-has-otool.patch
-
- # Add in the Gentoo -r number to fluxbox -version output.
- if [[ "${PR}" == "r0" ]] ; then
- suffix="gentoo"
- else
- suffix="gentoo-${PR}"
- fi
- sed -i \
- -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
- version.h.in || die "version sed failed"
-}
-
-src_configure() {
- use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
-
- econf ${myconf} \
- $(use_enable bidi fribidi ) \
- $(use_enable imlib imlib2) \
- $(use_enable nls) \
- $(use_enable slit ) \
- $(use_enable toolbar ) \
- $(use_enable toolbar systray ) \
- $(use_enable truetype xft) \
- $(use_enable xinerama) \
- --sysconfdir="${EPREFIX}"/etc/X11/${PN} \
- --with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
-}
-
-src_compile() {
- default
-
- ebegin "Creating a menu file (may take a while)"
- mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
- # Call fluxbox-generate_menu through bash since it lacks +x
- # chmod 744 may be an equal fix
- MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
- CHECKINIT="no. go away." HOME="${T}/home" \
- bash "${S}/util/fluxbox-generate_menu" -is -ds \
- || die "menu generation failed"
- eend $?
-}
-
-src_install() {
- emake DESTDIR="${D}" STRIP="" install
- dodoc README* AUTHORS TODO* ChangeLog NEWS
-
- # Install the generated menu
- insinto /usr/share/fluxbox
- doins data/menu
-
- insinto /usr/share/xsessions
- doins "${FILESDIR}"/${PN}.desktop
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}.xsession fluxbox
-
- # Styles menu framework
- insinto /usr/share/fluxbox/menu.d/styles
- doins "${FILESDIR}"/styles-menu-fluxbox
- doins "${FILESDIR}"/styles-menu-commonbox
- doins "${FILESDIR}"/styles-menu-user
-}
diff --git a/x11-wm/fluxbox/fluxbox-1.3.5.ebuild b/x11-wm/fluxbox/fluxbox-1.3.5.ebuild
deleted file mode 100644
index 7556e09ba474..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.3.5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs prefix
-
-IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.lzma"
-HOMEPAGE="http://www.fluxbox.org"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-
-RDEPEND="
- !!<=x11-misc/fbdesk-1.2.1
- !!<=x11-misc/fluxconf-0.9.9
- !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
- bidi? ( >=dev-libs/fribidi-0.19.2 )
- imlib? ( >=media-libs/imlib2-1.2.0[X] )
- truetype? ( media-libs/freetype )
- vim-syntax? ( app-vim/fluxbox-syntax )
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrandr
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- || ( x11-misc/gxmessage x11-apps/xmessage )
-"
-DEPEND="
- ${RDEPEND}
- bidi? ( virtual/pkgconfig )
- nls? ( sys-devel/gettext )
- x11-proto/xextproto
-"
-
-src_prepare() {
- # We need to be able to include directories rather than just plain
- # files in menu [include] items. This patch will allow us to do clever
- # things with style ebuilds.
- epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
- eprefixify util/fluxbox-generate_menu.in
-
- epatch "${FILESDIR}"/osx-has-otool.patch
-
- # Add in the Gentoo -r number to fluxbox -version output.
- if [[ "${PR}" == "r0" ]] ; then
- suffix="gentoo"
- else
- suffix="gentoo-${PR}"
- fi
- sed -i \
- -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
- version.h.in || die "version sed failed"
-}
-
-src_configure() {
- use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
-
- econf ${myconf} \
- $(use_enable bidi fribidi ) \
- $(use_enable imlib imlib2) \
- $(use_enable nls) \
- $(use_enable slit ) \
- $(use_enable toolbar ) \
- $(use_enable truetype xft) \
- $(use_enable xinerama) \
- --sysconfdir="${EPREFIX}"/etc/X11/${PN} \
- --with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
-}
-
-src_compile() {
- default
-
- ebegin "Creating a menu file (may take a while)"
- mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
- MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
- CHECKINIT="no. go away." HOME="${T}/home" \
- "${S}/util/fluxbox-generate_menu" -is -ds \
- || die "menu generation failed"
- eend $?
-}
-
-src_install() {
- dodir /usr/share/fluxbox
- emake DESTDIR="${D}" STRIP="" install
- dodoc README* AUTHORS TODO* ChangeLog NEWS
-
- dodir /usr/share/xsessions
- insinto /usr/share/xsessions
- doins "${FILESDIR}/${PN}.desktop"
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}/${PN}.xsession" fluxbox
-
- dodir /usr/share/fluxbox/menu.d
-
- # Styles menu framework
- dodir /usr/share/fluxbox/menu.d/styles
- insinto /usr/share/fluxbox/menu.d/styles
- doins "${FILESDIR}/styles-menu-fluxbox"
- doins "${FILESDIR}/styles-menu-commonbox"
- doins "${FILESDIR}/styles-menu-user"
-}
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r1.ebuild
deleted file mode 100644
index f1e704ff3c1c..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r1.ebuild
+++ /dev/null
@@ -1,112 +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 prefix
-
-IUSE="nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax"
-
-REQUIRED_USE="systray? ( toolbar )"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
-HOMEPAGE="http://www.fluxbox.org"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-
-RDEPEND="
- !!<=x11-misc/fbdesk-1.2.1
- !!<=x11-misc/fluxconf-0.9.9
- !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
- bidi? ( >=dev-libs/fribidi-0.19.2 )
- imlib? ( >=media-libs/imlib2-1.2.0[X] )
- truetype? ( media-libs/freetype )
- vim-syntax? ( app-vim/fluxbox-syntax )
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrandr
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- || ( x11-misc/gxmessage x11-apps/xmessage )
-"
-DEPEND="
- ${RDEPEND}
- bidi? ( virtual/pkgconfig )
- nls? ( sys-devel/gettext )
- x11-proto/xextproto
-"
-
-src_prepare() {
- # We need to be able to include directories rather than just plain
- # files in menu [include] items. This patch will allow us to do clever
- # things with style ebuilds.
- epatch "${FILESDIR}"/gentoo_style_location-1.1.x.patch
-
- eprefixify util/fluxbox-generate_menu.in
-
- epatch "${FILESDIR}"/osx-has-otool.patch
-
- # Add in the Gentoo -r number to fluxbox -version output.
- if [[ "${PR}" == "r0" ]] ; then
- suffix="gentoo"
- else
- suffix="gentoo-${PR}"
- fi
- sed -i \
- -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
- version.h.in || die "version sed failed"
-}
-
-src_configure() {
- use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
-
- econf $(use_enable bidi fribidi ) \
- $(use_enable imlib imlib2) \
- $(use_enable nls) \
- $(use_enable slit ) \
- $(use_enable systray ) \
- $(use_enable toolbar ) \
- $(use_enable truetype xft) \
- $(use_enable xinerama) \
- --sysconfdir="${EPREFIX}"/etc/X11/${PN} \
- --with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
-}
-
-src_compile() {
- default
-
- ebegin "Creating a menu file (may take a while)"
- mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
- # Call fluxbox-generate_menu through bash since it lacks +x
- # chmod 744 may be an equal fix
- MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
- CHECKINIT="no. go away." HOME="${T}/home" \
- bash "${S}/util/fluxbox-generate_menu" -is -ds \
- || die "menu generation failed"
- eend $?
-}
-
-src_install() {
- emake DESTDIR="${D}" STRIP="" install
- dodoc README* AUTHORS TODO* ChangeLog NEWS
-
- # Install the generated menu
- insinto /usr/share/fluxbox
- doins data/menu
-
- insinto /usr/share/xsessions
- doins "${FILESDIR}"/${PN}.desktop
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}.xsession fluxbox
-
- # Styles menu framework
- insinto /usr/share/fluxbox/menu.d/styles
- doins "${FILESDIR}"/styles-menu-fluxbox
- doins "${FILESDIR}"/styles-menu-commonbox
- doins "${FILESDIR}"/styles-menu-user
-}
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7.ebuild
deleted file mode 100644
index 0728129aa2c5..000000000000
--- a/x11-wm/fluxbox/fluxbox-1.3.7.ebuild
+++ /dev/null
@@ -1,109 +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 prefix
-
-IUSE="nls xinerama bidi +truetype +imlib +slit +toolbar vim-syntax"
-
-DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
-
-SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
-HOMEPAGE="http://www.fluxbox.org"
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-
-RDEPEND="
- !!<=x11-misc/fbdesk-1.2.1
- !!<=x11-misc/fluxconf-0.9.9
- !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1
- bidi? ( >=dev-libs/fribidi-0.19.2 )
- imlib? ( >=media-libs/imlib2-1.2.0[X] )
- truetype? ( media-libs/freetype )
- vim-syntax? ( app-vim/fluxbox-syntax )
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXpm
- x11-libs/libXrandr
- x11-libs/libXrender
- xinerama? ( x11-libs/libXinerama )
- || ( x11-misc/gxmessage x11-apps/xmessage )
-"
-DEPEND="
- ${RDEPEND}
- bidi? ( virtual/pkgconfig )
- nls? ( sys-devel/gettext )
- x11-proto/xextproto
-"
-
-src_prepare() {
- # We need to be able to include directories rather than just plain
- # files in menu [include] items. This patch will allow us to do clever
- # things with style ebuilds.
- epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
- eprefixify util/fluxbox-generate_menu.in
-
- epatch "${FILESDIR}"/osx-has-otool.patch
-
- # Add in the Gentoo -r number to fluxbox -version output.
- if [[ "${PR}" == "r0" ]] ; then
- suffix="gentoo"
- else
- suffix="gentoo-${PR}"
- fi
- sed -i \
- -e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
- version.h.in || die "version sed failed"
-}
-
-src_configure() {
- use bidi && append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)"
-
- econf ${myconf} \
- $(use_enable bidi fribidi ) \
- $(use_enable imlib imlib2) \
- $(use_enable nls) \
- $(use_enable slit ) \
- $(use_enable toolbar ) \
- $(use_enable truetype xft) \
- $(use_enable xinerama) \
- --sysconfdir="${EPREFIX}"/etc/X11/${PN} \
- --with-style="${EPREFIX}"/usr/share/fluxbox/styles/Emerge
-}
-
-src_compile() {
- default
-
- ebegin "Creating a menu file (may take a while)"
- mkdir -p "${T}/home/.fluxbox" || die "mkdir home failed"
- # Call fluxbox-generate_menu through bash since it lacks +x
- # chmod 744 may be an equal fix
- MENUFILENAME="${S}/data/menu" MENUTITLE="Fluxbox ${PV}" \
- CHECKINIT="no. go away." HOME="${T}/home" \
- bash "${S}/util/fluxbox-generate_menu" -is -ds \
- || die "menu generation failed"
- eend $?
-}
-
-src_install() {
- emake DESTDIR="${D}" STRIP="" install
- dodoc README* AUTHORS TODO* ChangeLog NEWS
-
- # Install the generated menu
- insinto /usr/share/fluxbox
- doins data/menu
-
- insinto /usr/share/xsessions
- doins "${FILESDIR}"/${PN}.desktop
-
- exeinto /etc/X11/Sessions
- newexe "${FILESDIR}"/${PN}.xsession fluxbox
-
- # Styles menu framework
- insinto /usr/share/fluxbox/menu.d/styles
- doins "${FILESDIR}"/styles-menu-fluxbox
- doins "${FILESDIR}"/styles-menu-commonbox
- doins "${FILESDIR}"/styles-menu-user
-}
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index 45f3a57dd298..0e8cf0ee6a40 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,4 +1,5 @@
DIST i3-4.10.4.tar.bz2 940744 SHA256 dd4fa7a5c5b8feaf83f196fc181bfd33aff65c11d81c91b3ae9d9d3d2540655e SHA512 e777d1ca8ebeada185dfe11443a8b731cb72b6f836a0848e24291ea5d70e4b6d6c414acd58c156be97bd90d07ba4019a713cdb406a24fda33afeae08ceb6ed18 WHIRLPOOL 5bfaeb74d8f1c3dc10719bcac56087d7716e0a7a6c251495db256af1d1342eea3baae4b5c4f6c8131efa89393016c0dd0a56b17ff1f7bd757185dbf4747e7441
DIST i3-4.11.tar.bz2 972929 SHA256 78ce1e06fbd92fd63765bbe23faa7b8f929c17f99ed623f7abf2e568169d982f SHA512 76d45be9006973dd4093fd21ea1c83742b7977c7698e133ce8f9e7826d97d1631fbe6c3ea4a7eb3d989027f98e12738158e72ec450b0df3dddd28f912ff49a4f WHIRLPOOL f3bff5c0386ad09c5cabb25c7ccb14033f1a7ba3ee19fcc832739cbc61a31f84d3a57418264db4728fbb406c24464a8c87cbfde1e651599a3b63d87eb0af11cb
+DIST i3-4.12.tar.bz2 988084 SHA256 e19e1ce08c2549cba83e083cc768d487202c41760d5c283f67752e791f1d78b4 SHA512 966f62dbd82c6c70d1344cc61f14f154f3f649ce1b5a5b5168f00f50d598582ef26f5bd5496ea62e13213e45b1c7043f6209c94fcbefe2947fec63284445c1f5 WHIRLPOOL 7cf414de6d375029328edc8d824d2542ccae99ddf48eac9a563e81e0e86db5506f45f851d5af755ebfe8514e9afb5f8394d962fb191f4b0ab4268a81b8397395
DIST i3-4.8.tar.bz2 939690 SHA256 502c34290f239780bb40352191f0500e8f35d2446eddb573c67c27873d6a1b6b SHA512 fd6f92da857246119f1ae710b6c5168128fa2da5eae8308550b1b9c75879f060cac8246897333f3d67e18de36828a11dd12b4ccee9bd6cd6ad32e2b44c50b43e WHIRLPOOL 6c6288cb66ffdbf225df0dfcdc4f540cd36d7c8333a9f9d9c363cb6580d6a7c1ca0deb227a8f46ac907f2afc6e4e46efc448a51f0764a167bb9639956beae4ef
DIST i3-4.9.1.tar.bz2 939630 SHA256 b70deff027c7d05276c9646e53faeeeccdde706370b9b337a633bed85b16dc43 SHA512 7a8f71dd944faae426a2239b8bf12ea1cfc83a95c49fcb64ded8321ef302f3277af7d2ecd84d99cef47aba73e5a1091f94e37e9ed2af78c4722ffee507477c90 WHIRLPOOL 15cd2722beaeef642815edd44ff189ff0d003fefbff71c067b94a65dadb55cd15dd1a142a37499fa55cc80424dbdc74cb979c8998d740addcc492eaf025e467f
diff --git a/x11-wm/i3/i3-4.12.ebuild b/x11-wm/i3/i3-4.12.ebuild
new file mode 100644
index 000000000000..eabd399c705b
--- /dev/null
+++ b/x11-wm/i3/i3-4.12.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="http://i3wm.org/"
+SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+pango"
+
+CDEPEND="dev-libs/libev
+ dev-libs/libpcre
+ >=dev-libs/yajl-2.0.3
+ x11-libs/libxcb[xkb]
+ x11-libs/libxkbcommon[X]
+ x11-libs/startup-notification
+ x11-libs/xcb-util
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-wm
+ pango? (
+ >=x11-libs/pango-1.30.0[X]
+ >=x11-libs/cairo-1.12.2[X,xcb]
+ )"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+ dev-lang/perl
+ dev-perl/AnyEvent-I3
+ dev-perl/JSON-XS"
+
+DOCS=( RELEASE-NOTES-${PV} )
+
+src_prepare() {
+ if ! use pango; then
+ sed -i common.mk -e '/PANGO/d' || die
+ fi
+
+ cat <<- EOF > "${T}"/i3wm
+ #!/bin/sh
+ exec /usr/bin/i3
+ EOF
+ sed -e 's/FALSE/false/' -i src/handlers.c || die #546444
+ epatch_user #471716
+}
+
+src_compile() {
+ emake V=1 CC="$(tc-getCC)" AR="$(tc-getAR)"
+}
+
+src_install() {
+ default
+ dohtml -r docs/*
+ doman man/*.1
+ exeinto /etc/X11/Sessions
+ doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+ einfo "There are several packages that you may find useful with ${PN} and"
+ einfo "their usage is suggested by the upstream maintainers, namely:"
+ einfo " x11-misc/dmenu"
+ einfo " x11-misc/i3status"
+ einfo " x11-misc/i3lock"
+ einfo "Please refer to their description for additional info."
+}
diff --git a/x11-wm/marco/marco-1.8.2.ebuild b/x11-wm/marco/marco-1.8.2.ebuild
index 91435e689373..af1d770a5290 100644
--- a/x11-wm/marco/marco-1.8.2.ebuild
+++ b/x11-wm/marco/marco-1.8.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://mate-desktop.org"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="startup-notification test xinerama"
RDEPEND="
diff --git a/x11-wm/muffin/muffin-2.8.4.ebuild b/x11-wm/muffin/muffin-2.8.4.ebuild
index 905c927d8d85..2ce94a2ad556 100644
--- a/x11-wm/muffin/muffin-2.8.4.ebuild
+++ b/x11-wm/muffin/muffin-2.8.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/linuxmint/muffin/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
IUSE="+introspection test xinerama"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
COMMON_DEPEND="
>=x11-libs/pango-1.2[X,introspection?]
diff --git a/x11-wm/mutter/mutter-3.18.2-r1.ebuild b/x11-wm/mutter/mutter-3.18.2-r1.ebuild
index ac1d7156a505..25916f4b63aa 100644
--- a/x11-wm/mutter/mutter-3.18.2-r1.ebuild
+++ b/x11-wm/mutter/mutter-3.18.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://git.gnome.org/browse/mutter/"
LICENSE="GPL-2+"
SLOT="0"
IUSE="+introspection +kms test wayland"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
# libXi-1.7.4 or newer needed per:
# https://bugzilla.gnome.org/show_bug.cgi?id=738944
diff --git a/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild b/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild
index 1d664dbcf35e..6b35e6b5ed9f 100644
--- a/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild
+++ b/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://xfce/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="debug"
RDEPEND=">=xfce-base/libxfcegui4-4.8:=