summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/consul-replicate/Manifest12
-rw-r--r--app-admin/consul-replicate/consul-replicate-0.2.0.ebuild88
-rw-r--r--app-admin/consul-replicate/metadata.xml10
-rw-r--r--app-admin/consul-template/Manifest27
-rw-r--r--app-admin/consul-template/consul-template-0.12.2.ebuild139
-rw-r--r--app-admin/consul/consul-0.5.2-r1.ebuild12
-rw-r--r--app-admin/consul/consul-0.6.3.ebuild14
-rw-r--r--app-admin/consul/consul-9999.ebuild12
-rw-r--r--app-admin/emacs-updater/metadata.xml5
-rw-r--r--app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch4
-rw-r--r--app-admin/fsvs/fsvs-1.2.5-r2.ebuild61
-rw-r--r--app-admin/glance/glance-11.0.1.ebuild2
-rw-r--r--app-admin/ulogd/ulogd-2.0.5-r4.ebuild152
-rw-r--r--app-admin/vault/Manifest1
-rw-r--r--app-admin/vault/vault-0.1.2-r1.ebuild10
-rw-r--r--app-admin/vault/vault-0.4.1.ebuild90
-rw-r--r--app-admin/vault/vault-9999.ebuild10
-rw-r--r--app-cdr/cdrtools/Manifest2
-rw-r--r--app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild2
-rw-r--r--app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild2
-rw-r--r--app-cdr/cdrtools/cdrtools-3.02_alpha02.ebuild2
-rw-r--r--app-cdr/cdrtools/cdrtools-3.02_alpha05.ebuild (renamed from app-cdr/cdrtools/cdrtools-3.01_alpha31.ebuild)6
-rw-r--r--app-crypt/gkeys-gen/Manifest2
-rw-r--r--app-crypt/gkeys-gen/gkeys-gen-0.2.ebuild (renamed from app-crypt/gkeys-gen/gkeys-gen-0.1-r1.ebuild)4
-rw-r--r--app-crypt/gkeys/Manifest2
-rw-r--r--app-crypt/gkeys/gkeys-0.2.ebuild (renamed from app-crypt/gkeys/gkeys-0.1-r1.ebuild)10
-rw-r--r--app-crypt/keybase/keybase-0.8.25.ebuild2
-rw-r--r--app-doc/casting-spels-emacs/metadata.xml5
-rw-r--r--app-doc/elisp-manual/metadata.xml5
-rw-r--r--app-editors/e3/metadata.xml5
-rw-r--r--app-editors/emacs-vcs/metadata.xml5
-rw-r--r--app-editors/emacs/metadata.xml5
-rw-r--r--app-editors/emact/metadata.xml5
-rw-r--r--app-editors/ersatz-emacs/metadata.xml5
-rw-r--r--app-editors/fe/metadata.xml5
-rw-r--r--app-editors/gvim/Manifest2
-rw-r--r--app-editors/gvim/gvim-7.4.769.ebuild8
-rw-r--r--app-editors/jasspa-microemacs/metadata.xml5
-rw-r--r--app-editors/jed/metadata.xml5
-rw-r--r--app-editors/jove/metadata.xml5
-rw-r--r--app-editors/mg/Manifest1
-rw-r--r--app-editors/mg/metadata.xml5
-rw-r--r--app-editors/mg/mg-20160118.ebuild52
-rw-r--r--app-editors/qemacs/metadata.xml5
-rw-r--r--app-editors/uemacs-pk/metadata.xml5
-rw-r--r--app-editors/vim/Manifest2
-rw-r--r--app-editors/vim/vim-7.4.769.ebuild7
-rw-r--r--app-editors/zile/metadata.xml5
-rw-r--r--app-emacs/actionscript-mode/metadata.xml5
-rw-r--r--app-emacs/analog/metadata.xml5
-rw-r--r--app-emacs/anything/metadata.xml5
-rw-r--r--app-emacs/apache-mode/metadata.xml5
-rw-r--r--app-emacs/apel/metadata.xml5
-rw-r--r--app-emacs/auctex/metadata.xml5
-rw-r--r--app-emacs/auto-complete/metadata.xml5
-rw-r--r--app-emacs/autoconf-mode/metadata.xml5
-rw-r--r--app-emacs/bbdb/metadata.xml25
-rw-r--r--app-emacs/binclock/metadata.xml5
-rw-r--r--app-emacs/bison-mode/metadata.xml5
-rw-r--r--app-emacs/blogmax/metadata.xml7
-rw-r--r--app-emacs/bm/metadata.xml5
-rw-r--r--app-emacs/bongo/metadata.xml5
-rw-r--r--app-emacs/boxquote/metadata.xml5
-rw-r--r--app-emacs/browse-kill-ring/metadata.xml7
-rw-r--r--app-emacs/bubblet/metadata.xml5
-rw-r--r--app-emacs/calfw/metadata.xml5
-rw-r--r--app-emacs/chess/metadata.xml5
-rw-r--r--app-emacs/circe/metadata.xml5
-rw-r--r--app-emacs/cldoc/metadata.xml17
-rw-r--r--app-emacs/cmail/metadata.xml5
-rw-r--r--app-emacs/color-browser/metadata.xml5
-rw-r--r--app-emacs/color-moccur/metadata.xml5
-rw-r--r--app-emacs/color-theme/metadata.xml5
-rw-r--r--app-emacs/company-mode/metadata.xml5
-rw-r--r--app-emacs/crontab-mode/metadata.xml5
-rw-r--r--app-emacs/crypt++/metadata.xml5
-rw-r--r--app-emacs/csharp-mode/metadata.xml5
-rw-r--r--app-emacs/css-mode/metadata.xml5
-rw-r--r--app-emacs/csv-mode/metadata.xml5
-rw-r--r--app-emacs/d-mode/metadata.xml5
-rw-r--r--app-emacs/dash/metadata.xml13
-rw-r--r--app-emacs/ddskk/metadata.xml5
-rw-r--r--app-emacs/develock/metadata.xml5
-rw-r--r--app-emacs/df-mode/metadata.xml5
-rw-r--r--app-emacs/dictionary/metadata.xml5
-rw-r--r--app-emacs/dircolors/metadata.xml5
-rw-r--r--app-emacs/dired-sort-menu/metadata.xml5
-rw-r--r--app-emacs/distel/metadata.xml5
-rw-r--r--app-emacs/doctest-mode/metadata.xml13
-rw-r--r--app-emacs/doxymacs/metadata.xml5
-rw-r--r--app-emacs/dropdown-list/metadata.xml5
-rw-r--r--app-emacs/dts-mode/metadata.xml5
-rw-r--r--app-emacs/ebuild-mode/metadata.xml11
-rw-r--r--app-emacs/ecb/metadata.xml17
-rw-r--r--app-emacs/edb/metadata.xml5
-rw-r--r--app-emacs/edit-list/metadata.xml5
-rw-r--r--app-emacs/elib/metadata.xml13
-rw-r--r--app-emacs/elscreen/metadata.xml5
-rw-r--r--app-emacs/emacs-common-gentoo/metadata.xml5
-rw-r--r--app-emacs/emacs-daemon/metadata.xml5
-rw-r--r--app-emacs/emacs-jabber/metadata.xml5
-rw-r--r--app-emacs/emacs-w3m/metadata.xml5
-rw-r--r--app-emacs/emacs-wget/metadata.xml5
-rw-r--r--app-emacs/emacs-wiki-blog/metadata.xml5
-rw-r--r--app-emacs/emacs-wiki/metadata.xml27
-rw-r--r--app-emacs/emhacks/metadata.xml23
-rw-r--r--app-emacs/emms/metadata.xml5
-rw-r--r--app-emacs/erobot/metadata.xml5
-rw-r--r--app-emacs/eselect-mode/metadata.xml5
-rw-r--r--app-emacs/ess/metadata.xml5
-rw-r--r--app-emacs/evil/metadata.xml7
-rw-r--r--app-emacs/fff/metadata.xml5
-rw-r--r--app-emacs/filladapt/metadata.xml5
-rw-r--r--app-emacs/flashcard/metadata.xml5
-rw-r--r--app-emacs/flim/metadata.xml5
-rw-r--r--app-emacs/folding/metadata.xml5
-rw-r--r--app-emacs/ghc-mod/metadata.xml24
-rw-r--r--app-emacs/gnuplot-mode/metadata.xml5
-rw-r--r--app-emacs/gnuserv/metadata.xml5
-rw-r--r--app-emacs/google-c-style/metadata.xml13
-rw-r--r--app-emacs/graphviz-dot-mode/metadata.xml5
-rw-r--r--app-emacs/h4x0r/metadata.xml5
-rw-r--r--app-emacs/haskell-mode/metadata.xml5
-rw-r--r--app-emacs/hexrgb/metadata.xml5
-rw-r--r--app-emacs/highline/metadata.xml5
-rw-r--r--app-emacs/howm/metadata.xml13
-rw-r--r--app-emacs/htmlize/metadata.xml5
-rw-r--r--app-emacs/httpd/metadata.xml5
-rw-r--r--app-emacs/icicles/metadata.xml5
-rw-r--r--app-emacs/identica-mode/metadata.xml5
-rw-r--r--app-emacs/igrep/metadata.xml5
-rw-r--r--app-emacs/imaxima/metadata.xml5
-rw-r--r--app-emacs/inform-mode/metadata.xml5
-rw-r--r--app-emacs/initsplit/metadata.xml5
-rw-r--r--app-emacs/jam-mode/metadata.xml5
-rw-r--r--app-emacs/jasmin/metadata.xml13
-rw-r--r--app-emacs/javascript/metadata.xml5
-rw-r--r--app-emacs/jde/metadata.xml29
-rw-r--r--app-emacs/keywiz/metadata.xml5
-rw-r--r--app-emacs/limit/metadata.xml5
-rw-r--r--app-emacs/lookup/metadata.xml5
-rw-r--r--app-emacs/lua-mode/metadata.xml5
-rw-r--r--app-emacs/lyskom-elisp-client/metadata.xml5
-rw-r--r--app-emacs/magit/metadata.xml5
-rw-r--r--app-emacs/mailcrypt/metadata.xml5
-rw-r--r--app-emacs/markdown-mode/metadata.xml5
-rw-r--r--app-emacs/matlab/metadata.xml13
-rw-r--r--app-emacs/mcomplete/metadata.xml5
-rw-r--r--app-emacs/mediawiki/metadata.xml5
-rw-r--r--app-emacs/mew/metadata.xml5
-rw-r--r--app-emacs/mic-paren/metadata.xml5
-rw-r--r--app-emacs/mldonkey/metadata.xml5
-rw-r--r--app-emacs/mmm-mode/metadata.xml15
-rw-r--r--app-emacs/moccur-edit/metadata.xml5
-rw-r--r--app-emacs/mode-compile/metadata.xml5
-rw-r--r--app-emacs/mpg123-el/metadata.xml5
-rw-r--r--app-emacs/mu-cite/metadata.xml5
-rw-r--r--app-emacs/multi-term/metadata.xml7
-rw-r--r--app-emacs/multiple-cursors/metadata.xml5
-rw-r--r--app-emacs/muse/metadata.xml45
-rw-r--r--app-emacs/nagios-mode/metadata.xml5
-rw-r--r--app-emacs/navi2ch/metadata.xml5
-rw-r--r--app-emacs/nxml-docbook5-schemas/metadata.xml5
-rw-r--r--app-emacs/nxml-gentoo-schemas/metadata.xml5
-rw-r--r--app-emacs/nxml-libvirt-schemas/metadata.xml7
-rw-r--r--app-emacs/nxml-svg-schemas/metadata.xml5
-rw-r--r--app-emacs/ocaml-mode/metadata.xml7
-rw-r--r--app-emacs/org-mode/metadata.xml5
-rw-r--r--app-emacs/outline-magic/metadata.xml5
-rw-r--r--app-emacs/paredit/metadata.xml5
-rw-r--r--app-emacs/php-mode/metadata.xml5
-rw-r--r--app-emacs/planner/metadata.xml13
-rw-r--r--app-emacs/po-mode/metadata.xml5
-rw-r--r--app-emacs/popwin/metadata.xml5
-rw-r--r--app-emacs/pov-mode/metadata.xml7
-rw-r--r--app-emacs/prom-wl/metadata.xml5
-rw-r--r--app-emacs/proofgeneral/metadata.xml5
-rw-r--r--app-emacs/protbuf/metadata.xml5
-rw-r--r--app-emacs/psgml/metadata.xml13
-rw-r--r--app-emacs/pymacs/metadata.xml13
-rw-r--r--app-emacs/python-mode/metadata.xml5
-rw-r--r--app-emacs/quack/metadata.xml5
-rw-r--r--app-emacs/quilt-el/metadata.xml5
-rw-r--r--app-emacs/qwerty/metadata.xml5
-rw-r--r--app-emacs/redo+/metadata.xml5
-rw-r--r--app-emacs/regress/metadata.xml9
-rw-r--r--app-emacs/remember/metadata.xml5
-rw-r--r--app-emacs/rfcview/metadata.xml5
-rw-r--r--app-emacs/riece/metadata.xml7
-rw-r--r--app-emacs/rnc-mode/metadata.xml5
-rw-r--r--app-emacs/rpm-spec-mode/metadata.xml5
-rw-r--r--app-emacs/ruby-mode/metadata.xml5
-rw-r--r--app-emacs/rudel/metadata.xml17
-rw-r--r--app-emacs/rust-mode/metadata.xml13
-rw-r--r--app-emacs/scala-mode/metadata.xml5
-rw-r--r--app-emacs/scheme-complete/metadata.xml5
-rw-r--r--app-emacs/scim-bridge-el/metadata.xml5
-rw-r--r--app-emacs/scss-mode/metadata.xml5
-rw-r--r--app-emacs/semi/metadata.xml5
-rw-r--r--app-emacs/session/metadata.xml5
-rw-r--r--app-emacs/setnu/metadata.xml5
-rw-r--r--app-emacs/slime/metadata.xml5
-rw-r--r--app-emacs/sml-mode/metadata.xml5
-rw-r--r--app-emacs/sokoban/metadata.xml5
-rw-r--r--app-emacs/ssh/metadata.xml5
-rw-r--r--app-emacs/stripes/metadata.xml11
-rw-r--r--app-emacs/sumibi/metadata.xml5
-rw-r--r--app-emacs/tdtd/metadata.xml5
-rw-r--r--app-emacs/teco/metadata.xml5
-rw-r--r--app-emacs/template/metadata.xml5
-rw-r--r--app-emacs/tempo-snippets/metadata.xml5
-rw-r--r--app-emacs/thinks/metadata.xml5
-rw-r--r--app-emacs/thumbs/metadata.xml5
-rw-r--r--app-emacs/tuareg-mode/metadata.xml5
-rw-r--r--app-emacs/twittering-mode/metadata.xml5
-rw-r--r--app-emacs/typing/metadata.xml5
-rw-r--r--app-emacs/uboat/metadata.xml5
-rw-r--r--app-emacs/undo-tree/metadata.xml5
-rw-r--r--app-emacs/uptimes/metadata.xml5
-rw-r--r--app-emacs/vhdl-mode/metadata.xml5
-rw-r--r--app-emacs/visual-basic-mode/metadata.xml5
-rw-r--r--app-emacs/vm/metadata.xml5
-rw-r--r--app-emacs/volume/metadata.xml5
-rw-r--r--app-emacs/w3mnav/metadata.xml16
-rw-r--r--app-emacs/wanderlust/metadata.xml5
-rw-r--r--app-emacs/wgrep/metadata.xml5
-rw-r--r--app-emacs/whine/metadata.xml5
-rw-r--r--app-emacs/wikipedia-mode/metadata.xml5
-rw-r--r--app-emacs/xclip/metadata.xml5
-rw-r--r--app-emacs/xrdb-mode/metadata.xml5
-rw-r--r--app-emacs/xslide/metadata.xml5
-rw-r--r--app-emacs/yaml-mode/metadata.xml5
-rw-r--r--app-emacs/yasnippet/metadata.xml19
-rw-r--r--app-emacs/yatex/metadata.xml5
-rw-r--r--app-emacs/yc/metadata.xml5
-rw-r--r--app-emacs/zenburn/metadata.xml5
-rw-r--r--app-emacs/zenirc/metadata.xml5
-rw-r--r--app-emulation/wine/metadata.xml2
-rw-r--r--app-eselect/eselect-ctags/metadata.xml5
-rw-r--r--app-eselect/eselect-emacs/metadata.xml5
-rw-r--r--app-misc/regex-markup/regex-markup-0.10.0-r1.ebuild37
-rw-r--r--app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1-r1.ebuild2
-rw-r--r--app-shells/zsh/zsh-5.2.ebuild2
-rw-r--r--app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild2
-rw-r--r--app-text/dvipng/metadata.xml18
-rw-r--r--app-xemacs/ebuild-mode/metadata.xml6
-rw-r--r--dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild2
-rw-r--r--dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild6
-rw-r--r--dev-db/postgresql/postgresql-9.3.10-r2.ebuild2
-rw-r--r--dev-db/postgresql/postgresql-9.4.5-r2.ebuild2
-rw-r--r--dev-java/icedtea-bin/Manifest20
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-6.1.13.9.ebuild2
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-7.2.6.3.ebuild185
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-7.2.6.4.ebuild (renamed from dev-java/icedtea-bin/icedtea-bin-7.2.6.3-r1.ebuild)4
-rw-r--r--dev-java/icedtea-bin/metadata.xml1
-rw-r--r--dev-java/icedtea/Manifest16
-rw-r--r--dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild2
-rw-r--r--dev-java/icedtea/icedtea-7.2.6.4-r1.ebuild (renamed from dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild)16
-rw-r--r--dev-java/piccolo2d/Manifest1
-rw-r--r--dev-java/piccolo2d/piccolo2d-3.0.ebuild52
-rw-r--r--dev-libs/icu/Manifest1
-rw-r--r--dev-libs/icu/icu-56.1.ebuild134
-rw-r--r--dev-libs/libRocket/files/libRocket-1.2.1-build.patch44
-rw-r--r--dev-libs/libRocket/files/libRocket-1.3.0.0-build.patch44
-rw-r--r--dev-libs/libRocket/libRocket-1.2.1_p20130110.ebuild82
-rw-r--r--dev-libs/libburn/Manifest1
-rw-r--r--dev-libs/libburn/libburn-1.3.8.ebuild4
-rw-r--r--dev-libs/libburn/libburn-1.4.0.ebuild4
-rw-r--r--dev-libs/libburn/libburn-1.4.2.ebuild43
-rw-r--r--dev-libs/libisoburn/Manifest1
-rw-r--r--dev-libs/libisoburn/libisoburn-1.3.8.ebuild4
-rw-r--r--dev-libs/libisoburn/libisoburn-1.4.0.ebuild4
-rw-r--r--dev-libs/libisoburn/libisoburn-1.4.2.ebuild66
-rw-r--r--dev-libs/libisofs/Manifest1
-rw-r--r--dev-libs/libisofs/libisofs-1.3.8.ebuild4
-rw-r--r--dev-libs/libisofs/libisofs-1.4.0.ebuild4
-rw-r--r--dev-libs/libisofs/libisofs-1.4.2.ebuild42
-rw-r--r--dev-libs/librep/Manifest1
-rw-r--r--dev-libs/librep/files/librep-0.92.0-disable-elisp.patch4
-rw-r--r--dev-libs/librep/librep-0.92.5.ebuild77
-rw-r--r--dev-libs/libuv/libuv-1.8.0.ebuild2
-rw-r--r--dev-perl/Any-Moose/Any-Moose-0.260.0.ebuild2
-rw-r--r--dev-perl/Archive-Zip/Archive-Zip-1.560.0.ebuild2
-rw-r--r--dev-perl/Audio-Wav/Audio-Wav-0.130.0-r1.ebuild20
-rw-r--r--dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild2
-rw-r--r--dev-perl/Audio-Wav/Manifest1
-rw-r--r--dev-perl/BerkeleyDB/BerkeleyDB-0.540.0.ebuild32
-rw-r--r--dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild2
-rw-r--r--dev-perl/BerkeleyDB/Manifest1
-rw-r--r--dev-perl/Bit-Vector/Bit-Vector-7.200.0-r1.ebuild21
-rw-r--r--dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild2
-rw-r--r--dev-perl/Bit-Vector/Manifest1
-rw-r--r--dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.12.0.ebuild2
-rw-r--r--dev-perl/Cache-Memcached/Cache-Memcached-1.290.0-r1.ebuild21
-rw-r--r--dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild2
-rw-r--r--dev-perl/Cache-Memcached/Manifest1
-rw-r--r--dev-perl/Cairo/Cairo-1.103.0.ebuild34
-rw-r--r--dev-perl/Cairo/Cairo-1.106.0.ebuild2
-rw-r--r--dev-perl/Cairo/Manifest1
-rw-r--r--dev-perl/Class-Load-XS/Class-Load-XS-0.60.0-r1.ebuild2
-rw-r--r--dev-perl/Class-MethodMaker/Class-MethodMaker-2.210.0.ebuild20
-rw-r--r--dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild2
-rw-r--r--dev-perl/Class-MethodMaker/Manifest1
-rw-r--r--dev-perl/Clone/Clone-0.370.0.ebuild17
-rw-r--r--dev-perl/Clone/Clone-0.380.0.ebuild2
-rw-r--r--dev-perl/Clone/Manifest1
-rw-r--r--dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild2
-rw-r--r--dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.110.0-r1.ebuild24
-rw-r--r--dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild2
-rw-r--r--dev-perl/Crypt-Rijndael/Manifest1
-rw-r--r--dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.640.0.ebuild34
-rw-r--r--dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild2
-rw-r--r--dev-perl/Crypt-SSLeay/Manifest1
-rw-r--r--dev-perl/Curses/Curses-1.280.0-r1.ebuild40
-rw-r--r--dev-perl/Curses/Curses-1.320.0.ebuild2
-rw-r--r--dev-perl/Curses/Manifest1
-rw-r--r--dev-perl/Cwd-Guard/Cwd-Guard-0.40.0.ebuild2
-rw-r--r--dev-perl/DBD-Pg/DBD-Pg-3.4.2.ebuild2
-rw-r--r--dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild2
-rw-r--r--dev-perl/DBD-mysql/DBD-mysql-4.31.0-r1.ebuild48
-rw-r--r--dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild2
-rw-r--r--dev-perl/DBD-mysql/Manifest1
-rw-r--r--dev-perl/DBI/DBI-1.628.0.ebuild37
-rw-r--r--dev-perl/DBI/DBI-1.634.0.ebuild2
-rw-r--r--dev-perl/DBI/Manifest1
-rw-r--r--dev-perl/Date-Calc/Date-Calc-6.400.0.ebuild2
-rw-r--r--dev-perl/DateTime/DateTime-1.030.0.ebuild30
-rw-r--r--dev-perl/DateTime/DateTime-1.200.0.ebuild2
-rw-r--r--dev-perl/DateTime/Manifest1
-rw-r--r--dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.50.0.ebuild2
-rw-r--r--dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.130.0.ebuild2
-rw-r--r--dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.4.0.ebuild2
-rw-r--r--dev-perl/Devel-Symdump/Devel-Symdump-2.120.0.ebuild17
-rw-r--r--dev-perl/Devel-Symdump/Devel-Symdump-2.140.0.ebuild23
-rw-r--r--dev-perl/Devel-Symdump/Devel-Symdump-2.150.0.ebuild2
-rw-r--r--dev-perl/Devel-Symdump/Manifest2
-rw-r--r--dev-perl/Digest-CRC/Digest-CRC-0.180.0-r1.ebuild21
-rw-r--r--dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild2
-rw-r--r--dev-perl/Digest-CRC/Manifest1
-rw-r--r--dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild2
-rw-r--r--dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild2
-rw-r--r--dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild2
-rw-r--r--dev-perl/File-Find-Rule-Perl/File-Find-Rule-Perl-1.130.0.ebuild2
-rw-r--r--dev-perl/Filter/Filter-1.540.0.ebuild2
-rw-r--r--dev-perl/Finance-Quote/Finance-Quote-1.370.0.ebuild2
-rw-r--r--dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.240.0-r1.ebuild23
-rw-r--r--dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.250.0.ebuild2
-rw-r--r--dev-perl/Finance-YahooQuote/Manifest1
-rw-r--r--dev-perl/GDGraph/GDGraph-1.480.0-r1.ebuild20
-rw-r--r--dev-perl/GDGraph/GDGraph-1.490.0.ebuild2
-rw-r--r--dev-perl/GDGraph/Manifest1
-rw-r--r--dev-perl/MRO-Compat/MRO-Compat-0.120.0-r1.ebuild2
-rw-r--r--dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild2
-rw-r--r--dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.140.0.ebuild2
-rw-r--r--dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.2.0.ebuild2
-rw-r--r--dev-perl/Moose/Moose-2.160.400.ebuild2
-rw-r--r--dev-perl/MooseX-Types/MooseX-Types-0.460.0.ebuild2
-rw-r--r--dev-perl/Mouse/Mouse-2.4.5.ebuild2
-rw-r--r--dev-perl/MouseX-Types/MouseX-Types-0.60.0.ebuild2
-rw-r--r--dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild2
-rw-r--r--dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.201.0-r1.ebuild (renamed from dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.201.0.ebuild)4
-rw-r--r--dev-perl/PadWalker/PadWalker-2.100.0.ebuild2
-rw-r--r--dev-perl/Path-Class/Manifest1
-rw-r--r--dev-perl/Path-Class/Path-Class-0.320.0.ebuild28
-rw-r--r--dev-perl/Path-Class/Path-Class-0.350.0.ebuild2
-rw-r--r--dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r1.ebuild2
-rw-r--r--dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild2
-rw-r--r--dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild2
-rw-r--r--dev-perl/Sub-Identify/Sub-Identify-0.40.0-r1.ebuild2
-rw-r--r--dev-perl/Test-CheckDeps/Test-CheckDeps-0.10.0.ebuild2
-rw-r--r--dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.180.0.ebuild2
-rw-r--r--dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild2
-rw-r--r--dev-perl/Test-MockModule/Test-MockModule-0.50.0-r2.ebuild2
-rw-r--r--dev-perl/Test-Most/Test-Most-0.340.0.ebuild2
-rw-r--r--dev-perl/Text-Diff/Text-Diff-1.430.0.ebuild2
-rw-r--r--dev-perl/Try-Tiny/Manifest2
-rw-r--r--dev-perl/Try-Tiny/Try-Tiny-0.180.0.ebuild20
-rw-r--r--dev-perl/Try-Tiny/Try-Tiny-0.190.0.ebuild25
-rw-r--r--dev-perl/Try-Tiny/Try-Tiny-0.220.0.ebuild2
-rw-r--r--dev-perl/Unicode-Stringprep/Unicode-Stringprep-1.105.0-r1.ebuild (renamed from dev-perl/Unicode-Stringprep/Unicode-Stringprep-1.105.0.ebuild)4
-rw-r--r--dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild2
-rw-r--r--dev-perl/namespace-clean/namespace-clean-0.260.0.ebuild2
-rw-r--r--dev-perl/perltidy/perltidy-20140711.0.0.ebuild2
-rw-r--r--dev-php/igbinary/Manifest1
-rw-r--r--dev-php/igbinary/igbinary-1.2.1.ebuild38
-rw-r--r--dev-php/pecl-apcu/pecl-apcu-4.0.7.ebuild63
-rw-r--r--dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild2
-rw-r--r--dev-php/pecl-redis/Manifest2
-rw-r--r--dev-php/pecl-redis/metadata.xml7
-rw-r--r--dev-php/pecl-redis/pecl-redis-2.2.3.ebuild32
-rw-r--r--dev-php/pecl-redis/pecl-redis-2.2.5.ebuild32
-rw-r--r--dev-php/pecl-redis/pecl-redis-2.2.7-r1.ebuild2
-rw-r--r--dev-php/pecl-redis/pecl-redis-2.2.7.ebuild35
-rw-r--r--dev-python/botocore/Manifest1
-rw-r--r--dev-python/botocore/botocore-1.3.22.ebuild54
-rw-r--r--dev-python/bsddb3/bsddb3-6.1.1.ebuild2
-rw-r--r--dev-python/livereload/Manifest1
-rw-r--r--dev-python/livereload/livereload-2.4.1.ebuild39
-rw-r--r--dev-python/polygon/polygon-2.0.6.ebuild2
-rw-r--r--dev-python/pyGPG/Manifest1
-rw-r--r--dev-python/pyGPG/pyGPG-0.2.ebuild47
-rw-r--r--dev-python/pychroot/Manifest3
-rw-r--r--dev-python/pychroot/pychroot-0.9.11.ebuild34
-rw-r--r--dev-python/pychroot/pychroot-0.9.12.ebuild51
-rw-r--r--dev-python/pychroot/pychroot-0.9.9.ebuild34
-rw-r--r--dev-python/pychroot/pychroot-9999.ebuild9
-rw-r--r--dev-python/pyfeyn/Manifest1
-rw-r--r--dev-python/pyfeyn/files/pyfeyn-0.3.5.patch598
-rw-r--r--dev-python/pyfeyn/pyfeyn-0.3.5.ebuild23
-rw-r--r--dev-python/pygpgme/pygpgme-0.3-r1.ebuild18
-rw-r--r--dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild2
-rw-r--r--dev-python/pyx/Manifest1
-rw-r--r--dev-python/pyx/metadata.xml2
-rw-r--r--dev-python/pyx/pyx-0.14.1.ebuild48
-rw-r--r--dev-python/reno/reno-1.2.0.ebuild2
-rw-r--r--dev-python/ssl-fetch/Manifest1
-rw-r--r--dev-python/ssl-fetch/ssl-fetch-0.4.ebuild42
-rw-r--r--dev-python/visual/visual-5.74-r1.ebuild2
-rw-r--r--dev-ros/audio_capture/Manifest1
-rw-r--r--dev-ros/audio_capture/audio_capture-0.2.10.ebuild29
-rw-r--r--dev-ros/audio_common_msgs/Manifest1
-rw-r--r--dev-ros/audio_common_msgs/audio_common_msgs-0.2.10.ebuild20
-rw-r--r--dev-ros/audio_play/Manifest1
-rw-r--r--dev-ros/audio_play/audio_play-0.2.10.ebuild29
-rw-r--r--dev-ros/sound_play/Manifest1
-rw-r--r--dev-ros/sound_play/sound_play-0.2.10.ebuild35
-rw-r--r--dev-ruby/delayer-deferred/Manifest1
-rw-r--r--dev-ruby/delayer-deferred/delayer-deferred-1.0.3.ebuild21
-rw-r--r--dev-ruby/delayer-deferred/metadata.xml11
-rw-r--r--dev-ruby/delayer/delayer-0.0.2.ebuild4
-rw-r--r--dev-ruby/instance_storage/Manifest1
-rw-r--r--dev-ruby/instance_storage/instance_storage-1.0.0.ebuild18
-rw-r--r--dev-ruby/instance_storage/metadata.xml11
-rw-r--r--dev-ruby/memoist/Manifest1
-rw-r--r--dev-ruby/memoist/memoist-0.14.0.ebuild25
-rw-r--r--dev-ruby/memoist/metadata.xml11
-rw-r--r--dev-ruby/pluggaloid/Manifest1
-rw-r--r--dev-ruby/pluggaloid/metadata.xml11
-rw-r--r--dev-ruby/pluggaloid/pluggaloid-1.0.2.ebuild18
-rw-r--r--dev-ruby/ruby-gettext/Manifest1
-rw-r--r--dev-ruby/ruby-gettext/ruby-gettext-3.2.1.ebuild66
-rw-r--r--dev-ruby/totoridipjp/Manifest1
-rw-r--r--dev-ruby/totoridipjp/metadata.xml11
-rw-r--r--dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild22
-rw-r--r--dev-tex/biber/Manifest2
-rw-r--r--dev-tex/biber/biber-2.2-r1.ebuild (renamed from dev-tex/biber/biber-2.2.ebuild)4
-rw-r--r--dev-tex/biber/biber-2.3-r1.ebuild (renamed from dev-tex/biber/biber-2.1.ebuild)10
-rw-r--r--dev-tex/biblatex/Manifest1
-rw-r--r--dev-tex/biblatex/biblatex-3.0-r1.ebuild35
-rw-r--r--dev-tex/latexdiff/latexdiff-1.1.0.ebuild2
-rw-r--r--dev-texlive/texlive-langeuropean/texlive-langeuropean-2015.ebuild1
-rw-r--r--dev-util/pkgcheck/pkgcheck-9999.ebuild10
-rw-r--r--dev-util/trinity/Manifest4
-rw-r--r--dev-util/trinity/files/trinity-1.1-flags.patch20
-rw-r--r--dev-util/trinity/files/trinity-1.2-btrfs-headers.patch39
-rw-r--r--dev-util/trinity/files/trinity-1.2-videodev2-ioctls.patch40
-rw-r--r--dev-util/trinity/files/trinity-1.4-flags.patch20
-rw-r--r--dev-util/trinity/trinity-1.1.ebuild31
-rw-r--r--dev-util/trinity/trinity-1.2.ebuild50
-rw-r--r--dev-util/trinity/trinity-1.3.ebuild47
-rw-r--r--dev-util/trinity/trinity-1.4.ebuild45
-rw-r--r--dev-util/umockdev/Manifest4
-rw-r--r--dev-util/umockdev/umockdev-0.8.10.ebuild27
-rw-r--r--dev-util/umockdev/umockdev-0.8.2.ebuild27
-rw-r--r--dev-util/umockdev/umockdev-0.8.8.ebuild27
-rw-r--r--dev-util/umockdev/umockdev-0.8.9.ebuild27
-rw-r--r--dev-vcs/kdesvn/Manifest1
-rw-r--r--dev-vcs/kdesvn/kdesvn-1.7.0.ebuild40
-rw-r--r--dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch129
-rw-r--r--dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch4
-rw-r--r--dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild118
-rw-r--r--eclass/elisp-common.eclass2
-rw-r--r--eclass/elisp.eclass2
-rw-r--r--eclass/readme.gentoo.eclass1
-rw-r--r--games-arcade/supertux/supertux-0.4.0.ebuild2
-rw-r--r--mail-client/mutt/mutt-1.5.24-r2.ebuild2
-rw-r--r--mate-base/mate-panel/files/mate-panel-1.8.1-fix-networkmanager-flags.patch53
-rw-r--r--mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild5
-rw-r--r--media-gfx/fbida/fbida-2.10-r1.ebuild112
-rw-r--r--media-gfx/fbida/fbida-2.10.ebuild2
-rw-r--r--media-gfx/fbida/files/fbida-2.10-fprintf-format.patch11
-rw-r--r--media-libs/cogl/cogl-1.22.0-r1.ebuild144
-rw-r--r--media-libs/cogl/files/cogl-1.22.0-fglrx.patch10
-rw-r--r--media-libs/cogl/files/cogl-1.22.0-initial-output.patch46
-rw-r--r--media-libs/cogl/files/cogl-1.22.0-wait-flip.patch42
-rw-r--r--media-libs/iulib/files/iulib-0.4-default-arguments-declaration.patch25
-rw-r--r--media-libs/iulib/files/iulib-0.4-scons-build-env.patch4
-rw-r--r--media-libs/iulib/iulib-0.4-r1.ebuild58
-rw-r--r--media-libs/opencv/Manifest1
-rw-r--r--media-libs/opencv/files/opencv-3.1.0-cmake-no-opengl.patch22
-rw-r--r--media-libs/opencv/files/opencv-3.1.0-fix-hal-headers.patch91
-rw-r--r--media-libs/opencv/files/opencv-3.1.0-fix-ocl-declaration.patch214
-rw-r--r--media-libs/opencv/files/opencv-3.1.0-invalid-string-usage.patch75
-rw-r--r--media-libs/opencv/metadata.xml2
-rw-r--r--media-libs/opencv/opencv-3.1.0.ebuild252
-rw-r--r--media-libs/plib/files/plib-1.8.5-CVE-2011-4552.patch54
-rw-r--r--media-libs/plib/files/plib-1.8.5-CVE-2011-4620.patch11
-rw-r--r--media-libs/plib/files/plib-1.8.5-X11.patch4
-rw-r--r--media-libs/plib/plib-1.8.5-r1.ebuild34
-rw-r--r--media-plugins/live/Manifest1
-rw-r--r--media-plugins/live/live-2016.01.20.ebuild129
-rw-r--r--media-radio/cwdaemon/cwdaemon-0.10.2.ebuild2
-rw-r--r--media-radio/fldigi/fldigi-3.23.06.ebuild2
-rw-r--r--media-radio/grig/grig-0.8.1.ebuild2
-rw-r--r--media-radio/unixcw/unixcw-3.5.0.ebuild2
-rw-r--r--media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild2
-rw-r--r--media-sound/pulseaudio/Manifest3
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-5.0-crash-udp.patch53
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-5.0-module-switch.patch35
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-1.patch26
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-2.patch73
-rw-r--r--media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch77
-rw-r--r--media-sound/pulseaudio/files/svolume-fix_param_loading_undefined_beh.patch37
-rw-r--r--media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild356
-rw-r--r--media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild367
-rw-r--r--media-sound/pulseaudio/pulseaudio-6.0.ebuild389
-rw-r--r--media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild371
-rw-r--r--media-sound/pulseaudio/pulseaudio-7.0.ebuild368
-rw-r--r--media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff4
-rw-r--r--media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch211
-rw-r--r--media-sound/splay/splay-0.9.5.2-r1.ebuild28
-rw-r--r--media-sound/wavegain/Manifest1
-rw-r--r--media-sound/wavegain/wavegain-1.3.0.ebuild31
-rw-r--r--media-tv/tvbrowser/files/3.4.3-build.xml.patch109
-rw-r--r--media-tv/tvbrowser/files/3.4.3-remove-registrykey.patch150
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild5
-rw-r--r--media-video/mpv/mpv-9999.ebuild5
-rw-r--r--media-video/nvenc/Manifest1
-rw-r--r--media-video/nvidia_video_sdk/Manifest1
-rw-r--r--media-video/nvidia_video_sdk/metadata.xml (renamed from media-video/nvenc/metadata.xml)1
-rw-r--r--media-video/nvidia_video_sdk/nvidia_video_sdk-6.0.1.ebuild (renamed from media-video/nvenc/nvenc-5.0.1-r1.ebuild)29
-rw-r--r--media-video/vlc/metadata.xml2
-rw-r--r--media-video/vlc/vlc-9999.ebuild47
-rw-r--r--net-analyzer/bwm-ng/Manifest1
-rw-r--r--net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild38
-rw-r--r--net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch82
-rw-r--r--net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild23
-rw-r--r--net-analyzer/dosdetector/files/dosdetector-20060621-sizeof.patch11
-rw-r--r--net-analyzer/greenbone-security-assistant/Manifest1
-rw-r--r--net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.6-r1.ebuild64
-rw-r--r--net-firewall/fwknop/Manifest1
-rw-r--r--net-firewall/fwknop/fwknop-2.6.8-r1.ebuild (renamed from net-firewall/fwknop/fwknop-2.6.7-r2.ebuild)4
-rw-r--r--net-firewall/fwknop/fwknop-2.6.8.ebuild131
-rw-r--r--net-ftp/lftp/lftp-4.6.5.ebuild2
-rw-r--r--net-im/ejabberd/metadata.xml8
-rw-r--r--net-libs/courier-authlib/courier-authlib-0.66.4.ebuild2
-rw-r--r--net-libs/net6/net6-1.3.14-r1.ebuild2
-rw-r--r--net-libs/rb_libtorrent/rb_libtorrent-1.0.8.ebuild12
-rw-r--r--net-mail/notmuch/notmuch-0.21.ebuild2
-rw-r--r--net-misc/chrony/chrony-2.2.1.ebuild2
-rw-r--r--net-misc/icecast/Manifest1
-rw-r--r--net-misc/icecast/icecast-2.4.3.ebuild83
-rw-r--r--net-misc/tor/tor-0.2.7.6.ebuild2
-rw-r--r--net-proxy/bfilter/bfilter-1.1.4-r3.ebuild85
-rw-r--r--net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch4
-rw-r--r--net-wireless/irda-utils/files/irda-utils-0.9.18-headers.patch4
-rw-r--r--net-wireless/irda-utils/files/irda-utils-0.9.18-smcinit.diff4
-rw-r--r--net-wireless/irda-utils/irda-utils-0.9.18-r5.ebuild105
-rw-r--r--perl-core/Devel-PPPort/Devel-PPPort-3.310.0.ebuild2
-rw-r--r--perl-core/Module-Metadata/Module-Metadata-1.0.26.ebuild2
-rw-r--r--perl-core/Unicode-Normalize/Manifest (renamed from dev-perl/Unicode-Normalize/Manifest)1
-rw-r--r--perl-core/Unicode-Normalize/Unicode-Normalize-1.180.0.ebuild (renamed from dev-perl/Unicode-Normalize/Unicode-Normalize-1.180.0.ebuild)2
-rw-r--r--perl-core/Unicode-Normalize/Unicode-Normalize-1.250.0.ebuild25
-rw-r--r--perl-core/Unicode-Normalize/metadata.xml (renamed from dev-perl/Unicode-Normalize/metadata.xml)0
-rw-r--r--profiles/package.mask5
-rw-r--r--profiles/prefix/darwin/macos/10.10/x64/make.defaults3
-rw-r--r--profiles/prefix/darwin/macos/10.10/x86/make.defaults3
-rw-r--r--profiles/prefix/darwin/macos/10.11/x64/make.defaults3
-rw-r--r--profiles/prefix/darwin/macos/10.11/x86/make.defaults3
-rw-r--r--profiles/prefix/darwin/macos/10.4/x86/make.defaults3
-rw-r--r--profiles/prefix/darwin/macos/10.5/x64/make.defaults3
-rw-r--r--profiles/prefix/darwin/macos/10.5/x86/make.defaults3
-rw-r--r--profiles/prefix/darwin/macos/10.6/x64/make.defaults3
-rw-r--r--profiles/prefix/darwin/macos/10.6/x86/make.defaults3
-rw-r--r--profiles/prefix/darwin/macos/10.7/x64/make.defaults3
-rw-r--r--profiles/prefix/darwin/macos/10.7/x86/make.defaults3
-rw-r--r--profiles/prefix/darwin/macos/10.8/x64/make.defaults3
-rw-r--r--profiles/prefix/darwin/macos/10.8/x86/make.defaults3
-rw-r--r--profiles/prefix/darwin/macos/10.9/x64/make.defaults3
-rw-r--r--profiles/prefix/darwin/macos/10.9/x86/make.defaults3
-rw-r--r--profiles/prefix/darwin/macos/arch/x64/make.defaults2
-rw-r--r--profiles/prefix/darwin/macos/arch/x86/make.defaults2
-rw-r--r--profiles/targets/desktop/plasma/package.use2
-rw-r--r--profiles/updates/1Q-20162
-rw-r--r--ros-meta/audio_common/Manifest1
-rw-r--r--ros-meta/audio_common/audio_common-0.2.10.ebuild23
-rw-r--r--ros-meta/image_common/Manifest1
-rw-r--r--ros-meta/image_common/image_common-1.11.10.ebuild23
-rw-r--r--sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.7-entry.patch4
-rw-r--r--sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.7-wformat-security.patch48
-rw-r--r--sci-calculators/qalculate-gtk/qalculate-gtk-0.9.7-r1.ebuild44
-rw-r--r--sci-chemistry/gsim/gsim-21.3-r1.ebuild80
-rw-r--r--sci-chemistry/mpqc/files/mpqc-2.3.1-wformat-security.patch71
-rw-r--r--sci-chemistry/mpqc/mpqc-2.3.1-r4.ebuild106
-rw-r--r--sci-libs/geos/geos-3.5.0.ebuild2
-rw-r--r--sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch8
-rw-r--r--sci-libs/netcdf-cxx/netcdf-cxx-4.2.1-r1.ebuild40
-rw-r--r--sci-libs/netcdf-fortran/Manifest1
-rw-r--r--sci-libs/netcdf-fortran/netcdf-fortran-4.4.3.ebuild44
-rw-r--r--sci-libs/netcdf/netcdf-4.4.0-r1.ebuild54
-rw-r--r--sci-mathematics/coq/Manifest1
-rw-r--r--sci-mathematics/coq/coq-8.5.ebuild96
-rw-r--r--sci-mathematics/coq/files/coq-8.5-do-not-install-revision.patch19
-rw-r--r--sci-physics/lammps/lammps-20151207.ebuild2
-rw-r--r--sys-apps/man-db/man-db-2.7.5.ebuild2
-rw-r--r--sys-apps/openrc/openrc-0.19.1.ebuild2
-rw-r--r--sys-apps/pkgcore/pkgcore-9999.ebuild3
-rw-r--r--sys-auth/keystone/keystone-8.0.1.ebuild2
-rw-r--r--sys-block/partitionmanager/Manifest1
-rw-r--r--sys-block/partitionmanager/partitionmanager-2.0.0.ebuild44
-rw-r--r--sys-block/zram-init/zram-init-3.6.ebuild1
-rw-r--r--sys-cluster/cinder/cinder-7.0.1.ebuild2
-rw-r--r--sys-cluster/neutron/neutron-7.0.1.ebuild2
-rw-r--r--sys-cluster/nova/nova-12.0.1.ebuild2
-rw-r--r--sys-fs/ddrescue/ddrescue-1.20.ebuild2
-rw-r--r--sys-fs/eudev/eudev-3.1.5.ebuild2
-rw-r--r--sys-kernel/gentoo-sources/Manifest36
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-3.10.95.ebuild (renamed from sys-kernel/gentoo-sources/gentoo-sources-3.10.92.ebuild)4
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-3.12.49.ebuild29
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-3.12.50.ebuild29
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-3.12.52-r1.ebuild2
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-3.12.52.ebuild29
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-3.14.56.ebuild29
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-3.14.58-r1.ebuild2
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-3.14.59.ebuild (renamed from sys-kernel/gentoo-sources/gentoo-sources-3.10.94.ebuild)7
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.1.16.ebuild (renamed from sys-kernel/gentoo-sources/gentoo-sources-3.10.93.ebuild)9
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.3.4.ebuild (renamed from sys-kernel/gentoo-sources/gentoo-sources-4.4.0.ebuild)4
-rw-r--r--sys-libs/kpmcore/Manifest1
-rw-r--r--sys-libs/kpmcore/kpmcore-2.0.0.ebuild34
-rw-r--r--sys-libs/kpmcore/metadata.xml5
-rw-r--r--sys-power/cpudyn/cpudyn-1.0.1-r1.ebuild48
-rw-r--r--sys-power/cpudyn/files/cpudyn-0.99.0-init_conf_updates.patch4
-rw-r--r--sys-process/cronbase/cronbase-0.3.7-r1.ebuild2
-rw-r--r--virtual/editor/metadata.xml6
-rw-r--r--virtual/emacs-flim/metadata.xml5
-rw-r--r--virtual/emacs/metadata.xml5
-rw-r--r--virtual/jdk/jdk-1.7.0-r1.ebuild16
-rw-r--r--virtual/jdk/jdk-1.8.0-r1.ebuild (renamed from virtual/jdk/jdk-1.8.0.ebuild)12
-rw-r--r--virtual/jre/jre-1.7.0-r1.ebuild14
-rw-r--r--virtual/jre/jre-1.8.0-r1.ebuild (renamed from virtual/jre/jre-1.8.0.ebuild)11
-rw-r--r--virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.310.0.ebuild2
-rw-r--r--virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.26.ebuild2
-rw-r--r--virtual/perl-Unicode-Normalize/metadata.xml5
-rw-r--r--virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.170.0.ebuild21
-rw-r--r--virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.180.0.ebuild21
-rw-r--r--virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.250.0.ebuild19
-rw-r--r--www-apps/jekyll/jekyll-2.5.3.ebuild4
-rw-r--r--www-apps/tt-rss/Manifest2
-rw-r--r--www-apps/tt-rss/tt-rss-20160124.ebuild (renamed from www-apps/tt-rss/tt-rss-20150624.ebuild)0
-rw-r--r--www-client/dwb/Manifest1
-rw-r--r--www-client/dwb/dwb-2013.03.30.ebuild58
-rw-r--r--www-client/dwb/dwb-2014.03.07.ebuild52
-rw-r--r--www-client/qupzilla/qupzilla-1.8.9.ebuild2
-rw-r--r--x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild170
-rw-r--r--x11-base/xorg-server/Manifest1
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch53
-rw-r--r--x11-base/xorg-server/xorg-server-1.18.0.ebuild242
-rw-r--r--x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.0.ebuild4
-rw-r--r--x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.1.ebuild2
-rw-r--r--x11-drivers/xf86-video-intel/Manifest9
-rw-r--r--x11-drivers/xf86-video-intel/xf86-video-intel-2.99.903.ebuild65
-rw-r--r--x11-drivers/xf86-video-intel/xf86-video-intel-2.99.905-r1.ebuild72
-rw-r--r--x11-drivers/xf86-video-intel/xf86-video-intel-2.99.906.ebuild72
-rw-r--r--x11-drivers/xf86-video-intel/xf86-video-intel-2.99.907-r1.ebuild72
-rw-r--r--x11-drivers/xf86-video-intel/xf86-video-intel-2.99.909.ebuild69
-rw-r--r--x11-drivers/xf86-video-intel/xf86-video-intel-2.99.910.ebuild69
-rw-r--r--x11-drivers/xf86-video-intel/xf86-video-intel-2.99.914.ebuild73
-rw-r--r--x11-drivers/xf86-video-intel/xf86-video-intel-2.99.916.ebuild73
-rw-r--r--x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917.ebuild67
-rw-r--r--x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160122.ebuild (renamed from x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917-r1.ebuild)15
-rw-r--r--x11-drivers/xf86-video-nouveau/Manifest2
-rw-r--r--x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.10-r1.ebuild32
-rw-r--r--x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.11.ebuild4
-rw-r--r--x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.12.ebuild (renamed from x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.10.ebuild)10
-rw-r--r--x11-misc/qterm/qterm-0.5.12-r1.ebuild2
-rw-r--r--x11-plugins/vicious/vicious-2.1.3.ebuild2
-rw-r--r--x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild2
-rw-r--r--x11-wm/awesome/awesome-3.5.6-r2.ebuild2
678 files changed, 7688 insertions, 5845 deletions
diff --git a/app-admin/consul-replicate/Manifest b/app-admin/consul-replicate/Manifest
new file mode 100644
index 000000000000..572eb4a27762
--- /dev/null
+++ b/app-admin/consul-replicate/Manifest
@@ -0,0 +1,12 @@
+DIST consul-0.6.3.tar.gz 2224536 SHA256 5cdc21d6f20f9b703d38e19d3d2ed1c037dcbb236b80bff6a9b9c481ded74435 SHA512 c80b96e18c283f8d2dc7542393e9d788c8247200890b1f2ecdf292b545c01c971f1452f6b37b23b92654409a191fbd4608710b1ca31d6c426ff77b53c4840c4b WHIRLPOOL b021bb7ecc97c2a99e88a8dd17dc1958fe7b2d17848c9e629edb0627d72d5651f96ef625cda4280989463e66c4b48880690b5e4a1180117bc762062be3b0566a
+DIST consul-replicate-0.2.0.tar.gz 24575 SHA256 64028b79994407f8d0d0b858a064d0bb9cbecf1e889f55b74a0f6a2c0cb63f6e SHA512 af1bdc0747524996a1cffe989d05a265c0fbcfac9d4d7c4b4bcf94dbd3db6f7635cb013cf542e1cdad049975a8dfad2bca417dd5566c922b7f86e7fd451ea0a2 WHIRLPOOL efac8709e6efa87b8aca5342d5bfaf752a22bca42a9a38cb9c4bada6855302a02140ef5bb06c27bf178081f7aef570a773c64b67ecec5f1e57c15c5a4d9c86c4
+DIST consul-template-0.8.0.tar.gz 63281 SHA256 ac12bdde35e88184d5e3f2201c2f46e2dd7b301d4f31b51945905d1b2c456064 SHA512 4a738aa70a291df6e7a48e40fd73c70e279bb957d988de1277b1223dfe151867e06de28542fdbd9fd7f816650b150ed53989fc061fc228b930551fcd0b3005fb WHIRLPOOL e8e48972350d9bb617c72ba07b86823359b8e997494671a23d8d897861e9cfcf429d6edb4ce3fc117849a2fbf6a56aee35809b9db6d738460da34671cfc9c4a7
+DIST errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz 8320 SHA256 e77d6aa78ef6342b21358d689edcd043778c5623af5a9b2690ed8e3fa4ea7db0 SHA512 da45b1696253bebe012f3d0e624a63dd11ad1a613d81cc302f2ea6f096f29a8d81015b9c00363bd2590c4cacc59de52a27e84435a7b4ad6512485cdd87df11c0 WHIRLPOOL 5c6013d852711e001a0eca6a3ad11f64e006be527cfc0b46db21049af97506730b48cfe1b2fac10bcfc66f61dce69023f20b06c83558e80ce337d75a127aa90d
+DIST go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz 6595 SHA256 b0a0282baa30df0e77ebd0902c5f0043f9af3460172ff61070927c270fa8139d SHA512 bfdeea0c0aad4160729bb023c9c908ff56c7faa64a820b16e982efede0389365987343b2a227cac95edaa4c9096f2dfcb1fd3f7d55510328dfdb284cfbf7600a WHIRLPOOL 1cd82ed8a82a2cb1de58a9a0177fead214e63908e880b2d57a4434c024a49d05579ea77142aa9d5ecca370adc4539bfb7db1d9d4a2cc27fc41d83a350c4fce39
+DIST go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz 8792 SHA256 734fdf39b7fb299ecf18e65f72ac3f1929bd978618af575e8bcad9e5ca55b494 SHA512 8a3e37ac07bbd571dd8b76bd8c119e5dbc620444e78a6f9fe2c4d28b0171a46704a0b088380ca201a08f7235698f07de4e4881691aef5370739c8bfe2db9e85b WHIRLPOOL 7b501d47880ad570dd79d2da79cc10373b03426f7f89b513f3b3b195682b0b36aeefac675a56070c262ee7e0d31ff9a564a9667924b1da66957ad0f97ab2d46c
+DIST go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz 4397 SHA256 378f5249729661db9d0c65030fbf636f6ec1d60ee926e67abf8c6dd7921d3907 SHA512 42257d0599936bb215f4a9f9189518418f02bc43e4d7417823ea460bfc45c6fd1f9b0bf5a35dd73881b57cd9e892c702b813a68fe6e417e82dd31c6635c1b24e WHIRLPOOL 26cf1464bf0899ae9bad0067481f57a121433c5fe7c93fef92523a157d7906b8c1c4216c2a4fe738222e4afaa85fc0a7b7b29149254125a3e8b2e7064add6cb1
+DIST hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz 54677 SHA256 5656a59a398dc22d383d8daf33c410dcc1c21894d0053df5f7263d3a65f85fd9 SHA512 a430b7a4be9147e0fad3d932ecaee5970f049991351654682c679ace971e883615f957255d81da3dc2f732b0bfa26d66eb73ec7811957f05c2f72c2c506c23cd WHIRLPOOL d6dddcfbc53bc68fdf3971829bf8f0662e47a447682b37306424dd91ee2cc3d0280c7c368b3a8ded9f2127b2789b7b68648de9beaf9f9847cedb7324c2605dbf
+DIST logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz 7717 SHA256 a58c8a6112b9ca2eb193d75996a54699f572411f3146d8ba62377af4a9fb933a SHA512 54e55f95808fb68be532e35076ffb04ff844a7d032530b82bbdd87f809bd1b0585538964cc22c7ae1cc039c5c30a02eca9734734c0c01ad76a14bd5a4c386426 WHIRLPOOL 0086485565e6fae835f54a1bb00a40660650c6018a6e79e05ba15120a59a6552ba60d86bfd63f7bc5cd8b331984fcdbe7162ef24d257bcc18a7fd8e6c028dd80
+DIST mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz 13977 SHA256 3b2873f0e7e7a37f1b809493717033c1257bf41a9996e336746d83556df68240 SHA512 f495fe99c8ce752830b3d36db445cdc32baac6e266a0862d13e7e80e04f412ae7ee85e13ba794f1cfae3effb226007874c8ee819a4ef568ce2884077dfba4f9c WHIRLPOOL e3cf27de3f414014f9f068f66540daeeb90e10d69196a117a1e3a06c02cd096f5d711657c19c8ffdc26bf6a399a45fb9f78e96e26335f788baf7695785b7b90f
+DIST serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz 579000 SHA256 6c74d90b84c402c684e27a8948ba54074ad368ed121945d21b9c00135cdf7c74 SHA512 eced133c2ba261e4e39d16f2252f555611e90f23f70a746a6f8d60b24e6747e73e619ec74f10a1c0646ec5edfd731cd79f6700d9bc5fb7b100723aac32203a5f WHIRLPOOL eaa15ec8dcdfeeb490cea4e9af24c8507dba09583f5e02919fd71607bfed8c999f872d3c8dd818378f79ade5fd065e1c2e270dda8ff428848c409f7922196478
+DIST structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz 12276 SHA256 f9998ee9ab32a55cfa7a9f93a9439ee56fc146d8aff6601f06bb2048b71c381a SHA512 ae2f0bc1f9e1ddbf1bd32d5e50a2ffbc4841c17d451739aee7cbbe359abac982e98a00caaff2aa433d10aad4dc414ce17e94a1d0893610ff53c52beddb21dd4f WHIRLPOOL cc4063c7463e261a32a84c357c352141a91e4a88874c02acd6f91bc05f478e668b5ad7629a7473009cebe201a789854f295b22d56310d39d632d81d223baec65
diff --git a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
new file mode 100644
index 000000000000..ef70f35a0686
--- /dev/null
+++ b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit golang-base
+
+KEYWORDS="~amd64"
+DESCRIPTION="Consul cross-DC KV replication daemon"
+EGO_PN="github.com/hashicorp/${PN}/..."
+HOMEPAGE="http://${EGO_PN%/*}"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND=">=dev-lang/go-1.4:="
+RDEPEND=""
+
+SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/hashicorp/consul-template/archive/v0.8.0.tar.gz -> consul-template-0.8.0.tar.gz
+ https://github.com/fatih/structs/archive/a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz -> structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz
+ https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz
+ https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
+ https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz
+ https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz
+ https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
+ https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz
+ https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz
+ https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz
+ https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz"
+
+STRIP_MASK="*.a"
+S="${WORKDIR}/src/${EGO_PN%/*}"
+
+get_archive_go_package() {
+ local archive=${1} uri x
+ for x in ${SRC_URI}; do
+ if [[ ${x} == http* ]]; then
+ uri=${x}
+ elif [[ ${x} == ${archive} ]]; then
+ break
+ fi
+ done
+ uri=${uri#https://}
+ echo ${uri%/archive/*}
+}
+
+unpack_go_packages() {
+ local go_package x
+ # Unpack packages to appropriate locations for GOPATH
+ for x in ${A}; do
+ unpack ${x}
+ go_package=$(get_archive_go_package ${x})
+ mkdir -p src/${go_package%/*}
+ mv ${go_package##*/}-* src/${go_package} || die
+ done
+}
+
+src_unpack() {
+ unpack_go_packages
+ export GOPATH=${WORKDIR}:$(get_golibdir_gopath)
+}
+
+src_prepare() {
+ # Create a writable GOROOT in order to avoid sandbox violations.
+ export GOROOT="${WORKDIR}/goroot"
+ cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+ rm -rf "${GOROOT}"/{src,pkg/$(go env GOOS)_$(go env GOARCH)}/"${EGO_PN%/*}" || die
+
+ # Prune conflicting libraries from GOROOT
+ while read -r -d '' x; do
+ x=${x#${WORKDIR}/src}
+ rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
+ done < <(find "${WORKDIR}/src" -maxdepth 3 -mindepth 3 -type d -print0)
+
+ sed -e 's:TestParseConfig_parseFileError(:_\0:' -i config_test.go || die
+}
+
+src_compile() {
+ go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+ go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_install() {
+ dobin "${WORKDIR}/bin/${PN}"
+ dodoc CHANGELOG.md README.md
+}
diff --git a/app-admin/consul-replicate/metadata.xml b/app-admin/consul-replicate/metadata.xml
new file mode 100644
index 000000000000..dd8c8da64294
--- /dev/null
+++ b/app-admin/consul-replicate/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>
+ <email>zmedico@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">hashicorp/consul-replicate</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index 0cd0f9c1d7a0..a598b3f0a5bc 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -1,14 +1,41 @@
+DIST aws-sdk-go-1.0.11.tar.gz 2914311 SHA256 7750f3ed8f616fdfa5c478b1768947909907a5a10dc98e1d70f9fa3fd7da96ba SHA512 ae966170cd906f510246c51ed9738f4ca8e3b4c2b31ed3d92f4f9c272e8a11ca411fe4a24bdbc7099c5b537f42abc784e336e05004421c138de7b8b2a5240d0a WHIRLPOOL 1bae846bde5b3beec5448336378e63b0ebb9da5b5f0b7f37941a5450ec091e250c861847883759e5df1f1e20b02942fc5f77599d6763a60de15d7ceb84fb896f
+DIST consul-0.6.3.tar.gz 2224536 SHA256 5cdc21d6f20f9b703d38e19d3d2ed1c037dcbb236b80bff6a9b9c481ded74435 SHA512 c80b96e18c283f8d2dc7542393e9d788c8247200890b1f2ecdf292b545c01c971f1452f6b37b23b92654409a191fbd4608710b1ca31d6c426ff77b53c4840c4b WHIRLPOOL b021bb7ecc97c2a99e88a8dd17dc1958fe7b2d17848c9e629edb0627d72d5651f96ef625cda4280989463e66c4b48880690b5e4a1180117bc762062be3b0566a
+DIST consul-template-0.12.2.tar.gz 93913 SHA256 9d8ae6ba84caa826400a3eef0e28325518a21c44332eebaaf3878dc5972f3997 SHA512 c085d916d7e7ae933583b6f397c73117a35b2f54e634db9bbe43a3e6f6b9497177729b3b5e25f028766eb6f9f59ff411486390bc2f544806af04f9038729533e WHIRLPOOL af485e0b743eb3d34d52bdbc6dd1edcf17614e07061384f24c5bd1d5d74d5a5bc1c092553fd074269566298847af2052ffd6dbf8b8e9a524438227e7230fe2d8
DIST consul-template-0.9.0.tar.gz 69085 SHA256 5277cc43b61d531630854d707cd7a51bdd84328d8c30bc330dd2e2aa8898ede8 SHA512 39da6029d818f3ee0b9aba332f0a645c9e381b1115549dcc6945245c4dee53cd3d503e3dc3da4c4394192989798b242994b53e3256755ffe02c4b3c9296139d3 WHIRLPOOL 1ba0d1c2a2a9c8617338901f85916e25460155979dda9604752bc62c289e40d904ad27f2c31ca2491936289519d4f09fe72bbe4c176035880f01c789fdf74db2
DIST copystructure-6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz 4028 SHA256 4e7271e88e101ac324f799c421b1c8c1477d1f54048d6b6b1ff3930498870272 SHA512 3c804e126f676cb7a6c5af775b7fdf6a3b591b42315707ebb83a66a96f583eac414e01402bc489d9b218b64db7780f57bd5a4bd922aff59dca068b869f825de5 WHIRLPOOL 3be054304612292adef0361bbd2d94d51c4186d4a66bf949d326345da0f7f5c6f5558c0db62fb1ed1144899155f5c63ceeb9243c267b82605b024cf6898f31ba
DIST errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz 8320 SHA256 e77d6aa78ef6342b21358d689edcd043778c5623af5a9b2690ed8e3fa4ea7db0 SHA512 da45b1696253bebe012f3d0e624a63dd11ad1a613d81cc302f2ea6f096f29a8d81015b9c00363bd2590c4cacc59de52a27e84435a7b4ad6512485cdd87df11c0 WHIRLPOOL 5c6013d852711e001a0eca6a3ad11f64e006be527cfc0b46db21049af97506730b48cfe1b2fac10bcfc66f61dce69023f20b06c83558e80ce337d75a127aa90d
+DIST etcd-5099bf6f7ab92181158cc2f0f0db1bb6056e9aeb.tar.gz 2171596 SHA256 72f642f10d014dff089b7a0fe66168639d30ed0e1586cec43a88b2bd7311cc11 SHA512 cc1d75d73c46f7c8438ddec8f0cf6829936e4ecb58efcaae958f818bbdd777751b393406e6c89784d9234080766ea67d71e660aa973f409ce4319768e76f4dad WHIRLPOOL 7f645f6ae41769e8bf0e4f35e4ac399df385bd1693f3c49d0f3e2859cfbf58e0cbd6f9be8c7de101e37720514828e56ae996cbf8a89e665a867ae083457bf9e8
+DIST go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz 6595 SHA256 b0a0282baa30df0e77ebd0902c5f0043f9af3460172ff61070927c270fa8139d SHA512 bfdeea0c0aad4160729bb023c9c908ff56c7faa64a820b16e982efede0389365987343b2a227cac95edaa4c9096f2dfcb1fd3f7d55510328dfdb284cfbf7600a WHIRLPOOL 1cd82ed8a82a2cb1de58a9a0177fead214e63908e880b2d57a4434c024a49d05579ea77142aa9d5ecca370adc4539bfb7db1d9d4a2cc27fc41d83a350c4fce39
+DIST go-gatedio-8b8de1022221dde1fb52fa25d0caab46e59c8c14.tar.gz 8209 SHA256 d2283d24b1ea8e7b9520c022eb2530150eed03b6e72f698c9371658654777fea SHA512 2b2cf5ee8adf3dc3e106b3882812ecf925e4bfa7a43962eab70e106fdb46d6928414e1da741f713e1001b50a3ccefb7a1814997f6c3a4f5a1956fba7c40abbb4 WHIRLPOOL fddaa5ce23e418c7e099ba089256f591115e4667e86450454be6040502d94faa52160f6f77f1805299ff82e44a04d225165ef4d98a11f342c2ede0ccf35c3dfc
+DIST go-ini-1.8.6.tar.gz 26600 SHA256 66a1328c8dfc21a3b1657177e60681b2b6fa0ab4fce4b6e861c059bff0507511 SHA512 802c4ad56a2ba2f1a543bed8bdd1970557d973d10d3eff7fc69a406af52484943f7d20f91ccfca4cc8364ac438da7b464b05fae30f04b930717cb58f5fc55676 WHIRLPOOL f6a34a8a7bb07b7fc1aaa43ac422eb5e6c1c6b081b065023cc37584ceecd74489001b25af39d70de22e28919bcb410dda7b0fb52cef914889a023db22947208f
+DIST go-jmespath-0.2.2.tar.gz 47588 SHA256 d0a918ec689c3997077960c30d2ab6c1f93e3722684940d19286f85274cf56dd SHA512 93d1b64f6a0c658d832c065ddcd006b1d521a71c154a55a818a20063a9f9777640fa077a29e476c4e31f0b208a3c765a32aacf65d44d65d80702dccb7faed2a6 WHIRLPOOL 3f07a5f76117a9c54fe6a6ab6c94d29dff15176909904ba437a48f743e7b4189238428e1ca0080c572a3105855bf740769d65e6d1bb0014e12d335601bdafb43
+DIST go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz 13610 SHA256 2efdf7c349cb81ef75fbb812e150aac9a7c6c27417f4e84f655ff77ddb006789 SHA512 2dd120d6da4d8cfcd4546a288534f233f7073281ed3d6e7712c8a92fc11f7b800c0950835037ec936ec89e6fc2dba06088d70bc7faee6f139cc9656c0a81d4b7 WHIRLPOOL ebe0a792cb231f3ff5241f8c2526c7a7927d6d1ab138e92ae0da34ba72e54bbb4769aa14804110e61d7de280ce28a0040ebd17e79ceccec585ad48c9aac91c33
DIST go-metrics-a54701ebec11868993bc198c3f315353e9de2ed6.tar.gz 11268 SHA256 2f4206d5d50eaab383cdc4f5c57179e285b93649c028a69dd9e2a4a45b69afe3 SHA512 e3da3f7b98edd32da5c3381afc3e92021b92416d7ea9de0423a05c06bc9ff808e28d29ca9f689c0029809a4b1643819954039516d6ab5890bb5512f5fe99fd6d WHIRLPOOL 815f83ae08bb6a37ee1774a718a8c3b4087ee9a95f190b8a77453f0d1ba1ca88a331e8be12b2f63d0c1fdb9472f2ff35786b94eaf1f61f5cb33fe1e6d9e4e460
DIST go-msgpack-71c2886f5a673a35f909803f38ece5810165097b.tar.gz 49485 SHA256 c32b90e67762a375981b38154cae65222bb1aaa7722727d0225d5f8de773e4c8 SHA512 e4141e664c3237f7ab4c283b110d04e933bfb36a9d57af374ab42fed00a4ad6d8399e3399b206eebe76c5e142746412b2ada6c20b1ec09088f3bb7d82a7b01a9 WHIRLPOOL 1434e72897de4063515a0d3319e96b066406c110e3e36f710970886ba6ec9411f71908d9696a4528ee0fcb88bea54ab9c064faa230761ce38b82bb5506a2c073
+DIST go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz 49488 SHA256 eeffbd458f4996334275f828cfd3549d32a2ba6eda359e5c9be09f091548781f SHA512 7e60a122cca007bf5455d6e15f77c24eaa5739deedc9e0c158282249e84698f873628bffa9eb7d23c1c59bda7632b1968ca770c8e1796e2d50750ac86e80fcb2 WHIRLPOOL 41745e39256ef510d42c4da413609e3bdd0621cc2acccfddabb4c8774e47b73ad46656639bed3fac2335cf1b6a2a245d3b8b4f3831cfafb2c6e7ecb90293475d
+DIST go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz 8792 SHA256 734fdf39b7fb299ecf18e65f72ac3f1929bd978618af575e8bcad9e5ca55b494 SHA512 8a3e37ac07bbd571dd8b76bd8c119e5dbc620444e78a6f9fe2c4d28b0171a46704a0b088380ca201a08f7235698f07de4e4881691aef5370739c8bfe2db9e85b WHIRLPOOL 7b501d47880ad570dd79d2da79cc10373b03426f7f89b513f3b3b195682b0b36aeefac675a56070c262ee7e0d31ff9a564a9667924b1da66957ad0f97ab2d46c
DIST go-multierror-fcdddc395df1ddf4247c69bd436e84cfa0733f7e.tar.gz 8058 SHA256 af90f9be029c091eb011ff25d270772fdb51edf3c6396cf99f224c4e7ad724c3 SHA512 f5cb12407f9bc986867a274c623037edab04f8e2b664c7d4db3bb7e32f970dd073a3d233d18549a5f01b5e88abff0eb0c1fcf79b6696a531c208e6fe8137080e WHIRLPOOL c997792a5c1b3029b32d0fad3a55a281b5ced2bef306367a1fd49df75cab831b93a3752e76f8a18ce5d08e155f66b3826aa5d9878fb9655821cef7a69b71de31
DIST go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz 5446 SHA256 f4e628adceee06d7717dce0bf566d5ebd8c009599807f2436b3cda259011b331 SHA512 350904076752e2fda17e9c2891a50b037d2ca165924880d6d5e466b8ed76685d79ff00bbbfbe9a665668e0ebde23c87129d3c1c4bf27ffe0c034df160db9d08f WHIRLPOOL 8571b9e818904a56ea16c35883725013d2009dc294acfdf4f28920a03baff36ffcd3d4d6d8be0ecfc78eefbfeef57e4b2ca224f2ce37d665caae724389346f88
+DIST go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz 5484 SHA256 4b5ac4fe94fb221c849b0e9694301eba2dc91ac1a6b79cee48da038cb1a3d2aa SHA512 e76b6eb6e23f3f1872486e1ad0cfe9e4dcd676a1bee62cfb2e2de28ead2defb8997adadfc48781d910b327fc777c4b38acca1e983a0fb14dd73142f4edb97337 WHIRLPOOL 391097c2c1f7e2a170b41d752595480454d036e9c35dd4ff08678d103a5bd2baddedb3a4a7ce89ca938408fa234be3a63bc74461c09bbfea212d016efa7c3028
+DIST go-reap-2d85522212dcf5a84c6b357094f5c44710441912.tar.gz 8469 SHA256 919b889e2fa550e97b6b2254983cb4e826772ebf5237a787c65217caa244efa0 SHA512 aec1ab90bf1a461e0031f4e3015585129be095896bc40c4188f01d3295b95565f544271ee51d284936d504097831bfee979ba9002bf2749805e565ae6991b066 WHIRLPOOL cda564739e7f49621eb1fb26eecd1b2bc22df673206ffe1877b78eaf08b587fcab80976cfc1452349111d519cae1e46e07fc8f00578355f67741b0dec1c37a18
+DIST go-sql-driver-mysql-1.2.tar.gz 45364 SHA256 3b59eeb0a61146877a0e48eb894d1bf3965b691ae7ee370a9ee84d24417c7dcb SHA512 3e85325a962e8567ad0340b8ac816927df8d794a1f4066599f094de8b362aba411f5f4a1bf406285757680631ee8ec000ffd392e8d5ebe85c82dd10611096df4 WHIRLPOOL 901075f39347928023a144af98b827d573eb9a241fd3f7d47fade4301e1b98cd4ab40355b039cd30c5ac79182f68bcea92b691fc7129d88ba375c9844ee51911
+DIST go-sys-0_pre20150729.tar.gz 529002 SHA256 9f9e4a2bca96d9f9708770607e21395c3f4f873f9b6266cae1ba1da526729528 SHA512 f80afa938977f3945ab3f08462eaf5d8db430013240a11b1f8a43911948fd2a8a390192ea9ebf79434b348b2ca520267a0441b922110e70603fff4849e57c487 WHIRLPOOL 0b269666650f285521c9fd3486959957ad9279544baac7ab5caa21158fb10ed4de2b2e7c080ffca9aa352c8e5685f2035612d40a04c8f6c5f7093daf1a020029
DIST go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz 4397 SHA256 378f5249729661db9d0c65030fbf636f6ec1d60ee926e67abf8c6dd7921d3907 SHA512 42257d0599936bb215f4a9f9189518418f02bc43e4d7417823ea460bfc45c6fd1f9b0bf5a35dd73881b57cd9e892c702b813a68fe6e417e82dd31c6635c1b24e WHIRLPOOL 26cf1464bf0899ae9bad0067481f57a121433c5fe7c93fef92523a157d7906b8c1c4216c2a4fe738222e4afaa85fc0a7b7b29149254125a3e8b2e7064add6cb1
+DIST go-uuid-36289988d83ca270bc07c234c36f364b0dd9c9a7.tar.gz 6491 SHA256 3faf76788a69f6558882170746003bbd430ef617a0f433e93b6ab6d457ad4270 SHA512 f9d7807a27d17d4e7d0b53f43d7e3561492fb0669fd4f1e610f4e39309c8759e3e5d8e061feabae5c60e1a87f9ed989309bd9a796c5811012ee347631c3fbd73 WHIRLPOOL 2b18286b50186c10f2f7cf5ce53354878c6bb3ea77e0c91cde7fadba4df82bb90460847f82775a515ac9de6fb7819e758cbaeb3ada061f29710a17c3e596de98
+DIST go-yaml-v2-f7716cbe52baa25d2e9b0d0da546fcf909fc16b4.tar.gz 63079 SHA256 d2044d0801b9f1da380f5a957404ca95454057a213c46182e2db08dc10cf287b SHA512 52129998e308c0a6033a0da6872759cf30cce3220af4ccd821fcb071f9165ee4f126f080726bbeac2bcacb20c2710dc66f936f8763c19ba5e182b8592700e6c0 WHIRLPOOL b34e0da03adaa61b37432300ec1d03953e220c4a3dd1d8af89ccccad752ba01286d71427e4354e6672d4ac5bde4cfab74e99de66414f02fe555f5c246decf244
+DIST go-zookeeper-218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f.tar.gz 29301 SHA256 f90c7f318c92b9ad6fee417af842d9b9fc5b6635121e3f8035e236272ad41f28 SHA512 0fda62feaa668b43bdc7866270780b30069d7dace5c25c69d27d5df17bc3331885c9a7d3575b822c4da712e8a4af0465c6370cd3e89f6c39e73d70aed346d599 WHIRLPOOL f02c8c9edbf464111bc3302e23c986a73f7bc6684fb0e37136822cb910fc92136e0e2ca65420bcf98dce02245b42951acce17b0a062c4a0eb01df5b2b103e61f
DIST go-zookeeper-d0e0d8e11f318e000a8cc434616d69e329edc374.tar.gz 24950 SHA256 773f4428d6eb2bcc53726fc2af7f495d30fd6d962ed182b7ec2edc8f8ad55ef3 SHA512 c1ac076b2abf9106c185c29158fdf8b3a74ea41458f336b5ebc2f5f13168ec6f06be14cbc3df61c1307a0fa4381d2f4f7cd8b569411152ae748c7fe12896bd24 WHIRLPOOL 94bb9b02d4c7e8eafa0fce1d6d9b79a6cf8007d9774a42267cb92673a89d9c30e60a7eb4d2cd464fbdc5e2e644649d3a980a3c92d6badfbf092f99a99306729e
+DIST golang-lru-5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz 12310 SHA256 9eb4e0d57ee38d379a1940a6970e7e4b8073e14dcfdbd83a5bdfadfd73635a2e SHA512 1fd87ae7707d1b01955896b55075237939d00eb58510a4af9e07f752222171cbdf294a98309cacee947629b577bd8c3e69c635212a56d96d2b6edf82e7720820 WHIRLPOOL 6d7ff2e77000654efcad5dd287e87800c671f20a23423951dd7c4b05e38b12df778d021ca601b19e2ab25ad966d9730796ebfdc6fc49e39059f68d6f9a31cc2f
DIST golang-lru-995efda3e073b6946b175ed93901d729ad47466a.tar.gz 7872 SHA256 cac6e889020e8b31e46d50b98e0af9acbb44bf352ad0ca9d30db79b6235849e2 SHA512 29eee70cbdc9c712d1cece1f911f3a74ebfd44318b91dcd1932f0bff031286f0a80db93772dd04be350c0cca3cc77c0676659ef0f85229f31a1140e23c1fc3f5 WHIRLPOOL c4711d30caf5c2d880aeec7330bc06011dc4e741e305f6dcac8d983734b3706cb5967b06755f7684370ca61a91f356a97c9866ffda0e275e26bb11d3a74d0145
DIST hcl-513e04c400ee2e81e97f5e011c08fb42c6f69b84.tar.gz 28692 SHA256 109ec067ff8ff7f30538e0d2ba1384c1fe25694c99d56972003b1c669d19d0b2 SHA512 90f568373d20cccbb56ada29257bd2ea808bbacb668fd1b82e71abf8f5e2592b4a58dc5d3f1174a2b38c660316cd0227eb333e747aae7a846e94168ebe9d2297 WHIRLPOOL cf5685f25d3c3b69d330e30ad089e2cbc9c6636b0f2ac4933638d6bcad06aa5a50f92d5228a1f1ddabd5e0f8187bc5b16f38f4a3bd86bbbf161a5409d5102ec0
+DIST hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz 54677 SHA256 5656a59a398dc22d383d8daf33c410dcc1c21894d0053df5f7263d3a65f85fd9 SHA512 a430b7a4be9147e0fad3d932ecaee5970f049991351654682c679ace971e883615f957255d81da3dc2f732b0bfa26d66eb73ec7811957f05c2f72c2c506c23cd WHIRLPOOL d6dddcfbc53bc68fdf3971829bf8f0662e47a447682b37306424dd91ee2cc3d0280c7c368b3a8ded9f2127b2789b7b68648de9beaf9f9847cedb7324c2605dbf
+DIST logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz 7717 SHA256 a58c8a6112b9ca2eb193d75996a54699f572411f3146d8ba62377af4a9fb933a SHA512 54e55f95808fb68be532e35076ffb04ff844a7d032530b82bbdd87f809bd1b0585538964cc22c7ae1cc039c5c30a02eca9734734c0c01ad76a14bd5a4c386426 WHIRLPOOL 0086485565e6fae835f54a1bb00a40660650c6018a6e79e05ba15120a59a6552ba60d86bfd63f7bc5cd8b331984fcdbe7162ef24d257bcc18a7fd8e6c028dd80
DIST logutils-367a65d59043b4f846d179341d138f01f988c186.tar.gz 7704 SHA256 9b2173d9277574adbc45400101cb0b65534a5cd3defe62eeb3bff652eeb3e34c SHA512 9a4444fbae3bd1c0b2391981edf2f8155ebdd90a14a367f718bc7bcdced68b37b563ae38141fc3cb35409ff70820bd32b5a44cb218630418bce37f78181ef109 WHIRLPOOL 4973a7ef035807c9ef1135cface87cce4707910e6c33cece87dc8200df5e3d3c351d129ce20214e2cbf6bf58a7b040e9d1c5e12f5414cf37e45890a6a8ec439c
+DIST mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz 13977 SHA256 3b2873f0e7e7a37f1b809493717033c1257bf41a9996e336746d83556df68240 SHA512 f495fe99c8ce752830b3d36db445cdc32baac6e266a0862d13e7e80e04f412ae7ee85e13ba794f1cfae3effb226007874c8ee819a4ef568ce2884077dfba4f9c WHIRLPOOL e3cf27de3f414014f9f068f66540daeeb90e10d69196a117a1e3a06c02cd096f5d711657c19c8ffdc26bf6a399a45fb9f78e96e26335f788baf7695785b7b90f
DIST mapstructure-442e588f213303bec7936deba67901f8fc8f18b1.tar.gz 12220 SHA256 b4fa5d3b888734f849c5d6784fc1c5749e4ece168fda65c604676fca39c085d2 SHA512 de79f2579a086cccc047b280ae7e2b5dc5f8a95d504ead9d7f0cbaf01e70d37cb4eea8e7ab9aec446a7c2f1771152add3e2e488c18963d63ca3dac43ed2a33b7 WHIRLPOOL ecf8bd2bc9e50bb9e5ad3b6ebb04f5fdc10cf0e515f25d1381bbd1591c074887706b7c25f03a749ff212555fc537534056dab58eaece9357de9045ba2edd9a51
DIST reflectwalk-242be0c275dedfba00a616563e6db75ab8f279ec.tar.gz 4290 SHA256 70ccfe92748dcc9e23460f6cedaeb4dd3f4807cc76241298b954beb71448cce6 SHA512 50ceea50f26307903138d5a0e0c395863ae662993a58d2053fce79ca49b0a17f9ba863adcdf4053cd9eb6592c91de02671be486ec4693449439b2b634be55fc1 WHIRLPOOL 4f88fd9ea461838acbf1344be39e9ecc1494ac8ae060917e27f16a6e5b19833b41be23dd8c0638c22933991b802f2f6dfc72e0bb772828bb43b020a08f22f1b1
+DIST reflectwalk-eecf4c70c626c7cfbb95c90195bc34d386c74ac6.tar.gz 4270 SHA256 04326a06d49f75738857f07eea4e04ec5f72ef62232f24c0d5785464baba42bf SHA512 a8112877ca2743887d39e2d2a6074932455a4ee4d9a24301495018f504922079b50f43c65601eb459d0142faf2828551cf316123092d18581c6d0c92b05209ca WHIRLPOOL 22cfcdefb8d51e9ced65589e13e16b5fbed01cc0b5d6c9f1e38c88c1b9f3b656796503068f593d85c570dad3c41939ac4142aaf6a916a4b2c2a6015034e3d164
+DIST serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz 579000 SHA256 6c74d90b84c402c684e27a8948ba54074ad368ed121945d21b9c00135cdf7c74 SHA512 eced133c2ba261e4e39d16f2252f555611e90f23f70a746a6f8d60b24e6747e73e619ec74f10a1c0646ec5edfd731cd79f6700d9bc5fb7b100723aac32203a5f WHIRLPOOL eaa15ec8dcdfeeb490cea4e9af24c8507dba09583f5e02919fd71607bfed8c999f872d3c8dd818378f79ade5fd065e1c2e270dda8ff428848c409f7922196478
+DIST structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz 12276 SHA256 f9998ee9ab32a55cfa7a9f93a9439ee56fc146d8aff6601f06bb2048b71c381a SHA512 ae2f0bc1f9e1ddbf1bd32d5e50a2ffbc4841c17d451739aee7cbbe359abac982e98a00caaff2aa433d10aad4dc414ce17e94a1d0893610ff53c52beddb21dd4f WHIRLPOOL cc4063c7463e261a32a84c357c352141a91e4a88874c02acd6f91bc05f478e668b5ad7629a7473009cebe201a789854f295b22d56310d39d632d81d223baec65
+DIST uuid-2951e8b9707a040acdb49145ed9f36a088f3532e.tar.gz 6165 SHA256 4e1a23490fec052724bbf267133f7b0aee3ffe30837886721192cc3c8ca1349b SHA512 db60e435d0c2ab9a0a6f3417e264cfe3fbb4754a8606f1cfc24712c2b0161bf7282fc6ab7f0f9268194c0fc075a34291ee5ac45e286b6d24b3920706dd4f9faf WHIRLPOOL cb1f1ce863a287daf1e357a86490e8cd8cf2c440acfb6d20c9604b7927ac48b0e8c23965739cf411c3496bf1dba9ca870bc39b5858398939521d13a050b66573
+DIST vault-145041757cee09193b0d132b816f72bc1e846107.tar.gz 3129266 SHA256 9edac0b55e590346fd6e822b4bd798f0c0f917da6bfc28e1e10dd57c2df11403 SHA512 ac8af7de2fb25e8d31f1caad18060eba5f80f12d04f6e128a315126ed6e98c24971e567beb0a3b96934af6983ae6bdd9fa2e6650e87a416199922bcd80fc534e WHIRLPOOL 821aa1c883d8b7f1c6e310781895f782beefa5bf92f1602d538aa2f69fba73e8d1e176aa1f04697a37e4040b72a4d5cc995b81d847e6c4317e0bfcc2c65f6a1b
diff --git a/app-admin/consul-template/consul-template-0.12.2.ebuild b/app-admin/consul-template/consul-template-0.12.2.ebuild
new file mode 100644
index 000000000000..ab46d48dd0dd
--- /dev/null
+++ b/app-admin/consul-template/consul-template-0.12.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit golang-base systemd user
+
+KEYWORDS="~amd64"
+DESCRIPTION="Generic template rendering and notifications with Consul"
+EGO_PN="github.com/hashicorp/${PN}/..."
+HOMEPAGE="http://${EGO_PN%/*}"
+LICENSE="MPL-2.0"
+SLOT="0"
+IUSE="test"
+
+DEPEND=">=dev-lang/go-1.4:="
+RDEPEND=""
+
+SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/fatih/structs/archive/a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz -> structs-a924a2250d1033753512e95dce41dca3fd793ad9.tar.gz
+ https://github.com/go-yaml/yaml/archive/f7716cbe52baa25d2e9b0d0da546fcf909fc16b4.tar.gz -> go-yaml-v2-f7716cbe52baa25d2e9b0d0da546fcf909fc16b4.tar.gz
+ https://github.com/golang/sys/archive/58da1121af381632b48b2843aeb16299f2e1dc50.tar.gz -> go-sys-0_pre20150729.tar.gz
+ https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz
+ https://github.com/hashicorp/go-cleanhttp/archive/ce617e79981a8fff618bb643d155133a8f38db96.tar.gz -> go-cleanhttp-ce617e79981a8fff618bb643d155133a8f38db96.tar.gz
+ https://github.com/hashicorp/errwrap/archive/7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz -> errwrap-7554cd9344cec97297fa6649b055a8c98c2a1e55.tar.gz
+ https://github.com/hashicorp/go-multierror/archive/d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz -> go-multierror-d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5.tar.gz
+ https://github.com/hashicorp/go-reap/archive/2d85522212dcf5a84c6b357094f5c44710441912.tar.gz -> go-reap-2d85522212dcf5a84c6b357094f5c44710441912.tar.gz
+ https://github.com/hashicorp/go-syslog/archive/42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz -> go-syslog-42a2b573b664dbf281bd48c3cc12c086b17a39ba.tar.gz
+ https://github.com/hashicorp/hcl/archive/578dd9746824a54637686b51a41bad457a56bcef.tar.gz -> hcl-578dd9746824a54637686b51a41bad457a56bcef.tar.gz
+ https://github.com/hashicorp/logutils/archive/0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz -> logutils-0dc08b1671f34c4250ce212759ebd880f743d883.tar.gz
+ https://github.com/hashicorp/serf/archive/64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz -> serf-64d10e9428bd70dbcd831ad087573b66731c014b.tar.gz
+ https://github.com/hashicorp/vault/archive/145041757cee09193b0d132b816f72bc1e846107.tar.gz -> vault-145041757cee09193b0d132b816f72bc1e846107.tar.gz
+ https://github.com/mitchellh/mapstructure/archive/281073eb9eb092240d33ef253c404f1cca550309.tar.gz -> mapstructure-281073eb9eb092240d33ef253c404f1cca550309.tar.gz
+ test? (
+ https://github.com/armon/go-metrics/archive/345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz -> go-metrics-345426c77237ece5dab0e1605c3e4b35c3f54757.tar.gz
+ https://github.com/armon/go-radix/archive/4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz -> go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2.tar.gz
+ https://github.com/aws/aws-sdk-go/archive/v1.0.11.tar.gz -> aws-sdk-go-1.0.11.tar.gz
+ https://github.com/coreos/etcd/archive/5099bf6f7ab92181158cc2f0f0db1bb6056e9aeb.tar.gz -> etcd-5099bf6f7ab92181158cc2f0f0db1bb6056e9aeb.tar.gz
+ https://github.com/go-ini/ini/archive/v1.8.6.tar.gz -> go-ini-1.8.6.tar.gz
+ https://github.com/go-sql-driver/mysql/archive/v1.2.tar.gz -> go-sql-driver-mysql-1.2.tar.gz
+ https://github.com/hashicorp/consul/archive/v0.6.3.tar.gz -> consul-0.6.3.tar.gz
+ https://github.com/hashicorp/go-gatedio/archive/8b8de1022221dde1fb52fa25d0caab46e59c8c14.tar.gz -> go-gatedio-8b8de1022221dde1fb52fa25d0caab46e59c8c14.tar.gz
+ https://github.com/hashicorp/go-msgpack/archive/fa3f63826f7c23912c15263591e65d54d080b458.tar.gz -> go-msgpack-fa3f63826f7c23912c15263591e65d54d080b458.tar.gz
+ https://github.com/hashicorp/go-uuid/archive/36289988d83ca270bc07c234c36f364b0dd9c9a7.tar.gz -> go-uuid-36289988d83ca270bc07c234c36f364b0dd9c9a7.tar.gz
+ https://github.com/hashicorp/golang-lru/archive/5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz -> golang-lru-5c7531c003d8bf158b0fe5063649a2f41a822146.tar.gz
+ https://github.com/hashicorp/uuid/archive/2951e8b9707a040acdb49145ed9f36a088f3532e.tar.gz -> uuid-2951e8b9707a040acdb49145ed9f36a088f3532e.tar.gz
+ https://github.com/jmespath/go-jmespath/archive/0.2.2.tar.gz -> go-jmespath-0.2.2.tar.gz
+ https://github.com/mitchellh/copystructure/archive/6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz -> copystructure-6fc66267e9da7d155a9d3bd489e00dad02666dc6.tar.gz
+ https://github.com/mitchellh/reflectwalk/archive/eecf4c70c626c7cfbb95c90195bc34d386c74ac6.tar.gz -> reflectwalk-eecf4c70c626c7cfbb95c90195bc34d386c74ac6.tar.gz
+ https://github.com/samuel/go-zookeeper/archive/218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f.tar.gz -> go-zookeeper-218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f.tar.gz
+ )"
+
+STRIP_MASK="*.a"
+S="${WORKDIR}/src/${EGO_PN%/*}"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+get_archive_go_package() {
+ local archive=${1} uri x
+ case ${archive} in
+ go-sys-*) echo "sys-* golang.org/x/sys"; return;;
+ go-yaml-v2-*) echo "yaml-* gopkg.in/yaml.v2"; return;;
+ esac
+ for x in ${SRC_URI}; do
+ if [[ ${x} == http* ]]; then
+ uri=${x}
+ elif [[ ${x} == ${archive} ]]; then
+ break
+ fi
+ done
+ uri=${uri#https://}
+ uri=${uri%/archive/*}
+ echo "${uri##*/}-* ${uri}"
+}
+
+unpack_go_packages() {
+ local go_package pattern x
+ # Unpack packages to appropriate locations for GOPATH
+ for x in ${A}; do
+ unpack ${x}
+ go_package=$(get_archive_go_package ${x})
+ pattern=${go_package%% *}
+ go_package=${go_package##* }
+ mkdir -p src/${go_package%/*}
+ mv ${pattern} src/${go_package} || die
+ done
+}
+
+src_unpack() {
+ unpack_go_packages
+ export GOPATH=${WORKDIR}:$(get_golibdir_gopath)
+}
+
+src_prepare() {
+ # Avoid the need to have a git checkout
+ sed -e 's:^GIT.*::' \
+ -e 's:-ldflags.*:\\:' \
+ -i scripts/build.sh || die
+
+ # Create a writable GOROOT in order to avoid sandbox violations.
+ export GOROOT="${WORKDIR}/goroot"
+ cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+ rm -rf "${GOROOT}"/{src,pkg/$(go env GOOS)_$(go env GOARCH)}/"${EGO_PN%/*}" || die
+
+ # Prune conflicting libraries from GOROOT
+ while read -r -d '' x; do
+ x=${x#${WORKDIR}/src}
+ rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
+ done < <(find "${WORKDIR}/src" -maxdepth 3 -mindepth 3 -type d -print0)
+
+ # Disable tests that fail under network-sandbox
+ sed -e 's:TestRun_onceFlag(:_\0:' -i cli_test.go || die
+ sed -e 's:TestRunner_quiescence(:_\0:' -i runner_test.go || die
+}
+
+src_compile() {
+ go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+ go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_install() {
+ dobin "${WORKDIR}/bin/${PN}"
+ dodoc README.md
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ keepdir /etc/${PN}.d
+ insinto /etc/${PN}.d
+ doins "${FILESDIR}/"*.json.example
+}
diff --git a/app-admin/consul/consul-0.5.2-r1.ebuild b/app-admin/consul/consul-0.5.2-r1.ebuild
index f48f76037eda..e95e2e7a6b17 100644
--- a/app-admin/consul/consul-0.5.2-r1.ebuild
+++ b/app-admin/consul/consul-0.5.2-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit golang-base systemd user
+inherit git-r3 golang-base systemd user
GO_PN="github.com/hashicorp/consul"
@@ -100,7 +100,7 @@ src_unpack() {
cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
while read -r path; do
rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
- "${GOROOT}/pkg/linux_${ARCH}/${path#${WORKDIR}/src}" || die
+ "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die
done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
}
@@ -157,13 +157,13 @@ src_install() {
while read -r -d '' x; do
x=${x#${WORKDIR}/src}
- [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
- -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
+ [[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
+ -f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
rm -rf "${WORKDIR}"/src/${x}
done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
insopts -m0644 -p # preserve timestamps for bug 551486
- insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
- doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
+ insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+ doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
insinto /usr/lib/go/src/${GO_PN%/*}
doins -r "${WORKDIR}"/src/${GO_PN}
}
diff --git a/app-admin/consul/consul-0.6.3.ebuild b/app-admin/consul/consul-0.6.3.ebuild
index 99b94506fbbe..a2ff9c660b03 100644
--- a/app-admin/consul/consul-0.6.3.ebuild
+++ b/app-admin/consul/consul-0.6.3.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit golang-base systemd user
+inherit git-r3 golang-base systemd user
GO_PN="github.com/hashicorp/consul"
@@ -108,7 +108,7 @@ src_unpack() {
cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
while read -r path; do
rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
- "${GOROOT}/pkg/linux_${ARCH}/${path#${WORKDIR}/src}" || die
+ "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die
done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
}
@@ -129,7 +129,7 @@ src_prepare() {
}
src_compile() {
- PATH=${PATH}:${WORKDIR}/bin XC_ARCH=${ARCH} XC_OS=${KERNEL} emake
+ PATH=${PATH}:${WORKDIR}/bin XC_ARCH=$(go env GOARCH) XC_OS=$(go env GOOS) emake
}
src_install() {
@@ -158,13 +158,13 @@ src_install() {
while read -r -d '' x; do
x=${x#${WORKDIR}/src}
- [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
- -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
+ [[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
+ -f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
rm -rf "${WORKDIR}"/src/${x}
done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
insopts -m0644 -p # preserve timestamps for bug 551486
- insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
- doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
+ insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+ doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
insinto /usr/lib/go/src/${GO_PN%/*}
doins -r "${WORKDIR}"/src/${GO_PN}
}
diff --git a/app-admin/consul/consul-9999.ebuild b/app-admin/consul/consul-9999.ebuild
index bce86d8de781..deebbb42ff82 100644
--- a/app-admin/consul/consul-9999.ebuild
+++ b/app-admin/consul/consul-9999.ebuild
@@ -53,7 +53,7 @@ src_unpack() {
# Use latest versions of some packages, in case of incompatible
# API changes
rm -rf "${GOROOT}/src/${GO_PN%/*}" \
- "${GOROOT}/pkg/linux_${ARCH}/${GO_PN%/*}" || die
+ "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}" || die
# Fetch dependencies
emake deps
@@ -61,7 +61,7 @@ src_unpack() {
# Avoid interference from installed instances
while read -r path; do
rm -rf "${GOROOT}/src/${path#${WORKDIR}/src}" \
- "${GOROOT}/pkg/linux_${ARCH}/${path#${WORKDIR}/src}" || die
+ "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${path#${WORKDIR}/src}" || die
done < <(find "${WORKDIR}"/src -maxdepth 3 -mindepth 3 -type d)
}
@@ -112,13 +112,13 @@ src_install() {
while read -r -d '' x; do
x=${x#${WORKDIR}/src}
- [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
- -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
+ [[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
+ -f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
rm -rf "${WORKDIR}"/src/${x}
done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
insopts -m0644 -p # preserve timestamps for bug 551486
- insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
- doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
+ insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+ doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
insinto /usr/lib/go/src/${GO_PN%/*}
doins -r "${WORKDIR}"/src/${GO_PN}
}
diff --git a/app-admin/emacs-updater/metadata.xml b/app-admin/emacs-updater/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-admin/emacs-updater/metadata.xml
+++ b/app-admin/emacs-updater/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch b/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
index 6f833116f937..f06070f4beee 100644
--- a/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
+++ b/app-admin/fsvs/files/fsvs-1.2.5-as-needed.patch
@@ -2,8 +2,8 @@ Fixes --as-needed support(bug #294834)
Verbose build
Fixes underlinking(bug #463684) - patch went upstream
---- src/Makefile.in.orig 2011-11-11 22:19:12.000000000 +0400
-+++ src/Makefile.in 2013-08-19 13:30:16.186082295 +0400
+--- fsvs-1.2.5/src/Makefile.in.orig 2011-11-11 22:19:12.000000000 +0400
++++ fsvs-1.2.5/src/Makefile.in 2013-08-19 13:30:16.186082295 +0400
@@ -18,7 +18,7 @@
CFLAGS := @CFLAGS@ @NEED_FNESTED_FUNCTIONS@
CFLAGS += -Wall -funsigned-char -Os -DFSVS_VERSION='"$(VERSION)"'
diff --git a/app-admin/fsvs/fsvs-1.2.5-r2.ebuild b/app-admin/fsvs/fsvs-1.2.5-r2.ebuild
new file mode 100644
index 000000000000..feef5d4335f2
--- /dev/null
+++ b/app-admin/fsvs/fsvs-1.2.5-r2.ebuild
@@ -0,0 +1,61 @@
+# 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="Backup/restore for subversion backends"
+HOMEPAGE="http://fsvs.tigris.org/"
+SRC_URI="http://download.fsvs-software.org/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-vcs/subversion
+ dev-libs/libpcre
+ sys-libs/gdbm
+ dev-libs/apr-util
+ dev-util/ctags"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-as-needed.patch"
+)
+
+src_prepare() {
+ # fix #570596 by restoring pre-GCC5 inline semantics
+ append-cflags -std=gnu89
+ default
+}
+
+src_compile() {
+ # respect compiler
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin src/fsvs
+ dodir /etc/fsvs
+ keepdir /var/spool/fsvs
+ doman doc/*5 doc/*1
+ dodoc doc/{FAQ,IGNORING,PERFORMANCE,USAGE}
+}
+
+pkg_postinst() {
+ elog "Remember, this system works best when you're connecting to a remote"
+ elog "svn server."
+ elog
+ elog "Go to the base path for versioning:"
+ elog " cd /"
+ elog "Tell fsvs which URL it should use:"
+ elog " fsvs url svn+ssh://username@machine/path/to/repos"
+ elog "Define ignore patterns - all virtual filesystems (/proc, /sys, etc.),"
+ elog "and (assuming that you're in / currently) the temporary files in /tmp:"
+ elog " fsvs ignore DEVICE:0 ./tmp/*"
+ elog "And you're ready to play!"
+ elog "Check your data in:"
+ elog " fsvs commit -m \"First import\""
+}
diff --git a/app-admin/glance/glance-11.0.1.ebuild b/app-admin/glance/glance-11.0.1.ebuild
index c875e4f7db38..95dad05169b3 100644
--- a/app-admin/glance/glance-11.0.1.ebuild
+++ b/app-admin/glance/glance-11.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc mysql postgres +sqlite +swift test"
REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/app-admin/ulogd/ulogd-2.0.5-r4.ebuild b/app-admin/ulogd/ulogd-2.0.5-r4.ebuild
new file mode 100644
index 000000000000..9c28d08340ac
--- /dev/null
+++ b/app-admin/ulogd/ulogd-2.0.5-r4.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils flag-o-matic linux-info readme.gentoo-r1 systemd user
+
+DESCRIPTION="A userspace logging daemon for netfilter/iptables related logging"
+HOMEPAGE="https://netfilter.org/projects/ulogd/index.html"
+SRC_URI="
+ https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2
+ ftp://ftp.netfilter.org/pub/${PN}/${P}.tar.bz2
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog"
+
+RDEPEND="
+ || ( net-firewall/iptables net-firewall/nftables )
+ >=net-libs/libnfnetlink-1.0.1
+ dbi? ( dev-db/libdbi )
+ json? ( dev-libs/jansson )
+ nfacct? (
+ >=net-libs/libmnl-1.0.3
+ >=net-libs/libnetfilter_acct-1.0.1
+ )
+ nfct? ( >=net-libs/libnetfilter_conntrack-1.0.2 )
+ nflog? ( >=net-libs/libnetfilter_log-1.0.0 )
+ mysql? ( virtual/mysql )
+ pcap? ( net-libs/libpcap )
+ postgres? ( dev-db/postgresql:= )
+ sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${RDEPEND}
+ doc? (
+ app-text/linuxdoc-tools
+ app-text/texlive-core
+ virtual/latex-base
+ )
+"
+
+DOCS=( AUTHORS README TODO )
+
+PATCHES=( "${FILESDIR}/${P}-remove-db-automagic.patch" )
+
+DOC_CONTENTS="
+ You must have at least one logging stack enabled to make ulogd work.
+ Please edit example configuration located at /etc/ulogd.conf
+"
+
+pkg_setup() {
+ enewgroup ulogd
+ enewuser ulogd -1 -1 /var/log/ulogd ulogd
+
+ linux-info_pkg_setup
+
+ if kernel_is lt 2 6 14; then
+ die "ulogd requires kernel newer than 2.6.14"
+ fi
+
+ if kernel_is lt 2 6 18; then
+ ewarn "You are using kernel older than 2.6.18"
+ ewarn "Some ulogd features may be unavailable"
+ fi
+
+ if use nfacct && kernel_is lt 3 3 0; then
+ ewarn "NFACCT input plugin requires kernel newer than 3.3.0"
+ fi
+
+ if use ulog && kernel_is gt 3 17 0; then
+ ewarn "ULOG target was removed since 3.17.0 kernel release"
+ ewarn "Consider enabling NFACCT, NFCT or NFLOG support"
+ fi
+}
+
+src_prepare() {
+ # - make all logs to be kept in a single dir /var/log/ulogd
+ # - place sockets in /run instead of /tmp
+ sed -i \
+ -e 's%var/log%var/log/ulogd%g' \
+ -e 's%tmp%run%g' \
+ ulogd.conf.in || die
+
+ append-lfs-flags
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_with dbi)
+ $(use_with json jansson)
+ $(use_enable nfacct)
+ $(use_enable nfct)
+ $(use_enable nflog)
+ $(use_with mysql)
+ $(use_with pcap)
+ $(use_with postgres pgsql)
+ $(use_with sqlite)
+ $(use_enable ulog)
+ )
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+
+ if use doc; then
+ # Prevent access violations from bitmap font files generation
+ export VARTEXFONTS="${T}"/fonts
+ emake -C doc
+ fi
+}
+
+src_install() {
+ autotools-utils_src_install
+ prune_libtool_files --modules
+ readme.gentoo_create_doc
+
+ if use doc; then
+ dohtml doc/${PN}.html
+ dodoc doc/${PN}.{dvi,ps,txt}
+ fi
+
+ use mysql && dodoc doc/mysql-*.sql
+ use postgres && dodoc doc/pgsql-*.sql
+ use sqlite && dodoc doc/sqlite3.table
+
+ doman ${PN}.8
+
+ insinto /etc
+ doins "${BUILD_DIR}/${PN}.conf"
+ fowners root:ulogd /etc/${PN}.conf
+ fperms 640 /etc/${PN}.conf
+
+ newinitd "${FILESDIR}/${PN}.init" ${PN}
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ diropts -o ulogd -g ulogd
+ keepdir /var/log/ulogd
+}
+
+pkg_postinst() {
+ readme.gentoo_print_elog
+}
diff --git a/app-admin/vault/Manifest b/app-admin/vault/Manifest
index 9b5f8e0d029e..72df6cfc6ccd 100644
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@@ -1,3 +1,4 @@
DIST gox-0.3.0.tar.gz 13735 SHA256 29dc6b689f670a5444cc54cd9111549ccb01501901bc9197d0e1325a35157802 SHA512 cbc737a780403d1233af10a85b30676e0fcfbfbe99a740d0eff69bef4fd557c65d102c43b3b0dde0b8b935967be8cb33fab50d2baf481d27fa53285be6b1aef2 WHIRLPOOL f3a10a965c4cfe0707bad2f8307162564b00d2b0279d61311445714f28a17d97a4ee4d5a442a7aaaf25b9f44eff656a8b84485bdb0e5776cc7a1014350cff216
DIST iochan-b584a329b193e206025682ae6c10cdbe03b0cd77.tar.gz 1110 SHA256 27aa65991036fe736d3c383378e49758097f5a11a20b40f44cc434eac97659f7 SHA512 a4314506416d6ab84c9cd96aeadc8d08c88df8f2a146b1e6a51e5f756c2e2409f39adf274487998d0229a46d81b2d0899717064459966f4dbfa5571cc9e85400 WHIRLPOOL 9fd40b227de5452642696326b0b0a66d95e2ddf738a1b6e7e712e201101bb84cc854161609836cae82515ba95ba1e5efd331ce68abdf79c654a9d7a874f849f3
DIST vault-0.1.2.tar.gz 1158880 SHA256 b8d56f1ebd11f5d80a6a6728b6c9ac399c7e507e3e9fe8830966be50ba15d1b3 SHA512 49488d4fac62521e485a623a3f5fa384643e84bb9aff616efec2169d84731f9892b5ffa1ae475ce905032f6f8e816a372535bc328daf4ee5caf0344a3cd2e9bc WHIRLPOOL f1d678145fad5b8a988dacb8aabf02394a81b267aeabdd2a2968c0efc9576997e980800fe0f08fb70d2f6052fce5d9d94c6d46ee0b50d97ca68b404a78c2c381
+DIST vault-0.4.1.tar.gz 2108269 SHA256 e986424d9bb0ace5450e8ed576d102f1d2d3a9d2d4c2046710aa55464a9fc296 SHA512 5b46e7f28e4b79f48bdc03ee65177a2cc3e10b71a05f34bb78f9c00ee6b4249447c39f3830ce5bfa7a8289fad5fa532420f769c21bfc33168cfed86bacc228f5 WHIRLPOOL 5b5d65931dcb381f659fa423765783a78f812420c4de29102a50da8d7215fb96e34de39f407917a12a7aa21c3bbc01c751df278676aaefdd620edf6910949dbc
diff --git a/app-admin/vault/vault-0.1.2-r1.ebuild b/app-admin/vault/vault-0.1.2-r1.ebuild
index c30bcd2fda19..558bf59e87e8 100644
--- a/app-admin/vault/vault-0.1.2-r1.ebuild
+++ b/app-admin/vault/vault-0.1.2-r1.ebuild
@@ -53,7 +53,7 @@ src_unpack() {
export GOPATH=${WORKDIR}:${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace:$(get_golibdir_gopath)
while read -r -d '' x; do
- rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/${KERNEL}_${ARCH}/${x}"{,.a} || die
+ rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
done < <(find "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src" -maxdepth 3 -mindepth 3 -type d -print0)
mkdir -p "${GOROOT}/src/github.com/mitchellh" || die
@@ -97,13 +97,13 @@ src_install() {
while read -r -d '' x; do
x=${x#${WORKDIR}/src}
- [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
- -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
+ [[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
+ -f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
rm -rf "${WORKDIR}"/src/${x}
done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
insopts -m0644 -p # preserve timestamps for bug 551486
- insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
- doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
+ insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+ doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
insinto /usr/lib/go/src/${GO_PN%/*}
doins -r "${WORKDIR}"/src/${GO_PN}
}
diff --git a/app-admin/vault/vault-0.4.1.ebuild b/app-admin/vault/vault-0.4.1.ebuild
new file mode 100644
index 000000000000..98fbc4e8b747
--- /dev/null
+++ b/app-admin/vault/vault-0.4.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils fcaps golang-build systemd user
+
+EGO_PN="github.com/hashicorp/${PN}/..."
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/go-oauth2:="
+RDEPEND=""
+
+STRIP_MASK="*.a"
+
+S="${WORKDIR}/${P}"
+
+FILECAPS=(
+ -m 755 'cap_ipc_lock=+ei' usr/bin/${PN}
+)
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_unpack() {
+ local x
+
+ default
+ mv "${S}" "${S}_"
+ mkdir -p "$(dirname "${S}/src/${EGO_PN%/*}")" || die
+ mv "${S}_" "${S}/src/${EGO_PN%/*}" || die
+
+ # Create a writable GOROOT in order to avoid sandbox violations.
+ export GOROOT="${WORKDIR}/goroot"
+ cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
+ rm -rf "${GOROOT}"/{src,pkg/$(go env GOOS)_$(go env GOARCH)}/"${EGO_PN%/*}" || die
+
+ export GOPATH=${S}:${S}/src/github.com/hashicorp/vault/Godeps/_workspace:$(get_golibdir_gopath)
+
+ while read -r -d '' x; do
+ rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
+ done < <(find "${P}/src/github.com/hashicorp/vault/Godeps/_workspace/src" -maxdepth 3 -mindepth 3 -type d -print0)
+}
+
+src_compile() {
+ go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+ go install -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_install() {
+ local x
+
+ newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+ newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ keepdir /etc/${PN}.d
+ insinto /etc/${PN}.d
+ doins "${FILESDIR}/"*.json.example
+
+ keepdir /var/log/${PN}
+ fowners ${PN}:${PN} /var/log/${PN}
+
+ dobin "${S}/bin/${PN}"
+
+ find "${S}"/src/${EGO_PN%/*} -mindepth 1 -maxdepth 1 -type f -delete || die
+
+ while read -r -d '' x; do
+ x=${x#${S}/src}
+ [[ -d ${S}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
+ -f ${S}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
+ rm -rf "${S}"/src/${x}
+ done < <(find "${S}"/src/${EGO_PN%/*} -mindepth 1 -maxdepth 1 -type d -print0)
+ insopts -m0644 -p # preserve timestamps for bug 551486
+ insinto $(dirname /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*})
+ doins -r "${S}"/pkg/$(go env GOOS)_$(go env GOARCH)/${EGO_PN%/*}
+ insinto $(dirname /usr/lib/go/src/${EGO_PN%/*})
+ doins -r "${S}"/src/${EGO_PN%/*}
+}
diff --git a/app-admin/vault/vault-9999.ebuild b/app-admin/vault/vault-9999.ebuild
index ef7e7b59b029..4c8a514f461e 100644
--- a/app-admin/vault/vault-9999.ebuild
+++ b/app-admin/vault/vault-9999.ebuild
@@ -51,7 +51,7 @@ src_unpack() {
export GOPATH=${WORKDIR}:${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace:$(get_golibdir_gopath)
while read -r -d '' x; do
- rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/${KERNEL}_${ARCH}/${x}"{,.a} || die
+ rm -rf "${GOROOT}/src/${x}" "${GOROOT}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}"{,.a} || die
done < <(find "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src" -maxdepth 3 -mindepth 3 -type d -print0)
rm -rf "${WORKDIR}/src/github.com/hashicorp/vault/Godeps/_workspace/src/github.com/awslabs"
@@ -93,13 +93,13 @@ src_install() {
while read -r -d '' x; do
x=${x#${WORKDIR}/src}
- [[ -d ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x} ||
- -f ${WORKDIR}/pkg/${KERNEL}_${ARCH}/${x}.a ]] && continue
+ [[ -d ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x} ||
+ -f ${WORKDIR}/pkg/$(go env GOOS)_$(go env GOARCH)/${x}.a ]] && continue
rm -rf "${WORKDIR}"/src/${x}
done < <(find "${WORKDIR}"/src/${GO_PN} -mindepth 1 -maxdepth 1 -type d -print0)
insopts -m0644 -p # preserve timestamps for bug 551486
- insinto /usr/lib/go/pkg/${KERNEL}_${ARCH}/${GO_PN%/*}
- doins -r "${WORKDIR}"/pkg/${KERNEL}_${ARCH}/${GO_PN}
+ insinto /usr/lib/go/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN%/*}
+ doins -r "${WORKDIR}"/pkg/$(go env GOOS)_$(go env GOARCH)/${GO_PN}
insinto /usr/lib/go/src/${GO_PN%/*}
doins -r "${WORKDIR}"/src/${GO_PN}
}
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index bea749ee1b2b..648084c15dfa 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,4 +1,4 @@
DIST cdrtools-3.01a17.tar.bz2 2061522 SHA256 3d613965b213ad83e4be0ba2535e784901839ea4d11a20a2beb6765f0eb76dfa SHA512 34a0579c536028b030cf828441ad55a705472646bc3a1ae962aad234fbe0b12c2bcb670511487c17086f5ba7643d1b8ae42a4a86bfe2940dc94f9744377daa8b WHIRLPOOL b718d559e0b36a576a42a38f84b3917891450d0bbab47b084eb1e906a396cf28ce47b79fd16565d4e0697311ee0c3d5abdd95b52ba2d7ae4e9f32d9b26bc26e1
DIST cdrtools-3.01a24.tar.bz2 2075400 SHA256 4d9907b84f5b65dc6ca278b6202b90b8eb68652b01aa4dda978ffede8bdd4a5b SHA512 19be30de77fca00bb06fa6325149421304c1d5ff7d40a9d842496058494fcf0e798678c661ff3ae9ebc9e4c5971917f7aabfd813a6d88ff863d7e2e5f1456766 WHIRLPOOL 4533288dffef2b702eeef2a44fd702aff3e66283d5d90c810eb177ee4f1f1aa7cfd75238bf1f2a406e9b8ccaa43c7a77fb401825f8ce806e73fdc80abcc0a45a
-DIST cdrtools-3.01a31.tar.bz2 2097584 SHA256 183b5c12777779e78d8b69461aae52401f863768e7e7391d60730006f8cadc5a SHA512 455d7f3e1f4bbe79bb53f2fba4a8d5d8737eef8ce477a447d8687282dd2404a93cab07da1141292f8c26dd70963a26901486448db3c6a70a89aad47908fdf81c WHIRLPOOL 7a70464254645a0ce9ffaafbdb14a6ebb53a638310748a22c4a20c904059c92df746997fbd9b07d9a16876917bfd3b8b318acc5cd5494eac5e6b5d0ef66215e9
DIST cdrtools-3.02a02.tar.bz2 2096499 SHA256 b5c33d6cfbe265806f24f365bdb885dfe35194ef716f4b6f809b4377ec159c05 SHA512 f61241006464b7055994ee040ec498e4cd47254501e55ea1e570a7ebc9db1422b46b47398373f7227904bcf6cc785fa1c8ae913cbb297cf839250ceccea18330 WHIRLPOOL 757c80f9b05697f0479edea61b74d2bc2c945f292fcef04ab3a41dda14d096881751d0e9b796b8ad73e227336a295c97182a91e37c48372718440509bbc2bfb7
+DIST cdrtools-3.02a05.tar.bz2 2115386 SHA256 4c79ae080c334854ee8ea04a2e36e15f15709d8c3da2df22e818ab91639b6bba SHA512 86dadff90da5a90340d6c0f06367d0285e180fddc98fd009b8d18b67c6d81895359ee9293c38036ccfbbf479e8ea73225da8149dffb4cddb919c85226a63ddea WHIRLPOOL c5b9b9e694b1e69d0bd172d6976ac7c55cf1864d7eb32f86d867d6f75cad5eb971efd11056274790551eb24fbb0d500edaf7dd1e50c90cf9534b441226360723
diff --git a/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild
index 8a54b5f1043b..17f064ca8bbf 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha17.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha17.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-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild b/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
index fa531ad3e816..1a2dcec4d88c 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha24.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.01_alpha24.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-cdr/cdrtools/cdrtools-3.02_alpha02.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha02.ebuild
index 4e86b4bb4d32..8dd03a2ec8ab 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha02.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha02.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-cdr/cdrtools/cdrtools-3.01_alpha31.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha05.ebuild
index ddb0da5d7245..8dd03a2ec8ab 100644
--- a/app-cdr/cdrtools/cdrtools-3.01_alpha31.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha05.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$
@@ -84,10 +84,6 @@ src_prepare() {
sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
rules.cnf || die "sed rules.cnf"
- # Add support for arm64
- ln -sf i586-linux-cc.rul aarch64-linux-cc.rul
- ln -sf i586-linux-gcc.rul aarch64-linux-gcc.rul
-
# Schily make setup.
cd "${S}"/DEFAULTS
local os=$(cdrtools_os)
diff --git a/app-crypt/gkeys-gen/Manifest b/app-crypt/gkeys-gen/Manifest
index 41a87f4eb367..1c16ea9070ca 100644
--- a/app-crypt/gkeys-gen/Manifest
+++ b/app-crypt/gkeys-gen/Manifest
@@ -1 +1 @@
-DIST gkeys-gen-0.1.tar.bz2 18480 SHA256 c6ef23e3b1cc9f62cb094ee94067e7d01d43099c4d9941efc9ce3017698430a6 SHA512 3f9c7ba977912ce23f12a1a08421c4fd0d461444b17fa5d2d6e6980c550f19064c489921bac108fa6fe5af4064e1dd21e88426251008c5c019ee2a117dc4725a WHIRLPOOL 586e31d071ac5ba9edf159d472657eebe82f442fefa35ed5af08cfcfa477818b06f80cfbb67be9c472841ee97293bbff6bfff8ec6c30e6385e1db02391bc7f6d
+DIST gkeys-gen-0.2.tar.bz2 19160 SHA256 7e5c77a48d735014ba8f0ec70b85dfdd555dedacebfeb25b08c28c6018bce60a SHA512 ca46d8cc32f80ac98dfafc0b6ab3e543dc0cb4ee6db2938917d4c6f4fada980996e1ddd48f3ffe563893b973b5763e7016a66f67d4a2f8eb57ee227b1e71a1c2 WHIRLPOOL c7025f3697556cbe40b3ff18eac8ce608409e82388ef37e82da181fc15cd2c29713e6b823b1822e22b1273012fd0edea976196a7290853a8d9bcd68bfe41820d
diff --git a/app-crypt/gkeys-gen/gkeys-gen-0.1-r1.ebuild b/app-crypt/gkeys-gen/gkeys-gen-0.2.ebuild
index e4e49df2d0c2..a5b69e0236f6 100644
--- a/app-crypt/gkeys-gen/gkeys-gen-0.1-r1.ebuild
+++ b/app-crypt/gkeys-gen/gkeys-gen-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}
app-crypt/gnupg
dev-python/snakeoil[${PYTHON_USEDEP}]
dev-python/pygpgme[${PYTHON_USEDEP}]
- =app-crypt/gkeys-0.1*[${PYTHON_USEDEP}]
+ =app-crypt/gkeys-0.2*[${PYTHON_USEDEP}]
"
pkg_postinst() {
diff --git a/app-crypt/gkeys/Manifest b/app-crypt/gkeys/Manifest
index 9d9030f31546..76110535d798 100644
--- a/app-crypt/gkeys/Manifest
+++ b/app-crypt/gkeys/Manifest
@@ -1 +1 @@
-DIST gkeys-0.1.tar.bz2 40987 SHA256 b1e99873d1f966837eeb83b82d9289f6a6414de5a8467586b88d466800528524 SHA512 7da21ffc652ae95b308c8e8cd57754ad45b9414626b95d38b69867704df5def0a18cdb25934962e4a6109feeddbd1bbd8ac47f445b2977a869993b00771e79c5 WHIRLPOOL adc258dbc7955bf05f31106d16d1d4bd247517bd16d5562f1757e14a274d69c05b6749d83a94029caadd3704003f18cf8ca0e5985d6fbd498204ef36c91c4950
+DIST gkeys-0.2.tar.bz2 47726 SHA256 5e890992e5992ab168b34d9a731b75b2638ab35cf466b1c7615725a3b19646cc SHA512 0c594b5f451329e5e85998bb96243812e0c6e7ef7fa4db0f276a870148adffcf41acc31631fb28c44c473690f154e130ddcb10b986d4546ca19e2cc8cda95036 WHIRLPOOL 458c38e97cd3dccf3eec834bc0e7ead5a2b83e148999b087940dd66accf178bb2ee1c4daceecdcf8f79469fc69c1313cdbbe00f1ddb9defb0b676ce1c794e0ac
diff --git a/app-crypt/gkeys/gkeys-0.1-r1.ebuild b/app-crypt/gkeys/gkeys-0.2.ebuild
index ea69bc30b8b6..0e78a860bab3 100644
--- a/app-crypt/gkeys/gkeys-0.1-r1.ebuild
+++ b/app-crypt/gkeys/gkeys-0.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"
-PYTHON_COMPAT=(python{2_7,3_3,3_4})
+PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5})
inherit distutils-r1
@@ -21,8 +21,8 @@ KEYWORDS="~amd64 ~arm ~x86"
DEPEND=""
RDEPEND="${DEPEND}
app-crypt/gnupg
- >=dev-python/pyGPG-0.1[${PYTHON_USEDEP}]
- >=dev-python/ssl-fetch-0.3[${PYTHON_USEDEP}]
+ >=dev-python/pyGPG-0.2[${PYTHON_USEDEP}]
+ >=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
dev-python/snakeoil[${PYTHON_USEDEP}]
>=app-crypt/gentoo-keys-201501052117
"
@@ -38,8 +38,6 @@ pkg_preinst() {
}
pkg_postinst() {
- einfo "Fetching Gentoo Developer seed file..."
- gkeys fetch-seed -C gentoo-devs || die "Unable to fetch seeds"
einfo "This is experimental software."
einfo "The API's it installs should be considered unstable"
einfo "and are subject to change."
diff --git a/app-crypt/keybase/keybase-0.8.25.ebuild b/app-crypt/keybase/keybase-0.8.25.ebuild
index 644ff738ea67..22ca86a5b7ad 100644
--- a/app-crypt/keybase/keybase-0.8.25.ebuild
+++ b/app-crypt/keybase/keybase-0.8.25.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/keybase/node-client/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
RDEPEND="
diff --git a/app-doc/casting-spels-emacs/metadata.xml b/app-doc/casting-spels-emacs/metadata.xml
index b81c3b2a076a..39488bbc3dc0 100644
--- a/app-doc/casting-spels-emacs/metadata.xml
+++ b/app-doc/casting-spels-emacs/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Ever wonder what makes Lisp so powerful? Now you can find out for yourself -
And you can do it right inside your GNU Emacs text editor! If you've spent
diff --git a/app-doc/elisp-manual/metadata.xml b/app-doc/elisp-manual/metadata.xml
index b47e13bb88ac..fe3660e451d1 100644
--- a/app-doc/elisp-manual/metadata.xml
+++ b/app-doc/elisp-manual/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Most of the GNU Emacs text editor is written in the programming language
called Emacs Lisp. You can write new code in Emacs Lisp and install it as an
diff --git a/app-editors/e3/metadata.xml b/app-editors/e3/metadata.xml
index ddec4ff80d90..52ffbf8545d5 100644
--- a/app-editors/e3/metadata.xml
+++ b/app-editors/e3/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
e3 is a full-screen, user-friendly text editor with an interface similar to
that of either WordStar, Emacs, Pico, Nedit, or vi. It's heavily optimized
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index 88ecff51f01c..c5e623f1989b 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
GNU Emacs is an extensible, customizable text editor - and more. At its core
is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 88ecff51f01c..c5e623f1989b 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
GNU Emacs is an extensible, customizable text editor - and more. At its core
is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
diff --git a/app-editors/emact/metadata.xml b/app-editors/emact/metadata.xml
index f0b7b2b3c64c..1bb638a7aa07 100644
--- a/app-editors/emact/metadata.xml
+++ b/app-editors/emact/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
This product is an original development made to provide an emacs-like editor
on the PC for the purpose of writing Lisp code with the same features found
diff --git a/app-editors/ersatz-emacs/metadata.xml b/app-editors/ersatz-emacs/metadata.xml
index 21a5d93d303f..28debfc51377 100644
--- a/app-editors/ersatz-emacs/metadata.xml
+++ b/app-editors/ersatz-emacs/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
Ersatz Emacs is a very minimal imitation of the famous GNU Emacs editor.
Unlike most popular Emacs derivatives, Ersatz strives to use as little
diff --git a/app-editors/fe/metadata.xml b/app-editors/fe/metadata.xml
index f2371402a162..d9eb40b9481a 100644
--- a/app-editors/fe/metadata.xml
+++ b/app-editors/fe/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
Fe is a small and easy to use folding editor.
diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
index 41f05f7d19e1..7994411b4cc1 100644
--- a/app-editors/gvim/Manifest
+++ b/app-editors/gvim/Manifest
@@ -1,6 +1,6 @@
DIST vim-7.4.1089.tar.gz 12548552 SHA256 e52f7653a36b690441b47a273b1db72f0eb1e5f6729af25110a84088ca73e872 SHA512 0fca208152b3c33cebfba4c2a33a6e59643a8c2650863b56b5a5c1863eb20238c412453d9e53cf75feaef8a5ef8aa8b33b601670e39c1b3effc02ed193bbd91f WHIRLPOOL 87f61548b29755ab1a90999af99c46fc649589e6d2e132623c04a2fa24400738255648a43d79192b2b6eb2b34ed49dd8d439e65870025983738247368f2f8598
DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
-DIST vim-7.4.769.tar.gz 12189506 SHA256 d9b9c3af27161545a1e086e1ee9485432c0b1a792a1a59755f04ef94136c5042 SHA512 ce3917cc68dba8b69696eb43436f90347c68a687f1e8c4b2f15f4a232ff7ce1a581a61737042ec49548d78c5f010e55e4c40b051b1a2574bbc27146a9249f15c WHIRLPOOL 230304892e501ef9851bf9f0c9fc9c888bfe1ad2cd703bcd62c449866e28308027c37c7ed466966951ec9c5feb5d9ec82e843528861212cb40a5bf4cec6e8947
+DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c
DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed
DIST vim-7.4.827.tar.gz 12203128 SHA256 8920db8115c78d260abbb2757ebf0e1e64d6e2f989626435fffad1ef37a9760f SHA512 e055b71afdde347a45d78ff10a672be8b92d00dc0215febe39db8a0b44474a92b40f728cbbdbb2ceefbe6fa08683eed549880e07e6e97dd44c994b7f669a8e6a WHIRLPOOL e86e3b203c29ffd9b0b6536b7a997377bd0914cdb4f2b8775a4ae1fae2ab44f54b6c007e0d1bb08d8272aa8da596577729a9f004e7cf1f4914bf55c402b468e5
DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
diff --git a/app-editors/gvim/gvim-7.4.769.ebuild b/app-editors/gvim/gvim-7.4.769.ebuild
index 5edb54849968..238a3f202d28 100644
--- a/app-editors/gvim/gvim-7.4.769.ebuild
+++ b/app-editors/gvim/gvim-7.4.769.ebuild
@@ -8,14 +8,12 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} )
PYTHON_REQ_USE=threads
inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 prefix python-r1
-MY_PV=${PV//./-}
-
if [[ ${PV} == 9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/vim/vim.git"
- EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${MY_PV}
+ EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
else
- SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz -> vim-${PV}.tar.gz
+ SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
fi
@@ -77,7 +75,7 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
"
-S=${WORKDIR}/vim-${MY_PV}
+S=${WORKDIR}/vim-${PV}
pkg_setup() {
# people with broken alphabets run into trouble. bug 82186.
diff --git a/app-editors/jasspa-microemacs/metadata.xml b/app-editors/jasspa-microemacs/metadata.xml
index 4f5375ba4582..35a586253dba 100644
--- a/app-editors/jasspa-microemacs/metadata.xml
+++ b/app-editors/jasspa-microemacs/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
* An Emacs editor biased towards UNIX users, working across platforms by
providing a consistent interface under UNIX, Microsoft Windows '95/'98/NT
diff --git a/app-editors/jed/metadata.xml b/app-editors/jed/metadata.xml
index 36be58a2be04..47f4effcefc6 100644
--- a/app-editors/jed/metadata.xml
+++ b/app-editors/jed/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
Jed is a powerful editor, terminal and X11 interface. Color syntax
highlighting is one of its strong suits, along with emulation of GNU Emacs,
diff --git a/app-editors/jove/metadata.xml b/app-editors/jove/metadata.xml
index 5c7a37a88b60..2821cca37db3 100644
--- a/app-editors/jove/metadata.xml
+++ b/app-editors/jove/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
Jove is a compact, powerful, Emacs-style text-editor. It provides the common
emacs keyboard bindings, together with a reasonable assortment of the most
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index 59d457bd8e9f..b7b8243b9364 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,3 +1,4 @@
DIST mg-20110905.tar.gz 138805 SHA256 1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229 SHA512 b490a5a3526d35839353e138f33ac924c5afbbf7e5c9faa20ceccb82e1dc1e6a3f0726b32bac7d43dcf8a410b1b8525067da5557cf669c52a9e32d1d2f45a8a4 WHIRLPOOL 64dd179462a8c9e53946c756a4975ffd2e5bf1758a300fa699032542a6e2470f9ed03f9fe1a88ac441cf17ac20c2575f9b6c5c1c396c5a7915564fbedfb1c854
DIST mg-20150323.tar.gz 142105 SHA256 d71b24d47d3e1426f162e446d92dfa457df96dd47c1289419cba9fd14c2c3afb SHA512 747a04c203509cdbe84d9cea6c5be93585cdd5cb855b556ea5dee273a2923a4a68bee3f952cf92d584fcdd682049cb4442c21888304ba036851127174457351f WHIRLPOOL bdba74b62034a6613434fc3efea7b56fa1599b6059ab97dbd760b013be7dc50ab13dfcee3f5fb1f41f4c26c3f0146583680134d3809ec7977a14a28cb345c6db
DIST mg-20160115.tar.gz 145374 SHA256 968c212d720b76d42cf1b42806ca3c7ca9f7b72b06f16171694a9fc50ef8db77 SHA512 afe75f7c453552dd6ce65772a82155e328f7a4557072b5a1d5dca031a3d4e1e524bfeac2fdc8c76de9cb337770a77f71f96cc762db29518408579fccb25e1d71 WHIRLPOOL a647e999ae6cffe53fb17d460398b2967968a6f2de62db503eeb79f449d720836c0efb997ac70033a9c0b0ca1fb74c3096d370b45dcca3a4c6bf5c587bb68016
+DIST mg-20160118.tar.gz 144823 SHA256 26450b2564bec0b0afc465fd24a1917dc31508c5500c3a36823b9c763a2b8636 SHA512 ed4805d27a7a16b931767ab3af084491d219b6262ce18b43af019eb6a4f07d28d203aeab02c1dab8326bfe464eee1d6009bbf82b30ebd38945c446e7bf766ce8 WHIRLPOOL 4abd59bbfe33e91a3e3ee0bb4763c77298994c6ce51f0338ef6c186ae675c3accfa72e0421b4dbd62fd150880b7bf0346710a4c0ce3cd54b55dc5a0b345cff66
diff --git a/app-editors/mg/metadata.xml b/app-editors/mg/metadata.xml
index 41e5f9b7b110..a86fa59f0b14 100644
--- a/app-editors/mg/metadata.xml
+++ b/app-editors/mg/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
mg is Micro GNU/emacs, this is a portable version of the mg maintained by
the OpenBSD team.
diff --git a/app-editors/mg/mg-20160118.ebuild b/app-editors/mg/mg-20160118.ebuild
new file mode 100644
index 000000000000..197182edb717
--- /dev/null
+++ b/app-editors/mg/mg-20160118.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="MicroGnuEmacs, a port from the BSDs"
+HOMEPAGE="http://homepage.boetes.org/software/mg/"
+SRC_URI="http://homepage.boetes.org/software/mg/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="livecd"
+
+RDEPEND="sys-libs/ncurses:0
+ !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ # remove OpenBSD specific easter egg
+ sed -i -e 's/theo\.o//' GNUmakefile || die
+ sed -i -e '/theo_init/d' main.c || die
+
+ # fix path to tutorial in man page
+ sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
+
+ eapply_user
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+}
+
+src_install() {
+ dobin mg
+ doman mg.1
+ dodoc README tutorial
+ # don't compress the tutorial, otherwise mg cannot open it
+ docompress -x /usr/share/doc/${PF}/tutorial
+}
+
+pkg_postinst() {
+ if use livecd; then
+ [[ -e ${EROOT}/usr/bin/emacs ]] || ln -s mg "${EROOT}"/usr/bin/emacs
+ fi
+}
diff --git a/app-editors/qemacs/metadata.xml b/app-editors/qemacs/metadata.xml
index c0162f066ce4..6ba8754897fe 100644
--- a/app-editors/qemacs/metadata.xml
+++ b/app-editors/qemacs/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
QEmacs (for Quick Emacs) is a very small but powerful text editor. It has
the following features:
diff --git a/app-editors/uemacs-pk/metadata.xml b/app-editors/uemacs-pk/metadata.xml
index 62e65fab2924..86800a9b5223 100644
--- a/app-editors/uemacs-pk/metadata.xml
+++ b/app-editors/uemacs-pk/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
WHAT IS uEmacs/PK?
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest
index 41f05f7d19e1..7994411b4cc1 100644
--- a/app-editors/vim/Manifest
+++ b/app-editors/vim/Manifest
@@ -1,6 +1,6 @@
DIST vim-7.4.1089.tar.gz 12548552 SHA256 e52f7653a36b690441b47a273b1db72f0eb1e5f6729af25110a84088ca73e872 SHA512 0fca208152b3c33cebfba4c2a33a6e59643a8c2650863b56b5a5c1863eb20238c412453d9e53cf75feaef8a5ef8aa8b33b601670e39c1b3effc02ed193bbd91f WHIRLPOOL 87f61548b29755ab1a90999af99c46fc649589e6d2e132623c04a2fa24400738255648a43d79192b2b6eb2b34ed49dd8d439e65870025983738247368f2f8598
DIST vim-7.4.542-gentoo-patches.tar.bz2 3307 SHA256 0eb635f13e199de77846e0d363a473882f2186f138158271fabf0975747a2f3d SHA512 446c66764dac2533cc2f2b3d50481971d4c63a4e81d94c545862a1be620179fdcd81a79f2d81737d1188812a6ad41d90e2a752a05acf6913e7a71464f7cecdd9 WHIRLPOOL cfca8feef0eb8096897ef751afb0427acddd008530ded6cf908fcff51be9713da4ea3e5e613d544c5caba400d664ae19ca70925df3a218bec5c8be6f69aadda2
-DIST vim-7.4.769.tar.gz 12189506 SHA256 d9b9c3af27161545a1e086e1ee9485432c0b1a792a1a59755f04ef94136c5042 SHA512 ce3917cc68dba8b69696eb43436f90347c68a687f1e8c4b2f15f4a232ff7ce1a581a61737042ec49548d78c5f010e55e4c40b051b1a2574bbc27146a9249f15c WHIRLPOOL 230304892e501ef9851bf9f0c9fc9c888bfe1ad2cd703bcd62c449866e28308027c37c7ed466966951ec9c5feb5d9ec82e843528861212cb40a5bf4cec6e8947
+DIST vim-7.4.769.tar.gz 12189043 SHA256 c89568f3dfcefd773bfbb0958c1cf58a0b0ceedb9d0c264250b379a77ad02e9e SHA512 00048c1d579c409767308c991e5de4ed54e9e50db7e97b0d148f0667742d5e46047c702bee693a5caf13a1603548ab783f7fa846574841d807ffbaa97d7f611e WHIRLPOOL 28ada4763250bbed6f9a1768e81a79b75db64f0ef25296c5d4825f21d21d6e88ff24d488e841e6ba492e363da6d3a3e75e9ec2f2881a731e7ed261c7d21ffd3c
DIST vim-7.4.827-gentoo-patches.tar.bz2 3106 SHA256 1d2bb395fa79dde8e3dbc0a94e4b9591f9cb544d4e52a1ecd2eac4122e55b740 SHA512 122dbcdee115ce0979ce8c5a54623ed405e889fb18967d7c9208d924bd62a7dd615544538040aef19449410c0ea5783c1832a317a1afd056d4d387c43e7a5988 WHIRLPOOL 23afe4d61b8c2f6a4d7e0e3a64a0d7c79a72ea3c317d93e969f01706c666217d19c866db56e0b09428c77d44e2adbf86edbbf4f3dbe521481c234cc66c0bafed
DIST vim-7.4.827.tar.gz 12203128 SHA256 8920db8115c78d260abbb2757ebf0e1e64d6e2f989626435fffad1ef37a9760f SHA512 e055b71afdde347a45d78ff10a672be8b92d00dc0215febe39db8a0b44474a92b40f728cbbdbb2ceefbe6fa08683eed549880e07e6e97dd44c994b7f669a8e6a WHIRLPOOL e86e3b203c29ffd9b0b6536b7a997377bd0914cdb4f2b8775a4ae1fae2ab44f54b6c007e0d1bb08d8272aa8da596577729a9f004e7cf1f4914bf55c402b468e5
DIST vim-7.4.tar.bz2 9843297 SHA256 d0f5a6d2c439f02d97fa21bd9121f4c5abb1f6cd8b5a79d3ca82867495734ade SHA512 65d55da556ee283a364b376d251b70e430b7a157bb5a8ee89565060ff9937907966d416cffd33f701b3314d0fdf16efe00065f66bc8459469f5ae2f713418e0e WHIRLPOOL 914fc2c4fd485196410d853990bb5cc4c0071bc36dc0794655ec05cc0b5f7d2971dea780cc7293fcfbd4495a30a7437a3b1e33a2b6795c10a9f05a2eac3ca6f4
diff --git a/app-editors/vim/vim-7.4.769.ebuild b/app-editors/vim/vim-7.4.769.ebuild
index 0fcf8554c138..b346e3a97c38 100644
--- a/app-editors/vim/vim-7.4.769.ebuild
+++ b/app-editors/vim/vim-7.4.769.ebuild
@@ -8,14 +8,11 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} )
PYTHON_REQ_USE=threads
inherit eutils vim-doc flag-o-matic fdo-mime versionator bash-completion-r1 python-r1
-MY_PV=${PV//./-}
-
if [[ ${PV} == 9999* ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/vim/vim.git"
- EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${MY_PV}
else
- SRC_URI="https://github.com/vim/vim/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+ SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
https://dev.gentoo.org/~radhermit/vim/vim-7.4.542-gentoo-patches.tar.bz2"
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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
@@ -63,8 +60,6 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
"
-S=${WORKDIR}/vim-${MY_PV}
-
pkg_setup() {
# people with broken alphabets run into trouble. bug 82186.
unset LANG LC_ALL
diff --git a/app-editors/zile/metadata.xml b/app-editors/zile/metadata.xml
index 077afb685940..8a7000bae256 100644
--- a/app-editors/zile/metadata.xml
+++ b/app-editors/zile/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
Zile is a small, fast, and powerful Emacs clone. It is useful for small
footprint installations (e.g. on floppy disk), machines with little memory,
diff --git a/app-emacs/actionscript-mode/metadata.xml b/app-emacs/actionscript-mode/metadata.xml
index e6ac0b24adb7..2e0acac81fbd 100644
--- a/app-emacs/actionscript-mode/metadata.xml
+++ b/app-emacs/actionscript-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">austinhaas/actionscript-mode</remote-id>
</upstream>
diff --git a/app-emacs/analog/metadata.xml b/app-emacs/analog/metadata.xml
index a055ee9b776d..7d01ef42903e 100644
--- a/app-emacs/analog/metadata.xml
+++ b/app-emacs/analog/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Emacs mode to monitor lists of files or command output.
diff --git a/app-emacs/anything/metadata.xml b/app-emacs/anything/metadata.xml
index 1574e79ead43..5abd82fad5cb 100644
--- a/app-emacs/anything/metadata.xml
+++ b/app-emacs/anything/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<use>
<flag name='extensions'>Install optional extensions</flag>
</use>
diff --git a/app-emacs/apache-mode/metadata.xml b/app-emacs/apache-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/apache-mode/metadata.xml
+++ b/app-emacs/apache-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/apel/metadata.xml b/app-emacs/apel/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/apel/metadata.xml
+++ b/app-emacs/apel/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/auctex/metadata.xml b/app-emacs/auctex/metadata.xml
index f36206c93577..5376b5c38754 100644
--- a/app-emacs/auctex/metadata.xml
+++ b/app-emacs/auctex/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<herd>tex</herd>
<longdescription>
AUCTeX is an extensible package for writing and formatting TeX files
diff --git a/app-emacs/auto-complete/metadata.xml b/app-emacs/auto-complete/metadata.xml
index 8ad6abfbb6ee..46c40b7e8661 100644
--- a/app-emacs/auto-complete/metadata.xml
+++ b/app-emacs/auto-complete/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">m2ym/auto-complete</remote-id>
</upstream>
diff --git a/app-emacs/autoconf-mode/metadata.xml b/app-emacs/autoconf-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/autoconf-mode/metadata.xml
+++ b/app-emacs/autoconf-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/bbdb/metadata.xml b/app-emacs/bbdb/metadata.xml
index a71dd9eb2fad..551404c7fd2d 100644
--- a/app-emacs/bbdb/metadata.xml
+++ b/app-emacs/bbdb/metadata.xml
@@ -1,17 +1,20 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <longdescription>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
The Insidious Big Brother Database (BBDB) is a contact management utility
for use with GNU Emacs and XEmacs. It can hook into Emacs-based mail- and
news-readers and automatically collect information on messages therein.
- </longdescription>
- <use>
- <flag name="tex">Install plain TeX support files</flag>
- <flag name="vm">Add support for <pkg>app-emacs/vm</pkg></flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">bbdb</remote-id>
- </upstream>
+</longdescription>
+<use>
+ <flag name="tex">Install plain TeX support files</flag>
+ <flag name="vm">Add support for <pkg>app-emacs/vm</pkg></flag>
+</use>
+<upstream>
+ <remote-id type="sourceforge">bbdb</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/binclock/metadata.xml b/app-emacs/binclock/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/binclock/metadata.xml
+++ b/app-emacs/binclock/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/bison-mode/metadata.xml b/app-emacs/bison-mode/metadata.xml
index 485301c7a4ab..56ca2ca54395 100644
--- a/app-emacs/bison-mode/metadata.xml
+++ b/app-emacs/bison-mode/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>nicolasbock@gentoo.org</email>
<name>Nicolas Bock</name>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">Wilfred/bison-mode</remote-id>
</upstream>
diff --git a/app-emacs/blogmax/metadata.xml b/app-emacs/blogmax/metadata.xml
index 152470076db1..9cc274f6b23a 100644
--- a/app-emacs/blogmax/metadata.xml
+++ b/app-emacs/blogmax/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-BlogMax is an Emacs package that aids in the creation of a weblog.
+ BlogMax is an Emacs package that aids in the creation of a weblog.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/bm/metadata.xml b/app-emacs/bm/metadata.xml
index 0587eac4d913..6a0b3ee13e4f 100644
--- a/app-emacs/bm/metadata.xml
+++ b/app-emacs/bm/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
This package provides visible, buffer local, bookmarks and the ability to
jump forward and backward to the next bookmark.
diff --git a/app-emacs/bongo/metadata.xml b/app-emacs/bongo/metadata.xml
index a65893303f93..d4c63ed45218 100644
--- a/app-emacs/bongo/metadata.xml
+++ b/app-emacs/bongo/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Bongo is a buffer-oriented media player for Emacs, contemporary with and
comparable to <pkg>app-emacs/emms</pkg>.
diff --git a/app-emacs/boxquote/metadata.xml b/app-emacs/boxquote/metadata.xml
index b71e9e1351cd..e4b5613ae141 100644
--- a/app-emacs/boxquote/metadata.xml
+++ b/app-emacs/boxquote/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Boxquote provides a set of functions for using a text quoting style that
partially boxes in the left hand side of an area of text, such a marking
diff --git a/app-emacs/browse-kill-ring/metadata.xml b/app-emacs/browse-kill-ring/metadata.xml
index 883209f9d133..f4e37eb671bd 100644
--- a/app-emacs/browse-kill-ring/metadata.xml
+++ b/app-emacs/browse-kill-ring/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
- <longdescription>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
Are you tired of using the endless keystrokes of 'C-y M-y M-y M-y ...' to
get at that bit of text you killed thirty-seven kills ago? Ever wish you
could just look through everything you've killed recently to find out if you
diff --git a/app-emacs/bubblet/metadata.xml b/app-emacs/bubblet/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/bubblet/metadata.xml
+++ b/app-emacs/bubblet/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/calfw/metadata.xml b/app-emacs/calfw/metadata.xml
index bd25ab175ab2..3a7d30c6a667 100644
--- a/app-emacs/calfw/metadata.xml
+++ b/app-emacs/calfw/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>naota@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<use>
<flag name="howm">Add support for the <pkg>app-emacs/howm</pkg>
note-taking tool</flag>
diff --git a/app-emacs/chess/metadata.xml b/app-emacs/chess/metadata.xml
index d1df4e744e0e..03bb20e536e1 100644
--- a/app-emacs/chess/metadata.xml
+++ b/app-emacs/chess/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
chess.el is an Emacs Lisp library and several clients on top of the
underlying library functionality for performing various activities related
diff --git a/app-emacs/circe/metadata.xml b/app-emacs/circe/metadata.xml
index 5c42e1ba76b0..d634a41cebd9 100644
--- a/app-emacs/circe/metadata.xml
+++ b/app-emacs/circe/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">jorgenschaefer/circe</remote-id>
</upstream>
diff --git a/app-emacs/cldoc/metadata.xml b/app-emacs/cldoc/metadata.xml
index 23f59bff4a62..13c0f1e7ba37 100644
--- a/app-emacs/cldoc/metadata.xml
+++ b/app-emacs/cldoc/metadata.xml
@@ -1,14 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<herd>common-lisp</herd>
<longdescription>
-Show Common Lisp operators and variables information in echo area.
-cldoc.el has a database of parameters and results of Common Lisp's
-standard functions, and syntax rules of standard macros and special
-operators. cldoc.el automatically uses SLIME's autodoc facility if
-available to display parameters of user defined functions and macros,
-and the values of global variables.
+ Show Common Lisp operators and variables information in echo area.
+ cldoc.el has a database of parameters and results of Common Lisp's
+ standard functions, and syntax rules of standard macros and special
+ operators. cldoc.el automatically uses SLIME's autodoc facility if
+ available to display parameters of user defined functions and macros,
+ and the values of global variables.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/cmail/metadata.xml b/app-emacs/cmail/metadata.xml
index 955ea9e4689e..bfd3609ad424 100644
--- a/app-emacs/cmail/metadata.xml
+++ b/app-emacs/cmail/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge-jp">cmail</remote-id>
</upstream>
diff --git a/app-emacs/color-browser/metadata.xml b/app-emacs/color-browser/metadata.xml
index dfbc80022259..6e35c7ee62a8 100644
--- a/app-emacs/color-browser/metadata.xml
+++ b/app-emacs/color-browser/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
This package provides a tool that can (hopefully) aid in the production of
quality color themes. Basically it allows the user to
diff --git a/app-emacs/color-moccur/metadata.xml b/app-emacs/color-moccur/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/color-moccur/metadata.xml
+++ b/app-emacs/color-moccur/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/color-theme/metadata.xml b/app-emacs/color-theme/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/color-theme/metadata.xml
+++ b/app-emacs/color-theme/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/company-mode/metadata.xml b/app-emacs/company-mode/metadata.xml
index 91bd7f737518..b620c664ec4b 100644
--- a/app-emacs/company-mode/metadata.xml
+++ b/app-emacs/company-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<use>
<flag name="ropemacs">Install backend for
<pkg>dev-python/ropemacs</pkg></flag>
diff --git a/app-emacs/crontab-mode/metadata.xml b/app-emacs/crontab-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/crontab-mode/metadata.xml
+++ b/app-emacs/crontab-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/crypt++/metadata.xml b/app-emacs/crypt++/metadata.xml
index b7412c27c419..47f27bbc9430 100644
--- a/app-emacs/crypt++/metadata.xml
+++ b/app-emacs/crypt++/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
crypt++.el is a package of Lisp functions that recognize automatically
encrypted and encoded (i.e., compressed) files when they are first visited
diff --git a/app-emacs/csharp-mode/metadata.xml b/app-emacs/csharp-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/csharp-mode/metadata.xml
+++ b/app-emacs/csharp-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/css-mode/metadata.xml b/app-emacs/css-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/css-mode/metadata.xml
+++ b/app-emacs/css-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/csv-mode/metadata.xml b/app-emacs/csv-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/csv-mode/metadata.xml
+++ b/app-emacs/csv-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/d-mode/metadata.xml b/app-emacs/d-mode/metadata.xml
index dc4cb40bfcb1..e7e16aa2502a 100644
--- a/app-emacs/d-mode/metadata.xml
+++ b/app-emacs/d-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">Emacs-D-Mode-Maintainers/Emacs-D-Mode</remote-id>
</upstream>
diff --git a/app-emacs/dash/metadata.xml b/app-emacs/dash/metadata.xml
index b70add88d4a1..03f155607371 100644
--- a/app-emacs/dash/metadata.xml
+++ b/app-emacs/dash/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="github">magnars/dash.el</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="github">magnars/dash.el</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/ddskk/metadata.xml b/app-emacs/ddskk/metadata.xml
index df397ea3014c..7fb92b25f5a4 100644
--- a/app-emacs/ddskk/metadata.xml
+++ b/app-emacs/ddskk/metadata.xml
@@ -2,5 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>cjk</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/develock/metadata.xml b/app-emacs/develock/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/develock/metadata.xml
+++ b/app-emacs/develock/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/df-mode/metadata.xml b/app-emacs/df-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/df-mode/metadata.xml
+++ b/app-emacs/df-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/dictionary/metadata.xml b/app-emacs/dictionary/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/dictionary/metadata.xml
+++ b/app-emacs/dictionary/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/dircolors/metadata.xml b/app-emacs/dircolors/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/dircolors/metadata.xml
+++ b/app-emacs/dircolors/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/dired-sort-menu/metadata.xml b/app-emacs/dired-sort-menu/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/dired-sort-menu/metadata.xml
+++ b/app-emacs/dired-sort-menu/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/distel/metadata.xml b/app-emacs/distel/metadata.xml
index 0eb0d94a3b42..a32234bc7a6c 100644
--- a/app-emacs/distel/metadata.xml
+++ b/app-emacs/distel/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="google-code">distel</remote-id>
<remote-id type="github">massemanet/distel</remote-id>
diff --git a/app-emacs/doctest-mode/metadata.xml b/app-emacs/doctest-mode/metadata.xml
index 2178ad6af507..2c86c967630b 100644
--- a/app-emacs/doctest-mode/metadata.xml
+++ b/app-emacs/doctest-mode/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="sourceforge">python-mode.svn</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="sourceforge">python-mode.svn</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/doxymacs/metadata.xml b/app-emacs/doxymacs/metadata.xml
index a9e1348325d5..6d4554a0c050 100644
--- a/app-emacs/doxymacs/metadata.xml
+++ b/app-emacs/doxymacs/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">doxymacs</remote-id>
</upstream>
diff --git a/app-emacs/dropdown-list/metadata.xml b/app-emacs/dropdown-list/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/dropdown-list/metadata.xml
+++ b/app-emacs/dropdown-list/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/dts-mode/metadata.xml b/app-emacs/dts-mode/metadata.xml
index b6aad8082c11..77c5ff22b4ae 100644
--- a/app-emacs/dts-mode/metadata.xml
+++ b/app-emacs/dts-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">bgamari/dts-mode</remote-id>
</upstream>
diff --git a/app-emacs/ebuild-mode/metadata.xml b/app-emacs/ebuild-mode/metadata.xml
index bc306fe58224..7a5743cd65e5 100644
--- a/app-emacs/ebuild-mode/metadata.xml
+++ b/app-emacs/ebuild-mode/metadata.xml
@@ -1,5 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <maintainer status="active">
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+ </maintainer>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/ecb/metadata.xml b/app-emacs/ecb/metadata.xml
index 40e4a67ca089..5e18c480d78d 100644
--- a/app-emacs/ecb/metadata.xml
+++ b/app-emacs/ecb/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <longdescription>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
ECB stands for "Emacs Code Browser". While Emacs already has good editing
support for many modes, its browsing support is somewhat lacking. That's
where ECB comes in: it displays a number of informational windows that allow
@@ -28,8 +31,8 @@
It goes without saying that you can configure the layout, ie. which
informational windows should be displayed where. ECB comes with a number of
ready-made window layouts to choose from.
- </longdescription>
- <upstream>
- <remote-id type="sourceforge">ecb</remote-id>
- </upstream>
+</longdescription>
+<upstream>
+ <remote-id type="sourceforge">ecb</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/edb/metadata.xml b/app-emacs/edb/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/edb/metadata.xml
+++ b/app-emacs/edb/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/edit-list/metadata.xml b/app-emacs/edit-list/metadata.xml
index 4b4a912af00d..4e1cc89c5d92 100644
--- a/app-emacs/edit-list/metadata.xml
+++ b/app-emacs/edit-list/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
So you've just added an incorrect entry to auto-mode-alist and want to fix
it quickly. `M-x edit-list RET auto-mode-alist RET' to the rescue. Make your
diff --git a/app-emacs/elib/metadata.xml b/app-emacs/elib/metadata.xml
index bcc2d5e5f170..0f7852c582d2 100644
--- a/app-emacs/elib/metadata.xml
+++ b/app-emacs/elib/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="sourceforge">jdee</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="sourceforge">jdee</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/elscreen/metadata.xml b/app-emacs/elscreen/metadata.xml
index 105523fef1a2..cf4f2e881ac6 100644
--- a/app-emacs/elscreen/metadata.xml
+++ b/app-emacs/elscreen/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Emacs is more of an "environment" than just an editor, since it has the
strong configuration language, emacs-lisp. There are a lot of applications
diff --git a/app-emacs/emacs-common-gentoo/metadata.xml b/app-emacs/emacs-common-gentoo/metadata.xml
index dce592051146..0df1cf6f4daa 100644
--- a/app-emacs/emacs-common-gentoo/metadata.xml
+++ b/app-emacs/emacs-common-gentoo/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<use>
<flag name='games'>Support shared score files for games</flag>
</use>
diff --git a/app-emacs/emacs-daemon/metadata.xml b/app-emacs/emacs-daemon/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/emacs-daemon/metadata.xml
+++ b/app-emacs/emacs-daemon/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/emacs-jabber/metadata.xml b/app-emacs/emacs-jabber/metadata.xml
index 2efe4fd9d4b2..d79a82a8a93d 100644
--- a/app-emacs/emacs-jabber/metadata.xml
+++ b/app-emacs/emacs-jabber/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">emacs-jabber</remote-id>
</upstream>
diff --git a/app-emacs/emacs-w3m/metadata.xml b/app-emacs/emacs-w3m/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/emacs-w3m/metadata.xml
+++ b/app-emacs/emacs-w3m/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/emacs-wget/metadata.xml b/app-emacs/emacs-wget/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/emacs-wget/metadata.xml
+++ b/app-emacs/emacs-wget/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/emacs-wiki-blog/metadata.xml b/app-emacs/emacs-wiki-blog/metadata.xml
index 03ffb61f731b..8951337df522 100644
--- a/app-emacs/emacs-wiki-blog/metadata.xml
+++ b/app-emacs/emacs-wiki-blog/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Emacs-wiki-blog is an Emacs Lisp package to maintain online journals,
like the way blogger or livejournal does, but much more powerful.
diff --git a/app-emacs/emacs-wiki/metadata.xml b/app-emacs/emacs-wiki/metadata.xml
index fd8b7e6425eb..51376d5af1c6 100644
--- a/app-emacs/emacs-wiki/metadata.xml
+++ b/app-emacs/emacs-wiki/metadata.xml
@@ -1,21 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-Emacs-wiki allows you to create a wiki on your local system and export
-HTML pages.
+ Emacs-wiki allows you to create a wiki on your local system and
+ export HTML pages.
-Emacs-wiki has many uses. It has been used to organize links. It can
-make web page maintenance and design a lot easier. It is used as the
-back-end of Planner. You can store and link together various bits of
-information in a coherent manner. A weblog of sorts can be made with
-it, but RSS syndication is not supported.
+ Emacs-wiki has many uses. It has been used to organize links. It can
+ make web page maintenance and design a lot easier. It is used as the
+ back-end of Planner. You can store and link together various bits of
+ information in a coherent manner. A weblog of sorts can be made with
+ it, but RSS syndication is not supported.
-Emacs-wiki is not a real wiki in its basic configuration, because
-users from the web cannot edit the pages unless you use
-emacs-wiki-httpd.el .
+ Emacs-wiki is not a real wiki in its basic configuration, because
+ users from the web cannot edit the pages unless you use
+ emacs-wiki-httpd.el.
-Emacs-wiki does not allow you to edit the pages of TheEmacsWiki.
+ Emacs-wiki does not allow you to edit the pages of TheEmacsWiki.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/emhacks/metadata.xml b/app-emacs/emhacks/metadata.xml
index 99a40a1ed9dc..a2114ce5c303 100644
--- a/app-emacs/emhacks/metadata.xml
+++ b/app-emacs/emhacks/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <longdescription>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
The EMHACKS project goal is to provide a set of useful libraries to help
using Emacs or XEmacs.
@@ -12,11 +15,11 @@
jmaker, Java Makefile generator;
swbuff, Quick switch between Emacs buffers;
tabbar, Display a tab bar in the header line.
- </longdescription>
- <use>
- <flag name="jde">Enable support for Java Development Environment</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">emhacks</remote-id>
- </upstream>
+</longdescription>
+<use>
+ <flag name="jde">Enable support for Java Development Environment</flag>
+</use>
+<upstream>
+ <remote-id type="sourceforge">emhacks</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/emms/metadata.xml b/app-emacs/emms/metadata.xml
index bff8c8626d37..4316be3a5d77 100644
--- a/app-emacs/emms/metadata.xml
+++ b/app-emacs/emms/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
EMMS, the Emacs Multimedia System, is an extensible, light-weight
multimedia player system for Emacs. It includes support for audio
diff --git a/app-emacs/erobot/metadata.xml b/app-emacs/erobot/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/erobot/metadata.xml
+++ b/app-emacs/erobot/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/eselect-mode/metadata.xml b/app-emacs/eselect-mode/metadata.xml
index b2c96c69ba47..400f45cc2bf2 100644
--- a/app-emacs/eselect-mode/metadata.xml
+++ b/app-emacs/eselect-mode/metadata.xml
@@ -2,5 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>eselect</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/ess/metadata.xml b/app-emacs/ess/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/ess/metadata.xml
+++ b/app-emacs/ess/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/evil/metadata.xml b/app-emacs/evil/metadata.xml
index 4182a42c03c0..9daa11a4ea20 100644
--- a/app-emacs/evil/metadata.xml
+++ b/app-emacs/evil/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/fff/metadata.xml b/app-emacs/fff/metadata.xml
index d66f0dd32b1e..1c29e2978704 100644
--- a/app-emacs/fff/metadata.xml
+++ b/app-emacs/fff/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
This package provides several shortcut commands for visiting or
inserting files without having to specify them by their complete name.
diff --git a/app-emacs/filladapt/metadata.xml b/app-emacs/filladapt/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/filladapt/metadata.xml
+++ b/app-emacs/filladapt/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/flashcard/metadata.xml b/app-emacs/flashcard/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/flashcard/metadata.xml
+++ b/app-emacs/flashcard/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/flim/metadata.xml b/app-emacs/flim/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/flim/metadata.xml
+++ b/app-emacs/flim/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/folding/metadata.xml b/app-emacs/folding/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/folding/metadata.xml
+++ b/app-emacs/folding/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/ghc-mod/metadata.xml b/app-emacs/ghc-mod/metadata.xml
index f86749b31dae..d999aca2da6e 100644
--- a/app-emacs/ghc-mod/metadata.xml
+++ b/app-emacs/ghc-mod/metadata.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>haskell</herd>
- <longdescription>
- This packages includes Elisp files
- and a Haskell command, &quot;ghc-mod&quot;.
- &quot;ghc*.el&quot; enable completion of
- Haskell symbols on Emacs.
- Flymake is also integrated.
- &quot;ghc-mod&quot; is a backend of &quot;ghc*.el&quot;.
- It lists up all installed modules
- or extracts names of functions, classes,
- and data declarations.
- </longdescription>
+<herd>haskell</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ This packages includes Elisp files and a Haskell command, "ghc-mod".
+ "ghc*.el" enable completion of Haskell symbols on Emacs. Flymake is
+ also integrated. "ghc-mod" is a backend of "ghc*.el". It lists up
+ all installed modules or extracts names of functions, classes, and
+ data declarations.
+</longdescription>
</pkgmetadata>
diff --git a/app-emacs/gnuplot-mode/metadata.xml b/app-emacs/gnuplot-mode/metadata.xml
index 536405d4b31c..d263fd9cd27e 100644
--- a/app-emacs/gnuplot-mode/metadata.xml
+++ b/app-emacs/gnuplot-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">bruceravel/gnuplot-mode</remote-id>
</upstream>
diff --git a/app-emacs/gnuserv/metadata.xml b/app-emacs/gnuserv/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/gnuserv/metadata.xml
+++ b/app-emacs/gnuserv/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/google-c-style/metadata.xml b/app-emacs/google-c-style/metadata.xml
index f662d74d64b6..c4a025804ec8 100644
--- a/app-emacs/google-c-style/metadata.xml
+++ b/app-emacs/google-c-style/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>chromium</herd>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="github">google/styleguide</remote-id>
- </upstream>
+<herd>chromium</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="github">google/styleguide</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/graphviz-dot-mode/metadata.xml b/app-emacs/graphviz-dot-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/graphviz-dot-mode/metadata.xml
+++ b/app-emacs/graphviz-dot-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/h4x0r/metadata.xml b/app-emacs/h4x0r/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/h4x0r/metadata.xml
+++ b/app-emacs/h4x0r/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/haskell-mode/metadata.xml b/app-emacs/haskell-mode/metadata.xml
index c94cb834097f..00a2be873bec 100644
--- a/app-emacs/haskell-mode/metadata.xml
+++ b/app-emacs/haskell-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">haskell/haskell-mode</remote-id>
</upstream>
diff --git a/app-emacs/hexrgb/metadata.xml b/app-emacs/hexrgb/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/hexrgb/metadata.xml
+++ b/app-emacs/hexrgb/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/highline/metadata.xml b/app-emacs/highline/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/highline/metadata.xml
+++ b/app-emacs/highline/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/howm/metadata.xml b/app-emacs/howm/metadata.xml
index 1dc47cec2e87..a4aa5f2412a2 100644
--- a/app-emacs/howm/metadata.xml
+++ b/app-emacs/howm/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="sourceforge-jp">howm</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="sourceforge-jp">howm</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/htmlize/metadata.xml b/app-emacs/htmlize/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/htmlize/metadata.xml
+++ b/app-emacs/htmlize/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/httpd/metadata.xml b/app-emacs/httpd/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/httpd/metadata.xml
+++ b/app-emacs/httpd/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/icicles/metadata.xml b/app-emacs/icicles/metadata.xml
index 730939bd5524..b28b15c5cbe8 100644
--- a/app-emacs/icicles/metadata.xml
+++ b/app-emacs/icicles/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">emacsmirror/icicles</remote-id>
</upstream>
diff --git a/app-emacs/identica-mode/metadata.xml b/app-emacs/identica-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/identica-mode/metadata.xml
+++ b/app-emacs/identica-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/igrep/metadata.xml b/app-emacs/igrep/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/igrep/metadata.xml
+++ b/app-emacs/igrep/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/imaxima/metadata.xml b/app-emacs/imaxima/metadata.xml
index b2c87461ee65..dff6ceb4b947 100644
--- a/app-emacs/imaxima/metadata.xml
+++ b/app-emacs/imaxima/metadata.xml
@@ -2,7 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>sci-mathematics</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription lang="en">
Imaxima provides support for interacting with the computer algebra system
Maxima in an Emacs buffer. Imaxima processes the output from Maxima with TeX
diff --git a/app-emacs/inform-mode/metadata.xml b/app-emacs/inform-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/inform-mode/metadata.xml
+++ b/app-emacs/inform-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/initsplit/metadata.xml b/app-emacs/initsplit/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/initsplit/metadata.xml
+++ b/app-emacs/initsplit/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/jam-mode/metadata.xml b/app-emacs/jam-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/jam-mode/metadata.xml
+++ b/app-emacs/jam-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/jasmin/metadata.xml b/app-emacs/jasmin/metadata.xml
index 875419a23c9c..e096066bd2e6 100644
--- a/app-emacs/jasmin/metadata.xml
+++ b/app-emacs/jasmin/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-jasmin.el is an Emacs major mode for editing Jasmin Java bytecode
-assembler files. It provides automatic formatting, customizable
-fontifying, and quick-reference syntax help. Font-lock specifications
-are derived from an encoded grammar, for detailed syntax coloring.
+ jasmin.el is an Emacs major mode for editing Jasmin Java bytecode
+ assembler files. It provides automatic formatting, customizable
+ fontifying, and quick-reference syntax help. Font-lock specifications
+ are derived from an encoded grammar, for detailed syntax coloring.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/javascript/metadata.xml b/app-emacs/javascript/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/javascript/metadata.xml
+++ b/app-emacs/javascript/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/jde/metadata.xml b/app-emacs/jde/metadata.xml
index 72d70ada4707..ba9dba3feeb2 100644
--- a/app-emacs/jde/metadata.xml
+++ b/app-emacs/jde/metadata.xml
@@ -1,15 +1,18 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <herd>java</herd>
- <longdescription>
- The Java Development Environment for Emacs is a software package that
- interfaces Emacs to command-line Java development tools (for example,
- JavaSoft's JDK). JDEE features include:
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<herd>java</herd>
+<longdescription>
+ The Java Development Environment for Emacs is a software package
+ that interfaces Emacs to command-line Java development tools (for
+ example, JavaSoft's JDK). JDEE features include:
- * JDEE menu with compile, run, debug, build, browse, project, and help
- commands
+ * JDEE menu with compile, run, debug, build, browse, project, and
+ help commands
* syntax coloring
* auto indentation
* compile error to source links
@@ -18,8 +21,8 @@
* make file support
* automatic code generation
* Java source interpreter (Pat Neimeyer's BeanShell)
- </longdescription>
- <upstream>
- <remote-id type="sourceforge">jdee</remote-id>
- </upstream>
+</longdescription>
+<upstream>
+ <remote-id type="sourceforge">jdee</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/keywiz/metadata.xml b/app-emacs/keywiz/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/keywiz/metadata.xml
+++ b/app-emacs/keywiz/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/limit/metadata.xml b/app-emacs/limit/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/limit/metadata.xml
+++ b/app-emacs/limit/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/lookup/metadata.xml b/app-emacs/lookup/metadata.xml
index 92d4e62095de..202265529129 100644
--- a/app-emacs/lookup/metadata.xml
+++ b/app-emacs/lookup/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<herd>cjk</herd>
</pkgmetadata>
diff --git a/app-emacs/lua-mode/metadata.xml b/app-emacs/lua-mode/metadata.xml
index cca32e07cd8f..a2b3921954b7 100644
--- a/app-emacs/lua-mode/metadata.xml
+++ b/app-emacs/lua-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">immerrr/lua-mode</remote-id>
</upstream>
diff --git a/app-emacs/lyskom-elisp-client/metadata.xml b/app-emacs/lyskom-elisp-client/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/lyskom-elisp-client/metadata.xml
+++ b/app-emacs/lyskom-elisp-client/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/magit/metadata.xml b/app-emacs/magit/metadata.xml
index b95826009842..90c8a318e33c 100644
--- a/app-emacs/magit/metadata.xml
+++ b/app-emacs/magit/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Magit is an interface to the version control system Git, implemented as an
extension to Emacs.
diff --git a/app-emacs/mailcrypt/metadata.xml b/app-emacs/mailcrypt/metadata.xml
index d6d654a5d70b..e1b80dff9e38 100644
--- a/app-emacs/mailcrypt/metadata.xml
+++ b/app-emacs/mailcrypt/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">mailcrypt</remote-id>
</upstream>
diff --git a/app-emacs/markdown-mode/metadata.xml b/app-emacs/markdown-mode/metadata.xml
index dea4fc9df66e..e8f3b49b5d72 100644
--- a/app-emacs/markdown-mode/metadata.xml
+++ b/app-emacs/markdown-mode/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>naota@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/matlab/metadata.xml b/app-emacs/matlab/metadata.xml
index ebcd4a8456ab..a4c0fe525efc 100644
--- a/app-emacs/matlab/metadata.xml
+++ b/app-emacs/matlab/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="sourceforge">matlab-emacs</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="sourceforge">matlab-emacs</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/mcomplete/metadata.xml b/app-emacs/mcomplete/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/mcomplete/metadata.xml
+++ b/app-emacs/mcomplete/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/mediawiki/metadata.xml b/app-emacs/mediawiki/metadata.xml
index c6470844bc55..e1f3c3570ad2 100644
--- a/app-emacs/mediawiki/metadata.xml
+++ b/app-emacs/mediawiki/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="launchpad">mediawiki-el</remote-id>
</upstream>
diff --git a/app-emacs/mew/metadata.xml b/app-emacs/mew/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/mew/metadata.xml
+++ b/app-emacs/mew/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/mic-paren/metadata.xml b/app-emacs/mic-paren/metadata.xml
index 7afdcc0fc87b..a1dd52c28c81 100644
--- a/app-emacs/mic-paren/metadata.xml
+++ b/app-emacs/mic-paren/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Load this file, activate it and Emacs will display highlighting on whatever
parenthesis (and paired delimiter if you like this) matches the one before
diff --git a/app-emacs/mldonkey/metadata.xml b/app-emacs/mldonkey/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/mldonkey/metadata.xml
+++ b/app-emacs/mldonkey/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/mmm-mode/metadata.xml b/app-emacs/mmm-mode/metadata.xml
index d4be75b5e357..22031cb5d67e 100644
--- a/app-emacs/mmm-mode/metadata.xml
+++ b/app-emacs/mmm-mode/metadata.xml
@@ -1,9 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="sourceforge">mmm-mode</remote-id>
- <remote-id type="github">purcell/mmm-mode</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="sourceforge">mmm-mode</remote-id>
+ <remote-id type="github">purcell/mmm-mode</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/moccur-edit/metadata.xml b/app-emacs/moccur-edit/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/moccur-edit/metadata.xml
+++ b/app-emacs/moccur-edit/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/mode-compile/metadata.xml b/app-emacs/mode-compile/metadata.xml
index fd0567d9ae89..88f968e5fe53 100644
--- a/app-emacs/mode-compile/metadata.xml
+++ b/app-emacs/mode-compile/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">emacsmirror/mode-compile</remote-id>
</upstream>
diff --git a/app-emacs/mpg123-el/metadata.xml b/app-emacs/mpg123-el/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/mpg123-el/metadata.xml
+++ b/app-emacs/mpg123-el/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/mu-cite/metadata.xml b/app-emacs/mu-cite/metadata.xml
index 92d4e62095de..202265529129 100644
--- a/app-emacs/mu-cite/metadata.xml
+++ b/app-emacs/mu-cite/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<herd>cjk</herd>
</pkgmetadata>
diff --git a/app-emacs/multi-term/metadata.xml b/app-emacs/multi-term/metadata.xml
index df4301f0f4a7..006dd03698ac 100644
--- a/app-emacs/multi-term/metadata.xml
+++ b/app-emacs/multi-term/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
-<maintainer>
+<maintainer>
<email>mjo@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/multiple-cursors/metadata.xml b/app-emacs/multiple-cursors/metadata.xml
index 3a7d30f6e618..3c1551c445cf 100644
--- a/app-emacs/multiple-cursors/metadata.xml
+++ b/app-emacs/multiple-cursors/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">magnars/multiple-cursors.el</remote-id>
</upstream>
diff --git a/app-emacs/muse/metadata.xml b/app-emacs/muse/metadata.xml
index 135da40f247e..d70dd6cbd1ab 100644
--- a/app-emacs/muse/metadata.xml
+++ b/app-emacs/muse/metadata.xml
@@ -1,30 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-Emacs Muse is an authoring and publishing environment for Emacs. It
-simplifies the process of writing documents and publishing them to
-various output formats.
+ Emacs Muse is an authoring and publishing environment for Emacs.
+ It simplifies the process of writing documents and publishing them
+ to various output formats.
-Muse consists of two main parts: an enhanced text-mode for authoring
-documents and navigating within Muse projects, and a set of publishing
-styles for generating different kinds of output.
+ Muse consists of two main parts: an enhanced text-mode for authoring
+ documents and navigating within Muse projects, and a set of
+ publishing styles for generating different kinds of output.
-This idea is not in any way new. Numerous systems exist - even one
-other for Emacs itself (Bhl Mode). What Muse adds to the picture is a
-more modular environment, with a rather simple core, in which "styles"
-are derived from to create new styles. Much of Muse's overall
-functionality is optional. For example, you can use the publisher
-without the major-mode, or the mode without doing any publishing; or
-if you don't load the Texinfo or LaTeX modules, those styles won't be
-available.
+ This idea is not in any way new. Numerous systems exist - even one
+ other for Emacs itself (Bhl Mode). What Muse adds to the picture is
+ a more modular environment, with a rather simple core, in which
+ "styles" are derived from to create new styles. Much of Muse's
+ overall functionality is optional. For example, you can use the
+ publisher without the major-mode, or the mode without doing any
+ publishing; or if you don't load the Texinfo or LaTeX modules, those
+ styles won't be available.
-The Muse codebase is a departure from emacs-wiki.el version 2.44. The
-code has been restructured and rewritten, especially its publishing
-functions. The focus in this revision is on the authoring and
-publishing aspects, and the "wikiness" has been removed as a default
-behavior (available as the optional module muse-wiki.el). CamelCase
-words are no longer special by default.
+ The Muse codebase is a departure from emacs-wiki.el version 2.44.
+ The code has been restructured and rewritten, especially its
+ publishing functions. The focus in this revision is on the authoring
+ and publishing aspects, and the "wikiness" has been removed as a
+ default behavior (available as the optional module muse-wiki.el).
+ CamelCase words are no longer special by default.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/nagios-mode/metadata.xml b/app-emacs/nagios-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/nagios-mode/metadata.xml
+++ b/app-emacs/nagios-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/navi2ch/metadata.xml b/app-emacs/navi2ch/metadata.xml
index 7751814d02a5..4e09ad0e30fd 100644
--- a/app-emacs/navi2ch/metadata.xml
+++ b/app-emacs/navi2ch/metadata.xml
@@ -2,7 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>cjk</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">navi2ch</remote-id>
</upstream>
diff --git a/app-emacs/nxml-docbook5-schemas/metadata.xml b/app-emacs/nxml-docbook5-schemas/metadata.xml
index d0e321d9a75d..b0f74dbff2bd 100644
--- a/app-emacs/nxml-docbook5-schemas/metadata.xml
+++ b/app-emacs/nxml-docbook5-schemas/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/nxml-gentoo-schemas/metadata.xml b/app-emacs/nxml-gentoo-schemas/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/nxml-gentoo-schemas/metadata.xml
+++ b/app-emacs/nxml-gentoo-schemas/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/nxml-libvirt-schemas/metadata.xml b/app-emacs/nxml-libvirt-schemas/metadata.xml
index a178e33b29d2..9078b5ed03d6 100644
--- a/app-emacs/nxml-libvirt-schemas/metadata.xml
+++ b/app-emacs/nxml-libvirt-schemas/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
-<herd>virtualization</herd>
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<herd>virtualization</herd>
</pkgmetadata>
diff --git a/app-emacs/nxml-svg-schemas/metadata.xml b/app-emacs/nxml-svg-schemas/metadata.xml
index d0e321d9a75d..b0f74dbff2bd 100644
--- a/app-emacs/nxml-svg-schemas/metadata.xml
+++ b/app-emacs/nxml-svg-schemas/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/ocaml-mode/metadata.xml b/app-emacs/ocaml-mode/metadata.xml
index d3eb2339e1fa..987ffbd1b686 100644
--- a/app-emacs/ocaml-mode/metadata.xml
+++ b/app-emacs/ocaml-mode/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ml</herd>
- <herd>emacs</herd>
+<herd>ml</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/org-mode/metadata.xml b/app-emacs/org-mode/metadata.xml
index 191bd8718bc9..841e9895518c 100644
--- a/app-emacs/org-mode/metadata.xml
+++ b/app-emacs/org-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Org-mode is a mode for keeping notes, maintaining ToDo lists, and doing
project planning with a fast and effective plain-text system.
diff --git a/app-emacs/outline-magic/metadata.xml b/app-emacs/outline-magic/metadata.xml
index 0e07ff7b6d4c..71c6993f4c38 100644
--- a/app-emacs/outline-magic/metadata.xml
+++ b/app-emacs/outline-magic/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">tj64/outline-magic</remote-id>
</upstream>
diff --git a/app-emacs/paredit/metadata.xml b/app-emacs/paredit/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/paredit/metadata.xml
+++ b/app-emacs/paredit/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/php-mode/metadata.xml b/app-emacs/php-mode/metadata.xml
index f7f0dd4460a2..c874778b42fd 100644
--- a/app-emacs/php-mode/metadata.xml
+++ b/app-emacs/php-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">php-mode</remote-id>
</upstream>
diff --git a/app-emacs/planner/metadata.xml b/app-emacs/planner/metadata.xml
index 27000b3f07e8..323c4d2bc024 100644
--- a/app-emacs/planner/metadata.xml
+++ b/app-emacs/planner/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-Planner is a personal information manager (PIM) for Emacs. You can use
-it to manage your tasks, schedules, notes and anything else you want
-to store in a free-text richly-hyperlinked personal information
-manager integrated into Emacs.
+ Planner is a personal information manager (PIM) for Emacs. You can
+ use it to manage your tasks, schedules, notes and anything else you
+ want to store in a free-text richly-hyperlinked personal information
+ manager integrated into Emacs.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/po-mode/metadata.xml b/app-emacs/po-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/po-mode/metadata.xml
+++ b/app-emacs/po-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/popwin/metadata.xml b/app-emacs/popwin/metadata.xml
index 62aa791f2446..6178f5c36c6f 100644
--- a/app-emacs/popwin/metadata.xml
+++ b/app-emacs/popwin/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>naota@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">m2ym/popwin-el</remote-id>
</upstream>
diff --git a/app-emacs/pov-mode/metadata.xml b/app-emacs/pov-mode/metadata.xml
index 4182a42c03c0..9daa11a4ea20 100644
--- a/app-emacs/pov-mode/metadata.xml
+++ b/app-emacs/pov-mode/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/prom-wl/metadata.xml b/app-emacs/prom-wl/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/prom-wl/metadata.xml
+++ b/app-emacs/prom-wl/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/proofgeneral/metadata.xml b/app-emacs/proofgeneral/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/proofgeneral/metadata.xml
+++ b/app-emacs/proofgeneral/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/protbuf/metadata.xml b/app-emacs/protbuf/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/protbuf/metadata.xml
+++ b/app-emacs/protbuf/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/psgml/metadata.xml b/app-emacs/psgml/metadata.xml
index 7d4e87f66790..87c000289863 100644
--- a/app-emacs/psgml/metadata.xml
+++ b/app-emacs/psgml/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="sourceforge">psgml</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="sourceforge">psgml</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/pymacs/metadata.xml b/app-emacs/pymacs/metadata.xml
index 4f7be8f8a824..25d3fe951b7e 100644
--- a/app-emacs/pymacs/metadata.xml
+++ b/app-emacs/pymacs/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <herd>python</herd>
- <upstream>
- <remote-id type="github">pinard/Pymacs</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<herd>python</herd>
+<upstream>
+ <remote-id type="github">pinard/Pymacs</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/python-mode/metadata.xml b/app-emacs/python-mode/metadata.xml
index 4c84d631ad42..81c665a3f069 100644
--- a/app-emacs/python-mode/metadata.xml
+++ b/app-emacs/python-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="launchpad">python-mode</remote-id>
</upstream>
diff --git a/app-emacs/quack/metadata.xml b/app-emacs/quack/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/quack/metadata.xml
+++ b/app-emacs/quack/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/quilt-el/metadata.xml b/app-emacs/quilt-el/metadata.xml
index dc70d2e97d27..e8fef63a5b4e 100644
--- a/app-emacs/quilt-el/metadata.xml
+++ b/app-emacs/quilt-el/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
quilt-el is an Emacs minor mode for quilt. By using this, it becomes easy to
edit files controlled by quilt. The main features are as follows:
diff --git a/app-emacs/qwerty/metadata.xml b/app-emacs/qwerty/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/qwerty/metadata.xml
+++ b/app-emacs/qwerty/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/redo+/metadata.xml b/app-emacs/redo+/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/redo+/metadata.xml
+++ b/app-emacs/redo+/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/regress/metadata.xml b/app-emacs/regress/metadata.xml
index 97e784644cc2..68505ec68086 100644
--- a/app-emacs/regress/metadata.xml
+++ b/app-emacs/regress/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-This module provides support for writing and executing regression
-tests for Emacs Lisp code.
+ This module provides support for writing and executing regression
+ tests for Emacs Lisp code.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/remember/metadata.xml b/app-emacs/remember/metadata.xml
index f4406812d32f..187bc899595d 100644
--- a/app-emacs/remember/metadata.xml
+++ b/app-emacs/remember/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
'Remember' is a mode for remembering data. It uses whatever back-end is
appropriate to record and correlate the data, but its main intention is to
diff --git a/app-emacs/rfcview/metadata.xml b/app-emacs/rfcview/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/rfcview/metadata.xml
+++ b/app-emacs/rfcview/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/riece/metadata.xml b/app-emacs/riece/metadata.xml
index 9cc80b349a64..fbb92e6910c1 100644
--- a/app-emacs/riece/metadata.xml
+++ b/app-emacs/riece/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <herd>net-irc</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<herd>net-irc</herd>
</pkgmetadata>
diff --git a/app-emacs/rnc-mode/metadata.xml b/app-emacs/rnc-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/rnc-mode/metadata.xml
+++ b/app-emacs/rnc-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/rpm-spec-mode/metadata.xml b/app-emacs/rpm-spec-mode/metadata.xml
index 417d155c0e49..39589e3df8bc 100644
--- a/app-emacs/rpm-spec-mode/metadata.xml
+++ b/app-emacs/rpm-spec-mode/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>sochotnicky@gentoo.org</email>
<name>Stanislav Ochotnicky</name>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/ruby-mode/metadata.xml b/app-emacs/ruby-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/ruby-mode/metadata.xml
+++ b/app-emacs/ruby-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/rudel/metadata.xml b/app-emacs/rudel/metadata.xml
index 76fede0181fd..f3cbec8ebc29 100644
--- a/app-emacs/rudel/metadata.xml
+++ b/app-emacs/rudel/metadata.xml
@@ -1,16 +1,19 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <longdescription>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
Rudel is collaborative editing environment for GNU Emacs. Its purpose
is tod share buffers with other users in order to edit the contents
of those buffers collaboratively. Rudel supports multiple backends to
enable communication with other collaborative editors using different
protocols, though currently Obby (for use with the Gobby editor) is
the only fully-functional one.
- </longdescription>
- <upstream>
- <remote-id type="sourceforge">rudel</remote-id>
- </upstream>
+</longdescription>
+<upstream>
+ <remote-id type="sourceforge">rudel</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/rust-mode/metadata.xml b/app-emacs/rust-mode/metadata.xml
index b1bfa491b811..8901c22a753b 100644
--- a/app-emacs/rust-mode/metadata.xml
+++ b/app-emacs/rust-mode/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <maintainer>
- <email>jauhien@gentoo.org</email>
- <name>Jauhien Piatlicki</name>
- </maintainer>
+<maintainer>
+ <email>jauhien@gentoo.org</email>
+ <name>Jauhien Piatlicki</name>
+</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/scala-mode/metadata.xml b/app-emacs/scala-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/scala-mode/metadata.xml
+++ b/app-emacs/scala-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/scheme-complete/metadata.xml b/app-emacs/scheme-complete/metadata.xml
index 51ab1920de63..43a0838f703d 100644
--- a/app-emacs/scheme-complete/metadata.xml
+++ b/app-emacs/scheme-complete/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Very smart tab-completion and autodoc for Scheme code in Emacs, complete
with type inferencing and lexical environment awareness.
diff --git a/app-emacs/scim-bridge-el/metadata.xml b/app-emacs/scim-bridge-el/metadata.xml
index a3dc60932031..e4bdcb750b3d 100644
--- a/app-emacs/scim-bridge-el/metadata.xml
+++ b/app-emacs/scim-bridge-el/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>heroxbd@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
A SCIM-Bridge client for Emacs.
</longdescription>
diff --git a/app-emacs/scss-mode/metadata.xml b/app-emacs/scss-mode/metadata.xml
index 86027b0987d0..51de88f313ba 100644
--- a/app-emacs/scss-mode/metadata.xml
+++ b/app-emacs/scss-mode/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">antonj/scss-mode</remote-id>
</upstream>
diff --git a/app-emacs/semi/metadata.xml b/app-emacs/semi/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/semi/metadata.xml
+++ b/app-emacs/semi/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/session/metadata.xml b/app-emacs/session/metadata.xml
index 1839c43c667a..9edf7895555e 100644
--- a/app-emacs/session/metadata.xml
+++ b/app-emacs/session/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">emacs-session</remote-id>
</upstream>
diff --git a/app-emacs/setnu/metadata.xml b/app-emacs/setnu/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/setnu/metadata.xml
+++ b/app-emacs/setnu/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/slime/metadata.xml b/app-emacs/slime/metadata.xml
index 907cce48a952..1cf8ad40d03d 100644
--- a/app-emacs/slime/metadata.xml
+++ b/app-emacs/slime/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<herd>common-lisp</herd>
<longdescription>
SLIME: The Superior Lisp Interaction Mode for Emacs. SLIME is a
diff --git a/app-emacs/sml-mode/metadata.xml b/app-emacs/sml-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/sml-mode/metadata.xml
+++ b/app-emacs/sml-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/sokoban/metadata.xml b/app-emacs/sokoban/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/sokoban/metadata.xml
+++ b/app-emacs/sokoban/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/ssh/metadata.xml b/app-emacs/ssh/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/ssh/metadata.xml
+++ b/app-emacs/ssh/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/stripes/metadata.xml b/app-emacs/stripes/metadata.xml
index e6afb9ae7207..a4059ed3801e 100644
--- a/app-emacs/stripes/metadata.xml
+++ b/app-emacs/stripes/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-Highlights every even line with an alternative background
-color. Useful for buffers that display lists of any kind - as a guide
-for your eyes to follow these lines.
+ Highlights every even line with an alternative background color.
+ Useful for buffers that display lists of any kind - as a guide for
+ your eyes to follow these lines.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/sumibi/metadata.xml b/app-emacs/sumibi/metadata.xml
index ccebeb74e563..0672c8815592 100644
--- a/app-emacs/sumibi/metadata.xml
+++ b/app-emacs/sumibi/metadata.xml
@@ -2,7 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>cjk</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge-jp">sumibi</remote-id>
</upstream>
diff --git a/app-emacs/tdtd/metadata.xml b/app-emacs/tdtd/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/tdtd/metadata.xml
+++ b/app-emacs/tdtd/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/teco/metadata.xml b/app-emacs/teco/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/teco/metadata.xml
+++ b/app-emacs/teco/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/template/metadata.xml b/app-emacs/template/metadata.xml
index 62541310d2d2..fc40138f3dff 100644
--- a/app-emacs/template/metadata.xml
+++ b/app-emacs/template/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">emacs-template</remote-id>
</upstream>
diff --git a/app-emacs/tempo-snippets/metadata.xml b/app-emacs/tempo-snippets/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/tempo-snippets/metadata.xml
+++ b/app-emacs/tempo-snippets/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/thinks/metadata.xml b/app-emacs/thinks/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/thinks/metadata.xml
+++ b/app-emacs/thinks/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/thumbs/metadata.xml b/app-emacs/thumbs/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/thumbs/metadata.xml
+++ b/app-emacs/thumbs/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/tuareg-mode/metadata.xml b/app-emacs/tuareg-mode/metadata.xml
index 0899764535c6..53adc5aad66b 100644
--- a/app-emacs/tuareg-mode/metadata.xml
+++ b/app-emacs/tuareg-mode/metadata.xml
@@ -2,7 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>ml</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Tuareg is an Object Caml/Camllight mode for Emacs. It handles automatic
indentation and syntax highlighting of code. It also supports an interactive
diff --git a/app-emacs/twittering-mode/metadata.xml b/app-emacs/twittering-mode/metadata.xml
index 3da2601fe3c2..4e34b67ba897 100644
--- a/app-emacs/twittering-mode/metadata.xml
+++ b/app-emacs/twittering-mode/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>naota@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">twmode</remote-id>
</upstream>
diff --git a/app-emacs/typing/metadata.xml b/app-emacs/typing/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/typing/metadata.xml
+++ b/app-emacs/typing/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/uboat/metadata.xml b/app-emacs/uboat/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/uboat/metadata.xml
+++ b/app-emacs/uboat/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/undo-tree/metadata.xml b/app-emacs/undo-tree/metadata.xml
index dbcd421d2b18..49088e772b03 100644
--- a/app-emacs/undo-tree/metadata.xml
+++ b/app-emacs/undo-tree/metadata.xml
@@ -5,7 +5,10 @@
<email>tomka@gentoo.org</email>
<name>Thomas Kahle</name>
</maintainer>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription lang="en">
Emacs has a powerful undo system. Unlike the standard undo/redo system in
most software, it allows you to recover *any* past state of a buffer
diff --git a/app-emacs/uptimes/metadata.xml b/app-emacs/uptimes/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/uptimes/metadata.xml
+++ b/app-emacs/uptimes/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/vhdl-mode/metadata.xml b/app-emacs/vhdl-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/vhdl-mode/metadata.xml
+++ b/app-emacs/vhdl-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/visual-basic-mode/metadata.xml b/app-emacs/visual-basic-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/visual-basic-mode/metadata.xml
+++ b/app-emacs/visual-basic-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/vm/metadata.xml b/app-emacs/vm/metadata.xml
index b0fb5c476928..427c9f4ff22c 100644
--- a/app-emacs/vm/metadata.xml
+++ b/app-emacs/vm/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
VM is a mail reader that runs inside GNU Emacs and XEmacs. It was written as
an alternative to the Emacs RMAIL mail reader. VM is highly configurable and
diff --git a/app-emacs/volume/metadata.xml b/app-emacs/volume/metadata.xml
index 4b82c0179582..615a647ffe15 100644
--- a/app-emacs/volume/metadata.xml
+++ b/app-emacs/volume/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">dbrock/volume-el</remote-id>
</upstream>
diff --git a/app-emacs/w3mnav/metadata.xml b/app-emacs/w3mnav/metadata.xml
index affa9b85b291..bed0dff059fa 100644
--- a/app-emacs/w3mnav/metadata.xml
+++ b/app-emacs/w3mnav/metadata.xml
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-w3mnav.el is an Emacs add-on that kludges some Info-like navigation keys to the
-w3m Web browser. This functionality was originally part of the Scheme support
-package Quack, and was intended to work with the numerous Scheme books that were
-converted to HTML from LaTeX format. It also works with some other HTML pages
-that have book-like &quot;next page&quot; and &quot;previous page&quot; links.
+ w3mnav.el is an Emacs add-on that kludges some Info-like navigation
+ keys to the w3m Web browser. This functionality was originally part
+ of the Scheme support package Quack, and was intended to work with
+ the numerous Scheme books that were converted to HTML from LaTeX
+ format. It also works with some other HTML pages that have book-like
+ "next page" and "previous page" links.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/wanderlust/metadata.xml b/app-emacs/wanderlust/metadata.xml
index 3fab274a410c..3e2504b4bb23 100644
--- a/app-emacs/wanderlust/metadata.xml
+++ b/app-emacs/wanderlust/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<herd>net-mail</herd>
<use>
<flag name="bbdb">Include support for <pkg>app-emacs/bbdb</pkg></flag>
diff --git a/app-emacs/wgrep/metadata.xml b/app-emacs/wgrep/metadata.xml
index 4be47a3f1ad3..23b119c5563b 100644
--- a/app-emacs/wgrep/metadata.xml
+++ b/app-emacs/wgrep/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
wgrep allows you to edit a grep buffer and apply those changes to
the file buffer.
diff --git a/app-emacs/whine/metadata.xml b/app-emacs/whine/metadata.xml
index ce96f79d40d0..ff0a5a3fc26a 100644
--- a/app-emacs/whine/metadata.xml
+++ b/app-emacs/whine/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Whine modifies a lot of the commands bound to the main Emacs keys, like SPC
and C-f and RET and C-x C-s. They still do the same things they did before,
diff --git a/app-emacs/wikipedia-mode/metadata.xml b/app-emacs/wikipedia-mode/metadata.xml
index 526fe57e8937..1ab9e7415d5e 100644
--- a/app-emacs/wikipedia-mode/metadata.xml
+++ b/app-emacs/wikipedia-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
An Emacs major mode for editing articles in Wikipedia and other wikis
running MediaWiki software offline. This mode tweaks Emacs's behavior in
diff --git a/app-emacs/xclip/metadata.xml b/app-emacs/xclip/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/xclip/metadata.xml
+++ b/app-emacs/xclip/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/xrdb-mode/metadata.xml b/app-emacs/xrdb-mode/metadata.xml
index fb51ee8b64e7..600ffcb21c88 100644
--- a/app-emacs/xrdb-mode/metadata.xml
+++ b/app-emacs/xrdb-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="launchpad">xrdb-mode</remote-id>
</upstream>
diff --git a/app-emacs/xslide/metadata.xml b/app-emacs/xslide/metadata.xml
index abe614759038..f5b58ef0c901 100644
--- a/app-emacs/xslide/metadata.xml
+++ b/app-emacs/xslide/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">xslide</remote-id>
</upstream>
diff --git a/app-emacs/yaml-mode/metadata.xml b/app-emacs/yaml-mode/metadata.xml
index dfc7f88ca6dd..884f5ed8cd3c 100644
--- a/app-emacs/yaml-mode/metadata.xml
+++ b/app-emacs/yaml-mode/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">yoshiki/yaml-mode</remote-id>
</upstream>
diff --git a/app-emacs/yasnippet/metadata.xml b/app-emacs/yasnippet/metadata.xml
index be75e8ba45aa..d32e0a543a32 100644
--- a/app-emacs/yasnippet/metadata.xml
+++ b/app-emacs/yasnippet/metadata.xml
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <longdescription>YASnippet is a re-design and re-write of smart-snippet. It is much cleaner
- and more powerful than smart-snippet.</longdescription>
- <upstream>
- <remote-id type="google-code">yasnippet</remote-id>
- <remote-id type="github">capitaomorte/yasnippet</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ YASnippet is a re-design and re-write of smart-snippet. It is much
+ cleaner and more powerful than smart-snippet.
+</longdescription>
+<upstream>
+ <remote-id type="google-code">yasnippet</remote-id>
+ <remote-id type="github">capitaomorte/yasnippet</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/yatex/metadata.xml b/app-emacs/yatex/metadata.xml
index ca038952bd63..51d2849fce16 100644
--- a/app-emacs/yatex/metadata.xml
+++ b/app-emacs/yatex/metadata.xml
@@ -2,7 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>cjk</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription lang="en">
YaTeX is an intelligent, acquisitive and integrated package which reduces
your efforts of composing LaTeX source on Emacs. And yahtml is the honest
diff --git a/app-emacs/yc/metadata.xml b/app-emacs/yc/metadata.xml
index df397ea3014c..7fb92b25f5a4 100644
--- a/app-emacs/yc/metadata.xml
+++ b/app-emacs/yc/metadata.xml
@@ -2,5 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>cjk</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/zenburn/metadata.xml b/app-emacs/zenburn/metadata.xml
index 47a77903d550..801c33d8cf94 100644
--- a/app-emacs/zenburn/metadata.xml
+++ b/app-emacs/zenburn/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Zenburn is a low-contrast color theme. It's easy for your eyes and
designed to keep you in the zone for long programming sessions.
diff --git a/app-emacs/zenirc/metadata.xml b/app-emacs/zenirc/metadata.xml
index f4514376b4e9..4de747e56845 100644
--- a/app-emacs/zenirc/metadata.xml
+++ b/app-emacs/zenirc/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
ZenIRC is a full-featured scriptable IRC client for the EMACS text editor.
It runs on any OS where EMACS supports sockets. It is compatible with GNU
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index 6c44031b86f6..b81ce11ec0b1 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -12,6 +12,8 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
<flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag>
<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>
<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>
diff --git a/app-eselect/eselect-ctags/metadata.xml b/app-eselect/eselect-ctags/metadata.xml
index bc306fe58224..385932e856ab 100644
--- a/app-eselect/eselect-ctags/metadata.xml
+++ b/app-eselect/eselect-ctags/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-eselect/eselect-emacs/metadata.xml b/app-eselect/eselect-emacs/metadata.xml
index bc306fe58224..385932e856ab 100644
--- a/app-eselect/eselect-emacs/metadata.xml
+++ b/app-eselect/eselect-emacs/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-misc/regex-markup/regex-markup-0.10.0-r1.ebuild b/app-misc/regex-markup/regex-markup-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..f0f186a0fc5e
--- /dev/null
+++ b/app-misc/regex-markup/regex-markup-0.10.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="A tool to color syslog files as well"
+HOMEPAGE="http://www.nongnu.org/regex-markup/"
+SRC_URI="http://savannah.nongnu.org/download/regex-markup/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples nls"
+
+PATCHES=(
+ "${FILESDIR}/${P}-locale.patch"
+)
+
+src_configure() {
+ # fix #570960 by restoring pre-GCC5 inline semantics
+ append-cflags -std=gnu89
+
+ econf \
+ --enable-largefile \
+ $(use_enable nls)
+}
+
+src_install() {
+ default
+ if use examples; then
+ cd examples || die
+ emake -f Makefile
+ fi
+}
diff --git a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1-r1.ebuild b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1-r1.ebuild
index 54fa609b8463..4859b34f0ff4 100644
--- a/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1-r1.ebuild
+++ b/app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
KEYWORDS=""
SRC_URI=""
else
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
SRC_URI="https://github.com/thewtex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
fi
diff --git a/app-shells/zsh/zsh-5.2.ebuild b/app-shells/zsh/zsh-5.2.ebuild
index f456ba735bfe..cf15c8d5e91d 100644
--- a/app-shells/zsh/zsh-5.2.ebuild
+++ b/app-shells/zsh/zsh-5.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]] ; then
inherit git-r3 autotools
EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
else
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
fi
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild
index ba093defa5e6..0a955313b70e 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ruby"
RDEPEND=">=app-text/build-docbook-catalog-1.1
diff --git a/app-text/dvipng/metadata.xml b/app-text/dvipng/metadata.xml
index f1c2746b9c1f..dda183467782 100644
--- a/app-text/dvipng/metadata.xml
+++ b/app-text/dvipng/metadata.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>tex</herd>
- <herd>emacs</herd>
- <longdescription>
+<herd>tex</herd>
+<herd>emacs</herd>
+<longdescription>
This program makes PNG and/or GIF graphics from DVI files as obtained
from TeX and its relatives.
@@ -17,11 +17,11 @@
(X)Emacs. Yes, you get to see your formulas in the (X)Emacs buffer, see
&lt;https://www.gnu.org/software/auctex/preview-latex.html&gt;.
</longdescription>
- <use>
- <flag name="t1lib">Enable support for T1lib font rendering
+<use>
+ <flag name="t1lib">Enable support for T1lib font rendering
(<pkg>media-libs/t1lib</pkg>)</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">dvipng</remote-id>
- </upstream>
+</use>
+<upstream>
+ <remote-id type="sourceforge">dvipng</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-xemacs/ebuild-mode/metadata.xml b/app-xemacs/ebuild-mode/metadata.xml
index 298888916608..00e0c73ebee0 100644
--- a/app-xemacs/ebuild-mode/metadata.xml
+++ b/app-xemacs/ebuild-mode/metadata.xml
@@ -2,4 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>xemacs</herd>
+ <upstream>
+ <maintainer status="active">
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+ </maintainer>
+ </upstream>
</pkgmetadata>
diff --git a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
index c159ab590ff6..ae27eb2c84bd 100644
--- a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
+++ b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.antlr2.org/"
SRC_URI="http://www.antlr2.org/download/${MY_P}.tar.gz"
LICENSE="public-domain"
SLOT="2"
-KEYWORDS="~amd64 ~arm ppc ~x86"
+KEYWORDS="amd64 ~arm ppc ~x86"
IUSE="doc examples static-libs"
RESTRICT="test" # No tests but test target blows up!
diff --git a/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild b/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild
index ea29c3c6f97f..f523908495bb 100644
--- a/dev-db/kyotocabinet/kyotocabinet-1.2.76-r1.ebuild
+++ b/dev-db/kyotocabinet/kyotocabinet-1.2.76-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$
@@ -15,8 +15,8 @@ SLOT="0"
KEYWORDS="~alpha amd64 ~arm64 ~hppa ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="debug doc examples static-libs"
-DEPEND="sys-libs/zlib
- app-arch/xz-utils"
+DEPEND="sys-libs/zlib[static-libs?]
+ app-arch/xz-utils[static-libs?]"
RDEPEND="${DEPEND}"
src_prepare() {
diff --git a/dev-db/postgresql/postgresql-9.3.10-r2.ebuild b/dev-db/postgresql/postgresql-9.3.10-r2.ebuild
index d08a3dd1953f..58343b44b6f6 100644
--- a/dev-db/postgresql/postgresql-9.3.10-r2.ebuild
+++ b/dev-db/postgresql/postgresql-9.3.10-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-db/postgresql/postgresql-9.4.5-r2.ebuild b/dev-db/postgresql/postgresql-9.4.5-r2.ebuild
index 3a8c797b487e..587f8410671a 100644
--- a/dev-db/postgresql/postgresql-9.4.5-r2.ebuild
+++ b/dev-db/postgresql/postgresql-9.4.5-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} )
inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
SLOT="$(get_version_component_range 1-2)"
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 8ea6502bae2b..1b1cb207bb9e 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,16 +1,16 @@
DIST icedtea-bin-core-6.1.13.9-amd64.tar.xz 49472280 SHA256 3faf62158a33cf1021f63f137a5b35c1c04bc4366d40d7288a6745911bf15034 SHA512 237266a1843b5d1ed0b4553fa36e88d7dce7f6a9bf6e13277d38bc83bb85cfac9b031ed5b362e73e5bc24464893cfdb37bfe67fcf3d4e218a87f101ab56afae7 WHIRLPOOL dd067ee66e2ce7ebbf08d4187d4699198d9759d6571c7d3bf127b7c8ff3a8eb1bea48bf45ed5d480df8de7320ab4f9a00ed6608935f2b3b794a99141568aa57a
DIST icedtea-bin-core-6.1.13.9-x86.tar.xz 50947228 SHA256 fbef618f82fc640553bf69383ddf6a4ffb4da5191426d040f0186538fdb3ab2f SHA512 04a066493a0e742da0508fa7e010e7663e73a48e0663939884d22a2f7fa4d440d3680f6a38d7909b2b2f569bbd35facabe838a275cdd589556570601484d443c WHIRLPOOL 9e144546554bf0de5c7cc280fe20a3cd97554d0745b071d0c3f5f97a394556c71246423a39d10de207d0058889ddc010fd367813f4d10fe888d49924b4d7bac7
-DIST icedtea-bin-core-7.2.6.3-amd64.tar.xz 52999776 SHA256 565383f7cecedf740e9ca0f0c98921cef04f5ccb754d9a4591f98b75a6b6d616 SHA512 9299a9f62fb1a05688523ff4a48ab28a2fd1d16bb8a9984dfc203d919e7e49e733792b9f5aa9852867e8542a422327c235a03fb850b20d38877d0048ccfb6420 WHIRLPOOL 657cf42fdff2a40f8acaa9fe1ea0c7a29d28799943f92418636ec76dd82ed658dfb628596d01c4d432220bfdc0f0f4c4dc247181a5e17cdb198d2edf09b61bb1
-DIST icedtea-bin-core-7.2.6.3-arm.tar.xz 43980964 SHA256 bfc50f27b063461e2382da6f480bdc24a498feb3eba3c368912239ef176a384c SHA512 2d3aa682c20a6abd200263e15f0a7cb7f2ee3bdd52db6eff5d1d3676f286c3ed356ed9ca71041ad9514ca4684ab84f52c7df2a94bb112c99e34477a225f57a20 WHIRLPOOL 1c2139fe5b2da957ac64fdf9214cd2c62b55591f7c535b6ff287d0da20b7f9e6e19f5d93d816cb4346ec3746491a30b5b080184132669bd0a90d7f0ac3fa0da3
-DIST icedtea-bin-core-7.2.6.3-ppc64.tar.xz 42984708 SHA256 8d0723accf8cb0258504581dd6663200bc89917ef3a8950f542c9a80eea4f96f SHA512 4557909277fb2ef74c7fc4882dc07ce161ef8e1e1b5c672a72a3ca095c409273a4fda521c7d2f5241939c2f1124857ec3bbf84dce67a34b0ad47e3aafbc896fd WHIRLPOOL fada9dc621792549d4a8622fbfa6ecc693cc02aeb7c191efbfe816c6e71d2174823f2e9cea5b57aa4a8ff49e176bbed45de5f4fecac09b0881ccd0c635e0c3ec
-DIST icedtea-bin-core-7.2.6.3-x86.tar.xz 54651304 SHA256 3fc4faf7a9370cb0155df3c650eb36096c9430e38b3904e535027d823234043c SHA512 3ad55d66839c4cde86b44826ef8ba0ef1565cf9af9386cc327ef2b5476ddd954c519f925885e156ac87d4c606b0fd00ebaf8c8987c8b4fd81e789713a2ba3ef7 WHIRLPOOL 43df9b60ec270eb4a750299beeae316026d27b8ddf1e2246c5ce711f7d1f6f297b710b7cbf481d887fffa44a1a59f36997af7c52722a06d6c4e4ea1cf5b33208
+DIST icedtea-bin-core-7.2.6.4-amd64.tar.xz 53010708 SHA256 16e33d1f686c657c9b16c63d206bfbc6b079dd2112108f4205057e6998291345 SHA512 ee6674d99d2ffcc9c9209eb22f9efc0f2ff4a57e1cdf6763de7ff505e312cc740068a68c4ad77ff8f9941ebc5407cd2b3cacb17dda22fefb77c9a0dab4ea66a6 WHIRLPOOL e86c06eefd6f7eb605c7a39c6865f8eb56260febe595527cbbd6db41ea2fcb7c0a65bb60846dd2bfaaf6b2ee3548297a0bb3af61df900d10b8c5a7605d95737e
+DIST icedtea-bin-core-7.2.6.4-arm.tar.xz 43993060 SHA256 980d3185cda11cc4b7b6287d3a7a5ea7c87e5b138f066f9fc6d2a2ec6b7157d6 SHA512 892b7e0268baabd2e921d5144e233c127698bff21da075f77c3b96b0c70a0a4b9515cd184bc992f89c3821eea9decaac3bee507ceeb0758573280b51f92e6928 WHIRLPOOL ba334447e3ae703c8240667be155844b470b54753792dc6c8ae207a73b3a9b278752eee4a085d13cc5b6fa5371da631cc6e02607d524810df14f056745821ac9
+DIST icedtea-bin-core-7.2.6.4-ppc64.tar.xz 42990476 SHA256 b5a94318086797e230e9cdc3f87224464979b5024ce0a02a6a10875e15bc5609 SHA512 be065eeb6682163b290ad4374a2d24ed4c7cb042d2253962bb9c2129d1a78ec97439c3e0fa4f3a6db74fbaee2f9ef8f09dd80188d55b5aabde320a13c1c8d2e4 WHIRLPOOL 266bbb109cae1d97befc1cca6a915f989ec5d43b689499c42a26d3be7a5903bd4c9ae7cc571f044b59f0a786ab74bd68b8eb46691ac743f31b9e20eb23cedd5f
+DIST icedtea-bin-core-7.2.6.4-x86.tar.xz 54661536 SHA256 9329914ee4a6072afb940e2a3f63b5ee356cb1d332a94b46d38e54ea68c2a4b2 SHA512 42348aca553722161102f7eaa9833ff4723b183a2844d5a2cdab9d1dd88ac02e991971a61c8b934f1455b21f9a11947b2a753283941135495c84717ca55cd825 WHIRLPOOL 3548ec0058b38cfc551a687f8f1fc998872975d3c9bd07124b3593ed8da59c2a689de133c414ec934cee8a47e5a4ef915e42ab9c4541cbf7d2b358505e6d729c
DIST icedtea-bin-doc-6.1.13.9.tar.xz 9853020 SHA256 94ff85ba64be5c8cfcf261cb6293e48cc3239c1c9da69e98fbc744a82620bd16 SHA512 501d483dccfc349c6dd8a55f9d509d2859774054be9b9ca8020a75e3975d740d78d40184aa86f16b5ea948e16b74944ce4d890396d8ccb5209f7a9514a8b649a WHIRLPOOL 751afbb1e0e2384419424d9ae093893c2e377c004c69d0e06979385823f743ee33321b3c3076e0c8e0b16625a159293d81f959455ca6ee779dfdfa5fc5361907
-DIST icedtea-bin-doc-7.2.6.3.tar.xz 10604044 SHA256 7e43108f95991600d58f85ce44480d5702cfc6951d0cc096e1321852997acc5b SHA512 35688e7a19620ef7d4890ee9058b6f49f76b5ba67b5f1038cc9a53b7c50224eaec599baf6fc9e9bc4cc5b49e13c0dd05d5d14043b4d291caf237e9cd5a7e31fa WHIRLPOOL 9a6d3e3ad62f1cd5a4435dc1e1cf3943cb752898c3ba61b149be38603cb8746ad88b68e3e3812a449d65ccb4b9d8da211c07bc503044efe5849a35188944ad2b
+DIST icedtea-bin-doc-7.2.6.4.tar.xz 10603692 SHA256 07e1bf90c61b56bf311d528891f30ed0cd67f073e6019aa92c8907c86bf1c6ac SHA512 6c97c37926989b1a36bb1fe9712caf6270c539646aeb76d30a10e9479ecbf734f2f56ef934f774a9cfe4d713651fd0b8c99872f6651f2d7e3c86a18294f9ea79 WHIRLPOOL 023eb8ee8851882101cff967d7ee58f69aa569257f113e512faef2ba3eebf066f01b80440cfbb59c7ed67b36630426ea88300724e7348611ae80c498e5da8b84
DIST icedtea-bin-examples-6.1.13.9-amd64.tar.xz 1904980 SHA256 aa10b253ba35e14d83852c80999c04bfee7c6ffee7b1baa9df502e253a6a87a1 SHA512 f9be25093aed5b762a268a5fc2cd943fa010bab469e1fd0cc9c39c927a9a154041e637036bfa804cc826f1c674b661ee6d4a5dd7d29820df1de4390db403a229 WHIRLPOOL 121122c84abe3ddbddf5faf6e163ce9a34331cdddfc8cd0ca746d8ba94a79af31c1dadba711aa4bb709edd91605d81785de4fe4ff1e3edd526d4aff592b18816
DIST icedtea-bin-examples-6.1.13.9-x86.tar.xz 1904548 SHA256 1aaaaa4ba6c37b5f03ecea8a978c9bdac371e5891dd02459cd7f4174286b182a SHA512 fcdae8dc62376f60a19a3de1fbba867fcbcaa069b5d669120e53d1792119a147566ce59e3e3205ca1db0afea3e6809f339a4a443ff0d21cb1a7c4aa8eb5060df WHIRLPOOL 5625b1af755e79c1e4360ac3fcbf786664525c9508f6fe902788f95a1be9b94d429a61ef0e475fa9d0e2c4ea386fe251a299305961e7936f932c8e2c0abcaa3e
-DIST icedtea-bin-examples-7.2.6.3-amd64.tar.xz 1796572 SHA256 bdbe018716fa955df5dfea56c1321698033debed7a29fe03650b0cdc5c7e6da3 SHA512 d6e1b5a93dde61bb0d7ebd7a06e7a326e94423ad362e0b9956d5eeb37197f716d5db7bbd6fbc32a1906089953a83a77ebc2ee99cedcfd9e7944e48ec3865e0fe WHIRLPOOL 0e728e3cdc1e33d264bfb3b5f54bbe4bd3ec64a19b0bc3047dc65c99cc45009fef9d8eab94761100ce84919379e5890e96c54965e840c5f10eb102a4df03767a
-DIST icedtea-bin-examples-7.2.6.3-arm.tar.xz 1779684 SHA256 78e068da88739404332cb50588229d236709f0adfe00596405c80c8a10f03d3a SHA512 a854095d3ee23db768ce9d1dff8bcd1598523a65af82ee6654b9ba464436d9f5d88208fe6879c1ea5140f30fca4f31e8dd5212b781722608c535d951c9670feb WHIRLPOOL 8dc1a49eb6a8bff49690d64384e9ffbd51725882aeca064419a69ff9ec82f624c6a16023b1930f16806189b0a89a70f3339ca653d3abc5335850205129b13d01
-DIST icedtea-bin-examples-7.2.6.3-ppc64.tar.xz 1790340 SHA256 33b1f32e1b88469d1a8d37516825b0ec4eaa4645e205c2d4e669a4e6bc2c3449 SHA512 02ac15c513d2c870c7bafc5f18720bce4b7bdc84f3a7eaa64ce27094af5357a76211dbc6674a482c0ebc083da5ede2a79cfe2b1964477401aa508c3eebfd2a3a WHIRLPOOL 34090707fb04daed9993b5873bd5b71d2fec2cabdbf33ed8cd08540255a2edd07d16556bf8c4cece762c3d83856ec00254682eb316bd4ac9c848bc165bb2192f
-DIST icedtea-bin-examples-7.2.6.3-x86.tar.xz 1796668 SHA256 3f7d09d5f7b3dd45e9555c7653adf450b74c24eed8e91d4c6829cd084eaf1894 SHA512 d1bc7800bded733e69573694d8cb18cf352a633c36f336ff40fe8e4cde42f390dcac54a08945926eb0c17591574bf8eb7861977cbfaeb9b8eff7c2e7cef036d3 WHIRLPOOL a324137216a623749f8a1de904dd5cddb481b92c7286c365fb1f7d95682044674a2267d23e660cb804e071eecec3c6baea63ce75c0b97c0caed0afae1b2a7761
+DIST icedtea-bin-examples-7.2.6.4-amd64.tar.xz 1796924 SHA256 1cba4146c597bd9cae873965b2f198fa944a368fe4bd39deb0e0a06df8638143 SHA512 10be9af6a44e0e10fff7df279e4c0912df4f53e48b6fbb3891a1f9b72eb4ca7c696019eee780ad7bfd2cf9001e8acdc44739ba8c95706a46e33278e104c1bbbd WHIRLPOOL d5272f7a711dbf69d976b83623b64e1f55cb1d459a081aa5c71dffb585675c2b05b00798fe034007e7f58d94f7dabb0c8a47c9ffec740c2d55bfbfbec35326cd
+DIST icedtea-bin-examples-7.2.6.4-arm.tar.xz 1779692 SHA256 2b0965c93b8b1fe97ac25519739f132824f2f6cfb0662dcc93e5016f640f3024 SHA512 a16bcf86f3fba0dfd09d233cc53cb7e49f52317479b84db5d49939e3d22afdc31c2e75ec81bc8ebe7635e993097d0bc0d7b0e9610cfe3c6491b0f69f578e4e55 WHIRLPOOL 1ecbc914e22fe52697a57d0e5cb202c96478a07447f33877a7e3ad3b8e27f35e640ecf856e35c4c1e288220208efc0244b0b1f93ff6f1b83df0e64b001695e5c
+DIST icedtea-bin-examples-7.2.6.4-ppc64.tar.xz 1790468 SHA256 cb0b8ce994281676259f92e91b513f23765ad7364367986f46bbbeca661a914d SHA512 d749f6d42a7c05bc2499a4df69b6921e0fc36bbf12bef1cd64cf79fc13b1c256c2b10159f120bbf5546696777a3d71e64a3370903cfc49d095925931eb12f75f WHIRLPOOL 44b41eb5f857f695e305f85ab7f3a6b71989372f1b327ba6d8dab1251237fe9ea274bf29e32663644298b44febef3b5b220fa740793bc62e40811b1a0a9aded2
+DIST icedtea-bin-examples-7.2.6.4-x86.tar.xz 1796620 SHA256 16591cca92ef9470873f89c6c2291b458c4dc441a8adac1e4a1c34bd5f9514a4 SHA512 7ca0d297247a367c63de0c016949a1157f987592d6481347d31d2b127db71f932f6444c75c42c55357494579357fed65c3261a25ad046f14d473cf58b585822f WHIRLPOOL 8d28811e3c83534e5a2545a15ce3729827073099095e43923d653b6ac3d6d6f4838e24757e6aefd87603e22f27a2a82cacc219459bfe7f2b5f5346750d9cb25a
DIST icedtea-bin-src-6.1.13.9.tar.xz 39778948 SHA256 11ed522199d3919f7013f4d3d4fb2324d4505ca60fdbcb015faf635c4dfcfc70 SHA512 4c02e7368ed21882afe68cbba3475a16a30276110282d28984586f1c1e0c3d14278e70e495fc74676ba57df3849b8f60ea24da49c6f41070319c46962f1a221a WHIRLPOOL b6daed3717d434688e8946976d96857ce904d510cb45fc30b464e86d1c123ccb2a81ee07bea432ad6fb5148d1b0a73bebe7f51a0bc2f5b1308701a4fce436d79
-DIST icedtea-bin-src-7.2.6.3.tar.xz 40039304 SHA256 eb8a7e7dd567934a274f496640d984792731ca1192f2fd415a4d6597a282b8b8 SHA512 f02778176bdf524a954689576272ea4af8d77e6dacdab05edb8bc0ff2db43ae2d63635b07ae88f8f9d88797c4b9f28c4d24341c8e10a0f7841bae1b6775b97e4 WHIRLPOOL b9603cbaeb9528288b18225323f97635efd7a434d4a9fb45ceb1abfa2d93c1cc1fc212187448a8ed3cb074d657736537b5e175ca82749c8cb04cf085f16a162b
+DIST icedtea-bin-src-7.2.6.4.tar.xz 40039764 SHA256 62f0cc8dee7a518c01e3fb1cc821686440171c67e32936faedbfd57500d7a252 SHA512 e4e208766f35b9a0d720c5e853bbded04cc38f5f972ff83c759786bdaef43e5a454361be61f677ff57686007d9e393e15345ba9577abf189f94ebb6067ca885c WHIRLPOOL dc9102f20caf079d61a816ed21c791348fe1717cf4424d5b5b8e1928010bcee7eab885bf44a438934ccf6562f1f8b6259a31f45d32b1bf752e893e1153c1cb0e
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.13.9.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.13.9.ebuild
index 09fdf402dfd3..3d9e4f80bf34 100644
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.13.9.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-6.1.13.9.ebuild
@@ -26,7 +26,7 @@ LICENSE="GPL-2-with-linking-exception"
SLOT="6"
KEYWORDS="-* amd64 x86"
-IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin selinux source webstart"
+IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin selinux source +webstart"
REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
RESTRICT="preserve-libs strip"
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.3.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.3.ebuild
deleted file mode 100644
index cd849a1992b7..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.3.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit java-vm-2 multilib prefix toolchain-funcs versionator
-
-dist="https://dev.gentoo.org/~chewi/distfiles"
-TARBALL_VERSION="${PV}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
- source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
-
-for arch in amd64 arm ppc64 x86; do
- SRC_URI+="
- ${arch}? (
- ${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
- examples? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
- )"
-done
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="-* amd64 ~arm ~ppc64 x86"
-
-IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source webstart"
-REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
-
-RESTRICT="preserve-libs strip"
-QA_PREBUILT="opt/.*"
-
-# gsettings-desktop-schemas is needed for native proxy support. #431972
-RDEPEND=">=dev-libs/glib-2.42:2
- >=dev-libs/nss-3.16.1-r1
- >=dev-libs/nspr-4.10
- >=gnome-base/gsettings-desktop-schemas-3.12.2
- media-fonts/dejavu
- >=media-libs/fontconfig-2.11:1.0
- >=media-libs/freetype-2.5.5:2
- >=media-libs/lcms-2.6:2
- >=sys-devel/gcc-4.9.3
- >=sys-libs/glibc-2.21
- >=sys-libs/zlib-1.2.8-r1
- virtual/jpeg:62
- alsa? ( >=media-libs/alsa-lib-1.0 )
- !headless-awt? (
- >=media-libs/giflib-4.1.6-r1
- media-libs/libpng:0/16
- >=x11-libs/libX11-1.6
- >=x11-libs/libXext-1.3
- >=x11-libs/libXi-1.7
- >=x11-libs/libXrender-0.9.8
- >=x11-libs/libXtst-1.2
- )
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- cups? ( >=net-print/cups-2.0 )
- gtk? (
- >=dev-libs/atk-2.16.0
- >=x11-libs/cairo-1.14.2
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.24:2
- >=x11-libs/pango-1.36
- )
- selinux? ( sec-policy/selinux-java )"
-
-DEPEND="!arm? ( dev-util/patchelf )"
-
-PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
- nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
- pulseaudio? ( dev-java/icedtea-sound )"
-
-pkg_pretend() {
- if [[ "$(tc-is-softfloat)" != "no" ]]; then
- die "These binaries require a hardfloat system."
- fi
-}
-
-src_prepare() {
- if ! use alsa; then
- rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
- fi
-
- if use headless-awt; then
- rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
- {,jre/}bin/policytool bin/appletviewer || die
- fi
-
- if ! use gtk; then
- rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
- fi
-
- # NSS is already required because of SunEC. The nss flag in the
- # icedtea package just comments or uncomments this line.
- sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" jre/lib/security/java.security || die
-
- if [[ -n "${EPREFIX}" ]]; then
- # The binaries are built on a non-prefixed system so the
- # fontconfig needs to have prefixes inserted.
- sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
- eprefixify jre/lib/fontconfig.Gentoo.properties
- fi
-
- # Fix the RPATHs, except on arm.
- # https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
- # https://github.com/NixOS/patchelf/issues/8
- if use arm; then
- ewarn "The RPATHs on these binaries are normally modified to avoid"
- ewarn "conflicts with an icedtea installation built from source. This"
- ewarn "is currently not possible on ARM so please refrain from"
- ewarn "installing dev-java/icedtea on the same system."
- else
- local old="/usr/$(get_libdir)/icedtea${SLOT}"
- local new="${EPREFIX}/opt/${P}"
- local elf rpath
-
- for elf in $(find -type f -executable ! -name "*.cgi" || die); do
- rpath=$(patchelf --print-rpath "${elf}" || die "patchelf ${elf}")
-
- if [[ -n "${rpath}" ]]; then
- patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}" || die "patchelf ${elf}"
- fi
- done
- fi
-}
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}${dest#/}"
- dodir "${dest}"
-
- # doins doesn't preserve executable bits.
- cp -pRP bin include jre lib man "${ddest}" || die
-
- dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
- use doc && dodoc -r doc/html
-
- if use examples; then
- cp -pRP demo sample "${ddest}" || die
- fi
-
- if use source; then
- cp src.zip "${ddest}" || die
- fi
-
- if use webstart || use nsplugin; then
- dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/bin/itweb-settings"
- dosym /usr/libexec/icedtea-web/itweb-settings "${dest}/jre/bin/itweb-settings"
- fi
- if use webstart; then
- dosym /usr/libexec/icedtea-web/javaws "${dest}/bin/javaws"
- dosym /usr/libexec/icedtea-web/javaws "${dest}/jre/bin/javaws"
- fi
-
- # Both icedtea itself and the icedtea ebuild set PAX markings but we
- # disable them for the icedtea-bin build because the line below will
- # respect end-user settings when icedtea-bin is actually installed.
- java-vm_set-pax-markings "${ddest}"
-
- set_java_env
- java-vm_revdep-mask "${dest}"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- if use nsplugin; then
- if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
- elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
- elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below"
- elog "The switch should complete properly during the subsequent installation of icedtea-web"
- elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
- fi
- fi
-
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.3-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.4.ebuild
index e07e771a9667..aa3fe4f2c406 100644
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.6.3-r1.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.4.ebuild
@@ -24,9 +24,9 @@ done
LICENSE="GPL-2-with-linking-exception"
SLOT="7"
-KEYWORDS="-* ~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="-* amd64 ~arm ~ppc64 x86"
-IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source webstart"
+IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source +webstart"
REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
RESTRICT="preserve-libs strip"
diff --git a/dev-java/icedtea-bin/metadata.xml b/dev-java/icedtea-bin/metadata.xml
index 0c161d9e63fc..c1fbf8dce06d 100644
--- a/dev-java/icedtea-bin/metadata.xml
+++ b/dev-java/icedtea-bin/metadata.xml
@@ -3,7 +3,6 @@
<pkgmetadata>
<herd>java</herd>
<use>
- <flag name="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag>
<flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag>
<flag name="nss">Enable NSS security provider support</flag>
<flag name="webstart">Provide javaws command through symlink to icedtea-web</flag>
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 93c5fc80b323..3875c9b27086 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,11 +1,11 @@
-DIST icedtea-2.6-corba-9a3ca529125a.tar.bz2 1072549 SHA256 1052ae3c70908aa3374818ada320685cb7abdc7bd7bbd3cfb4f26fbbe7435ec6 SHA512 8d46557d564917514a14296b06cc35c1d84b1d7be7a3c6cd14770fe76481fcd02af9ff1cc528acde684cc1c5e2a065ce2e5254fae47fdaa3598c6e5ab8779697 WHIRLPOOL 8890517cc5b992d8d35c5486e3105c7e52dd86c94bdfafaa2657cf58a09e7b4e776b90cdd5a2ae311e12dadb6eab010b1b29416697cfb285f12ea5eceb31db36
-DIST icedtea-2.6-hotspot-c3cde6774003.tar.bz2 8163275 SHA256 dd8f3771439b4d51fa84e3f9b384b80e6656cf1a19ee3492b4f2fe09b37eef0e SHA512 3aadde373e01575cdd1fa3621ab132eb2273d70f08f8a3ad784cd238d8902626f9121c0f8abdddae7a810fb79cf70c0ea3fe7f2c2035fadd2803a2177a305ea9 WHIRLPOOL ccdd1f3bc14380673204021b7a3f57bc03d70c5ba085e34ead4a32349bc95ae85e706dcc207d2c335d087b6dcd3a53f109dc0f31ebcb6b2c8c59654b6fa03233
-DIST icedtea-2.6-jaxp-f7bf82fcbd09.tar.bz2 2732623 SHA256 a0e978bc07371901560a746cae492edf0bcb22ddbb9e47b77319ffda1351806b SHA512 4a0de68af85699b611e37af0749cccdb0483ac75af1fbd0f63cdc2f0c173605bca77c60bbb41aff916c768b5a29a933fbd8e34d8bd2dd67c22cbd629078061ab WHIRLPOOL 7904da721c88e6daf5ee32cb5492e5e3d09e10ec78c4275625f5ba0a04720cbec0de59f6a5900f62c90ce3284b9441400508b69e2660c43dc8561f15c4255601
-DIST icedtea-2.6-jaxws-39ef53b9c403.tar.bz2 2021458 SHA256 55897d92e368ac7df3e04d4f235e9dba12ea8264e20d4bd6b68e8c13e5addc1e SHA512 a4cd98bc6c4b1b54dcee68f4a373322e550246ed88412e33d3700631bbd662d390df89047f9cc40f80c10f1ffce81142c301db06ef46bbc16e1245880242151d WHIRLPOOL 0e1889c115a0e03a4f57bcc357b8b19470e768eeb2650554fe6573e057b4f6280c879101ce250b25d2b00b0964383c6399129736fd5236929964badef6a0228d
-DIST icedtea-2.6-jdk-5215185a1d57.tar.bz2 32415510 SHA256 583898549b52e958521474db34f2ce535b6a0926c7df1fa99a3f0321b3a109f5 SHA512 9cfe22d2a112d35c8008069c61118f5e289e78a91d325da301949843d5c7b747cdf99fa7c97c09ea4c15a263f47d09b65ee26ca01282aa4d9abed6087a09f656 WHIRLPOOL 3a7d1848f742318c1a93430956671d0618eb394f0282f3c7d81eba28770d942c11ba10fcae49342ffc50a056ec9e508d3cd6a3da6ce8c45e2850728bd80c5fcd
-DIST icedtea-2.6-langtools-91fdb0c83e50.tar.bz2 1710122 SHA256 f14716df84e047b19884ac5b0830e87b6cdf1925d0951195255c9124e89df27e SHA512 2aa47e622194e0afd773c3f56df67afa35e69edc7af0c6385edc4d26383a3b1a29d87470c6fb2bc3d3e51b58c0283023ddb53bca4c4bf5504ed22fe457c39bb1 WHIRLPOOL a1cd8f6b6ab9ebdf01c836480429ff877fd37b0f12faa1add187dae95628a5588b1d66aa5751dcf7ed969c821570483c010e0efc7a635e0d6f71810bc0eb1aae
-DIST icedtea-2.6-openjdk-f0e7f22f09ef.tar.bz2 129924 SHA256 9e5d26bb1888a8a1378e078953aa04314d4fb4f263ebbaf7f459110c21f8d46d SHA512 ff6246a8615a2113197eb41839912fa1fdc22d95252846b08ff1539db13715131aac65dc06f9086ffb83daa4558caf1b707091ed5ef058bebb5fffc9b665e472 WHIRLPOOL 73c87a7055493668d17a99e1d616d7de2320fd792455504c147d5211dff28168b4161c0bb057645678ab71e665ed84f914cc6aa910d00dd6fea8494fd21934ef
-DIST icedtea-2.6.3.tar.xz 2075476 SHA256 df38aa10b4d30f3bae089dcc72f4c32fb2385cb541491791c12829960f53c612 SHA512 ea3333739627d64513140db77c7db11d1d74b5e6802889d11e54d1930feaea3733241d1691cb01d4550d4035c0e2e1076a03883d93db400ebc26a3ab0c8092c3 WHIRLPOOL 3b15fa2a661ca58fbc31bb195dda1dcc185af1c66eb89475bb95b762bb84541b6db0df7d7e5eeda4276398b3ebdf47a0c7f32cde950a53c82bb3c3793c1c3afe
+DIST icedtea-2.6-corba-2135da66cc53.tar.bz2 1072269 SHA256 26bbfae0504fb7e83fd5eaba08d9e44e0c07a609cdf7c04fb6832a097b56bc08 SHA512 2e07d6529c347625c06aed7dc25b41b5ca425aedb0652cc92df477f8a4ab1343c4aa90b1204a94a327a550d75cfe13c0adaf607b7e064e11b5a9ed07afb9313f WHIRLPOOL 2cbf0e97038907800f6d88084fc9879714c8c1297842179e3f220dde416d6f47d076fdc2c2296600aa06dcf839ec029378db8e7a662ce8c3cbfd8eda67e9ac3b
+DIST icedtea-2.6-hotspot-19d919ae5506.tar.bz2 8162545 SHA256 3747417c3ba69d1ff7d80dc6df19454c4f4023c35f8b711e47baefe2fc772e65 SHA512 be3c356fac53112324f688e6336e8bcde453284f20671a1630b97a30bfaaedf1f7915984250e51aea106fbcc25790aca3f7d4ed419499394748f0391b17782c5 WHIRLPOOL 65251c4e6d91fd8a25bb2bc83b58aacd23f3e7f4f65112d135ec04f98136e351a8175a84a05c070a42d1a351c8301c55a34f65f120e908e129cecb0ff703d32d
+DIST icedtea-2.6-jaxp-bc6edb6c12a7.tar.bz2 2733735 SHA256 097cb0423271b6439b36db190a66bab9d447dd03ee22e42a6089a3b3b8363f62 SHA512 fb9a7607403ba15759427bd7ef1740949dc9cf3892e61a643b9dcdfda7633876d38606dd06af96b0fa362eec427c68b9faa458762defe502c81cdd97290a056b WHIRLPOOL 62583d7e1907b97b90f818b9b0e76fe10a0f57342597191157f6c0a696af8f1fdc4b4968aa2112c7b42900e6a988fd291b0d5ffe7c3de7d89473e536ab6b9e56
+DIST icedtea-2.6-jaxws-271b555de438.tar.bz2 2022035 SHA256 da7604aaaedaab93ba9ad21ee5ee8f18c807606a97d60037ae8c3647e823dfa1 SHA512 cc7d9ee95ba4350c44eb1e9c08e70f6c4e5f1c115a8bc1c3af91828e8c6b814c31494426edc08e75601506e8f6208d07e8425f0f5b14ba5f5de7c7e3165b76c4 WHIRLPOOL a9376fc7ccfd9fea8adf7716aa0da93a32f855acc565b6ea39fa38cbbf3a008a035e62d54d9b2e3633c8a1c185787e0a373d2b166ef609e6483a4d28a3fdd1fc
+DIST icedtea-2.6-jdk-dc86038147b2.tar.bz2 32420326 SHA256 9d3199c0f9c39238c6920c941026cf8661a92e97845f75d74e9ff277532b5d63 SHA512 d22cba72083b65ec5b818652e0520c7b63974ecd940f6f39e27ce83cac664de15c3c4611e088056b6ae123b77f605fb61c1226c05811b03086c39cc2e12f114d WHIRLPOOL 48d3cacd5ec54c8e7dd203abd53f956669ff861ebe98e677d107d31d6964467b2387995e644a64ba238f44dab287bb2f6ef5d6e8333aa167d994cd72d74fdda3
+DIST icedtea-2.6-langtools-fd0a34cb97b4.tar.bz2 1707682 SHA256 f9b0ce14c73c263276d3dfe78601714869cd2c0463bd01c637c8556d52a7d7cc SHA512 0044e405fdaaae8fa54dd576b9efec4e51bdc0ee410eeeb3f78984a20efd6bd31b678e9b113a9d33c4eafaab3cb4ef190c78a4d02172e010282768bad917c497 WHIRLPOOL 6c70b2b176b1186eb9faf1a017becef1cc05b7c1c49ddfe5251b5660972514bb65c613cd5a5de5a11a5f104d63414947d5a3229e30294f57e67ace001acd9ef9
+DIST icedtea-2.6-openjdk-4f1e498cad9c.tar.bz2 129984 SHA256 bb02e71972ad606e739c79fc11c6dc61b4840a526a41049a600a206cc37152e2 SHA512 0b5affd4dfd76f584d1cd921026c5ae1d1017ee176f323a14eaaa5d02aa699e744f4c42ca76c31be93b334bfade63e1ca6635f9d9191640841497ba92cfb813c WHIRLPOOL 46769805754e869e4348925e96e63acec443e7e7bc4181925eb3610181d78784c54e288d0383668607b86945ee1e2eb7eeb345a161abb4524cb9f5acc77566c2
+DIST icedtea-2.6.4.tar.xz 2078228 SHA256 d20a365feea95a4c01c9f9db1f7562f471f638bc672db9de6c6e654d2d826164 SHA512 96373c8452b3087804d906544cd84ddae5bd3969314bd856cb89a9aa02c49fde0ea04d602f6d0d9e82308d34c60aa6c309314ec03ec7c73a4bf3c18a8825d1e0 WHIRLPOOL 688051df4a304874761f5e37bd0b003e20df17cf9f1552230b9638aa6df62d09c8c29dcdf3c7646b523266cc40ad0b4a4528bf4dfb46eae2e91d7e5e575dbc5c
DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
diff --git a/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild b/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
index 4d4f4dc50b77..a5d637de5885 100644
--- a/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.13.9-r2.ebuild
@@ -39,7 +39,7 @@ RESTRICT="test"
IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
javascript +jbootstrap kerberos nsplugin +nss pax_kernel pulseaudio
- selinux source systemtap test webstart zero"
+ selinux source systemtap test +webstart zero"
# Ideally the following were optional at build time.
ALSA_COMMON_DEP="
diff --git a/dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild b/dev-java/icedtea/icedtea-7.2.6.4-r1.ebuild
index d68f4174148c..9d0e86f02471 100644
--- a/dev-java/icedtea/icedtea-7.2.6.3-r4.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.4-r1.ebuild
@@ -16,13 +16,13 @@ ICEDTEA_VER=$(get_version_component_range 2-4)
ICEDTEA_BRANCH=$(get_version_component_range 2-3)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="9a3ca529125a.tar.bz2"
-JAXP_TARBALL="f7bf82fcbd09.tar.bz2"
-JAXWS_TARBALL="39ef53b9c403.tar.bz2"
-JDK_TARBALL="5215185a1d57.tar.bz2"
-LANGTOOLS_TARBALL="91fdb0c83e50.tar.bz2"
-OPENJDK_TARBALL="f0e7f22f09ef.tar.bz2"
-HOTSPOT_TARBALL="c3cde6774003.tar.bz2"
+CORBA_TARBALL="2135da66cc53.tar.bz2"
+JAXP_TARBALL="bc6edb6c12a7.tar.bz2"
+JAXWS_TARBALL="271b555de438.tar.bz2"
+JDK_TARBALL="dc86038147b2.tar.bz2"
+LANGTOOLS_TARBALL="fd0a34cb97b4.tar.bz2"
+OPENJDK_TARBALL="4f1e498cad9c.tar.bz2"
+HOTSPOT_TARBALL="19d919ae5506.tar.bz2"
CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -62,7 +62,7 @@ RESTRICT="test"
IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality
jamvm javascript +jbootstrap kerberos nsplugin nss pax_kernel
- pulseaudio sctp selinux smartcard source +sunec test webstart zero"
+ pulseaudio sctp selinux smartcard source +sunec test +webstart zero"
REQUIRED_USE="gtk? ( !headless-awt )"
diff --git a/dev-java/piccolo2d/Manifest b/dev-java/piccolo2d/Manifest
index 352799936b9b..2b8a3c2f962d 100644
--- a/dev-java/piccolo2d/Manifest
+++ b/dev-java/piccolo2d/Manifest
@@ -1 +1,2 @@
DIST Piccolo2D.Java-1.2.1.zip 1886765 SHA256 3ba041d458226f8f54170cd82b76d2868a943f3b6d18c602ffacb8887598a621 SHA512 00e8119148abfe2b399ca252eda97c0199bdc03584e08b34438b16cf3c27bb103eb04c6afe9bf4c07832fe2a95147f53a4a536abe81a2f3116c332678f2dd919 WHIRLPOOL d4da92c931c65a26b5f5925c9557aa4a7af4c0cc009a9a49b01853b74e3a63bbde110e30d2464a2bb39fbce6058a73a0a76d1d7778370abe122ef06baaeb98ac
+DIST piccolo2d-3.0.zip 786064 SHA256 acfc9a8b6baf12a22d1307a0fd0dfa8abb160bd1aef7cade63158d65ba939b33 SHA512 c57d0e86ea36e662027559c63c8e300629361849d4526d9271ea1ed3c8d55296ab1fab846c7a475c5d831fc6330052fa897ba8d3f89a196bca752a7ae802aa2a WHIRLPOOL 547ee6e23986f0cee9c5c65819c6da910a1e6931f5961d8e417476b0c62346fbb647b498fd63db28bdfe92248cd3e9f3b856f18741690486ff1ff1d552f4d628
diff --git a/dev-java/piccolo2d/piccolo2d-3.0.ebuild b/dev-java/piccolo2d/piccolo2d-3.0.ebuild
new file mode 100644
index 000000000000..0697b8ee4345
--- /dev/null
+++ b/dev-java/piccolo2d/piccolo2d-3.0.ebuild
@@ -0,0 +1,52 @@
+# 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="A Structured 2D Graphics Framework"
+HOMEPAGE="https://github.com/piccolo2d/piccolo2d.java"
+SRC_URI="https://github.com/${PN}/${PN}.java/archive/${PN}-complete-${PV}.zip -> ${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/swt:3.7"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DEPEND="
+ ${CDEPEND}
+ app-arch/unzip
+ >=virtual/jdk-1.6"
+
+S="${WORKDIR}/${PN}.java-${PN}-complete-${PV}"
+
+JAVA_GENTOO_CLASSPATH="swt-3.7"
+
+JAVA_SRC_DIR="core extras swt"
+
+java_prepare() {
+ rm -rf core/src/test extras/src/test swt/src/test || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+ dodoc Readme.txt ReleaseNotes.txt
+
+ if use examples; then
+ local INSDESTTREE=/usr/share/doc/${PF}/examples
+ doins -r examples/src/main/java/org/piccolo2d/examples/*
+ doins -r examples/src/main/java/org/piccolo2d/tutorial
+ doins -r swt-examples/src/main/java/org/piccolo2d/extras
+ docompress -x "${INSDESTTREE}"
+ fi
+}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index f600c9f200bd..6dcb7c1ca743 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1 +1,2 @@
DIST icu4c-55_1-src.tgz 25600847 SHA256 e16b22cbefdd354bec114541f7849a12f8fc2015320ca5282ee4fd787571457b SHA512 21a3eb2c3678cd27b659eed073f8f1bd99c9751291d077820e9a370fd90b7d9b3bf414cc03dec4acb7fa61087e02d04f9f40e91a32c5180c718e2102fbd0cd35 WHIRLPOOL 8c5221c82ee2c8a02beafd0fdf91e0038e49912cc8b05fb7437dd4d0a0204b97ea62c45c2dd9dde0f658620b772d706e795821865c567d2e1eb91f8b83a12c4a
+DIST icu4c-56_1-src.tgz 25721871 SHA256 3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816 SHA512 297fd91ce6c478309ac3d18813f1b3ff39a992584e3bafb79e2e816a516e903af6b86c6318e1104cda0bb29ba7c0414b65c1e83c0ed0e848ce897a06d7678d9a WHIRLPOOL d7ed3a260fb6b8f8a65ae3872c93528528650d85ddef341abeeaf609f6db3f40de2f4856e0629bed4e31c412120263378642941f8c8029d400082ad2017cd28c
diff --git a/dev-libs/icu/icu-56.1.ebuild b/dev-libs/icu/icu-56.1.ebuild
new file mode 100644
index 000000000000..1bf9466cffff
--- /dev/null
+++ b/dev-libs/icu/icu-56.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs autotools multilib-minimal
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://www.icu-project.org/"
+SRC_URI="http://download.icu-project.org/files/icu4c/${PV/_/}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/56"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="debug doc examples static-libs"
+
+DEPEND="
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen[dot]
+ )
+"
+
+S="${WORKDIR}/${PN}/source"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/icu-config
+)
+
+src_prepare() {
+ local variable
+
+ epatch "${FILESDIR}/${PN}-remove-bashisms.patch"
+ epatch_user
+
+ # Disable renaming as it is stupind thing to do
+ sed -i \
+ -e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+ common/unicode/uconfig.h || die
+
+ # Fix linking of icudata
+ sed -i \
+ -e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+ config/mh-linux || die
+
+ # Append doxygen configuration to configure
+ sed -i \
+ -e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+ configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # Do _not_ use C++11 yet, make sure to force GNU C++ 98 standard.
+ append-cxxflags -std=gnu++98
+
+ if tc-is-cross-compiler; then
+ mkdir "${WORKDIR}"/host || die
+ pushd "${WORKDIR}"/host >/dev/null || die
+
+ CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+ CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+ RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+ "${S}"/configure --disable-renaming --disable-debug \
+ --disable-samples --enable-static || die
+ emake
+
+ popd >/dev/null || die
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --disable-renaming
+ --disable-samples
+ $(use_enable debug)
+ $(use_enable static-libs static)
+ )
+
+ multilib_is_native_abi && myeconfargs+=(
+ $(use_enable examples samples)
+ )
+ tc-is-cross-compiler && myeconfargs+=(
+ --with-cross-build="${WORKDIR}"/host
+ )
+
+ # icu tries to use clang by default
+ tc-export CC CXX
+
+ ECONF_SOURCE=${S} \
+ econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi && use doc; then
+ doxygen -u Doxyfile || die
+ doxygen Doxyfile || die
+ fi
+}
+
+multilib_src_test() {
+ # INTLTEST_OPTS: intltest options
+ # -e: Exhaustive testing
+ # -l: Reporting of memory leaks
+ # -v: Increased verbosity
+ # IOTEST_OPTS: iotest options
+ # -e: Exhaustive testing
+ # -v: Increased verbosity
+ # CINTLTST_OPTS: cintltst options
+ # -e: Exhaustive testing
+ # -v: Increased verbosity
+ emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi && use doc; then
+ dohtml -p api -r doc/html/
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ dohtml ../readme.html
+}
diff --git a/dev-libs/libRocket/files/libRocket-1.2.1-build.patch b/dev-libs/libRocket/files/libRocket-1.2.1-build.patch
deleted file mode 100644
index e578b441f42b..000000000000
--- a/dev-libs/libRocket/files/libRocket-1.2.1-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
---- Build/CMakeLists.txt
-+++ Build/CMakeLists.txt
-@@ -11,6 +11,9 @@
-
- project(libRocket C CXX)
-
-+# paths
-+include(GNUInstallDirs)
-+
- set(LIBROCKET_VERSION_MAJOR 1)
- set(LIBROCKET_VERSION_MINOR 2)
- set(LIBROCKET_VERSION_PATCH 1)
-@@ -131,8 +134,8 @@
- endif()
-
- install(TARGETS ${NAME}
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
- endforeach(library)
-
-@@ -237,7 +240,7 @@
- endif()
- endif()
-
-- set(SAMPLES_DIR opt/Rocket/Samples)
-+ set(SAMPLES_DIR opt/Rocket/Samples CACHE PATH "path to samples dir")
-
- # The samples use the shell library
- include_directories(${PROJECT_SOURCE_DIR}/Samples/shell/include)
-@@ -256,8 +259,8 @@
- target_link_libraries(${sample_LIBRARIES})
-
- install(TARGETS shell
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
-
- list(APPEND samples treeview customlog drag loaddocument)
diff --git a/dev-libs/libRocket/files/libRocket-1.3.0.0-build.patch b/dev-libs/libRocket/files/libRocket-1.3.0.0-build.patch
deleted file mode 100644
index e578b441f42b..000000000000
--- a/dev-libs/libRocket/files/libRocket-1.3.0.0-build.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
---- Build/CMakeLists.txt
-+++ Build/CMakeLists.txt
-@@ -11,6 +11,9 @@
-
- project(libRocket C CXX)
-
-+# paths
-+include(GNUInstallDirs)
-+
- set(LIBROCKET_VERSION_MAJOR 1)
- set(LIBROCKET_VERSION_MINOR 2)
- set(LIBROCKET_VERSION_PATCH 1)
-@@ -131,8 +134,8 @@
- endif()
-
- install(TARGETS ${NAME}
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
- endforeach(library)
-
-@@ -237,7 +240,7 @@
- endif()
- endif()
-
-- set(SAMPLES_DIR opt/Rocket/Samples)
-+ set(SAMPLES_DIR opt/Rocket/Samples CACHE PATH "path to samples dir")
-
- # The samples use the shell library
- include_directories(${PROJECT_SOURCE_DIR}/Samples/shell/include)
-@@ -256,8 +259,8 @@
- target_link_libraries(${sample_LIBRARIES})
-
- install(TARGETS shell
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- )
-
- list(APPEND samples treeview customlog drag loaddocument)
diff --git a/dev-libs/libRocket/libRocket-1.2.1_p20130110.ebuild b/dev-libs/libRocket/libRocket-1.2.1_p20130110.ebuild
deleted file mode 100644
index 3ade21a4b32e..000000000000
--- a/dev-libs/libRocket/libRocket-1.2.1_p20130110.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit cmake-utils eutils python-r1
-
-DESCRIPTION="A HTML/CSS User Interface library"
-HOMEPAGE="http://librocket.com/"
-SRC_URI="https://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python samples"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="media-libs/freetype
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost[python]
- )
- samples? (
- virtual/opengl
- x11-libs/libXext
- x11-libs/libX11
- )"
-DEPEND="${RDEPEND}"
-
-python_BUILD_DIR=${WORKDIR}/${P}_build_python
-CMAKE_USE_DIR="${S}"/Build
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_PYTHON_BINDINGS=OFF
- $(cmake-utils_use_build samples SAMPLES)
- -DSAMPLES_DIR=/usr/share/${PN}/samples
- )
-
- cmake-utils_src_configure
-
- if use python ; then
- cfgpybind() {
- local mycmakeargs=(
- -DBUILD_PYTHON_BINDINGS=ON
- -DCMAKE_SKIP_RPATH=YES
- )
- BUILD_DIR="${python_BUILD_DIR}-${EPYTHON}" cmake-utils_src_configure
- }
- einfo "configuring python binding"
- python_foreach_impl cfgpybind
- fi
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use python ; then
- buildpybind() {
- cp "${WORKDIR}"/${P}_build/{libRocketCore*,libRocketControls*} "${python_BUILD_DIR}-${EPYTHON}"/ || die
- BUILD_DIR="${python_BUILD_DIR}-${EPYTHON}" cmake-utils_src_make _rocketcontrols/fast _rocketcore/fast
- }
- einfo "compiling python binding"
- python_foreach_impl buildpybind
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use python ; then
- instpybind() {
- python_domodule bin/rocket.py
- exeinto "$(python_get_sitedir)"
- doexe ${python_BUILD_DIR}-${EPYTHON}/_rocket{core,controls}.so
- }
- einfo "installing python binding"
- python_foreach_impl instpybind
- fi
-}
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 1e243e64bcd0..781253f68a57 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,2 +1,3 @@
DIST libburn-1.3.8.tar.gz 967404 SHA256 46266bdd4b37ca9700a44bbd8dbfbf3526423ede25751fd2f0211b2b5ce29283 SHA512 4f279319b49bc5f5d42751fcab16bfe949e14e6e1018f9138bcc9f8e10a298ecf9795780d5f8807c5c2bf1cc0332f931b709f1fb5809f30abb8054297370f3c6 WHIRLPOOL a814ab1c88b70b03788d490c1d6f9305878613d529fdd58df65a13bc683cf2e6c4e877192f85ffca07474a866115a34ef3932e838097e88db08d73554ed2ad3c
DIST libburn-1.4.0.tar.gz 970395 SHA256 6c975abae4ae1f80e47fc5d1e235f85157f73e954c84627a5ef85d8b1b95ae94 SHA512 33c6eabe79343c9ebd198fb7c23900cac6b92b6834d80d2060062c48ca32a243566ebb3f86b51c5d149ef6aef4da2eaa340b3094960b0bce1fd67c0b82ee75f1 WHIRLPOOL 82f8186e9471a2046c627261da831250d0c60a9a1f8f6658a4238b2c35480b153a949189a5b89235449602919a33b81ff0c9fc728cef1757979e54080089a9d7
+DIST libburn-1.4.2.tar.gz 970246 SHA256 bf641ac8e372b18e52fa911876b21f759e17804aa907eeae6c852f053729610a SHA512 68bae9ce50d99e7cd7dff60c39636af824142640c474cd67eba5b5659f2ae62c4e693c846f090f866a4b9cc303abf3da7a69f1431bc9e140f4ae2ca71ec59688 WHIRLPOOL eca0acf8519d2326af83ebf76903cabb67cb57b3b3815ef3cc028a83255cb392ae879b7a1d55e0ad95dab6977befae06d0a0bff4f7a1c1bfc9188f1d1bfaeea9
diff --git a/dev-libs/libburn/libburn-1.3.8.ebuild b/dev-libs/libburn/libburn-1.3.8.ebuild
index f6c8a8c7ab2b..291e67c49e3c 100644
--- a/dev-libs/libburn/libburn-1.3.8.ebuild
+++ b/dev-libs/libburn/libburn-1.3.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$
@@ -6,7 +6,7 @@ EAPI=5
inherit eutils
-DESCRIPTION="Libburn is an open-source library for reading, mastering and writing optical discs"
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
HOMEPAGE="http://libburnia-project.org"
SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
diff --git a/dev-libs/libburn/libburn-1.4.0.ebuild b/dev-libs/libburn/libburn-1.4.0.ebuild
index bf3b79fa415e..3d8b4d1d6be1 100644
--- a/dev-libs/libburn/libburn-1.4.0.ebuild
+++ b/dev-libs/libburn/libburn-1.4.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$
@@ -6,7 +6,7 @@ EAPI=5
inherit eutils
-DESCRIPTION="Libburn is an open-source library for reading, mastering and writing optical discs"
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
HOMEPAGE="http://libburnia-project.org"
SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
diff --git a/dev-libs/libburn/libburn-1.4.2.ebuild b/dev-libs/libburn/libburn-1.4.2.ebuild
new file mode 100644
index 000000000000..3d8b4d1d6be1
--- /dev/null
+++ b/dev-libs/libburn/libburn-1.4.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
+HOMEPAGE="http://libburnia-project.org"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cdio debug static-libs track-src-odirect"
+
+RDEPEND="cdio? ( >=dev-libs/libcdio-0.83 )"
+DEPEND="$RDEPEND
+ virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable track-src-odirect) \
+ --enable-pkg-check-modules \
+ $(use_enable cdio libcdio) \
+ --disable-ldconfig-at-install \
+ $(use_enable debug)
+}
+
+src_install() {
+ default
+
+ dodoc CONTRIBUTORS doc/{comments,*.txt}
+
+ docinto cdrskin
+ dodoc cdrskin/{*.txt,README}
+ docinto cdrskin/html
+ dohtml cdrskin/cdrskin_eng.html
+
+ prune_libtool_files --all
+}
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index 5fbcad51f686..e4867f51667f 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,2 +1,3 @@
DIST libisoburn-1.3.8.tar.gz 1429974 SHA256 b75c9a7f17faab5280ddc34ea6610c4e8bcf630762ee386d10bc52c4b50f6806 SHA512 369299e491a379e048038d8a46040feb628b6b9dfb6d6ffac01808b6814e6ca936bb7e4fe75f904ce755e9957011403a5d38bff9f37901086d284f5c1014deb7 WHIRLPOOL 3dc40ab34838bb3d79f0cbb08b16480106de16b2c8401859c52fa139eb8a555f4182402dacf51ee481ec8f490a33a2e09cfc4ec3ba63db9fc876854c80f4dd12
DIST libisoburn-1.4.0.tar.gz 1453974 SHA256 c1d51ae7e4662f75caae4442071b8e1480efb8e80682a9f82c32a76f30ba6421 SHA512 d9fd1e4a6f8d6ec2dfe2eccdf2ba2e379232d5eb66e25940a8854f160ccd456fa384488acf466af51fb9662ecd5a774dc81fe0fbd03fb8e1b82118ee9d066d1c WHIRLPOOL 3db2740f2ed9dc4b872f0d424a231673a10d0bb8af88ac9cdc1272e3e738d5bdda43b57ac0e0e69a95ad4d73b97947bbb07b360b275ec57a53dbb75d6565004d
+DIST libisoburn-1.4.2.tar.gz 1496784 SHA256 2dfac7312fd136db5c5e1a9738e3a0896bddea2f89621bd071f3b8045aef54d6 SHA512 aaf9d8eee70cbdf2a64315fe68d03c097f26f24f0d21394b7dc1ff1370eed2d21edf54273f2897371b05c9f8772821ae7ba5ea51f52ea43b39538ef64afff555 WHIRLPOOL 0156e5a6da8433c412ea2c6122364937a673ffa961707fa14530eaaeae7e0f960a1a020c0d74ab2202ecbc8f4348c5eec1de32566f01bdfdac0234baa8e30585
diff --git a/dev-libs/libisoburn/libisoburn-1.3.8.ebuild b/dev-libs/libisoburn/libisoburn-1.3.8.ebuild
index 163d995bba48..e1c4b04366cd 100644
--- a/dev-libs/libisoburn/libisoburn-1.3.8.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.3.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$
@@ -6,7 +6,7 @@ EAPI=5
inherit eutils
-DESCRIPTION="Enables creation and expansion of ISO-9660 filesystems on all CD/DVD media supported by libburn"
+DESCRIPTION="Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn"
HOMEPAGE="http://libburnia-project.org/"
SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
diff --git a/dev-libs/libisoburn/libisoburn-1.4.0.ebuild b/dev-libs/libisoburn/libisoburn-1.4.0.ebuild
index 750b8f14d591..42abf751badc 100644
--- a/dev-libs/libisoburn/libisoburn-1.4.0.ebuild
+++ b/dev-libs/libisoburn/libisoburn-1.4.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$
@@ -6,7 +6,7 @@ EAPI=5
inherit eutils
-DESCRIPTION="Enables creation and expansion of ISO-9660 filesystems on all CD/DVD media supported by libburn"
+DESCRIPTION="Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn"
HOMEPAGE="http://libburnia-project.org/"
SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
diff --git a/dev-libs/libisoburn/libisoburn-1.4.2.ebuild b/dev-libs/libisoburn/libisoburn-1.4.2.ebuild
new file mode 100644
index 000000000000..27799df5d8c7
--- /dev/null
+++ b/dev-libs/libisoburn/libisoburn-1.4.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Creation/expansion of ISO-9660 filesystems on CD/DVD media supported by libburn"
+HOMEPAGE="http://libburnia-project.org/"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="acl cdio debug external-filters external-filters-setuid frontend-optional
+ launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
+
+REQUIRED_USE="frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )"
+
+RDEPEND=">=dev-libs/libburn-1.4.2
+ >=dev-libs/libisofs-1.4.2
+ readline? ( sys-libs/readline:0= )
+ !readline? ( libedit? ( dev-libs/libedit ) )
+ acl? ( virtual/acl )
+ xattr? ( sys-apps/attr )
+ zlib? ( sys-libs/zlib )
+ cdio? ( >=dev-libs/libcdio-0.83 )
+ launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 )
+ launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 )
+ frontend-optional? ( dev-tcltk/bwidget )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable readline libreadline) \
+ $(usex readline --disable-libedit $(use_enable libedit)) \
+ $(use_enable acl libacl) \
+ $(use_enable xattr) \
+ $(use_enable zlib) \
+ --disable-libjte \
+ $(use_enable cdio libcdio) \
+ $(use_enable external-filters) \
+ $(use_enable external-filters-setuid) \
+ $(use_enable launch-frontend) \
+ $(use_enable launch-frontend-setuid) \
+ --disable-ldconfig-at-install \
+ --enable-pkg-check-modules \
+ $(use_enable debug)
+}
+
+src_install() {
+ default
+
+ dodoc CONTRIBUTORS doc/{comments,*.wiki,startup_file.txt}
+
+ docinto frontend
+ dodoc frontend/README-tcltk
+ docinto xorriso
+ dodoc xorriso/{changelog.txt,README_gnu_xorriso}
+ docinto xorriso/html
+
+ prune_libtool_files --all
+}
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 6ba531ed3da0..7d30ef8e4e70 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,2 +1,3 @@
DIST libisofs-1.3.8.tar.gz 802154 SHA256 acd7bf42d5d1d5c277f4aad46e5b96229045a38a0fb7d43cfd7841ee3268fda5 SHA512 7e078a4070741d975234ac10ed6cd2a0366724e9fa440e7063c64f91a60c9454c6828e2b7737d6105f36067008495bfcba8327e56892ccb0962027dc78e251ce WHIRLPOOL 660f2cba77e8b83306fe4d40e34f0e94ecc18a8defd0375cadc84c0d964d6c868b2965329e51e3b5139c88e7cb20ee78f817004cb141e8be5528aa00a25d5647
DIST libisofs-1.4.0.tar.gz 817349 SHA256 6e62824d879ffe85c0e4363677fd10f177a4c85af049d0861c70bf442b901fce SHA512 894976bc432f429d4a9fd4d92ba51d042b4944991c5ff01edc4cae5753f5fb73a4e4f147284974e4233c5b5fb1137c989d60ea349a4d8be7a237fd82530d3f36 WHIRLPOOL 378fb62befe4c929932386ee6b1a91d1b90f3de41abc65e7335a9015021aa0e49fddb1b0d46166087ae5b3719b2324163335233ac80a3da94f1fe2612d695c77
+DIST libisofs-1.4.2.tar.gz 820426 SHA256 d5e7f3ea613a78924dde979f699427b1c6b85ba4540d275aa67945b4a70fb3ab SHA512 609a803c091beb1ed8cb177703c5f4480e63d5d115ac20b07a2a906285d6d8f7a311f94ee5f1e6add61d82ca8783405c38a48ae1e142dc97c27e67df99f71dfa WHIRLPOOL 891d4f2f5aef4e59083cc06d8735d47ca92beaae14545c77171e88b4c99747e2321620c9ae61c74c1d8d32999e8376078fc9e22d97c562a6a8b43b923376a151
diff --git a/dev-libs/libisofs/libisofs-1.3.8.ebuild b/dev-libs/libisofs/libisofs-1.3.8.ebuild
index bf9f02d3f91a..0c1b0211eaff 100644
--- a/dev-libs/libisofs/libisofs-1.3.8.ebuild
+++ b/dev-libs/libisofs/libisofs-1.3.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$
@@ -6,7 +6,7 @@ EAPI=5
inherit eutils
-DESCRIPTION="libisofs is an open-source library for reading, mastering and writing optical discs"
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
HOMEPAGE="http://libburnia-project.org/"
SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
diff --git a/dev-libs/libisofs/libisofs-1.4.0.ebuild b/dev-libs/libisofs/libisofs-1.4.0.ebuild
index b0e0e418161d..36f669bed240 100644
--- a/dev-libs/libisofs/libisofs-1.4.0.ebuild
+++ b/dev-libs/libisofs/libisofs-1.4.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$
@@ -6,7 +6,7 @@ EAPI=5
inherit eutils
-DESCRIPTION="libisofs is an open-source library for reading, mastering and writing optical discs"
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
HOMEPAGE="http://libburnia-project.org/"
SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
diff --git a/dev-libs/libisofs/libisofs-1.4.2.ebuild b/dev-libs/libisofs/libisofs-1.4.2.ebuild
new file mode 100644
index 000000000000..36f669bed240
--- /dev/null
+++ b/dev-libs/libisofs/libisofs-1.4.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Open-source library for reading, mastering and writing optical discs"
+HOMEPAGE="http://libburnia-project.org/"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl debug static-libs verbose-debug xattr zlib"
+
+RDEPEND="acl? ( virtual/acl )
+ xattr? ( sys-apps/attr )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable debug) \
+ $(use_enable verbose-debug) \
+ $(use_enable acl libacl) \
+ $(use_enable xattr) \
+ $(use_enable zlib) \
+ --disable-libjte \
+ --disable-ldconfig-at-install
+}
+
+src_install() {
+ default
+
+ dodoc Roadmap doc/{*.txt,Tutorial}
+
+ prune_libtool_files --all
+}
diff --git a/dev-libs/librep/Manifest b/dev-libs/librep/Manifest
index fcafb6f6bccb..c0e0082535d0 100644
--- a/dev-libs/librep/Manifest
+++ b/dev-libs/librep/Manifest
@@ -1,2 +1,3 @@
DIST librep-0.92.2.1.tar.xz 608988 SHA256 47bb628a377e2c7cb6e22f3e691a88d88af83570ca99b0d7300a5fbcb46b6663 SHA512 7535fbf3af3b6775dfe740623abd09ff48a38641c3be52bbe84ef0b14d37455aa73f3a9941b3a814b04f203664c0e18f1add2111ac968fbf1f59fa4253f6a974 WHIRLPOOL ff59301e924b176e6944a79c1be5635d7d8845a89a06c811cdc891f9edcc4179f555ebbd8092ff0e2194763ab2f554fa224b41b5ec2515468fcfb211b887f747
DIST librep-0.92.3.tar.xz 607128 SHA256 45c98a5bbdfde4f1d98e3839b319d9ae15857d2d1ae8e3838d9a18d53f3e8b85 SHA512 d65b7a418a2782307c7afa74bba1cc9b690c0fe37938151e7ead3da08cba52d2f5bd2803de22f426b75a353f50287a5ce727c98fc23abbabf9e54b3389f04103 WHIRLPOOL 1ae547f4d795377d77f0fedc67cf3cffc2daf49295798aad088152cdef454c74226e9e9e7f703b0506cd4e1c6cd2b2f321ab8f4cd81f691e1d2d11612cf2c132
+DIST librep_0.92.5.tar.xz 638228 SHA256 22da9bab38d161309a593c36f2168fb78de8a8a93f171f08dee5ef89e22b5e7f SHA512 210fa3daac876dba68084f9e27996354e054ef0993d8d8a4a0498d742285b97f21eaaec218ba6439464c908f24cd8318f0d3edbab5a373b7c8057c8fc910ca55 WHIRLPOOL e1fce42af42fc09e81a609ccf92bb17e8ce8648ba048b3b1a935820a3d25ba41e0c04c4a61da6149ef0695b6f03156755876922d4a09d5dce333b463be927738
diff --git a/dev-libs/librep/files/librep-0.92.0-disable-elisp.patch b/dev-libs/librep/files/librep-0.92.0-disable-elisp.patch
index 6f7b2f1228c7..03cec6f710b6 100644
--- a/dev-libs/librep/files/librep-0.92.0-disable-elisp.patch
+++ b/dev-libs/librep/files/librep-0.92.0-disable-elisp.patch
@@ -1,5 +1,5 @@
---- Makefile.in.old 2011-07-25 14:08:18.000000000 +0200
-+++ Makefile.in 2011-07-25 14:09:05.000000000 +0200
+--- librep_0.92.5/Makefile.in.old 2011-07-25 14:08:18.000000000 +0200
++++ librep_0.92.5/Makefile.in 2011-07-25 14:09:05.000000000 +0200
@@ -53,15 +53,13 @@
$(INSTALL_SCRIPT) libtool $(DESTDIR)$(repcommonexecdir)
$(INSTALL_DATA) rules.mk $(DESTDIR)$(repcommonexecdir)
diff --git a/dev-libs/librep/librep-0.92.5.ebuild b/dev-libs/librep/librep-0.92.5.ebuild
new file mode 100644
index 000000000000..d5d6c92772f9
--- /dev/null
+++ b/dev-libs/librep/librep-0.92.5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit elisp-common eutils flag-o-matic
+
+DESCRIPTION="Shared library implementing a Lisp dialect"
+HOMEPAGE="http://librep.sourceforge.net/"
+SRC_URI="http://download.tuxfamily.org/librep/${PN}_${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="emacs readline"
+
+RDEPEND="
+ >=sys-libs/gdbm-1.8.0
+ emacs? ( virtual/emacs )
+ readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+ sys-apps/texinfo
+ app-arch/xz-utils
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.92.0-disable-elisp.patch"
+)
+
+S="${WORKDIR}/${PN}_${PV}"
+
+src_prepare() {
+ # fix #570072 by restoring pre-GCC5 inline semantics
+ append-cflags -std=gnu89
+ default
+}
+
+src_configure() {
+ econf \
+ --libexecdir=/usr/$(get_libdir) \
+ --without-gmp \
+ --without-ffi \
+ --disable-static \
+ $(use_with readline)
+}
+
+src_compile() {
+ default
+
+ if use emacs; then
+ elisp-compile rep-debugger.el || die "elisp-compile failed"
+ fi
+}
+
+src_install() {
+ default
+ prune_libtool_files --modules
+
+ docinto doc
+ dodoc doc/*
+
+ if use emacs; then
+ elisp-install ${PN} rep-debugger.{el,elc} || die "elisp-install failed"
+ elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el" \
+ || die "elisp-site-file-install failed"
+ fi
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
diff --git a/dev-libs/libuv/libuv-1.8.0.ebuild b/dev-libs/libuv/libuv-1.8.0.ebuild
index 2e3f46d63504..efb72d125424 100644
--- a/dev-libs/libuv/libuv-1.8.0.ebuild
+++ b/dev-libs/libuv/libuv-1.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libuv/libuv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD BSD-2 ISC MIT"
SLOT="0/1"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="static-libs"
RESTRICT="test"
diff --git a/dev-perl/Any-Moose/Any-Moose-0.260.0.ebuild b/dev-perl/Any-Moose/Any-Moose-0.260.0.ebuild
index 069f59947b24..c7229ad8a284 100644
--- a/dev-perl/Any-Moose/Any-Moose-0.260.0.ebuild
+++ b/dev-perl/Any-Moose/Any-Moose-0.260.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Use Moose or Mouse modules (DEPRECATED)"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
IUSE="test"
RDEPEND="|| ( >=dev-perl/Mouse-0.40 dev-perl/Moose )
diff --git a/dev-perl/Archive-Zip/Archive-Zip-1.560.0.ebuild b/dev-perl/Archive-Zip/Archive-Zip-1.560.0.ebuild
index e11123dbdb4c..ea02c7db27bd 100644
--- a/dev-perl/Archive-Zip/Archive-Zip-1.560.0.ebuild
+++ b/dev-perl/Archive-Zip/Archive-Zip-1.560.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A wrapper that lets you read Zip archive members as if they were files"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Audio-Wav/Audio-Wav-0.130.0-r1.ebuild b/dev-perl/Audio-Wav/Audio-Wav-0.130.0-r1.ebuild
deleted file mode 100644
index 4fbcfd8f1cf0..000000000000
--- a/dev-perl/Audio-Wav/Audio-Wav-0.130.0-r1.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
-
-MODULE_AUTHOR=BRIANSKI
-MODULE_VERSION=0.13
-inherit perl-module
-
-DESCRIPTION="Modules for reading & writing Microsoft WAV files"
-
-SLOT="0"
-KEYWORDS="amd64 hppa ppc x86"
-IUSE=""
-
-RDEPEND="dev-perl/Inline"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild b/dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild
index 56f51e8aab0a..38084cd05ecc 100644
--- a/dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild
+++ b/dev-perl/Audio-Wav/Audio-Wav-0.140.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Modules for reading & writing Microsoft WAV files"
SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86"
+KEYWORDS="amd64 hppa ppc x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Audio-Wav/Manifest b/dev-perl/Audio-Wav/Manifest
index c9044e3b8c43..e9cb28ecc904 100644
--- a/dev-perl/Audio-Wav/Manifest
+++ b/dev-perl/Audio-Wav/Manifest
@@ -1,2 +1 @@
-DIST Audio-Wav-0.13.tar.gz 23605 SHA256 af4e7d11c2328bff0ad0e1581bc962ab0d47113f2a7a4abb65752450a7b24da9 SHA512 d134dd056aacf7cb2241a92931155fd4f6b37207612612a9d95b550514bc19c40da7de96094b9bffc0a6741782a9afdc10f2c0f91bf53b4efdc2ca4745fe4218 WHIRLPOOL 9f0572142ad91f5a7c8b92f8bcdfb0119f4a7dcfa09316bf02154e0892cfd92970e08b765e1f2aa870efac8cf5231cf5a19ea9959265ed29ed197af8c3b581fe
DIST Audio-Wav-0.14.tar.gz 23688 SHA256 caad13f586375094a4212c48b6f4f75d2dd8f34536b295ba74489ffa766117a5 SHA512 8997eb3f3b2e3b2ba1fd1e4b7d88c037627940ed561b2fdc527eb6219ca8a194c6e078d54dc6253fcd5ca616578b69de6b4a3af33f9a42dff3d9e87c3f2cba16 WHIRLPOOL c0a3d97a083ed5cc93b7cc1c5c566bd0f0df2138dbbe2a4c4d007b75e9702246494594d175adc9ae1ee4044dfee5d07c85586df2cd34bc8b251f4ee7c87d18a9
diff --git a/dev-perl/BerkeleyDB/BerkeleyDB-0.540.0.ebuild b/dev-perl/BerkeleyDB/BerkeleyDB-0.540.0.ebuild
deleted file mode 100644
index 31a2044ba21f..000000000000
--- a/dev-perl/BerkeleyDB/BerkeleyDB-0.540.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=PMQS
-MODULE_VERSION=0.54
-inherit perl-module eutils db-use
-
-DESCRIPTION="This module provides Berkeley DB interface for Perl"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="test"
-
-# Install DB_File if you want older support. BerkleyDB no longer
-# supports less than 2.0.
-
-RDEPEND=">=sys-libs/db-2.0"
-DEPEND="${RDEPEND}
- test? ( dev-perl/Test-Pod )"
-
-SRC_TEST="do"
-
-src_prepare() {
- epatch "${FILESDIR}"/Gentoo-config-0.26.diff
- # on Gentoo/FreeBSD we cannot trust on the symlink /usr/include/db.h
- # as for Gentoo/Linux, so we need to esplicitely declare the exact berkdb
- # include path
- sed -i -e "s:/usr/include:$(db_includedir):" "${S}"/config.in || die "berkdb include directory"
-}
diff --git a/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild b/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild
index 7d16ebb4b8e9..15d537069e49 100644
--- a/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild
+++ b/dev-perl/BerkeleyDB/BerkeleyDB-0.550.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module eutils db-use
DESCRIPTION="This module provides Berkeley DB interface for Perl"
SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
IUSE="test"
# Install DB_File if you want older support. BerkleyDB no longer
diff --git a/dev-perl/BerkeleyDB/Manifest b/dev-perl/BerkeleyDB/Manifest
index 67f0921ed52f..b61e36877c00 100644
--- a/dev-perl/BerkeleyDB/Manifest
+++ b/dev-perl/BerkeleyDB/Manifest
@@ -1,2 +1 @@
-DIST BerkeleyDB-0.54.tar.gz 202422 SHA256 010e66d0034b93a8397c600da320611149aef7861eaf1f93b95e49ae37b825b8 SHA512 c9529f2682b269db1c5f5c5535b9497b5859530f7fb283003cf3f6990ae311b73221b14202fa9fd6870a0d3f5c66750cb1c4905a5599ba5313e752b5dba3b47c WHIRLPOOL a5c7dbcba424a6e13cb0c5bed4ff54db85bafaaeaa050e9b140342ee33222e3ce82e0be4ba2b5874393443769da642f5042a832aa2e43af1ccf7a1473afcda73
DIST BerkeleyDB-0.55.tar.gz 203318 SHA256 6f28e141c7e2fbc455621bc809d6e7d84a3640cc77568b07798ae3933107e44f SHA512 a9bee92b0168918eaf6fb38b7b66005cfbb360ce89a9ae9feeb022e3d27fa7e627412b5c19233840571ed60568729d4bd83d279f84a0c7db921b8eed9f73afea WHIRLPOOL 3831b7dcce5249c1576bee608feaf552d0482360451a391fd5f13ebe7da0124ccfabf3d5ea74155fc9baac12dd99b1742a15eb06fdb440d24cd54a24fb201281
diff --git a/dev-perl/Bit-Vector/Bit-Vector-7.200.0-r1.ebuild b/dev-perl/Bit-Vector/Bit-Vector-7.200.0-r1.ebuild
deleted file mode 100644
index ff2a0b2f5f88..000000000000
--- a/dev-perl/Bit-Vector/Bit-Vector-7.200.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=ANDK
-MODULE_VERSION=7.2
-inherit perl-module
-
-DESCRIPTION="Efficient bit vector, set of integers and big int math library"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-perl/Carp-Clan
- >=virtual/perl-Storable-2.20"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild b/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild
index 08c27ead2d71..200fccc9edb4 100644
--- a/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild
+++ b/dev-perl/Bit-Vector/Bit-Vector-7.400.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Efficient bit vector, set of integers and big int math library"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Bit-Vector/Manifest b/dev-perl/Bit-Vector/Manifest
index 8baa87970e37..db60ccc0b4e2 100644
--- a/dev-perl/Bit-Vector/Manifest
+++ b/dev-perl/Bit-Vector/Manifest
@@ -1,2 +1 @@
-DIST Bit-Vector-7.2.tar.gz 137817 SHA256 6339f9e4376c623b411934cdfb52d7553c6c38457bfa376b953d40ca007807c2 SHA512 0344c2572e4a16259a4bb4b5f668c8f0ab32dc5a4eb0ab9e7da15ae86c1845036851095aa6353dcc9b1f9bf72ec5bd204e349c286ff5896869c36a4b7ff55955 WHIRLPOOL 219338151a816d055930878efe9c127f35ff3976c9e4c8a374bb821daace297fc6fee760d02b16225b5e7ceee45323a9b6ace0ef07a82ffb88d4f91e6d8bbd56
DIST Bit-Vector-7.4.tar.gz 135965 SHA256 3c6daa671fecfbc35f92a9385b563d65f50dfc6bdc8b4805f9ef46c0d035a926 SHA512 80aa49aea8c31c60c14161198eab9d620d738530c3c209104b8ad8f1144822f80c3effb3303c569fc556b2457328659ae5d1aaf511d714c835618b84c722abc5 WHIRLPOOL 2953d658f769e511522d11322793dd60f71b95e3ce6b4cc1ef0ff154f5889d53c8c4bb2ca66533398b400010da426292fbf69d6b1f2da7b50ce3ce5fa204a998
diff --git a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.12.0.ebuild b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.12.0.ebuild
index dd760a3f692d..8cf26e50cc3c 100644
--- a/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.12.0.ebuild
+++ b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.12.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION='Verify requirements in a CPAN::Meta object'
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
IUSE="test"
# CPAN::Meta::Prereqs -> perl-CPAN-Meta
diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.290.0-r1.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.290.0-r1.ebuild
deleted file mode 100644
index ecfd5c1e5535..000000000000
--- a/dev-perl/Cache-Memcached/Cache-Memcached-1.290.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=DORMANDO
-MODULE_VERSION=1.29
-inherit perl-module
-
-DESCRIPTION="Perl API for memcached"
-HOMEPAGE="http://www.danga.com/memcached/ ${HOMEPAGE}"
-
-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"
-IUSE=""
-
-DEPEND="dev-perl/string-crc32"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
diff --git a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
index 27a5d3b73da6..cea8ff74d028 100644
--- a/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
+++ b/dev-perl/Cache-Memcached/Cache-Memcached-1.300.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl API for memcached"
HOMEPAGE="http://www.danga.com/memcached/ ${HOMEPAGE}"
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 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="dev-perl/string-crc32"
diff --git a/dev-perl/Cache-Memcached/Manifest b/dev-perl/Cache-Memcached/Manifest
index 833f482ce541..cf399c137053 100644
--- a/dev-perl/Cache-Memcached/Manifest
+++ b/dev-perl/Cache-Memcached/Manifest
@@ -1,2 +1 @@
-DIST Cache-Memcached-1.29.tar.gz 19542 SHA256 782d60a8bc28f58b0ab37f4a9ac84a5b7168f7f7b0be708a59f2ca98812f3d43 SHA512 108038bbe6d3522d69a499a9bf21861811648824e91152cc8adfcbfaf2897ca498ac07398f808e9f20f39056ad12e317d1285e69db58284338725ec42e40a413 WHIRLPOOL 12f9a82ca4c5e29fd4c9a6cb0e4857a05284b77469da92cfc409d1ea3846914299abb5e9ae4a124f1fc872fb0eea020871056c14bf37df34f9594aade164a68c
DIST Cache-Memcached-1.30.tar.gz 20643 SHA256 31b3c51ec0eaaf03002e2cc8e3d7d5cbe61919cfdada61c008eb9853acac42a9 SHA512 050cb8a764e4709fc8b195ca8bdf3012435656e285f45f569a4daaf687734f37d89043b12cf300b0b33d39179df5ccab8246e8ea613b1a41f10705d858c41ff8 WHIRLPOOL 4b80f61cb0daa576a9ed4772e8c6ebe1320884c746eeeba518f778a9991c009ab9153baee759261a15e99c5fab29011cea8e8e90915283609461afb29664eb2a
diff --git a/dev-perl/Cairo/Cairo-1.103.0.ebuild b/dev-perl/Cairo/Cairo-1.103.0.ebuild
deleted file mode 100644
index b3ee47643fc5..000000000000
--- a/dev-perl/Cairo/Cairo-1.103.0.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
-
-MODULE_AUTHOR=XAOC
-MODULE_VERSION=1.103
-inherit perl-module
-
-DESCRIPTION="Perl interface to the cairo library"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
- >=x11-libs/cairo-1.0.0
-"
-DEPEND="${RDEPEND}
- >=dev-perl/ExtUtils-Depends-0.205.0
- >=dev-perl/extutils-pkgconfig-1.70.0
- test? (
- dev-perl/Test-Number-Delta
- )
-"
-
-SRC_TEST="do"
-
-src_prepare() {
- perl-module_src_prepare
- sed -i -e 's,exit 0,exit 1,' "${S}"/Makefile.PL || die
-}
diff --git a/dev-perl/Cairo/Cairo-1.106.0.ebuild b/dev-perl/Cairo/Cairo-1.106.0.ebuild
index 1414850d2cd0..a5a2e0a06e55 100644
--- a/dev-perl/Cairo/Cairo-1.106.0.ebuild
+++ b/dev-perl/Cairo/Cairo-1.106.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl interface to the cairo library"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Cairo/Manifest b/dev-perl/Cairo/Manifest
index f2fdfbc49e72..ad471fa46449 100644
--- a/dev-perl/Cairo/Manifest
+++ b/dev-perl/Cairo/Manifest
@@ -1,2 +1 @@
-DIST Cairo-1.103.tar.gz 108254 SHA256 eaebd9c3b9d66b4c41533ec7c736a2a4b73e0bf6ad207132a970d83a85827872 SHA512 d7e7488af7e52834762f0baef48687989fc64c44518c1b5c4312299bba4a3a0f69e5af05fac02440ae70fb1dd474fae9974f8913809c1b17fcabf7527bc68b46 WHIRLPOOL 79ff6d205be88167adac29303aac6c2219d9637671f4d4d707841bdac09803891861f37a46451eeef96746ffe1f22791af60146711a1eee8b5690faa66e5774f
DIST Cairo-1.106.tar.gz 108779 SHA256 e64803018bc7cba49e73e258547f5378cc4249797beafec524852140f49c45c4 SHA512 190435f99e4c7a8f5e8d48834639b9e12c6bc4d5dfe721a2820de3479dd3f2144e1fc1ea74e7796fd7b219a45591b55c7648488e6dd276106bc5e51b0467fee7 WHIRLPOOL 8672355f074c75fd1562525e848f5ef186de44bbe46e43b1ba47d8e42e0c2c95dbe33c0dd92171480546ba314879351cf71fb2b60ff3c61c9fa60d8d33f7bd8e
diff --git a/dev-perl/Class-Load-XS/Class-Load-XS-0.60.0-r1.ebuild b/dev-perl/Class-Load-XS/Class-Load-XS-0.60.0-r1.ebuild
index 62bce23b53ed..3cb1e0a5336e 100644
--- a/dev-perl/Class-Load-XS/Class-Load-XS-0.60.0-r1.ebuild
+++ b/dev-perl/Class-Load-XS/Class-Load-XS-0.60.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="XS implementation of parts of Class::Load"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd ~x64-macos"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.210.0.ebuild b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.210.0.ebuild
deleted file mode 100644
index 6bbdd1e33297..000000000000
--- a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.210.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=SCHWIGON
-MODULE_VERSION=2.21
-SRC_URI="mirror://cpan/authors/id/S/SC/SCHWIGON/class-methodmaker/${PN}-${MODULE_VERSION}.tar.gz"
-inherit perl-module eutils
-
-DESCRIPTION="Create generic methods for OO Perl"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
-
-DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild
index 42591ec49cda..849cae1d893e 100644
--- a/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild
+++ b/dev-perl/Class-MethodMaker/Class-MethodMaker-2.240.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module eutils
DESCRIPTION="Create generic methods for OO Perl"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
DEPEND="
diff --git a/dev-perl/Class-MethodMaker/Manifest b/dev-perl/Class-MethodMaker/Manifest
index fec75edce47a..29c11a20b0bf 100644
--- a/dev-perl/Class-MethodMaker/Manifest
+++ b/dev-perl/Class-MethodMaker/Manifest
@@ -1,2 +1 @@
-DIST Class-MethodMaker-2.21.tar.gz 76999 SHA256 fc7844160317187b2acdf4fff1b6c35eb94f752cf5fb65ddcd154ce1250b8a3d SHA512 f39b95e724b794b58b9ae41bf1c76f40d2c71180f93d0b50148d0c204215ee0e12a858d81a53b9e590b9890be4af0215362cb36944ed535fcb34c7078c91c8ef WHIRLPOOL c97b8d870a5be4fe8a5c6bc54009ba0d7f2dd55f1313319d2f48d1aa8f1790ec8d98c29c12fb3ef797d07281ac92b3252ac02acace31c3619bf003135c9ebb1d
DIST Class-MethodMaker-2.24.tar.gz 77242 SHA256 5eef58ccb27ebd01bcde5b14bcc553b5347a0699e5c3e921c7780c3526890328 SHA512 d78f89df41d5c566dee74d30ff1b71488e9510639e795dd2f21e95e0516b039d15dd6743342cb28841e0fc698f64b3b3f349b5da788220598dff6ad95225ae0c WHIRLPOOL 26cf0074ccaf833416ac4ee91a698c837e1078aff38e4ba42e7d15d9414f009fa3aebd2637f09431930307062291bb5cb429d25f86ec57fbd445d0f3a1aba142
diff --git a/dev-perl/Clone/Clone-0.370.0.ebuild b/dev-perl/Clone/Clone-0.370.0.ebuild
deleted file mode 100644
index 05b7c1f29537..000000000000
--- a/dev-perl/Clone/Clone-0.370.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=GARU
-MODULE_VERSION=0.37
-inherit perl-module
-
-DESCRIPTION="Recursively copy Perl datatypes"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-SRC_TEST="do"
-mymake='OPTIMIZE=${CFLAGS}'
diff --git a/dev-perl/Clone/Clone-0.380.0.ebuild b/dev-perl/Clone/Clone-0.380.0.ebuild
index 8c2efb0d3c9a..75344749cca5 100644
--- a/dev-perl/Clone/Clone-0.380.0.ebuild
+++ b/dev-perl/Clone/Clone-0.380.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Recursively copy Perl datatypes"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
RDEPEND=""
diff --git a/dev-perl/Clone/Manifest b/dev-perl/Clone/Manifest
index 15031533563c..e1d8afee7cff 100644
--- a/dev-perl/Clone/Manifest
+++ b/dev-perl/Clone/Manifest
@@ -1,2 +1 @@
-DIST Clone-0.37.tar.gz 13369 SHA256 d9f251e6f01deaac3d29df1b8422b83dca972af999cd3f6ae456e0fc6f87cd9d SHA512 a47760938d826c28d6db2b3486238acff255c6e1c77ec797e93b4a9350a3cd5c3e730352f00675589594e4ec250ceb978990a10156669813933debce93f59266 WHIRLPOOL 7edd99560e83e0d0ea62e02b9f0409d305b565bd5ccd6e8ac6be6cc6b8db318081451b256cad98325ccb49dd12dcfa80d6f3629eee56a74134d1d7dcac2f10cd
DIST Clone-0.38.tar.gz 13636 SHA256 9fb0534bb7ef6ca1f6cc1dc3f29750d6d424394d14c40efdc77832fad3cebde8 SHA512 6e40547255eab43e7d2e43b745292277951cecc227f92c58246e3959395e6c23b13c25568c90012a851c6ad2e6173b5bc988664cdde54f2ca881c50b0108c766 WHIRLPOOL d36a96a4d5bcef4fd0dc62dd722976217bd61af74556ba1e52c0ae0a8a4d481e96b985ff2b9abd4e61cf47bf016e3e7d2bf88f08f0ccd201f5abb67080691e6f
diff --git a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
index 571b8e265531..a992f9063ace 100644
--- a/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
+++ b/dev-perl/Convert-BinHex/Convert-BinHex-1.124.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Extract data from Macintosh BinHex files"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 hppa ppc ~ppc64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.110.0-r1.ebuild b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.110.0-r1.ebuild
deleted file mode 100644
index 0fb8f1604a94..000000000000
--- a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.110.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=BDFOY
-MODULE_VERSION=1.11
-inherit perl-module
-
-DESCRIPTION="Crypt::CBC compliant Rijndael encryption module"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-DEPEND="
- test? (
- dev-perl/Test-Pod
- dev-perl/Test-Pod-Coverage
- )"
-
-SRC_TEST="do"
diff --git a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild
index 1206d53605b8..b22f47a8e184 100644
--- a/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild
+++ b/dev-perl/Crypt-Rijndael/Crypt-Rijndael-1.130.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Crypt::CBC compliant Rijndael encryption module"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="amd64 ~hppa ia64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 hppa ia64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="test"
DEPEND="
diff --git a/dev-perl/Crypt-Rijndael/Manifest b/dev-perl/Crypt-Rijndael/Manifest
index ac2e44f23043..9f5fd713caba 100644
--- a/dev-perl/Crypt-Rijndael/Manifest
+++ b/dev-perl/Crypt-Rijndael/Manifest
@@ -1,2 +1 @@
-DIST Crypt-Rijndael-1.11.tar.gz 23536 SHA256 8f8833bc8839e0d4aa3c26d86d2f39ceb9b13e52a9f5e4fd928da2e71989d3b4 SHA512 57a20811351e4376b10aed11fe6cb932575d2b5d0155d01780f69598b06b28e9eb3036ae322fbc844dd2dda37db2d02a61462caf5d5af5d6dd4ac585c348262a WHIRLPOOL c0c25050e21efd4154beb93402d776087557da5c77adff23a2438b38113713ea0005bcea1aec8a2cd2ef36ad6bdd19abbec2637245aba44397025637c6dccdd7
DIST Crypt-Rijndael-1.13.tar.gz 71724 SHA256 cd7209a6dfe0a3dc8caffe1aa2233b0e6effec7572d76a7a93feefffe636214e SHA512 46eea4eb6568d9bb70685314c6a29214552787c8cf138adb77271d07b85c16d83ee3faa53e6c3b7d0abb5cb735827407e970f954ae93123dfeaebb5fb34f1329 WHIRLPOOL 9ea6245e4c96b75331ad3a717db3b4be8a3ac2e72ec8eda74c253aed4fe6a209724663caff7380732ac251e9229e6ba29e1f441e3e252000ad6e6a1e28d31eab
diff --git a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.640.0.ebuild b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.640.0.ebuild
deleted file mode 100644
index 4cc69e67bfa4..000000000000
--- a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.640.0.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
-
-MODULE_AUTHOR=NANIS
-MODULE_VERSION=0.64
-inherit perl-module
-
-DESCRIPTION="Crypt::SSLeay module for perl"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-# Disabling tests for now. Opening a port always leads to mixed results for
-# folks - bug 59554
-# nb. Re-enabled tests, seem to be better written now, keeping an eye on bugs
-# for this though.
-SRC_TEST="do"
-
-RDEPEND="
- >=dev-libs/openssl-0.9.7c:0
- virtual/perl-MIME-Base64
-"
-DEPEND="${RDEPEND}
- test? ( dev-perl/Try-Tiny )"
-# PDEPEND: circular dependencies bug #144761
-PDEPEND="dev-perl/libwww-perl"
-
-export OPTIMIZE="${CFLAGS}"
-#myconf="--lib=${EPREFIX}/usr"
diff --git a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild
index 30c74b827213..49ba888d90ab 100644
--- a/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild
+++ b/dev-perl/Crypt-SSLeay/Crypt-SSLeay-0.720.0-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="OpenSSL support for LWP"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-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 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="libressl test"
RDEPEND="
diff --git a/dev-perl/Crypt-SSLeay/Manifest b/dev-perl/Crypt-SSLeay/Manifest
index de8271fc6a00..4d1dfccd1532 100644
--- a/dev-perl/Crypt-SSLeay/Manifest
+++ b/dev-perl/Crypt-SSLeay/Manifest
@@ -1,2 +1 @@
-DIST Crypt-SSLeay-0.64.tar.gz 121431 SHA256 eae61cf7aa64d79385b764010d8d77d09477e034c52fc3dfe68d0a13be78217c SHA512 2530a62f13154e2ce8a55e845dbc3dc2822420d56631ff64de2fd71c6cad5ddaa5e779070e7929f797a3fb09d004e31a9097bba0616d396abcb79aca710fa9eb WHIRLPOOL 4ddccd0cde43bb5c2a3c1f3bd59e221c758c0b31ba9f24b1fbc0fec40dbc2a98cc1a7da1a072af588379f6504b3e7c52a3b101a650005c2784ef34005adb4a19
DIST Crypt-SSLeay-0.72.tar.gz 129575 SHA256 f5d34f813677829857cf8a0458623db45b4d9c2311daaebe446f9e01afa9ffe8 SHA512 af7a2878df94e116e9aad9a0f028f2e4f89074aaf31672915162f86e55211632d65c1cb00f3ebd25644d77adf8eecdd244dba6a004d93ab90289ab34fe4caaf4 WHIRLPOOL 9a6adb48d3c54b9242473a3c0585f7cf29ec5ef518e5826477778e3b0a2ce96785afc490af3bcb1b7499fc00f4fc6c032c73c3baa72aff37ce0cf18c51c1250a
diff --git a/dev-perl/Curses/Curses-1.280.0-r1.ebuild b/dev-perl/Curses/Curses-1.280.0-r1.ebuild
deleted file mode 100644
index a40b41b99289..000000000000
--- a/dev-perl/Curses/Curses-1.280.0-r1.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
-
-MODULE_AUTHOR=GIRAFFED
-MODULE_VERSION=1.28
-MODULE_A_EXT=tgz
-inherit perl-module
-
-DESCRIPTION="Curses interface modules for Perl"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-solaris ~x86-solaris"
-IUSE="unicode"
-
-DEPEND=">=sys-libs/ncurses-5[unicode?]"
-RDEPEND="${DEPEND}"
-
-SRC_TEST="do"
-
-my_curses_version() {
- echo ncurses$(use unicode && echo w)
-}
-
-pkg_setup() {
- myconf="${myconf} FORMS PANELS MENUS"
- mydoc=HISTORY
- export CURSES_LIBTYPE=$(my_curses_version)
- export CURSES_LDFLAGS=$($(my_curses_version)5-config --libs)
- export CURSES_CFLAGS=$( $(my_curses_version)5-config --cflags)
-}
-
-src_configure(){
- perl-module_src_configure
- if ! use unicode ; then
- sed -i 's:<form.h>:"/usr/include/form.h":' "${S}"/c-config.h || die
- fi
-}
diff --git a/dev-perl/Curses/Curses-1.320.0.ebuild b/dev-perl/Curses/Curses-1.320.0.ebuild
index c8180724acff..536ae8095bdb 100644
--- a/dev-perl/Curses/Curses-1.320.0.ebuild
+++ b/dev-perl/Curses/Curses-1.320.0.ebuild
@@ -12,7 +12,7 @@ inherit perl-module
DESCRIPTION="Curses interface modules for Perl"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~sparc-solaris ~x86-solaris"
IUSE="+unicode"
DEPEND=">=sys-libs/ncurses-5:0=[unicode?]"
diff --git a/dev-perl/Curses/Manifest b/dev-perl/Curses/Manifest
index eb4eb4435a8f..59ab01c37f25 100644
--- a/dev-perl/Curses/Manifest
+++ b/dev-perl/Curses/Manifest
@@ -1,3 +1,2 @@
-DIST Curses-1.28.tgz 127412 SHA256 613b73c4b6075b1550592812214e4fc0e2205d3afcf234e3fa90f208fb8de892 SHA512 75664b39174c9875f7f779801bddb08f89ace029ea99857b561e8f8eec167f6f9059a32bc51265145b84bca1316e6d2f90a576b280cfcc7e050225f28730dff2 WHIRLPOOL dbfb87c59a236fef47e5b03735c92d109b2b4bf4a35ae69691c465f832d4122b5d48663ae4707ec6d79e6e5f892f3fdf6991400605f996e712863b3fca1a14c0
DIST Curses-1.32.tgz 134753 SHA256 5dba44fd7964806d9765e6692bc7eb8eb30aeced2740f28b9a4070a5d14ba650 SHA512 ecaa5cea2b544979229badc9f0d0ce84b385aa178ea0f821e6582865b3be63ea3d0cbc43651e2dc03334b796e5eab961c30e8f1637eec4af579843617e661562 WHIRLPOOL 37b548423430a79791659d40aa2d3d66546e0c49bbe8e1fc5c3798b30715ce1ed40343cdec70b3019a4d7c7d8adb37ca66fd8afa9f52d4b1e63774ac6a0c9b58
DIST Curses-1.33.tar.gz 134541 SHA256 eb1febf4c7dc01454f6e1d6a7380010e6a9b61b527e7f635c45b08b43c83ce88 SHA512 094ecf34f4116a4b405a810a16b727ab3201a32a42f98a2e2ac065e6b5cb25939091021f054bc15503fcc4aee1ee47825392cd8bd10e94f10792afcede6fe978 WHIRLPOOL 7cb13e0982a2e063325ac2a5716ff49258f81f03f657cee35856960f3452dd0b4e7ddf6f6baf82bc1f709ee436f5156da288d1ed98f018b61ba11eb63b321c83
diff --git a/dev-perl/Cwd-Guard/Cwd-Guard-0.40.0.ebuild b/dev-perl/Cwd-Guard/Cwd-Guard-0.40.0.ebuild
index d7d8727c6262..a1b4827da9bf 100644
--- a/dev-perl/Cwd-Guard/Cwd-Guard-0.40.0.ebuild
+++ b/dev-perl/Cwd-Guard/Cwd-Guard-0.40.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Temporary changing working directory (chdir)"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
IUSE=""
# Cwd -> perl-File-Spec
RDEPEND="
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 80edd830b38a..0b14a41033e3 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-SQLite/DBD-SQLite-1.480.0.ebuild b/dev-perl/DBD-SQLite/DBD-SQLite-1.480.0.ebuild
index 0e75b8fc76db..4e69ad9fc4ca 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-mysql/DBD-mysql-4.31.0-r1.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.31.0-r1.ebuild
deleted file mode 100644
index 0e6ef29c8515..000000000000
--- a/dev-perl/DBD-mysql/DBD-mysql-4.31.0-r1.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
-
-MODULE_AUTHOR=CAPTTOFU
-MODULE_VERSION=4.031
-inherit eutils perl-module
-
-DESCRIPTION="The Perl DBD:mysql Module"
-
-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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="embedded test"
-
-RDEPEND="dev-perl/DBI
- dev-perl/Test-Deep
- virtual/mysql[embedded?]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-print_embedded_options.patch
-}
-
-src_configure() {
- if use test; then
- myconf="${myconf} --testdb=test \
- --testhost=localhost \
- --testuser=test \
- --testpassword=test"
- fi
- use embedded && myconf="${myconf} --force-embedded --embedded=mysql_config"
- perl-module_src_configure
-}
-
-src_test() {
- einfo
- einfo "If tests fail, you have to configure your MySQL instance to create"
- einfo "and grant some privileges to the test user."
- einfo "You can run the following commands at the MySQL prompt: "
- einfo "> CREATE USER 'test'@'localhost' IDENTIFIED BY 'test';"
- einfo "> CREATE DATABASE test;"
- einfo "> GRANT ALL PRIVILEGES ON test.* TO 'test'@'localhost';"
- einfo
- sleep 5
- perl-module_src_test
-}
diff --git a/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild b/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild
index 9bd585bed70c..a183ad62ef02 100644
--- a/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild
+++ b/dev-perl/DBD-mysql/DBD-mysql-4.32.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit eutils perl-module
DESCRIPTION="The Perl DBD:mysql Module"
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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="embedded test"
RDEPEND="dev-perl/DBI
diff --git a/dev-perl/DBD-mysql/Manifest b/dev-perl/DBD-mysql/Manifest
index b18878110aff..db6437eec44a 100644
--- a/dev-perl/DBD-mysql/Manifest
+++ b/dev-perl/DBD-mysql/Manifest
@@ -1,2 +1 @@
-DIST DBD-mysql-4.031.tar.gz 145217 SHA256 ae2ee4339fb13429922d76d37e25ce838f98baa011f691a6bbec8513ddb4cfd2 SHA512 b7cdd80e340ecd5d2d9ab59fde73824dc1334afc9ccc3e851e1c5bbf39b95f2a82181d0a78785b8c9543bf4ae6d3115809da186a7778320adeaecdf318876f95 WHIRLPOOL f10f002796c723a4095055e8bbbcb3a585c59f6d2ca1b2937d3a1d5b24d91221ad6d474b403d26fffc34059e13097194933dfca8771a46ce0668485aafc6b782
DIST DBD-mysql-4.032.tar.gz 146476 SHA256 b8e681e719d8f2d1cecb9e8603e13483b09b56508629b079022778e7dfd7bfb6 SHA512 7e7ebaed07f0540079854294cc3ab4a4554fd0f850dd0927b2485cc985c2c9f5b70a650d971027c883cc4d8450020245656f6ff1f792a56d1a2d4b45402d73d0 WHIRLPOOL 79b94c7c85406e0f3a0469c8017594f81f6151eab3059d483c50326222fdb920d12db04a5382dbdc2862cf853e1c421fe0d7acc4a35b131a0f9d39c2d79f5d0b
diff --git a/dev-perl/DBI/DBI-1.628.0.ebuild b/dev-perl/DBI/DBI-1.628.0.ebuild
deleted file mode 100644
index 6a83ffb3cf40..000000000000
--- a/dev-perl/DBI/DBI-1.628.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=TIMB
-MODULE_VERSION=1.628
-inherit perl-module eutils
-
-DESCRIPTION="The Perl DBI Module"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
- >=dev-perl/PlRPC-0.200.0
- >=virtual/perl-Sys-Syslog-0.170.0
- virtual/perl-File-Spec
- !<=dev-perl/SQL-Statement-1.330.0
-"
-# !<=dev-perl/DBD-Amazon-0.100.0
-# !<=dev-perl/DBD-AnyData-0.110.0
-# !<=dev-perl/DBD-CSV-0.360.0
-# !<=dev-perl/DBD-Google-0.510.0
-# !<=dev-perl/DBD-PO-2.100.0
-# !<=dev-perl/DBD-RAM-0.72.0
-DEPEND="${RDEPEND}
- test? (
- >=virtual/perl-Test-Simple-0.900.0
- )
-"
-
-SRC_TEST="do"
-mydoc="ToDo"
-MAKEOPTS="${MAKEOPTS} -j1"
diff --git a/dev-perl/DBI/DBI-1.634.0.ebuild b/dev-perl/DBI/DBI-1.634.0.ebuild
index 206684f32c3a..7fd1f726259d 100644
--- a/dev-perl/DBI/DBI-1.634.0.ebuild
+++ b/dev-perl/DBI/DBI-1.634.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module eutils
DESCRIPTION="Database independent interface for Perl"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/DBI/Manifest b/dev-perl/DBI/Manifest
index f5c7a0543a1a..5f08f1dfe6ef 100644
--- a/dev-perl/DBI/Manifest
+++ b/dev-perl/DBI/Manifest
@@ -1,2 +1 @@
-DIST DBI-1.628.tar.gz 586733 SHA256 46c834f4ba1b28c8d8a2db8095835a67fc69a9585761523aea3a74437a969b52 SHA512 34bb50ba7c0364e064fd5a05ea5415e43e40d082ed299503beccf2cba7b2ddd8f1e79e96606f35f9da279175ac16531da96d3762a71e9e63570f6db7b683f3a1 WHIRLPOOL 95b72f418c5957dcc4051a889363ce020d6dfb4fcd30216d88c61e8ec66ed30822432343409418e342c62c67dabb91ab464338b14fe316ab20a38350b86f48a4
DIST DBI-1.634.tar.gz 595020 SHA256 250712f385864818abfba409420d16d9ee61f1cc73ac85159d054a5ee86d1450 SHA512 42e2b94d5e4cdcd57aaa43519fa1464a4d7132ed09426bb8cb7092b0ee57edde168105a25d02dcdeb304c6bc13c1ad97bc27b54b5f6af05eeaba011d5dab3c44 WHIRLPOOL 53b4b8caa8161b6d6fd999b039c31018060e018bc1b0e24163017e1128db1b29e2c798f8d91e64d2e3653088fd502efb440f21ae0fd8754d3d29803ea405057d
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 a08fb904469d..b93d4a6ec3e3 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/DateTime/DateTime-1.030.0.ebuild b/dev-perl/DateTime/DateTime-1.030.0.ebuild
deleted file mode 100644
index 72f2ecf44996..000000000000
--- a/dev-perl/DateTime/DateTime-1.030.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=DROLSKY
-MODULE_VERSION=1.03
-inherit perl-module
-
-DESCRIPTION="A date and time object"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
- >=dev-perl/Params-Validate-0.760.0
- >=dev-perl/DateTime-TimeZone-1.90.0
- >=dev-perl/DateTime-Locale-0.440.0
-"
-DEPEND="${RDEPEND}
- dev-perl/Module-Build
- test? (
- dev-perl/Test-Fatal
- )
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/DateTime/DateTime-1.200.0.ebuild b/dev-perl/DateTime/DateTime-1.200.0.ebuild
index 3d2782845f2f..937329504da8 100644
--- a/dev-perl/DateTime/DateTime-1.200.0.ebuild
+++ b/dev-perl/DateTime/DateTime-1.200.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A date and time object"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/DateTime/Manifest b/dev-perl/DateTime/Manifest
index 08c7f68f5856..77af81a63a55 100644
--- a/dev-perl/DateTime/Manifest
+++ b/dev-perl/DateTime/Manifest
@@ -1,3 +1,2 @@
-DIST DateTime-1.03.tar.gz 174369 SHA256 384f97c73da02492d771d6b5c3b37f6b18c2e12f4db3246b1d61ff19c6d6ad6d SHA512 6764b8bd8ccb22429d17dfc48412a0223481ae43249920347ae91514dbbe0d2f820601372b9cdae312d0ba9460c9abeae9e189afb1666b90e27b09f3daaf335f WHIRLPOOL 93903c881305ab2ca99aecb16c3100f74e0d32576565703feb6897d112056bc5b20d69f7ded92910574b514179a13adb3cd584a7910c55043eb492e9e34b7a3d
DIST DateTime-1.20.tar.gz 220697 SHA256 ac909ca4e26f2713940302ad1fd8068de0a6970416a5a88a812cceb155becb0d SHA512 b0374407683da3b68d0a127a2899deb8222f3bbd3e1f68481a000ca8c7fbde69bf4e43253b4cdd68f97b0a0ee7d8ed9d7a08fda8b5bf713b0f02ba722cd3aff9 WHIRLPOOL 0554f0d60fc57410aeecee8afa22997479bf9749eb1e46bd57f369a2ba98d8b4e8c06298304cd1bdec42879864440fe5e34f8df97def6188454caf14988e9143
DIST DateTime-1.21.tar.gz 221151 SHA256 a3a5840cae36d693b1371bd0f615aa8e3ab7f6cc25e06bff40c7010217d3f6b1 SHA512 256b49c6857c2eab4508ed1c1ddca0d88a32339c10334d70f95599d4d49934fe2fbc7689df334121c29abdb8eb0ebdf066183361224a5dbdce98fc1a216a721f WHIRLPOOL 73a277d680f6a806f54fd23d31d2bc34220e042e202d8df1d272c664f4171f3afbb34e2be8aef091bf4bd48ff9f4b775efa4810284a8e9081ac6bbde1af0e5ec
diff --git a/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.50.0.ebuild b/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.50.0.ebuild
index 3a44abe03978..e13bcceff1dd 100644
--- a/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.50.0.ebuild
+++ b/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.50.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Check the compiler's availability"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.130.0.ebuild b/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.130.0.ebuild
index 76bc294e9c4b..213d23e68392 100644
--- a/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.130.0.ebuild
+++ b/dev-perl/Devel-GlobalDestruction/Devel-GlobalDestruction-0.130.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION='Provides function returning the equivalent of ${^GLOBAL_PHASE} eq DESTRUCT for older perls'
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.4.0.ebuild b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.4.0.ebuild
index 24ee416fce97..684a62da6ac5 100644
--- a/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.4.0.ebuild
+++ b/dev-perl/Devel-OverloadInfo/Devel-OverloadInfo-0.4.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Introspect overloaded operators"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
IUSE="test"
# Scalar::Util -> Scalar-List-Utils
diff --git a/dev-perl/Devel-Symdump/Devel-Symdump-2.120.0.ebuild b/dev-perl/Devel-Symdump/Devel-Symdump-2.120.0.ebuild
deleted file mode 100644
index f3e709762157..000000000000
--- a/dev-perl/Devel-Symdump/Devel-Symdump-2.120.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ANDK
-MODULE_VERSION=2.12
-inherit versionator perl-module
-
-DESCRIPTION="Dump symbol names or the symbol table"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-SRC_TEST="do"
diff --git a/dev-perl/Devel-Symdump/Devel-Symdump-2.140.0.ebuild b/dev-perl/Devel-Symdump/Devel-Symdump-2.140.0.ebuild
deleted file mode 100644
index 3f0b145940b3..000000000000
--- a/dev-perl/Devel-Symdump/Devel-Symdump-2.140.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=ANDK
-MODULE_VERSION=2.14
-inherit versionator perl-module
-
-DESCRIPTION="Dump symbol names or the symbol table"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- virtual/perl-ExtUtils-MakeMaker
- test? ( virtual/perl-Test-Simple )
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Devel-Symdump/Devel-Symdump-2.150.0.ebuild b/dev-perl/Devel-Symdump/Devel-Symdump-2.150.0.ebuild
index f2284ddcb7e2..e4f3e40a6676 100644
--- a/dev-perl/Devel-Symdump/Devel-Symdump-2.150.0.ebuild
+++ b/dev-perl/Devel-Symdump/Devel-Symdump-2.150.0.ebuild
@@ -11,7 +11,7 @@ inherit versionator perl-module
DESCRIPTION="Dump symbol names or the symbol table"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="test"
RDEPEND=""
diff --git a/dev-perl/Devel-Symdump/Manifest b/dev-perl/Devel-Symdump/Manifest
index 3ea282a292d7..c10bee424e54 100644
--- a/dev-perl/Devel-Symdump/Manifest
+++ b/dev-perl/Devel-Symdump/Manifest
@@ -1,3 +1 @@
-DIST Devel-Symdump-2.12.tar.gz 17541 SHA256 9949c44f7646d380e71744f6d12291de29b0f468fe96e8e1614feb913054073d SHA512 a123e41daf386963c0e199702386b07db75cb675574137c0661183add10d95ef568e48a9c2639373b39e6102ce16c4685ff538711f7d76b3a27c1fee4bd80506 WHIRLPOOL bafd918520c32471102a51fb8e0e16076e1791bb4aeeac7f5fee29845c5f2e294062d232af11a2ed14f4ea14195c5118339e8950fa6abf8369ec910fff876f2e
-DIST Devel-Symdump-2.14.tar.gz 17828 SHA256 9b14fb22760e8f1292fdc52932b8dcc6abbd95a29f88d2e4faaf7add5ff71ede SHA512 7323e60ec39a1b4e52c617b001a645521f4361510608b9cfb44e349f5bce7f50565c36467ef25e08bd2ab53fcfdc44b040e77d735064c1a25a863b5f3688d889 WHIRLPOOL c16d1d4892943b375926f743556fb28a464468cce835c202cee3ca9d962963f5c9d2acc36ecf515435c794a9176f2c488ae17ac54a6a91081fb9db80f54a7f0d
DIST Devel-Symdump-2.15.tar.gz 18112 SHA256 76c2a90d31318204ecf1977f0217ce57b142e6681fe2b99fb8789efc5dd86f41 SHA512 eba7178da3b8c9b8b2f4c61e572e4aef2e181a9b0be7a58f0790534511ccef51b7def381bcf7c37cd4a127de1cf57f1536284b3cb65f8a99920460a172f2e446 WHIRLPOOL d3af70e4e49cb496a25eb1d359ca03a5a62e7dfbbe83116b464ace56af38cbc05405089fe715e27f0f30451b758682ba30e70db9e9df8901feb4723413e843e2
diff --git a/dev-perl/Digest-CRC/Digest-CRC-0.180.0-r1.ebuild b/dev-perl/Digest-CRC/Digest-CRC-0.180.0-r1.ebuild
deleted file mode 100644
index b3c09982be9a..000000000000
--- a/dev-perl/Digest-CRC/Digest-CRC-0.180.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MODULE_AUTHOR=OLIMAUL
-MODULE_VERSION=0.18
-inherit perl-module
-
-DESCRIPTION="Generic CRC function"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- >=dev-perl/Module-Build-0.380.0"
-
-SRC_TEST="do"
diff --git a/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild b/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild
index 3ce53cea1198..279c97cd8555 100644
--- a/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild
+++ b/dev-perl/Digest-CRC/Digest-CRC-0.210.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Generic CRC function"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/Digest-CRC/Manifest b/dev-perl/Digest-CRC/Manifest
index 7646afbb76b5..c3c2428f8933 100644
--- a/dev-perl/Digest-CRC/Manifest
+++ b/dev-perl/Digest-CRC/Manifest
@@ -1,2 +1 @@
-DIST Digest-CRC-0.18.tar.gz 7721 SHA256 5c5329f37c46eb79835169508583da8767d9839350b69bb2b48ac6f594f70374 SHA512 bd41837c2ff8b79dff80ff25437f60b32e8c18945a67b1bb0238c3e0ecdfb704ae8e9213d3a1dbf5b46990f558839834e22a5aa0b1463a34f5c23b5b6a9130cc WHIRLPOOL f053014f704d54b63e06c94e1fe2ed9618a0616939686cc8b856b2776e933e61c071925101f5e81e7545a404840068d50cf930f24e30a0b2d86e8d5907941929
DIST Digest-CRC-0.21.tar.gz 7924 SHA256 79a0ef8081767c324edb9da39f80835910ed7c5b0539ed106caf7f2467d1958f SHA512 65f81c6903a6bc41d0a2aaad000ba4827e919c5b3312e4bbf8de21f77ba79955f6fa5ff3827c1d9bd74b2a931d224795a443303248bb5e5d67b6e71b79da8d03 WHIRLPOOL 5e706b1c2731a63600999571feac914065d2a5d27bcb01b5ef75168416aa49163532f3cd77689f79e10093816dd77bd3e620e17af5733b3af1432ce806caac5d
diff --git a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild
index 4387b15f3b30..c091a6434a5a 100644
--- a/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild
+++ b/dev-perl/ExtUtils-Config/ExtUtils-Config-0.7.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION='A wrapper for perl'\''s configuration'
LICENSE=" || ( Artistic 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"
DEPEND="
diff --git a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild
index b5b7b8ba4918..9511dea5bbc1 100644
--- a/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild
+++ b/dev-perl/ExtUtils-Helpers/ExtUtils-Helpers-0.22.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION='Various portability utilities for module builders'
LICENSE=" || ( Artistic 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"
DEPEND="
diff --git a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild
index 2c0bb68c4391..018df7557d87 100644
--- a/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild
+++ b/dev-perl/ExtUtils-InstallPaths/ExtUtils-InstallPaths-0.10.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION='Build.PL install path logic made easy'
LICENSE=" || ( Artistic 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"
DEPEND="
diff --git a/dev-perl/File-Find-Rule-Perl/File-Find-Rule-Perl-1.130.0.ebuild b/dev-perl/File-Find-Rule-Perl/File-Find-Rule-Perl-1.130.0.ebuild
index 3abbda38c72d..ae298a35c90a 100644
--- a/dev-perl/File-Find-Rule-Perl/File-Find-Rule-Perl-1.130.0.ebuild
+++ b/dev-perl/File-Find-Rule-Perl/File-Find-Rule-Perl-1.130.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Common rules for searching for Perl things"
LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
IUSE=""
DEPEND="
diff --git a/dev-perl/Filter/Filter-1.540.0.ebuild b/dev-perl/Filter/Filter-1.540.0.ebuild
index fcaaa386aa70..c37c84226a03 100644
--- a/dev-perl/Filter/Filter-1.540.0.ebuild
+++ b/dev-perl/Filter/Filter-1.540.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Interface for creation of Perl Filters"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-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 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="
diff --git a/dev-perl/Finance-Quote/Finance-Quote-1.370.0.ebuild b/dev-perl/Finance-Quote/Finance-Quote-1.370.0.ebuild
index 3b5c6837a194..4afc2302b610 100644
--- a/dev-perl/Finance-Quote/Finance-Quote-1.370.0.ebuild
+++ b/dev-perl/Finance-Quote/Finance-Quote-1.370.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Get stock and mutual fund quotes from various exchanges"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
IUSE="test"
# virtual/perl-Data-Dumper currently commented out in the code
diff --git a/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.240.0-r1.ebuild b/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.240.0-r1.ebuild
deleted file mode 100644
index 3ef964152b69..000000000000
--- a/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.240.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=EDD
-MODULE_VERSION=0.24
-inherit perl-module
-
-DESCRIPTION="Get stock quotes from Yahoo! Finance"
-
-LICENSE="|| ( GPL-2 GPL-3 )" # GPL-2+
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="dev-perl/libwww-perl
- virtual/perl-MIME-Base64
- >=dev-perl/HTML-Parser-2.2"
-DEPEND="${RDEPEND}"
-
-SRC_TEST=online
diff --git a/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.250.0.ebuild b/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.250.0.ebuild
index d8577dc0bb93..be1343f3aed7 100644
--- a/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.250.0.ebuild
+++ b/dev-perl/Finance-YahooQuote/Finance-YahooQuote-0.250.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Get stock quotes from Yahoo! Finance"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Finance-YahooQuote/Manifest b/dev-perl/Finance-YahooQuote/Manifest
index 7df48ef93a6f..6401ff39bd5a 100644
--- a/dev-perl/Finance-YahooQuote/Manifest
+++ b/dev-perl/Finance-YahooQuote/Manifest
@@ -1,2 +1 @@
-DIST Finance-YahooQuote-0.24.tar.gz 20364 SHA256 967a963420a90533d385f1b7841b2f8bd0eae4c1ed0bb7ad6d9adee17a8b6c59 SHA512 e051fcd9e1c8382d7a7402466218df71c7463b704bf76fdd97884747a0a359b7b5a65ba81a8b71f8e19ee15691d8b322f3e4a2c46d1ff6cd8d15e6101c3437ba WHIRLPOOL 388ddcc93650f01692a18f719d911307af4eb07a3ebec4f422c6058fbf28dc5ea2a0ff20f4d598e7fe568d1376f87ce40d6e3d3941dadcc78f32de02804f1934
DIST Finance-YahooQuote-0.25.tar.gz 20650 SHA256 d29929ec543a305612996a906081d50fc8eee8428fc4c5af5a7571556839bdba SHA512 be1d906187916a62b50775a42e6b7ead983e65d2d3738ff8c76e4fb3c4c67eb8c01f8c95f181547547ec7624119b6be41b4299731e6a8dc76ecfc1c38779bf72 WHIRLPOOL cf941ceae3ab0ccf3ac5f440e96c0699e757e08fe610e7c08aa5c531c96f8b298d04510d22e36b0118fed6ac64b3e5a6b408ca1677433e2997512c0aa17a7bd9
diff --git a/dev-perl/GDGraph/GDGraph-1.480.0-r1.ebuild b/dev-perl/GDGraph/GDGraph-1.480.0-r1.ebuild
deleted file mode 100644
index 5f368b0b9c65..000000000000
--- a/dev-perl/GDGraph/GDGraph-1.480.0-r1.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
-
-MODULE_AUTHOR=RUZ
-MODULE_VERSION=1.48
-inherit perl-module
-
-DESCRIPTION="Perl5 module to create charts using the GD module"
-
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-perl/GDTextUtil
- dev-perl/GD
- media-libs/gd"
-DEPEND="${RDEPEND}"
diff --git a/dev-perl/GDGraph/GDGraph-1.490.0.ebuild b/dev-perl/GDGraph/GDGraph-1.490.0.ebuild
index c2b936243773..d840bb0dad4c 100644
--- a/dev-perl/GDGraph/GDGraph-1.490.0.ebuild
+++ b/dev-perl/GDGraph/GDGraph-1.490.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Perl5 module to create charts using the GD module"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris"
IUSE=""
RDEPEND="dev-perl/GDTextUtil
diff --git a/dev-perl/GDGraph/Manifest b/dev-perl/GDGraph/Manifest
index 524938f914c3..0fabed12e925 100644
--- a/dev-perl/GDGraph/Manifest
+++ b/dev-perl/GDGraph/Manifest
@@ -1,3 +1,2 @@
-DIST GDGraph-1.48.tar.gz 156383 SHA256 4324a104557edaf8925a20f24326af89c08e419989fbaa7380f0c9731bc2ac6c SHA512 1b72b0f647dbf79a358fdf49d10f5a016a075bbf257116f120af1874efc5615917d164d95d6125c7534e3fb14050127acbd5c2fb9f5bb745997e9401c7822040 WHIRLPOOL 47a6af3d33e9a9f5dca0226d1dbcb9f6b766b85755350040adac25fd29ea8f9a074f0368128fe375e25a96b427f7fa6caa10b0f160b4d90f5c3b110a082d865f
DIST GDGraph-1.49.tar.gz 155643 SHA256 d26538c827e35c1d4b27f3c045b60f1ab6b45401c54a87e86103cd7c2374cff5 SHA512 720cc51dda41963be087bb39418642f75dade1bbab54cd4d788c18c9328f3fbd6a5c0f73027bb0be64d44cd94b0c5f2d67c48d4b0c3c34736ac8f7bc8cba95ab WHIRLPOOL 34aa2f5af03d8ce794863a7c9bbae3ad5a14a13cf85b5ecf67a4ee7ba44cfdb7036ad88b69d286198f5b3c99d75b30298321f1015d3bebd5ef545109c55bd739
DIST GDGraph-1.51.tar.gz 156175 SHA256 0543f9549de28de05f0b40d1864cfa1f829577fad75063c45bf867d202d56123 SHA512 c9cafdc90905fea8689cac32d0429ae987a933ae090de9894c9f70668db5c636e9363e76a656898df667dd0b0b4f593a64f3327f0b8a9738f74cd2cd937005e0 WHIRLPOOL 717e90936dbe16beeff23dc85827c72a3ab32f7c2fb14f348f06bf7c30406d2c18cbb793c8103bfe1a8f2a5605201bac42b699795f7cdc84bdba2698fec24145
diff --git a/dev-perl/MRO-Compat/MRO-Compat-0.120.0-r1.ebuild b/dev-perl/MRO-Compat/MRO-Compat-0.120.0-r1.ebuild
index ed1bd4bbb052..558f44b7b5cb 100644
--- a/dev-perl/MRO-Compat/MRO-Compat-0.120.0-r1.ebuild
+++ b/dev-perl/MRO-Compat/MRO-Compat-0.120.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Lets you build groups of accessors"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
index b7400b3a2800..3093b7d86940 100644
--- a/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
+++ b/dev-perl/Module-Build-Tiny/Module-Build-Tiny-0.39.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION='A tiny replacement for Module::Build'
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.140.0.ebuild b/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.140.0.ebuild
index 7ef4269a09fc..3edd459f6450 100644
--- a/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.140.0.ebuild
+++ b/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.140.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A Module::Build class for building XS modules"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
IUSE="test"
# File::Basename -> perl
RDEPEND="
diff --git a/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.2.0.ebuild b/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.2.0.ebuild
index 3bc981341300..7c7fb38ccc65 100644
--- a/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.2.0.ebuild
+++ b/dev-perl/Module-Runtime-Conflicts/Module-Runtime-Conflicts-0.2.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Provide information on conflicts for Module::Runtime"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Moose/Moose-2.160.400.ebuild b/dev-perl/Moose/Moose-2.160.400.ebuild
index 59dc72d1d433..8dccb8d8c24b 100644
--- a/dev-perl/Moose/Moose-2.160.400.ebuild
+++ b/dev-perl/Moose/Moose-2.160.400.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A postmodern object system for Perl 5"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-macos"
IUSE="test"
CONFLICTS="
diff --git a/dev-perl/MooseX-Types/MooseX-Types-0.460.0.ebuild b/dev-perl/MooseX-Types/MooseX-Types-0.460.0.ebuild
index b9a23bfcc3d7..84d7978d63ed 100644
--- a/dev-perl/MooseX-Types/MooseX-Types-0.460.0.ebuild
+++ b/dev-perl/MooseX-Types/MooseX-Types-0.460.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Organise your Moose types in libraries"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Mouse/Mouse-2.4.5.ebuild b/dev-perl/Mouse/Mouse-2.4.5.ebuild
index b7f6141b9265..01f9ed632dde 100644
--- a/dev-perl/Mouse/Mouse-2.4.5.ebuild
+++ b/dev-perl/Mouse/Mouse-2.4.5.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Moose minus the antlers"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/MouseX-Types/MouseX-Types-0.60.0.ebuild b/dev-perl/MouseX-Types/MouseX-Types-0.60.0.ebuild
index d273fb9d52d7..06c5d238e232 100644
--- a/dev-perl/MouseX-Types/MouseX-Types-0.60.0.ebuild
+++ b/dev-perl/MouseX-Types/MouseX-Types-0.60.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Organize your Mouse types in libraries"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild b/dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild
index fc340a96b10b..d966493536de 100644
--- a/dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild
+++ b/dev-perl/Mozilla-CA/Mozilla-CA-20150826.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Mozilla's CA cert bundle in PEM format"
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.201.0.ebuild b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.201.0-r1.ebuild
index ba3162fe822c..c18da862e328 100644
--- a/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.201.0.ebuild
+++ b/dev-perl/Net-IDN-Encode/Net-IDN-Encode-2.201.0-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$
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND="
- dev-perl/Unicode-Normalize
+ virtual/perl-Unicode-Normalize
"
DEPEND="${RDEPEND}
virtual/perl-ExtUtils-CBuilder
diff --git a/dev-perl/PadWalker/PadWalker-2.100.0.ebuild b/dev-perl/PadWalker/PadWalker-2.100.0.ebuild
index 3db3f0492018..36aaf0addea8 100644
--- a/dev-perl/PadWalker/PadWalker-2.100.0.ebuild
+++ b/dev-perl/PadWalker/PadWalker-2.100.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="play with other peoples' lexical variables"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
DEPEND="virtual/perl-ExtUtils-MakeMaker"
diff --git a/dev-perl/Path-Class/Manifest b/dev-perl/Path-Class/Manifest
index 75bb44f22c92..b5812118d6bd 100644
--- a/dev-perl/Path-Class/Manifest
+++ b/dev-perl/Path-Class/Manifest
@@ -1,2 +1 @@
-DIST Path-Class-0.32.tar.gz 32205 SHA256 320ba296e134170eaabb42ff3929f82419bedd4de98bf44babfaccef17d3ecb8 SHA512 e943f4ef8069718dbd41025f2eae2bb827e903e98eb7f9d906f70373d88e8dfeb4aeef80c49773afdfba026dc39e673cb2323cc439d3def2007c86e1fbefcc05 WHIRLPOOL 62eee04fb048df34c92e398880e6d3a47f84529fc30b1f0725da78bcc82b10d59026d1515b2ccd3ee86756af4ddb255d5dff71deb66cff69b09cbdf3530d16bb
DIST Path-Class-0.35.tar.gz 34086 SHA256 9226b305196127d02529303dbd6c37802baafe736f0245cb089241ed25922aee SHA512 cfbd27bf4756bade7a9abd081eda79058c0225d4a803a34a2bfe2a6c2eef954908b33843f352c562599edc420ca7a0063e9f7fd9fdd1d608ecea230e585287e2 WHIRLPOOL 9db31ac3df38998edc1d58ac59ae46457e5286cb9da715be7e8f30701297ed2bad7cabd5c28a081f4af06b37ca4b0bfe81d376ab4262356f4f6e38a40da8dc5b
diff --git a/dev-perl/Path-Class/Path-Class-0.320.0.ebuild b/dev-perl/Path-Class/Path-Class-0.320.0.ebuild
deleted file mode 100644
index 4d55d7556cb3..000000000000
--- a/dev-perl/Path-Class/Path-Class-0.320.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
-
-MODULE_AUTHOR=KWILLIAMS
-MODULE_VERSION=0.32
-inherit perl-module
-
-DESCRIPTION="Cross-platform path specification manipulation"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-RDEPEND="
- >=virtual/perl-File-Spec-0.870.0
- virtual/perl-Scalar-List-Utils
-"
-DEPEND="${RDEPEND}
- dev-perl/Module-Build
- test? (
- virtual/perl-Test-Simple
- )
-"
-
-SRC_TEST="do"
diff --git a/dev-perl/Path-Class/Path-Class-0.350.0.ebuild b/dev-perl/Path-Class/Path-Class-0.350.0.ebuild
index 609e9f2a76c5..87b2d297bb46 100644
--- a/dev-perl/Path-Class/Path-Class-0.350.0.ebuild
+++ b/dev-perl/Path-Class/Path-Class-0.350.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Cross-platform path specification manipulation"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r1.ebuild b/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r1.ebuild
index e052bb4ca25a..455884174a0f 100644
--- a/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r1.ebuild
+++ b/dev-perl/Perl-Critic-Dynamic/Perl-Critic-Dynamic-0.50.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Base class for dynamic Policies"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
IUSE=""
RDEPEND="dev-perl/Perl-Critic
diff --git a/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild b/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild
index 6ce8255a5399..18a77bd8885a 100644
--- a/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild
+++ b/dev-perl/Sub-Exporter-ForMethods/Sub-Exporter-ForMethods-0.100.52.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Helper routines for using Sub::Exporter to build methods"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild
index 29c3d68fbafd..835d3b10e667 100644
--- a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild
+++ b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Only use Sub::Exporter if you need it"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Sub-Identify/Sub-Identify-0.40.0-r1.ebuild b/dev-perl/Sub-Identify/Sub-Identify-0.40.0-r1.ebuild
index feae7885fd6a..d25f7694dd03 100644
--- a/dev-perl/Sub-Identify/Sub-Identify-0.40.0-r1.ebuild
+++ b/dev-perl/Sub-Identify/Sub-Identify-0.40.0-r1.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Retrieve names of code references"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86 ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="test"
RDEPEND=""
diff --git a/dev-perl/Test-CheckDeps/Test-CheckDeps-0.10.0.ebuild b/dev-perl/Test-CheckDeps/Test-CheckDeps-0.10.0.ebuild
index 445341d4dc9b..c2f64265e00b 100644
--- a/dev-perl/Test-CheckDeps/Test-CheckDeps-0.10.0.ebuild
+++ b/dev-perl/Test-CheckDeps/Test-CheckDeps-0.10.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION='Check for presence of dependencies'
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~x86"
IUSE="test"
# rdep Test::Builder -> perl-Test-Simple
diff --git a/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.180.0.ebuild b/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.180.0.ebuild
index ce03c482f3e3..c12a6cd75a8b 100644
--- a/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.180.0.ebuild
+++ b/dev-perl/Test-CleanNamespaces/Test-CleanNamespaces-0.180.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Check for uncleaned imports"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
IUSE="test minimal"
# r:Test::Builder -> Test-Simple
diff --git a/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild b/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild
index dfa2ecae38f0..39b2f7e58590 100644
--- a/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild
+++ b/dev-perl/Test-Differences/Test-Differences-0.630.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Test strings and data structures and show differences if not ok"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ppc ~ppc64 ~x86"
IUSE="test"
RDEPEND="dev-perl/Text-Diff
diff --git a/dev-perl/Test-MockModule/Test-MockModule-0.50.0-r2.ebuild b/dev-perl/Test-MockModule/Test-MockModule-0.50.0-r2.ebuild
index b9d1a6b26605..f1ca111eb23a 100644
--- a/dev-perl/Test-MockModule/Test-MockModule-0.50.0-r2.ebuild
+++ b/dev-perl/Test-MockModule/Test-MockModule-0.50.0-r2.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Override subroutines in a module for unit testing"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Test-Most/Test-Most-0.340.0.ebuild b/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
index cc208ed87827..3f0343989ac5 100644
--- a/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
+++ b/dev-perl/Test-Most/Test-Most-0.340.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Most commonly needed test functions and features"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 hppa ppc ~ppc64 ~x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Text-Diff/Text-Diff-1.430.0.ebuild b/dev-perl/Text-Diff/Text-Diff-1.430.0.ebuild
index 4d23df000946..0fbcd7e075b4 100644
--- a/dev-perl/Text-Diff/Text-Diff-1.430.0.ebuild
+++ b/dev-perl/Text-Diff/Text-Diff-1.430.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Perform diffs on files and record sets"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Try-Tiny/Manifest b/dev-perl/Try-Tiny/Manifest
index dc6c2534d243..5919f4af8560 100644
--- a/dev-perl/Try-Tiny/Manifest
+++ b/dev-perl/Try-Tiny/Manifest
@@ -1,3 +1 @@
-DIST Try-Tiny-0.18.tar.gz 16499 SHA256 4ec6fa76eda43ceb10598ea9950c815b332bb4e927b11a62d247c447faca4a1a SHA512 2e21298a22670c58a702a5a168a43dc48a213ef407bd7be3b3676522ea17735ea22dc835aa89c4e57e53af030e3310c881e9432c527435d827351f2230af0de5 WHIRLPOOL 5822a52848a4716cbbe882d95e11e9ff486a4fd6c29d1601c00bfcce0e3517bba54e281308acf539c47df6708a7abb869a5c3bad2432c8ee10877e3414a9ea83
-DIST Try-Tiny-0.19.tar.gz 17165 SHA256 57ae3341b03af36a052922d88e1ebf1c17828b25da69dfbe98ac8b113c181aec SHA512 5a642da7e55becb41109bfbb1e44999bde6904c4c5b961658b3ddb5958c84320f02ba7e081f36e7381dd04ae7174373e0c69587f49882b35202e8a45f6eb5115 WHIRLPOOL 6398d05e865b6c155ff9774f72ea6e2b0610d1968750a0d3d41687dedbc10930cf9a15de15fb739f5ca4f0c048879ee00479986ec1ebec48bd54c6ea2dc3661c
DIST Try-Tiny-0.22.tar.gz 18311 SHA256 60fba46f4693d33d54539104f9001df008dabb400b6837e9605c39a6ee6a1b19 SHA512 4e39b4da16480bb2b93c05e8e016e9d1b5a68f29c527b19bbf9333442ca708e88dd2720a5812d141a152ae088ed1fcb1ce179018c2d0fe105545256396b2ccc4 WHIRLPOOL 1d260b96ef061e7a8ae605e5168bbac807a93387bcb3e085e2b305b8196fedebbebdaa3ac190edbd4c3772b8fd1e46219e6718ee849b8ae0b1d6e0360a88c82d
diff --git a/dev-perl/Try-Tiny/Try-Tiny-0.180.0.ebuild b/dev-perl/Try-Tiny/Try-Tiny-0.180.0.ebuild
deleted file mode 100644
index cfee4ec702da..000000000000
--- a/dev-perl/Try-Tiny/Try-Tiny-0.180.0.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
-
-MODULE_AUTHOR=DOY
-MODULE_VERSION=0.18
-inherit perl-module
-
-DESCRIPTION="Minimal try/catch with proper localization of $@"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-DEPEND="test? ( dev-perl/Sub-Name )"
-
-SRC_TEST=do
diff --git a/dev-perl/Try-Tiny/Try-Tiny-0.190.0.ebuild b/dev-perl/Try-Tiny/Try-Tiny-0.190.0.ebuild
deleted file mode 100644
index a2fb3cdcd641..000000000000
--- a/dev-perl/Try-Tiny/Try-Tiny-0.190.0.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_AUTHOR=DOY
-MODULE_VERSION=0.19
-inherit perl-module
-
-DESCRIPTION="Minimal try/catch with proper localization of $@"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="test"
-
-DEPEND="
- test? (
- dev-perl/Sub-Name
- dev-perl/Capture-Tiny
- )
-"
-
-SRC_TEST=do
diff --git a/dev-perl/Try-Tiny/Try-Tiny-0.220.0.ebuild b/dev-perl/Try-Tiny/Try-Tiny-0.220.0.ebuild
index 5eadd05a13d4..bea919baea34 100644
--- a/dev-perl/Try-Tiny/Try-Tiny-0.220.0.ebuild
+++ b/dev-perl/Try-Tiny/Try-Tiny-0.220.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Minimal try/catch with proper localization of $@"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/Unicode-Stringprep/Unicode-Stringprep-1.105.0.ebuild b/dev-perl/Unicode-Stringprep/Unicode-Stringprep-1.105.0-r1.ebuild
index 874542653eca..baf45680a799 100644
--- a/dev-perl/Unicode-Stringprep/Unicode-Stringprep-1.105.0.ebuild
+++ b/dev-perl/Unicode-Stringprep/Unicode-Stringprep-1.105.0-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$
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND="
- >=dev-perl/Unicode-Normalize-1
+ >=virtual/perl-Unicode-Normalize-1
"
DEPEND="${RDEPEND}
>=dev-perl/Module-Build-0.420.0
diff --git a/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild b/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild
index 1820d0cf7a95..9d5c769eb644 100644
--- a/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild
+++ b/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Keep imports out of your namespace"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~ppc ~x86 ~x64-macos"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/namespace-clean/namespace-clean-0.260.0.ebuild b/dev-perl/namespace-clean/namespace-clean-0.260.0.ebuild
index 0719d939f13a..43793a8ee9bf 100644
--- a/dev-perl/namespace-clean/namespace-clean-0.260.0.ebuild
+++ b/dev-perl/namespace-clean/namespace-clean-0.260.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Keep imports and functions out of your namespace"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~x64-macos"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/perltidy/perltidy-20140711.0.0.ebuild b/dev-perl/perltidy/perltidy-20140711.0.0.ebuild
index 3a84883dcb23..a556408979ea 100644
--- a/dev-perl/perltidy/perltidy-20140711.0.0.ebuild
+++ b/dev-perl/perltidy/perltidy-20140711.0.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://perltidy.sourceforge.net/ ${HOMEPAGE}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index 999547993181..2d948224dc1c 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,2 +1 @@
DIST igbinary-1.2.1-r1.tar.gz 143092 SHA256 f71a2e085669ed915740b29f55b6a81e30bae52215d041938afb9212e6bafc27 SHA512 5e69831606cfe47db2ae2b2200bd8bcfce42db32599a2a58cf23238d88896a2ef79baf16e78b3aaefb8725f8fdd7b815470e2d314ba14ea05f33be547da31777 WHIRLPOOL f7eb5d28b536bd1d2b0565f3e8541cbdb39edd2f5130bd041f0d75cc8218edeaa8719ebaea4d8ddf372172df9863d9d72a12dd8fc09c3653418b49e26d0e2f61
-DIST igbinary-1.2.1.tar.gz 143092 SHA256 f71a2e085669ed915740b29f55b6a81e30bae52215d041938afb9212e6bafc27 SHA512 5e69831606cfe47db2ae2b2200bd8bcfce42db32599a2a58cf23238d88896a2ef79baf16e78b3aaefb8725f8fdd7b815470e2d314ba14ea05f33be547da31777 WHIRLPOOL f7eb5d28b536bd1d2b0565f3e8541cbdb39edd2f5130bd041f0d75cc8218edeaa8719ebaea4d8ddf372172df9863d9d72a12dd8fc09c3653418b49e26d0e2f61
diff --git a/dev-php/igbinary/igbinary-1.2.1.ebuild b/dev-php/igbinary/igbinary-1.2.1.ebuild
deleted file mode 100644
index 2bd558fe06d9..000000000000
--- a/dev-php/igbinary/igbinary-1.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-PHP_EXT_NAME="igbinary"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="README"
-
-USE_PHP="php5-6 php5-5 php5-4"
-
-inherit php-ext-source-r2
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="A fast drop in replacement for the standard PHP serialize"
-HOMEPAGE="https://github.com/igbinary/igbinary"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PF}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_configure() {
- my_conf="--enable-igbinary"
- php-ext-source-r2_src_configure
-}
-
-src_test() {
- for slot in $(php_get_slots); do
- php_init_slot_env ${slot}
- NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}"
- done
-}
diff --git a/dev-php/pecl-apcu/pecl-apcu-4.0.7.ebuild b/dev-php/pecl-apcu/pecl-apcu-4.0.7.ebuild
deleted file mode 100644
index 7a0d5e4ed772..000000000000
--- a/dev-php/pecl-apcu/pecl-apcu-4.0.7.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
-
-PHP_EXT_NAME="apcu"
-PHP_EXT_PECL_PKG="APCu"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS="CHANGELOG INSTALL NOTICE TECHNOTES.txt TODO"
-
-USE_PHP="php5-6 php5-5 php5-4"
-
-S="${WORKDIR}/apcu-${PV}"
-PHP_EXT_S="${WORKDIR}/apcu-${PV}"
-
-inherit php-ext-pecl-r2 confutils eutils
-
-S="${WORKDIR}/apcu-${PV}"
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="Stripped down version of APC supporting only user cache"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="+mmap"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-LOCKS="pthreadmutex pthreadrw spinlock semaphore"
-
-LUSE=""
-for l in ${LOCKS}; do
- LUSE+="lock_${l} "
-done
-
-IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
-
-REQUIRED_USE="^^ ( $LUSE )"
-
-src_configure() {
- my_conf="--enable-apcu"
- use mmap || my_conf+=" --disable-apcu-mmap"
-
- enable_extension_enable "apcu-rwlocks" "lock_pthreadrw" 0
-
- php-ext-source-r2_src_configure
-}
-
-src_install() {
- php-ext-pecl-r2_src_install
-
- dodir "${PHP_EXT_SHARED_DIR}"
- insinto "${PHP_EXT_SHARED_DIR}"
- doins apc.php
-}
-
-pkg_postinst() {
- elog "The apc.php file shipped with this release of pecl-apcu was"
- elog "installed into ${PHP_EXT_SHARED_DIR}/."
-}
diff --git a/dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild
index cb650d732c68..5bb39e354566 100644
--- a/dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild
+++ b/dev-php/pecl-memcached/pecl-memcached-2.2.0-r1.ebuild
@@ -12,7 +12,7 @@ USE_PHP="php5-4 php5-5 php5-6"
inherit php-ext-pecl-r2
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
DESCRIPTION="Interface PHP with memcached via libmemcached library"
LICENSE="PHP-3"
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index 4f14eca0d213..58bb61093f9f 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,3 +1 @@
-DIST redis-2.2.3.tgz 86664 SHA256 87861198403ef7bf09306494f2efc5b55bfdcc6095b7aac059a546a2e662967d SHA512 17ff00c0ee3fa36fa6a2040740c51a9ad36e16be19b9b6df9872138a9015e3f01add59b0b6437c66966fb2850a4c63800b47737e468f4103d7285bdebf377b3b WHIRLPOOL bf0a30d2b9ba399edaddaae7856c6e42e48ed4be88e86a4da88ba5556a7aa36d54a448830810d3ffd3a3e49329f5a8e36a1d0eac9436843fc00b157e0fc592aa
-DIST redis-2.2.5.tgz 96970 SHA256 dceb18c9b563a8da92752ffc2c280beb1b14a86649342af307831a881c053343 SHA512 a0ae16146b97be678d3a25037ada6eb65b4a5cfbc02622c3c056635428851d52634e9d8fef9d393db4787f568d3d4d0c4ebbc740d1b008acc2f168ea5002aeb5 WHIRLPOOL bbb13c9d4b9e9a2d1b60314325cdf0eb921fb2e6d1962919499db89d9a3a11f82ad196c1bff81e404a7133fd21231decd7277b9a537a079d4cdd953fff24d451
DIST redis-2.2.7.tgz 134340 SHA256 95e5331cd7e709771eb4479c455bcf326a74b2aea3b1a5cba00b4c95e66dc902 SHA512 88be2abeda62b7c1c95b6d399bbb5f97774d956001b4d13a8e5f183e86fe6336d91f479a8125adcaeff1ad5617a920953961360fc3484ebafc3ed915bcd7f86c WHIRLPOOL e7c8ea7c0c4578933211d4571d742ad09eadb5dd93e207d4f0d5858bfacb7a78eb4bd7ed34cafbc17b465b0d423ea0ff788dee907d89c4939ee4a9acbbe8b95d
diff --git a/dev-php/pecl-redis/metadata.xml b/dev-php/pecl-redis/metadata.xml
index f18c6324cd03..191d18b8e79c 100644
--- a/dev-php/pecl-redis/metadata.xml
+++ b/dev-php/pecl-redis/metadata.xml
@@ -1,12 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>olemarkus@gentoo.org</email>
- <name>Ole Markus With</name>
- </maintainer>
- <longdescription lang="en">
- </longdescription>
+ <herd>php</herd>
<use>
<flag name="igbinary">Enables igbinary serialisation support</flag>
</use>
diff --git a/dev-php/pecl-redis/pecl-redis-2.2.3.ebuild b/dev-php/pecl-redis/pecl-redis-2.2.3.ebuild
deleted file mode 100644
index 56f8f55e754f..000000000000
--- a/dev-php/pecl-redis/pecl-redis-2.2.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PHP_EXT_NAME="redis"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-5 php5-4"
-
-DOCS="README ChangeLog"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="amd64"
-
-DESCRIPTION="This extension provides an API for communicating with Redis servers"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="igbinary"
-
-DEPEND="igbinary? ( dev-php/igbinary )"
-RDEPEND="$DEPEND"
-
-src_configure() {
- my_conf="--enable-redis
- $(use_enable igbinary redis-igbinary)"
-
- php-ext-source-r2_src_configure
-}
diff --git a/dev-php/pecl-redis/pecl-redis-2.2.5.ebuild b/dev-php/pecl-redis/pecl-redis-2.2.5.ebuild
deleted file mode 100644
index 574e25e2bb2b..000000000000
--- a/dev-php/pecl-redis/pecl-redis-2.2.5.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"
-
-PHP_EXT_NAME="redis"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6 php5-5 php5-4"
-
-DOCS="README ChangeLog"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="~amd64"
-
-DESCRIPTION="This extension provides an API for communicating with Redis servers"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="igbinary"
-
-DEPEND="igbinary? ( dev-php/igbinary )"
-RDEPEND="$DEPEND"
-
-src_configure() {
- my_conf="--enable-redis
- $(use_enable igbinary redis-igbinary)"
-
- php-ext-source-r2_src_configure
-}
diff --git a/dev-php/pecl-redis/pecl-redis-2.2.7-r1.ebuild b/dev-php/pecl-redis/pecl-redis-2.2.7-r1.ebuild
index 276b547335b9..06762312bc2a 100644
--- a/dev-php/pecl-redis/pecl-redis-2.2.7-r1.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-2.2.7-r1.ebuild
@@ -14,7 +14,7 @@ DOCS="arrays.markdown README.markdown"
inherit php-ext-pecl-r2
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
DESCRIPTION="PHP extension for interfacing with Redis"
LICENSE="PHP-3.01"
diff --git a/dev-php/pecl-redis/pecl-redis-2.2.7.ebuild b/dev-php/pecl-redis/pecl-redis-2.2.7.ebuild
deleted file mode 100644
index 604aa735d4ac..000000000000
--- a/dev-php/pecl-redis/pecl-redis-2.2.7.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"
-
-PHP_EXT_NAME="redis"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6 php5-5 php5-4"
-
-DOCS="README ChangeLog"
-
-inherit php-ext-pecl-r2
-
-KEYWORDS="amd64"
-
-DESCRIPTION="This extension provides an API for communicating with Redis servers"
-LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="igbinary"
-
-DEPEND="igbinary? ( php_targets_php5-4? ( dev-php/igbinary[php_targets_php5-4] )
- php_targets_php5-5? ( dev-php/igbinary[php_targets_php5-5] )
- php_targets_php5-6? ( dev-php/igbinary[php_targets_php5-6] )
- )"
-RDEPEND="$DEPEND"
-
-src_configure() {
- my_conf="--enable-redis
- $(use_enable igbinary redis-igbinary)"
-
- php-ext-source-r2_src_configure
-}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 84716cf15ae3..7d848a4e04d5 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,3 +1,4 @@
DIST botocore-1.2.10.tar.gz 2202147 SHA256 8541895aa2abe2183fa15efe33794db7428fec3302e0c9bf1db13fa1668e2b66 SHA512 5395776f50c5302d2fa75af702ced17da66a4c0435d62aed907f1ceaa93d38acc2d91a250d2153d852239a08d9f7f0bf361523cc89168a6cb81ef6f8a6ec5124 WHIRLPOOL aa4ff7a2aa1a900642782783b85479943bcce85c7df0c056d989d329c0693424110859a1d9d358e0cc5af94be174c96786c2f339e78934c114011606dfce11ec
DIST botocore-1.3.14.tar.gz 2289202 SHA256 44904496f26370f47469327e5df10e439aa07aaf1c0516c7c67352337eeeb729 SHA512 7cf1a342271b02842c5d989fa4ac2bb02074f8ff18dda70c751857f44b83e2ce02c904f0484a05f274bcb9459bf580e0456b72554e87509b2f2529170a239362 WHIRLPOOL efa0d700bdd7e9803be63fc3a54fffb4234356769b1dea69bf93c974deb9a3a3438d88de004dce6a0c83390042fb8f2b822d9204f6727eceb5aee657c22c6a98
DIST botocore-1.3.20.tar.gz 2326244 SHA256 9760d883611110a05f5f8346c7b2198aef87be9117d4cbe1e4ee6608a560c4a2 SHA512 bd8d80598631610da4f05c8cc735affef31c726dc30512e358950e967efefbe63455bc63dccbb180f059a3f9da6c0004edfafc9bf99198732708c1ef141f0b06 WHIRLPOOL 18ba18fa6d62b10d7547f58bf6e8d26cab8564f4e8a229dd6f939db6b4f4d05edda4a239811067443d14edcfe2b293acdb449fc809f551f99b4ff37e4fb70fbd
+DIST botocore-1.3.22.tar.gz 2349601 SHA256 02a6d320b09179bc5dcbafd4be732d9431bfebf5bed6d6b6508eca96b599a399 SHA512 7b349a78c83051a29993ce00a11ecfa4734425c3ed27ce3e405140e19017b5c670d857ea489ea1f6f3ec767b3e4704547565b2ec67f5d7001a0cc30ff2a39de7 WHIRLPOOL 98c5e7488c6d1fe5c3e3484c770f8b346508359c5d174e5660f10ea62b054f442e3d15cc716ddd5acc42f1af0a10463c1923de138338175f1dcba9ced283c8ee
diff --git a/dev-python/botocore/botocore-1.3.22.ebuild b/dev-python/botocore/botocore-1.3.22.ebuild
new file mode 100644
index 000000000000..44e0a6ae37a9
--- /dev/null
+++ b/dev-python/botocore/botocore-1.3.22.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+
+CDEPEND="
+ >=dev-python/docutils-0.10[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ <dev-python/jmespath-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+ <dev-python/python-dateutil-3.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ doc? (
+ >=dev-python/guzzle_sphinx_theme-0.7.10[${PYTHON_USEDEP}]
+ <dev-python/guzzle_sphinx_theme-0.8[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.3[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${CDEPEND}
+ ~dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND="${CDEPEND}"
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ nosetests tests/unit || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/bsddb3/bsddb3-6.1.1.ebuild b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
index 894f3017ac71..5a183c3d8cef 100644
--- a/dev-python/bsddb3/bsddb3-6.1.1.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.1.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc"
RDEPEND="
diff --git a/dev-python/livereload/Manifest b/dev-python/livereload/Manifest
index 5efc59e56cbb..24275ae46ea0 100644
--- a/dev-python/livereload/Manifest
+++ b/dev-python/livereload/Manifest
@@ -1,2 +1,3 @@
DIST livereload-2.3.2.tar.gz 24119 SHA256 fa2959005a134d767409c129cbf94528a0eb5022c915da9c685e14f1adb81b63 SHA512 59dc5be184d80a8b3aa6f98a6bc12f98f2efe00a0497deadfe5275222be2e0865e182cf0d83fc7a6e5f7297a7bf26a30c3ad9af5eeb2517af8b7ab3946e4bb1d WHIRLPOOL acf0c4ffa017a65d67423bb28b36cfd4e8acec59c47cc845f98669a3368920fa1e4e33b4c86e00082aeb416225066091305adcf1e8919071825a192ab5127180
DIST livereload-2.4.0.tar.gz 25258 SHA256 a3f162357d886710a317f6f8c0595ac1db176bd9db171f0ca751c4954c29b5e2 SHA512 9b961ed41224359e986873973840fae43387af1b773328ab1262d095879aeff98090d736d696abdfcd9b2f1c127a061a29d044df7cfa15ba218b0162576093a3 WHIRLPOOL 268d274d57b1e7f7587fd690dac2bae7051dde2d1b110a8953a84eea6e08017488d4ee0e59fbc1bb0a9468d7925913ca8cb28a74c13c291fd7e004a5322160cf
+DIST livereload-2.4.1.tar.gz 25593 SHA256 8a29fe9c869181f8e1617c2e32d6a3bf896d7da20267dc682150e7c98d230b55 SHA512 9106fe1894092ab336270f539be41d4db2d277560a41898e45014e34783ab0b601c993a5a5831c951d313db98ea835aecc8eb31468ba186e243a28df75bfe9bb WHIRLPOOL 70142a5bc1c6c7c4d2af20840eff93a19db7842dfa8b1d3ffd79904c924e9f6e9f93fd6c3dac976d22ace3cdbb833eb57f2ccb26b6abf0e03d67a57d97d845fd
diff --git a/dev-python/livereload/livereload-2.4.1.ebuild b/dev-python/livereload/livereload-2.4.1.ebuild
new file mode 100644
index 000000000000..b812bba2f0d4
--- /dev/null
+++ b/dev-python/livereload/livereload-2.4.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python LiveReload is an awesome tool for web developers"
+HOMEPAGE="https://github.com/lepture/python-livereload"
+SRC_URI="https://github.com/lepture/python-${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples test"
+
+CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="
+ ${CDEPEND}
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="
+ ${CDEPEND}
+ dev-python/six[${PYTHON_USEDEP}]
+ www-servers/tornado[${PYTHON_USEDEP}]
+"
+
+python_test() {
+ nosetests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( example/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/polygon/polygon-2.0.6.ebuild b/dev-python/polygon/polygon-2.0.6.ebuild
index b84f17892841..ab5880012eb5 100644
--- a/dev-python/polygon/polygon-2.0.6.ebuild
+++ b/dev-python/polygon/polygon-2.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.bitbucket.org/jraedler/${PN}2/downloads/Polygon2-${PV}.zip"
LICENSE="LGPL-2"
SLOT="2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
DEPEND="app-arch/unzip"
diff --git a/dev-python/pyGPG/Manifest b/dev-python/pyGPG/Manifest
index 9a891064f462..c050c3bf9565 100644
--- a/dev-python/pyGPG/Manifest
+++ b/dev-python/pyGPG/Manifest
@@ -1 +1,2 @@
DIST pyGPG-0.1.tar.gz 15441 SHA256 c699192606652ebe1a369770d00110baa490c74c3d858ad0513ec55f315e7735 SHA512 58a89fbee4311b89c5515ad1bc1d901057e8acdfdbcf36813f50a766374100a62efe456d52263711e5c2f46957791def9343d94f019e413506cfdbd353602060 WHIRLPOOL 24862897737516945cdc8e41ced589f4ef4b64cdd4a92ddae22c07e9252c0cf8779b685b6cd35fac5b3244d0000d9bade98d661c67ac904639ebc142281551c1
+DIST pyGPG-0.2.tar.gz 15439 SHA256 0c45b408b080c725832463d15a2227da48c4dbd9fa918c8662631adec5b0a08f SHA512 93d892a57a27b254bfdc9778b73d341dfec654c2104c578014628df78c43beaf93eafb571ac544d52f334e63f6e5b8c0cfad7c8a0d585ee7211e8649efce8c67 WHIRLPOOL 81e2bb285b9aef73edbef91b5ac460c048f8826fe480b356d39ba66105905aa02bf73f56b49918fd45b0765bad03361a11c6684303b37df20fb2d23113a3f7e7
diff --git a/dev-python/pyGPG/pyGPG-0.2.ebuild b/dev-python/pyGPG/pyGPG-0.2.ebuild
new file mode 100644
index 000000000000..f2fb3818d1c3
--- /dev/null
+++ b/dev-python/pyGPG/pyGPG-0.2.ebuild
@@ -0,0 +1,47 @@
+# 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,3_5})
+
+inherit distutils-r1
+
+EGIT_REPO_URI="git://github.com/dol-sen/pyGPG.git"
+
+DESCRIPTION="A python interface wrapper for gnupg's gpg command"
+HOMEPAGE="https://github.com/dol-sen/pyGPG"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+ app-crypt/gnupg
+ "
+
+pkg_postinst() {
+ einfo
+ einfo "This is experimental software."
+ einfo "The API's it installs should be considered unstable"
+ einfo "and are subject to change."
+ einfo
+ einfo "This version includes a new gkeys-gpg command"
+ einfo "It can be used as an alternate gpg command for git"
+ einfo "It will set the correct keyring to verify signed commits"
+ einfo "provided the key it needs to verify against is part of the gkeys"
+ einfo "keyring system. It only works for verification, any other call "
+ einfo "to it will re-direct directly to the normal gpg command."
+ einfo
+ einfo "Please file any enhancement requests, or bugs"
+ einfo "at https://github.com/dol-sen/pyGPG/issues"
+ einfo "I am also on IRC @ #gentoo-keys of the freenode network"
+ einfo
+ ewarn "There may be some python 3 compatibility issues still."
+ ewarn "Please help debug/fix/report them in github or bugzilla."
+}
diff --git a/dev-python/pychroot/Manifest b/dev-python/pychroot/Manifest
index 32e99c44e981..d328ae667f95 100644
--- a/dev-python/pychroot/Manifest
+++ b/dev-python/pychroot/Manifest
@@ -1,4 +1 @@
-DIST pychroot-0.9.11.tar.gz 17904 SHA256 986a49997bb90e78e68cc99363659e01482adc0158c895d621f754b7d1a1870e SHA512 0cc169b79dd29e4c712b6764a6cf83f91d71383664276faca676a848b00b34203fc6f4430bc0c6f4a099959e76fc06f08d4f3679fceaaf8126dc1c1c78283ea7 WHIRLPOOL 9ce13e27390c46cfe43ca597e55bd786ad338b513a60864d4bb040cf84a97c1e4d9e3c044d4c7c6f2d10ed0b7b815a7b4239a3aee40486df834a722e8803c914
-DIST pychroot-0.9.12.tar.gz 19791 SHA256 a536341b52d1e50ddbd20a999a24ca927d9efc1a2dc14a0488e6b2a7c9eeb7cb SHA512 27f8913fb624b928e9be07ea3e70fbc4a987d1313570f67d7c433fa96c31931defb661cb18734fb0f766bab494a0429d7931227224783fa3cd62faf44e005ee0 WHIRLPOOL 64dcc7fa3ec797d885fd96c332621fbcf42510094626a0de5e984096239ec0c7e7bb1246fb35dff503f6a7fe8ae348e3dca102a1c9bd8dd13646cb5d975b0ec0
DIST pychroot-0.9.13.tar.gz 25610 SHA256 e94c9c738402f4957e757aa1fdcd2febeaa7cc01df1b1ca0d6adf3324a8bbfce SHA512 ec2773e9285905aa1fc83a69653e830fc83c42c306760bbc9a8bf48cd388b99485a7ec30eef32ef4cc98cf25fe12b9ac1d09ae379c25d4c756d3afbffdfc2243 WHIRLPOOL bff205fb563e7e3f9603a639310cbf24ec10234e96e813082aeec94bc5cb3155947f818f53713a09f0626e5dad21a4d0b4c1c49d26eeb894677872e30bef92b7
-DIST pychroot-0.9.9.tar.gz 11936 SHA256 49558bdc85dbdd25dbd2b3417eb857bd770bfb026db76c7e2bcedc8c605fe76b SHA512 437e8fa1a7d13a884c6fccb0e0cc81de8ccd6ff63ca0b3d2f55dcaa0c9cbef0c81cd033d64e08c1d35805f1d7e568fe941128c569827d7ae641d2d3b2ca4c1c2 WHIRLPOOL 40b3deb33d865efa37ce0b78a4471a531c6c6d542750ef87bb54071084a3bbdb115ffec92fef9086c3cc0ca63f9a71c65e3a4daa88f30cede7e4a5cbbd3f4851
diff --git a/dev-python/pychroot/pychroot-0.9.11.ebuild b/dev-python/pychroot/pychroot-0.9.11.ebuild
deleted file mode 100644
index 2930d41c290e..000000000000
--- a/dev-python/pychroot/pychroot-0.9.11.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pychroot.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a python library that simplifies chroot handling"
-HOMEPAGE="https://github.com/pkgcore/pychroot"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=dev-python/snakeoil-0.6.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/pychroot/pychroot-0.9.12.ebuild b/dev-python/pychroot/pychroot-0.9.12.ebuild
deleted file mode 100644
index 53089fa7f923..000000000000
--- a/dev-python/pychroot/pychroot-0.9.12.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pychroot.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a python library and cli tool that simplify chroot handling"
-HOMEPAGE="https://github.com/pkgcore/pychroot"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- $(python_gen_cond_dep 'dev-python/3to2[${PYTHON_USEDEP}]' python2_7)
- test? (
- $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
-
-python_compile_all() {
- [[ ${PV} == *9999 ]] && emake -C doc man
-}
-
-python_test() {
- esetup.py test
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- if [[ ${PV} == *9999 ]]; then
- emake -C doc PREFIX=/usr DESTDIR="${D}" install_man
- else
- doman man/*
- fi
-}
diff --git a/dev-python/pychroot/pychroot-0.9.9.ebuild b/dev-python/pychroot/pychroot-0.9.9.ebuild
deleted file mode 100644
index 2930d41c290e..000000000000
--- a/dev-python/pychroot/pychroot-0.9.9.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/pkgcore/pychroot.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a python library that simplifies chroot handling"
-HOMEPAGE="https://github.com/pkgcore/pychroot"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND=">=dev-python/snakeoil-0.6.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
- dev-python/pytest[${PYTHON_USEDEP}]
- )"
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/pychroot/pychroot-9999.ebuild b/dev-python/pychroot/pychroot-9999.ebuild
index 86f99b936f5a..c35e8b948257 100644
--- a/dev-python/pychroot/pychroot-9999.ebuild
+++ b/dev-python/pychroot/pychroot-9999.ebuild
@@ -34,7 +34,7 @@ DEPEND="${RDEPEND}
[[ ${PV} == *9999 ]] && DEPEND+=" dev-python/sphinx[${PYTHON_USEDEP}]"
python_compile_all() {
- [[ ${PV} == *9999 ]] && emake -C doc man
+ [[ ${PV} == *9999 ]] && esetup.py build_man
}
python_test() {
@@ -42,10 +42,7 @@ python_test() {
}
python_install_all() {
+ local DOCS=( NEWS.rst README.rst )
+ distutils-r1_python_install install_man
distutils-r1_python_install_all
- if [[ ${PV} == *9999 ]]; then
- emake -C doc PREFIX=/usr DESTDIR="${D}" install_man
- else
- doman man/*
- fi
}
diff --git a/dev-python/pyfeyn/Manifest b/dev-python/pyfeyn/Manifest
index 7f4aad713d42..0c755aa93fe6 100644
--- a/dev-python/pyfeyn/Manifest
+++ b/dev-python/pyfeyn/Manifest
@@ -1 +1,2 @@
DIST pyfeyn-0.3.4.tar.gz 27074 SHA256 6b1d86606b9b61cfc6285aec4a15202f60a819368b3e74fc13a586835f22da6e SHA512 b0ce1939d893df3af060cc64d11c2bb09f22c99b074aefe0e79d820ee4c6b5c64f4e8de8f4c31020b33735627b2dead9a70ea9d3504773417a058ac7a1915db8 WHIRLPOOL 6d303b0c941f7d698d4f8ca4d0286be74291392700eec6d63dbec9d9d0db22f77d790022d49176b0dbbb25bc6b44e4360dcf1a4821cb9806de0baf24dfcbebbf
+DIST pyfeyn-0.3.5.tar.gz 27341 SHA256 b6aada34fd31d57e755547bb19324fb7ed679b3e7e5f2ceaf9d41c5535445ca0 SHA512 8e1f119553ba01432a7859d077ca241da205ec82908826ab3bb6b7c86fdab9d1f3c93797daf0a9a5716445617ce8e867f584219437ae2cfd6b4a7681ea2a6c6c WHIRLPOOL fe987ff0f89abadc8124f2a599f1d7372331c5cf77cefddfd00e1371ee560c601c41aff5a1d884db25819f84601c0f87d7b68f40d2bb0f20a7b55892c25cb2e0
diff --git a/dev-python/pyfeyn/files/pyfeyn-0.3.5.patch b/dev-python/pyfeyn/files/pyfeyn-0.3.5.patch
new file mode 100644
index 000000000000..0da755aca800
--- /dev/null
+++ b/dev-python/pyfeyn/files/pyfeyn-0.3.5.patch
@@ -0,0 +1,598 @@
+diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/__init__.py pyfeyn-0.3.5/pyfeyn/__init__.py
+--- pyfeyn-0.3.5.orig/pyfeyn/__init__.py 2016-01-21 14:24:35.000000000 +0600
++++ pyfeyn-0.3.5/pyfeyn/__init__.py 2016-01-24 19:21:55.813635215 +0600
+@@ -16,5 +16,5 @@
+ import pyx
+ except:
+- print "You don't have PyX - that's a problem unless you're just running the setup script."
++ print("You don't have PyX - that's a problem unless you're just running the setup script.")
+ import sys
+ sys.exit()
+@@ -23,6 +23,6 @@
+ from distutils.version import StrictVersion as Version
+ pyxversion = Version(pyx.version.version)
+-if pyxversion < Version("0.9.0"):
+- print "Warning: PyFeyn may not work with PyX versions older than 0.9!"
++if pyxversion < Version("0.14.0"):
++ print("Warning: PyFeyn may not work with PyX versions older than 0.14!")
+
+ ## Units
+@@ -31,10 +31,10 @@
+
+ ## TeX stuff
+-pyx.text.defaulttexrunner.set(mode="latex")
++pyx.text.set(pyx.text.LatexRunner)
+ import subprocess
+ try:
+ subprocess.Popen(["kpsewhich","hepnicenames.sty"])
+- pyx.text.defaulttexrunner.preamble(r"\usepackage{hepnicenames}")
++ pyx.text.default_runner.preamble(r"\usepackage{hepnicenames}")
+ except:
+- print "Warning: hepnicenames package not found!"
++ print("Warning: hepnicenames package not found!")
+
+diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/blobs.py pyfeyn-0.3.5/pyfeyn/blobs.py
+--- pyfeyn-0.3.5.orig/pyfeyn/blobs.py 2011-02-20 23:29:40.000000000 +0600
++++ pyfeyn-0.3.5/pyfeyn/blobs.py 2016-01-24 11:50:44.290773693 +0600
+@@ -64,9 +64,9 @@
+ """Add a label."""
+ if config.getOptions().DEBUG:
+- print "Adding label: " + text
++ print("Adding label: " + text)
+ self.labels.append(PointLabel(text=text, point=self,
+ displace=displace, angle=angle, size=size))
+ if config.getOptions().DEBUG:
+- print "Labels = " + str(self.labels)
++ print("Labels = " + str(self.labels))
+ return self
+
+diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/deco.py pyfeyn-0.3.5/pyfeyn/deco.py
+--- pyfeyn-0.3.5.orig/pyfeyn/deco.py 2016-01-21 14:24:35.000000000 +0600
++++ pyfeyn-0.3.5/pyfeyn/deco.py 2016-01-24 22:06:46.419219272 +0600
+@@ -4,20 +4,10 @@
+ from pyfeyn.diagrams import FeynDiagram
+ from pyfeyn.utils import Visible
+-from pyfeyn import config,pyxversion
++from pyfeyn import config
+
+-###########################################################################################
+-## Added by George S. Williams to allow PyFeyn to work with PyX versions 0.12.x and 0.11.x
+-## Also see changes in class Arrow and class ParallelArrow
+-from distutils.version import StrictVersion as Version
+-
+-def getarrowpath(arrowtopath, selfpos, var1, selfsize, var2, selfconstriction,
+- constrictionlen):
+- if pyxversion >= Version("0.12"):
+- arrowpath = pyx.deco._arrowhead(arrowtopath, selfpos,
+- var1, selfsize, var2, selfconstriction,
+- constrictionlen)
+- else:
+- arrowpath = pyx.deco._arrowhead(arrowtopath, selfpos,
+- var1, selfsize, var2, constrictionlen)
++
++def getarrowpath(arrowtopath, selfpos, var1, selfsize, var2, selfconstriction, constrictionlen):
++ arrowpath = pyx.deco._arrowhead(arrowtopath, selfpos, var1, selfsize, var2,
++ selfconstriction, constrictionlen)
+ return arrowpath
+
+@@ -37,5 +27,5 @@
+ self.constriction = constriction
+
+- def decorate(self, dp, texrunner=pyx.text.defaulttexrunner):
++ def decorate(self, dp, texrunner=pyx.text.default_runner):
+ """Attach arrow to a path (usually a line)."""
+ dp.ensurenormpath()
+@@ -120,5 +110,5 @@
+ displacement -= intrinsicwidth
+ if config.getOptions().DEBUG:
+- print "Displacement = ", displacement
++ print("Displacement = ", displacement)
+
+ ## Position the arrow on the right hand side of lines
+@@ -208,5 +198,5 @@
+ pyx.text.vshift.mathaxis,
+ self.size] + self.textattrs)
+- t = pyx.text.defaulttexrunner.text(self.x, self.y, self.text, textattrs)
++ t = pyx.text.default_runner.text(self.x, self.y, self.text, textattrs)
+ canvas.insert(t)
+
+@@ -247,5 +237,5 @@
+ pyx.text.vshift.mathaxis,
+ self.size] + self.textattrs)
+- t = pyx.text.defaulttexrunner.text(x, y, self.text, textattrs)
++ t = pyx.text.default_runner.text(x, y, self.text, textattrs)
+ canvas.insert(t)
+
+@@ -294,5 +284,5 @@
+ displacement -= intrinsicwidth
+ if config.getOptions().DEBUG:
+- print "Displacement = ", displacement
++ print("Displacement = ", displacement)
+
+ ## Position the label on the right hand side of lines
+@@ -320,5 +310,5 @@
+ pyx.text.vshift.mathaxis,
+ self.size] + self.textattrs)
+- t = pyx.text.defaulttexrunner.text(x, y, self.text, textattrs)
++ t = pyx.text.default_runner.text(x, y, self.text, textattrs)
+ #t.linealign(self.displace,
+ # math.cos(self.angle * math.pi/180),
+diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/diagrams.py pyfeyn-0.3.5/pyfeyn/diagrams.py
+--- pyfeyn-0.3.5.orig/pyfeyn/diagrams.py 2016-01-21 14:24:35.000000000 +0600
++++ pyfeyn-0.3.5/pyfeyn/diagrams.py 2016-01-24 22:12:15.453205434 +0600
+@@ -2,7 +2,5 @@
+
+ import pyx
+-from pyfeyn import config, pyxversion
+-from distutils.version import StrictVersion as Version
+-
++from pyfeyn import config
+
+ ## Diagram class
+@@ -28,15 +26,15 @@
+ for obj in objs:
+ if config.getOptions().DEBUG:
+- print "#objs = %d" % len(self.__objs)
++ print("#objs = %d" % len(self.__objs))
+ offset = 0
+- if obj.__dict__.has_key("layeroffset"):
+- #print "offset =", obj.layeroffset
++ if "layeroffset" in obj.__dict__:
++ #print("offset =", obj.layeroffset)
+ offset = obj.layeroffset
+ self.highestautolayer += 1
+ obj.setDepth(self.highestautolayer + offset)
+ if config.getOptions().DEBUG:
+- print "Object %s layer = %d + %d = %d" % \
++ print("Object %s layer = %d + %d = %d" % \
+ (obj.__class__, self.highestautolayer, offset,
+- self.highestautolayer + offset)
++ self.highestautolayer + offset))
+ self.__objs.append(obj)
+
+@@ -45,7 +43,7 @@
+ """Draw the components of this diagram in a well-defined order."""
+ if config.getOptions().DEBUG:
+- print "Final #objs = %d" % len(self.__objs)
++ print("Final #objs = %d" % len(self.__objs))
+ if config.getOptions().VDEBUG:
+- print "Running in visual debug mode"
++ print("Running in visual debug mode")
+
+ ## Sort drawing objects by layer
+@@ -59,5 +57,5 @@
+ for obj in drawingobjs:
+ if config.getOptions().DEBUG:
+- print "Depth = ", obj.getDepth()
++ print("Depth = ", obj.getDepth())
+ obj.draw(self.currentCanvas)
+
+@@ -70,7 +68,3 @@
+ c = self.drawToCanvas()
+ if c is not None and outfile is not None:
+- if pyxversion >= Version("0.12"):
+- c.writetofile(outfile, page_bbox=c.bbox().enlarged(enlargement))
+- else:
+- c.writetofile(outfile, bbox=c.bbox().enlarged(enlargement))
+-
++ c.writetofile(outfile, page_bbox=c.bbox().enlarged(enlargement))
+diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/feynml.py pyfeyn-0.3.5/pyfeyn/feynml.py
+--- pyfeyn-0.3.5.orig/pyfeyn/feynml.py 2011-02-20 23:29:40.000000000 +0600
++++ pyfeyn-0.3.5/pyfeyn/feynml.py 2016-01-24 12:08:07.881729805 +0600
+@@ -68,5 +68,5 @@
+ root.append(self.labelToXML(obj))
+ else:
+- print "Can't convert object to XML!"
++ print("Can't convert object to XML!")
+ # Combine single vertices/props into legs
+ self.legcount = 0
+@@ -76,14 +76,14 @@
+ if tag.attrib["id"]==point:
+ for tag2 in root.getchildren():
+- if ((tag2.attrib.has_key("source") and
++ if (("source" in tag2.attrib and
+ tag2.attrib["source"]==point) or
+- (tag2.attrib.has_key("target") and
++ ("target" in tag2.attrib and
+ tag2.attrib["target"]==point)):
+ attribs = tag2.attrib
+- if (tag2.attrib.has_key("source") and
++ if ("source" in tag2.attrib and
+ tag2.attrib["source"]==point):
+ del attribs["source"]
+ attribs["sense"] = "incoming"
+- if (tag2.attrib.has_key("target") and
++ if ("target" in tag2.attrib and
+ tag2.attrib["target"]==point):
+ attribs["sense"] = "outgoing"
+@@ -256,5 +256,5 @@
+ self.defaults = {}
+ if self.root.tag != "feynml":
+- raise "FeynML Error: <feynml> must be root element" % self.root.tag
++ raise Exception("FeynML Error: <feynml> must be root element" % self.root.tag)
+ for element in self.root:
+ if element.tag == "head":
+@@ -265,5 +265,5 @@
+ self.dicts.append({})
+ else:
+- raise "FeynML Error: invalid top-level tag <%s>" % element.tag
++ raise Exception("FeynML Error: invalid top-level tag <%s>" % element.tag)
+
+
+@@ -321,5 +321,5 @@
+ p2 = thedict[element.attrib["target"]]
+ except:
+- raise "FeynML Error: invalid attributes for <propagator> element"
++ raise Exception("FeynML Error: invalid attributes for <propagator> element")
+ l = NamedLine[thetype](p1, p2)
+ if "bend" in element.attrib:
+@@ -327,5 +327,5 @@
+ l.bend(float(element.attrib["bend"]))
+ except:
+- raise "FeynML Error: invalid bend amount %s for <propagator> element"%element.attrib["bend"]
++ raise Exception("FeynML Error: invalid bend amount %s for <propagator> element"%element.attrib["bend"])
+ if "style" in element.attrib:
+ l = self.apply_layout(element.attrib["style"], l)
+@@ -379,5 +379,5 @@
+ yradius = float(element.attrib["radius"][split:])
+ except:
+- raise "FeynML Error: invalid attribute for <blob> element"
++ raise Exception("FeynML Error: invalid attribute for <blob> element")
+ if shape=="circle":
+ b = Circle(x=x, y=y, radius=radius)
+@@ -385,5 +385,5 @@
+ b = Ellipse(x=x, y=y, xradius=xradius, yradius=yradius)
+ else:
+- raise "FeynML Error: invalid shape attribute for <blob> element"
++ raise Exception("FeynML Error: invalid shape attribute for <blob> element")
+ if "style" in element.attrib:
+ b = self.apply_layout(element.attrib["style"], b)
+@@ -393,5 +393,5 @@
+ thedict[element.attrib["id"]] = b
+ except:
+- raise "FeynML Error: missing id attribute in <blob> element"
++ raise Exception("FeynML Error: missing id attribute in <blob> element")
+ return b
+
+@@ -472,5 +472,5 @@
+ s = styling.split(":")
+ styledict[s[0].lstrip().rstrip()] = s[1]
+- if (styledict.has_key("fill-style")):
++ if "fill-style" in styledict:
+ filltype = styledict["fill-style"].split()
+ if filltype[0]=="solid":
+@@ -483,5 +483,5 @@
+ D,A = float(filltype[1]), int(filltype[2])
+ obj.fillstyles = [pyx.pattern.crosshatched(D,A)]
+- if (styledict.has_key("mark-shape") or styledict.has_key("mark-size"))\
++ if ("mark-shape" in styledict or "mark-size" in styledict)\
+ and isinstance(obj, DecoratedPoint):
+ try:
+@@ -494,7 +494,7 @@
+ marksize = 0.075
+ obj.setMark(marktype(size=marksize))
+- if (styledict.has_key("arrow-size") or styledict.has_key("arrow-angle")
+- or styledict.has_key("arrow-constrict")
+- or styledict.has_key("arrow-pos")) and isinstance(obj, Line):
++ if ("arrow-size" in styledict or "arrow-angle" in styledict
++ or "arrow-constrict" in styledict
++ or "arrow-pos" in styledict) and isinstance(obj, Line):
+ try:
+ arrsize = pyx.unit.length(float(styledict["arrow-size"]),unit="cm")
+@@ -514,11 +514,11 @@
+ arrpos = 0.5
+ obj.addArrow(arrow=Arrow(arrpos,arrsize,arrangle,arrconstrict))
+- if (styledict.has_key("parallel-arrow-size")
+- or styledict.has_key("parallel-arrow-angle")
+- or styledict.has_key("parallel-arrow-constrict")
+- or styledict.has_key("parallel-arrow-pos")
+- or styledict.has_key("parallel-arrow-length")
+- or styledict.has_key("parallel-arrow-displace")
+- or styledict.has_key("parallel-arrow-sense")) \
++ if ("parallel-arrow-size" in styledict
++ or "parallel-arrow-angle" in styledict
++ or "parallel-arrow-constrict" in styledict
++ or "parallel-arrow-pos" in styledict
++ or "parallel-arrow-length" in styledict
++ or "parallel-arrow-displace" in styledict
++ or "parallel-arrow-sense" in styledict) \
+ and isinstance(obj, Line):
+ try:
+@@ -552,5 +552,5 @@
+ obj.addParallelArrow(arrpos, arrdisp, arrlen, arrsize, arrangle,
+ arrconstrict, arrsense)
+- if styledict.has_key("is3d") and isinstance(obj, Line):
++ if "is3d" in styledict and isinstance(obj, Line):
+ fwords = ["0", "no", "false", "f", "off"]
+ twords = ["1", "yes", "true", "t", "on"]
+diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/hepnames.py pyfeyn-0.3.5/pyfeyn/hepnames.py
+--- pyfeyn-0.3.5.orig/pyfeyn/hepnames.py 2011-02-20 23:29:40.000000000 +0600
++++ pyfeyn-0.3.5/pyfeyn/hepnames.py 2016-01-24 12:12:08.927719668 +0600
+@@ -749,13 +749,13 @@
+ def is_photon(name):
+ """Check if the given name refers to the photon."""
+- return Photon_dict.has_key(name)
++ return name in Photon_dict
+
+ def is_gluon(name):
+ """Check if the given name refers to the gluon."""
+- return Gluon_dict.has_key(name)
++ return name in Gluon_dict
+
+ def is_weakboson(name):
+ """Check if the given name refers to a weak vector boson."""
+- return VectorBosons_dict.has_key(name)
++ return name in VectorBosons_dict
+
+ def is_gauge(name):
+@@ -767,5 +767,5 @@
+ def is_higgs(name):
+ """Check if the given name refers to a Higgs boson."""
+- return Higgses_dict.has_key(name)
++ return name in Higgses_dict
+
+ ## Fermion type testing
+@@ -773,9 +773,9 @@
+ def is_quark(name):
+ """Check if the given name refers to a quark."""
+- return Quarks_dict.has_key(name)
++ return name in Quarks_dict
+
+ def is_lepton(name):
+ """Check if the given name refers to a lepton."""
+- return Leptons_dict.has_key(name)
++ return name in Leptons_dict
+
+ def is_quark_lepton(name):
+@@ -787,13 +787,13 @@
+ def is_meson(name):
+ """Check if the given name refers to a meson."""
+- return mesons_dict.has_key(name)
++ return name in mesons_dict
+
+ def is_baryon(name):
+ """Check if the given name refers to a baryon."""
+- return Baryons_dict.has_key(name)
++ return name in Baryons_dict
+
+ def is_hadron(name):
+ """Check if the given name refers to a hadron."""
+- return Hadrons_dict.has_key(name)
++ return name in Hadrons_dict
+
+ ## Other type tests
+@@ -801,5 +801,5 @@
+ def is_ghost(name):
+ """Check if the given name refers to a ghost particle."""
+- return Ghost_dict.has_key(name)
++ return name in Ghost_dict
+
+ ## Classify particle according to its coarse physical type
+diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/lines.py pyfeyn-0.3.5/pyfeyn/lines.py
+--- pyfeyn-0.3.5.orig/pyfeyn/lines.py 2016-01-21 14:24:35.000000000 +0600
++++ pyfeyn-0.3.5/pyfeyn/lines.py 2016-01-24 22:02:12.045230810 +0600
+@@ -33,5 +33,5 @@
+ a TeXLabel object."""
+ if config.getOptions().DEBUG:
+- print "Adding label: " + text
++ print("Adding label: " + text)
+ #if text.__class__ == "Label":
+ # self.labels.append(label)
+@@ -39,5 +39,5 @@
+ self.labels.append(LineLabel(text=text, line=self, pos=pos, displace=displace, angle=angle, size=size))
+ if config.getOptions().DEBUG:
+- print "Labels = " + str(self.labels)
++ print("Labels = " + str(self.labels))
+ return self
+
+@@ -140,5 +140,5 @@
+ self.arcThru(arcpoint)
+ if config.getOptions().DEBUG:
+- print self.getVisiblePath()
++ print(self.getVisiblePath())
+ if config.getOptions().VDEBUG:
+ FeynDiagram.currenDiagram.currentCanvas.stroke(self.getVisiblePath(), [color.rgb.blue])
+@@ -212,5 +212,5 @@
+ except ZeroDivisionError:
+ if config.getOptions().DEBUG:
+- print "Grad 1 diverges"
++ print("Grad 1 diverges")
+ n13 = 1e100
+
+@@ -219,5 +219,5 @@
+ except ZeroDivisionError:
+ if config.getOptions().DEBUG:
+- print "Grad 2 diverges"
++ print("Grad 2 diverges")
+ n23 = 1e100
+
+@@ -258,5 +258,5 @@
+
+ if config.getOptions().DEBUG and arcangle1 == arcangle2:
+- print "Arc angles are the same - not drawing anything"
++ print("Arc angles are the same - not drawing anything")
+
+ ## Calculate cross product to determine direction of arc
+@@ -286,9 +286,6 @@
+ if len(subpaths) > 1:
+ if config.getOptions().DEBUG:
+- print "Num subpaths 1 = %d" % len(subpaths)
+- subpaths.sort(
+- lambda x, y :
+- int(pyx.unit.tocm(x.arclen() - y.arclen()) /
+- math.fabs(pyx.unit.tocm(x.arclen() - y.arclen()))) )
++ print("Num subpaths 1 = %d" % len(subpaths))
++ subpaths.sort(key=lambda x:pyx.unit.tocm(x.arclen()))
+ vispath = subpaths[-1]
+ if config.getOptions().VDEBUG:
+@@ -305,9 +302,6 @@
+ if len(subpaths) > 1:
+ if config.getOptions().DEBUG:
+- print "Num subpaths 2 = %d" % len(subpaths)
+- subpaths.sort(
+- lambda x, y :
+- int(pyx.unit.tocm(x.arclen() - y.arclen()) /
+- math.fabs(pyx.unit.tocm(x.arclen() - y.arclen()))) )
++ print("Num subpaths 2 = %d" % len(subpaths))
++ subpaths.sort(key=lambda x:pyx.unit.tocm(x.arclen()))
+ vispath = subpaths[-1]
+ if config.getOptions().VDEBUG:
+@@ -329,6 +323,6 @@
+ styles = self.styles + self.arrows
+ if config.getOptions().DEBUG:
+- print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
+- print path
++ print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
++ print(path)
+ canvas.stroke(path, styles)
+ for l in self.labels:
+@@ -382,6 +376,6 @@
+ ## TODO: call base class method?
+ if config.getOptions().DEBUG:
+- print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
+- print path
++ print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
++ print(path)
+ canvas.stroke(path, styles)
+ for l in self.labels:
+@@ -407,6 +401,6 @@
+ ## TODO: call base class method?
+ if config.getOptions().DEBUG:
+- print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
+- print path
++ print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
++ print(path)
+ canvas.stroke(path, styles)
+ for l in self.labels:
+@@ -520,5 +514,5 @@
+ styles = self.styles + self.arrows
+ if config.getOptions().DEBUG:
+- print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
++ print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
+ mypath = self.getDeformedPath()
+ if config.getOptions().DRAFT or not self.is3D:
+@@ -615,5 +609,5 @@
+ styles = self.styles + self.arrows
+ if config.getOptions().DEBUG:
+- print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
++ print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
+ canvas.stroke(self.getDeformedPath(), styles)
+ for l in self.labels:
+@@ -671,5 +665,5 @@
+ curveradius = abs(curveradius/pyx.unit.m)
+ #if config.getOptions().DEBUG:
+- # print self.__class__, "- curve radius = ", curveradius
++ # print(self.__class__, "- curve radius = ", curveradius)
+ if (mincurveradius is None or curveradius < mincurveradius):
+ mincurveradius = curveradius
+@@ -680,5 +674,5 @@
+ numhloopcurves += int(0.1/mincurveradius)
+ if config.getOptions().DEBUG:
+- print self.__class__, "- min curvature radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop"
++ print(self.__class__, "- min curvature radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop")
+
+ defo = pyx.deformer.cycloid(self.arcradius, intwindings, curvesperhloop=numhloopcurves,
+@@ -691,5 +685,5 @@
+ styles = self.styles + self.arrows
+ if config.getOptions().DEBUG:
+- print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
++ print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
+ mypath1 = self.getDeformedPath(+1)
+ mypath2 = self.getDeformedPath(-1)
+@@ -789,5 +783,5 @@
+ curveradius = abs(mincurveradius/pyx.unit.m)
+ #if config.getOptions().DEBUG:
+- # print self.__class__, "- curvature radius = ", curveradius
++ # print(self.__class__, "- curvature radius = ", curveradius)
+ if (mincurveradius is None or curveradius < mincurveradius):
+ mincurveradius = curveradius
+@@ -800,5 +794,5 @@
+ numhloopcurves += int(0.1/mincurveradius)
+ if config.getOptions().DEBUG:
+- print self.__class__, "- min curve radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop"
++ print(self.__class__, "- min curve radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop")
+
+ defo = pyx.deformer.cycloid(self.arcradius, intwindings, curvesperhloop=numhloopcurves,
+@@ -811,5 +805,5 @@
+ styles = self.styles + self.arrows
+ if config.getOptions().DEBUG:
+- print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
++ print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
+ mypath1 = self.getVisiblePath()
+ mypath2 = self.getDeformedPath()
+@@ -913,5 +907,5 @@
+ curveradius = abs(curvature/pyx.unit.m)
+ #if config.getOptions().DEBUG:
+- # print self.__class__, "- curvature radius = ", curveradius
++ # print(self.__class__, "- curvature radius = ", curveradius)
+ if (mincurveradius is None or curveradius < mincurveradius):
+ mincurveradius = curveradius
+@@ -924,5 +918,5 @@
+ numhloopcurves += int(0.2/mincurveradius)
+ if config.getOptions().DEBUG:
+- print self.__class__, "- min curve radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop"
++ print(self.__class__, "- min curve radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop")
+
+ defo = pyx.deformer.cycloid(self.arcradius, intwindings, curvesperhloop=numhloopcurves,
+@@ -935,5 +929,5 @@
+ styles = self.styles + self.arrows
+ if config.getOptions().DEBUG:
+- print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
++ print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
+ mypath1 = self.getVisiblePath()
+ mypath2 = self.getDeformedPath()
+@@ -1034,5 +1028,5 @@
+ curveradius = abs(curveradius/pyx.unit.m)
+ #if config.getOptions().DEBUG:
+- # print self.__class__, "- curve radius = ", curveradius
++ # print(self.__class__, "- curve radius = ", curveradius)
+ if (mincurveradius is None or curveradius < mincurveradius):
+ mincurveradius = curveradius
+@@ -1043,5 +1037,5 @@
+ numhloopcurves += int(0.1/mincurveradius)
+ if config.getOptions().DEBUG:
+- print self.__class__, "- min curvature radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop"
++ print(self.__class__, "- min curvature radius = ", mincurveradius, "->", numhloopcurves, "curves/hloop")
+
+ defo = pyx.deformer.cycloid(self.arcradius, intwindings, curvesperhloop=numhloopcurves,
+@@ -1054,5 +1048,5 @@
+ styles = self.styles + self.arrows
+ if config.getOptions().DEBUG:
+- print "Drawing " + str(self.__class__) + " with styles = " + str(styles)
++ print("Drawing " + str(self.__class__) + " with styles = " + str(styles))
+ mypath = [self.getVisiblePath(), self.getDeformedPath(+1), self.getDeformedPath(-1)]
+ if self.inverted:
+diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/points.py pyfeyn-0.3.5/pyfeyn/points.py
+--- pyfeyn-0.3.5.orig/pyfeyn/points.py 2016-01-21 14:24:35.000000000 +0600
++++ pyfeyn-0.3.5/pyfeyn/points.py 2016-01-24 11:57:49.863755795 +0600
+@@ -36,8 +36,8 @@
+ a PointLable object."""
+ if config.getOptions().DEBUG:
+- print "Adding label: " + text
++ print("Adding label: " + text)
+ self.labels.append(PointLabel(text=text, point=self, displace=displace, angle=angle, size=size))
+ if config.getOptions().DEBUG:
+- print "Labels = " + str(self.labels)
++ print("Labels = " + str(self.labels))
+ return self
+
+diff -r -U2 pyfeyn-0.3.5.orig/pyfeyn/utils.py pyfeyn-0.3.5/pyfeyn/utils.py
+--- pyfeyn-0.3.5.orig/pyfeyn/utils.py 2011-02-20 23:29:40.000000000 +0600
++++ pyfeyn-0.3.5/pyfeyn/utils.py 2016-01-24 12:12:43.881718198 +0600
+@@ -41,5 +41,5 @@
+ def getDepth(self):
+ """Return the depth at which this instance lives."""
+- if self.__dict__.has_key("depth"):
++ if "depth" in self.__dict__:
+ return self.depth
+ else:
+@@ -52,7 +52,7 @@
+
+ if config.getOptions().DEBUG:
+- print "Comparing visible classes: ", \
++ print("Comparing visible classes: ", \
+ self.__class__, "->", self.getDepth(), "vs.", \
+- other.__class__, "->", other.getDepth()
++ other.__class__, "->", other.getDepth())
+ else:
+ return cmp(self.getDepth(), other.getDepth())
diff --git a/dev-python/pyfeyn/pyfeyn-0.3.5.ebuild b/dev-python/pyfeyn/pyfeyn-0.3.5.ebuild
new file mode 100644
index 000000000000..0f438a75a2c4
--- /dev/null
+++ b/dev-python/pyfeyn/pyfeyn-0.3.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_{3,4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for drawing Feynman diagrams"
+HOMEPAGE="http://pyfeyn.hepforge.org/ https://pypi.python.org/pypi/pyfeyn/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="latex"
+
+DEPEND=""
+RDEPEND=">=dev-python/pyx-0.14[${PYTHON_USEDEP}]
+ latex? ( dev-texlive/texlive-science )"
+
+PATCHES=( "${FILESDIR}"/${P}.patch )
diff --git a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
index 8510bb2e4865..9646d87fb375 100644
--- a/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
+++ b/dev-python/pygpgme/pygpgme-0.3-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# 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} )
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-inherit distutils-r1
+inherit distutils-r1 flag-o-matic
DESCRIPTION="A Python wrapper for the GPGME library"
HOMEPAGE="https://launchpad.net/pygpgme"
@@ -20,14 +20,6 @@ IUSE=""
DEPEND="app-crypt/gpgme"
RDEPEND="${DEPEND}"
-python_prepare_all() {
- sed \
- -e 's/#include <gpgme\.h>/#include <gpgme\/gpgme\.h>/' \
- -i "${S}/src/pygpgme.h" || die
- sed \
- -e 's/suite.addTest(tests.test_sign_verify.test_suite())/#\0/' \
- -e 's/suite.addTest(tests.test_encrypt_decrypt.test_suite())/#\0/' \
- -e 's/suite.addTest(tests.test_passphrase.test_suite())/#\0/' \
- -i "${S}/tests/__init__.py" || die
- distutils-r1_python_prepare_all
+python_configure_all() {
+ append-cflags $(gpgme-config --cflags)
}
diff --git a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
index 0391eff6b536..108f080436ea 100644
--- a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="doc examples"
RDEPEND="
diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
index c91a569c5723..a6c57aa8651e 100644
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@@ -1,3 +1,4 @@
DIST PyX-0.12.1.tar.gz 561989 SHA256 e837b26a8b1c27524cf3f3dd6c0d563451249159edaa2e366d87e7143a867e8e SHA512 4941f5aa21aff3743546495fb073c10d2657ff42b2aff401903498638093d0e31e344cce778980f28a7170c6d29eab72ac074277b9d4088376e8692dc71e55c1 WHIRLPOOL a4d4a21e78b72841ca38dea87296d21f0bc8255e428cb0733fbee9d71c3bfb031d8a9f9fff988dbf0e2af7222553918a9aa924769891c50beb607c6ce3fe2fa4
DIST PyX-0.13.tar.gz 1237082 SHA256 1952962c965000d8e04a00d1b85c600cdef4588cea88c9face2adbedf21d42c6 SHA512 cab0c22f0862ae20cff92504ededf4fcf5820d5773130fb258de1a95d295ca4fe657b85d5ccd52021a4f84403e6db8eebe9f676fa405781738502456123eb05c WHIRLPOOL 0a6159cd5f2683c70b33aac71278ad6f0df3ae54897d0ab31a9b61897be9b4e531cc41c7772a60a152b3b7a39d383ba669be7401c503704f14cbbf3ceca25c41
+DIST PyX-0.14.1.tar.gz 2475186 SHA256 05d1b7fc813379d2c12fcb5bd0195cab522b5aabafac88f72913f1d47becd912 SHA512 16265bbdcaf28ce194189a2987b32952f296c850b829454bcccce0abd23838bfca0276c3e9c8e96b8cbfaf1473bf14669f9b7f2032ee039b61ae59ea3aa45a20 WHIRLPOOL b87f3cd4cd7620e6fdfe7e25f13bd424272695c8a93b658782b05b797e4424b3e1fe179123c9b1a9ebb610c59534c661f5db1b99d2b99b6f9b48e28215e327fd
DIST PyX-0.14.tar.gz 2475559 SHA256 b0ea832e97156338010767a7edacbf6147a75cdd5ac1b147bd73afd514eed370 SHA512 328b917e406e29f656dff00ff54fc5b82296cdc4b134f45ef380d0b1e7011311e4c149be59f5089064c183e8ade3adca27a2304b3bafd2e735f256e6de8b8b3b WHIRLPOOL 34ee7b2723618a493d15e2509456e1539acfc9d0010a202c14ba353505ef1394c753cfc083b557d0250918e501d9931dc7949ec6f623b00be63d16a5e3db6839
diff --git a/dev-python/pyx/metadata.xml b/dev-python/pyx/metadata.xml
index d580ab0df219..69bf06dee62d 100644
--- a/dev-python/pyx/metadata.xml
+++ b/dev-python/pyx/metadata.xml
@@ -9,6 +9,6 @@ Complex tasks like 2d and 3d plots in publication-ready quality are built out
of these primitives.
</longdescription>
<upstream>
- <remote-id type="sourceforge">pyx</remote-id>
+ <remote-id type="pypi">PyX</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-python/pyx/pyx-0.14.1.ebuild b/dev-python/pyx/pyx-0.14.1.ebuild
new file mode 100644
index 000000000000..3034975645cd
--- /dev/null
+++ b/dev-python/pyx/pyx-0.14.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python3_{3,4,5} )
+
+inherit distutils-r1
+MY_PN=PyX
+MY_P="${P/pyx/PyX}"
+DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
+HOMEPAGE="http://pyx.sourceforge.net/ http://pypi.python.org/pypi/PyX/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+RDEPEND="virtual/tex-base
+ dev-texlive/texlive-basic"
+
+DEPEND="${RDEPEND}
+ doc? ( virtual/latex-base
+ dev-python/sphinx[latex,${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ distutils-r1_src_prepare
+ sed -i \
+ -e 's/^build_t1code=.*/build_t1code=1/' \
+ -e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
+ setup.cfg || die "setup.cfg fix failed"
+}
+
+python_compile_all() {
+ if use doc; then
+ VARTEXFONTS="${T}"/fonts
+ emake -C "${S}"/manual latexpdf
+ emake -C "${S}"/faq latexpdf
+ fi
+}
+
+python_install_all() {
+ use doc && dodoc manual/_build/latex/manual.pdf faq/_build/latex/pyxfaq.pdf
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/reno/reno-1.2.0.ebuild b/dev-python/reno/reno-1.2.0.ebuild
index 2c22364c7bff..a55842086b97 100644
--- a/dev-python/reno/reno-1.2.0.ebuild
+++ b/dev-python/reno/reno-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
CDEPEND="
diff --git a/dev-python/ssl-fetch/Manifest b/dev-python/ssl-fetch/Manifest
index cc4a9ac591af..ef48c8481259 100644
--- a/dev-python/ssl-fetch/Manifest
+++ b/dev-python/ssl-fetch/Manifest
@@ -1,3 +1,4 @@
DIST ssl-fetch-0.2.1.tar.gz 10703 SHA256 2905a8301477cf309484e3beef892d68b33910db71be45c08720f70791690b9d SHA512 ca4c4d29463d5761fbcea151f1229152bd0092418254ce614154b012af9a23c0c52bb733f64815499b5ae0ae9325a808ae2157e7ff707345e92352b672c98966 WHIRLPOOL 4bea8540fce0a2bcc0f8d55b4d87e7c544321b14967af95ded400f4ae0af3fd14c8390ed808352aa89c6ba7d267536d2ef8956dcba4b871226e2be9d4e71a2f8
DIST ssl-fetch-0.2.tar.gz 10945 SHA256 027f63c5797e0fd84d4ed2195e42141316cceeed0b91058dd700b55482e40a78 SHA512 30aa040503eb05d8b0a7775ce843215ebbc198483fba2133e78a5da57f8b998c65018a1241f4f7bb3fbf66045c45bf050b59adb94a68c694aa3aeb6c0b5f726f WHIRLPOOL b4442b55d98741906eb1f3c0fda80cfbb0be42d2d8491c6bf1b86c0833a021ccfbae2887d2f833e9a297556d25c49cb4d617743a338e02299061f6e281d3563c
DIST ssl-fetch-0.3.tar.gz 11283 SHA256 cee2f05899e729bba8942b26d17b0a97ddfb0a5d0beea4123bf7f2635db088e8 SHA512 82fddbccd3a5da73e81803ce252171d42428d88d301a772127071130ce4336742e46093359f0a996c679cd12ced02d09035af283d4d2f505c67a551283328756 WHIRLPOOL 49938e39c386a83e60caa0260643c31d2c180e93f3be59757dd17c1c9bc05338d5c580e997a96f698d4e1f4cf317bba9f6738044696c6949fcc1a5351e19f6c2
+DIST ssl-fetch-0.4.tar.gz 11663 SHA256 9f646fdabfc3e80b1c464c2ff4471ce917f706fdbbce6f8f904f70e6fe7a153d SHA512 6b31a5dc5d3a566eded6ca284a3edac8c308596dd5a1971d13223e55abdd2ddc4d3e1eca5f369c1c05540bafcb6c273e5ef1eae627a7a9170bc262a0cda06696 WHIRLPOOL 002814cebc942e3daf14907efb22a6141b14b28a96e0a6f7811f642930b5e27864a5f5c8795826c20988a8be9a35f430e39382d20b526bf2439b5a70c9c7cc20
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
new file mode 100644
index 000000000000..155af41440a5
--- /dev/null
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -0,0 +1,42 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A small convenience library for fetching files securely"
+HOMEPAGE="https://github.com/dol-sen/ssl-fetch"
+SRC_URI="https://dev.gentoo.org/~dolsen/releases/ssl-fetch/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+DEPEND=""
+
+RDEPEND="${DEPEND}
+ >=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
+ python_targets_python2_7? (
+ dev-python/ndg-httpsclient[python_targets_python2_7]
+ dev-python/pyasn1[python_targets_python2_7]
+ >=dev-python/pyopenssl-0.13[python_targets_python2_7]
+ )
+ "
+
+pkg_postinst() {
+ echo
+ einfo "This is beta software."
+ einfo "The APIs it installs should be considered unstable"
+ einfo "and are subject to change in these early versions."
+ einfo
+ einfo "Please file any enhancement requests, or bugs"
+ einfo "at https://github.com/dol-sen/ssl-fetch/issues"
+ einfo "I am also on IRC @ #gentoo-portage, #gentoo-keys,... of the Freenode network"
+ echo
+}
diff --git a/dev-python/visual/visual-5.74-r1.ebuild b/dev-python/visual/visual-5.74-r1.ebuild
index a2d6d23d8739..e8381b7f0a6e 100644
--- a/dev-python/visual/visual-5.74-r1.ebuild
+++ b/dev-python/visual/visual-5.74-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.vpython.org/contents/download/${MY_P}.tar.bz2"
LICENSE="HPND Boost-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="doc examples"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-ros/audio_capture/Manifest b/dev-ros/audio_capture/Manifest
index 967f52c1efcd..96e69cfbc981 100644
--- a/dev-ros/audio_capture/Manifest
+++ b/dev-ros/audio_capture/Manifest
@@ -1,3 +1,4 @@
+DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4
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.10.ebuild b/dev-ros/audio_capture/audio_capture-0.2.10.ebuild
new file mode 100644
index 000000000000..dd65eace76e5
--- /dev/null
+++ b/dev-ros/audio_capture/audio_capture-0.2.10.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 967f52c1efcd..96e69cfbc981 100644
--- a/dev-ros/audio_common_msgs/Manifest
+++ b/dev-ros/audio_common_msgs/Manifest
@@ -1,3 +1,4 @@
+DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4
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.10.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.2.10.ebuild
new file mode 100644
index 000000000000..e872a7e500db
--- /dev/null
+++ b/dev-ros/audio_common_msgs/audio_common_msgs-0.2.10.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 967f52c1efcd..96e69cfbc981 100644
--- a/dev-ros/audio_play/Manifest
+++ b/dev-ros/audio_play/Manifest
@@ -1,3 +1,4 @@
+DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4
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.10.ebuild b/dev-ros/audio_play/audio_play-0.2.10.ebuild
new file mode 100644
index 000000000000..d8c67040ec3b
--- /dev/null
+++ b/dev-ros/audio_play/audio_play-0.2.10.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/sound_play/Manifest b/dev-ros/sound_play/Manifest
index 967f52c1efcd..96e69cfbc981 100644
--- a/dev-ros/sound_play/Manifest
+++ b/dev-ros/sound_play/Manifest
@@ -1,3 +1,4 @@
+DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4
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.10.ebuild b/dev-ros/sound_play/sound_play-0.2.10.ebuild
new file mode 100644
index 000000000000..c4b4cb101276
--- /dev/null
+++ b/dev-ros/sound_play/sound_play-0.2.10.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-ruby/delayer-deferred/Manifest b/dev-ruby/delayer-deferred/Manifest
new file mode 100644
index 000000000000..422344f006b4
--- /dev/null
+++ b/dev-ruby/delayer-deferred/Manifest
@@ -0,0 +1 @@
+DIST delayer-deferred-1.0.3.gem 11776 SHA256 87aeff69276d6c64ca973bab8d2b8ff39cbcac2ba878e25ebfe2b1deb8cc1c5f SHA512 e2cae2ac6d82fcee71f2717770b677610bca264bcb8c522296ee76f7038d5269adf8de7623923107fff589477e084bae2e6f7a4ebd7066d3e1cf24024ffac0b5 WHIRLPOOL 806a59c7fbe89a9ed4f7da8d0e0676e90af23fac0450e3b1223234bb139f4e8e44fe39dddd5d10f028041c64a3c12ceb8333a63aaf4c248e7df6035e2431e009
diff --git a/dev-ruby/delayer-deferred/delayer-deferred-1.0.3.ebuild b/dev-ruby/delayer-deferred/delayer-deferred-1.0.3.ebuild
new file mode 100644
index 000000000000..4daefd8bf38d
--- /dev/null
+++ b/dev-ruby/delayer-deferred/delayer-deferred-1.0.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+DESCRIPTION="Ruby implementation of JSDeferred"
+HOMEPAGE="https://github.com/toshia/delayer-deferred"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/delayer-0.0.2:0"
diff --git a/dev-ruby/delayer-deferred/metadata.xml b/dev-ruby/delayer-deferred/metadata.xml
new file mode 100644
index 000000000000..46ded822aa49
--- /dev/null
+++ b/dev-ruby/delayer-deferred/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>ruby</herd>
+ <maintainer>
+ <email>naota@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="rubygems">delayer-deferred</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/delayer/delayer-0.0.2.ebuild b/dev-ruby/delayer/delayer-0.0.2.ebuild
index 40e47fe36889..a67622612ab9 100644
--- a/dev-ruby/delayer/delayer-0.0.2.ebuild
+++ b/dev-ruby/delayer/delayer-0.0.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 ruby23"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/instance_storage/Manifest b/dev-ruby/instance_storage/Manifest
new file mode 100644
index 000000000000..9c84fef6b431
--- /dev/null
+++ b/dev-ruby/instance_storage/Manifest
@@ -0,0 +1 @@
+DIST instance_storage-1.0.0.gem 7680 SHA256 f41e64da2fe4f5f7d6c8cf9809ef898e660870f39d4e5569c293b584a12bce22 SHA512 45ff98b3d0ab47d3459d868eb1b0075abb83b23bbc3a9b84f261077bdddc385ed016e81d01c19f93fa6cffd7cb9020ce1e22411636709f18af09a76c7d44598f WHIRLPOOL 352f0b15593718babd626b94a9cd5c5fd6a8d577fdffcee12409f150fa1d39b2e4031cce55393b7331cc11315c8112ab0dac3cbcf5cf423727292c8a6925a569
diff --git a/dev-ruby/instance_storage/instance_storage-1.0.0.ebuild b/dev-ruby/instance_storage/instance_storage-1.0.0.ebuild
new file mode 100644
index 000000000000..b8b1b1c9bd61
--- /dev/null
+++ b/dev-ruby/instance_storage/instance_storage-1.0.0.ebuild
@@ -0,0 +1,18 @@
+# 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_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+DESCRIPTION="Manage class instances with dictionary"
+HOMEPAGE="https://rubygems.org/gems/instance_storage/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-ruby/instance_storage/metadata.xml b/dev-ruby/instance_storage/metadata.xml
new file mode 100644
index 000000000000..f0edcdf7d1f7
--- /dev/null
+++ b/dev-ruby/instance_storage/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>ruby</herd>
+ <maintainer>
+ <email>naota@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="rubygems">instance_storage</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/memoist/Manifest b/dev-ruby/memoist/Manifest
new file mode 100644
index 000000000000..1b245c19613b
--- /dev/null
+++ b/dev-ruby/memoist/Manifest
@@ -0,0 +1 @@
+DIST memoist-0.14.0.gem 11264 SHA256 953da0295e5e5e02655df08e368afd3e8a16ee6b9d858733036e9970a781a30d SHA512 5c1ca8f2973ad231efb89972adbc8044f4a0390ff0053963207210315670d4745841cc48f245e83c456441dd9cd0ae58a6aa527abd68a678136eeb9a575698c3 WHIRLPOOL b1729c4afb8ec7fd6a836503660728a74fa15c13ab2d0e0899a7a01ccc176f95b1c509bab49c25548912496f8a55b9f40734a693b0768b95f50a25c8928e24b4
diff --git a/dev-ruby/memoist/memoist-0.14.0.ebuild b/dev-ruby/memoist/memoist-0.14.0.ebuild
new file mode 100644
index 000000000000..6c5fabc277f6
--- /dev/null
+++ b/dev-ruby/memoist/memoist-0.14.0.ebuild
@@ -0,0 +1,25 @@
+# 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"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+DESCRIPTION="ActiveSupport::Memoizable with a few enhancements"
+HOMEPAGE="https://github.com/matthewrudy/memoist"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/memoist/metadata.xml b/dev-ruby/memoist/metadata.xml
new file mode 100644
index 000000000000..a2d9b67217b9
--- /dev/null
+++ b/dev-ruby/memoist/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>ruby</herd>
+ <maintainer>
+ <email>naota@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="rubygems">memoist</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/pluggaloid/Manifest b/dev-ruby/pluggaloid/Manifest
new file mode 100644
index 000000000000..02fa8e103c8b
--- /dev/null
+++ b/dev-ruby/pluggaloid/Manifest
@@ -0,0 +1 @@
+DIST pluggaloid-1.0.2.gem 11776 SHA256 839fc393f3e249ca3772adfb8e8ea6b4fafb3b570df82d47e6cbc3999fa9f36c SHA512 e9ba908f477bf254e7c3ae9f3736d21aeeb38848bcbd43e2ab995c3d592547c22572d07965096353d82ef38e81d4a489a495e80f9af3927fc937caa04d435275 WHIRLPOOL 9914d5b92870cf87ca26fd913df311628018bb9b93a9fe41e626b70b255f80e46a56effea216914afefc29a97aee3ae928775991e292c24d5faab5234698db43
diff --git a/dev-ruby/pluggaloid/metadata.xml b/dev-ruby/pluggaloid/metadata.xml
new file mode 100644
index 000000000000..46ded822aa49
--- /dev/null
+++ b/dev-ruby/pluggaloid/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>ruby</herd>
+ <maintainer>
+ <email>naota@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="rubygems">delayer-deferred</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/pluggaloid/pluggaloid-1.0.2.ebuild b/dev-ruby/pluggaloid/pluggaloid-1.0.2.ebuild
new file mode 100644
index 000000000000..9ea0c425ee93
--- /dev/null
+++ b/dev-ruby/pluggaloid/pluggaloid-1.0.2.ebuild
@@ -0,0 +1,18 @@
+# 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_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+DESCRIPTION="Pluggaloid is extensible plugin system for mikutter"
+HOMEPAGE="https://rubygems.org/gems/pluggaloid/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 1b47d752235b..ea462f92e684 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -4,3 +4,4 @@ DIST gettext-3.1.6.gem 282112 SHA256 b3b0d6cd779e3f99b3bd541300fd5ae8f5425f90d03
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.2.1.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.2.1.ebuild
new file mode 100644
index 000000000000..9fb4d26e1861
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.2.1.ebuild
@@ -0,0 +1,66 @@
+# 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/totoridipjp/Manifest b/dev-ruby/totoridipjp/Manifest
new file mode 100644
index 000000000000..c4c77d173363
--- /dev/null
+++ b/dev-ruby/totoridipjp/Manifest
@@ -0,0 +1 @@
+DIST totoridipjp-0.1.0.gem 7168 SHA256 93d1245c5273971c855b506a7a913d23d6f524e9d7d4494127ae1bc6174c910d SHA512 5298fe39b0705a0b913f7f6cad452be48480a6832e9451d86a7fe9a1248fe893a76af2f56c0bd6d3a65c756d4ed3fd29b4483ef82beeccfc78dcf9dbf43ed748 WHIRLPOOL 1c191cddf29755e31a6d21884f60647b91a5099e7a31a24c243f56cc9ca59d8ca05820fe6ab695698e7a7392b370f1c6266861912126eb6986dc06c95f0f4f27
diff --git a/dev-ruby/totoridipjp/metadata.xml b/dev-ruby/totoridipjp/metadata.xml
new file mode 100644
index 000000000000..46ded822aa49
--- /dev/null
+++ b/dev-ruby/totoridipjp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>ruby</herd>
+ <maintainer>
+ <email>naota@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="rubygems">delayer-deferred</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild b/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild
new file mode 100644
index 000000000000..b7ef079b14a7
--- /dev/null
+++ b/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+DESCRIPTION="A ruby binding to use totori.dip.jp Web API"
+HOMEPAGE="https://rubygems.org/gems/totoridipjp"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+ rm -fvr bin/ || die
+}
diff --git a/dev-tex/biber/Manifest b/dev-tex/biber/Manifest
index e1c2d040e5df..3cfd337822fd 100644
--- a/dev-tex/biber/Manifest
+++ b/dev-tex/biber/Manifest
@@ -1,2 +1,2 @@
-DIST biber-2.1.tar.gz 2222706 SHA256 7b20049557869a994ed9e0373f620720370981b6412ca415f0408d1af893f8f4 SHA512 4a19bf9781cb90da52d9f08163b9ed400233db5c446054b12ab339786456e85bc7aba16ff8c0a36351ecc66b90e4a93e594e820b52f93566449b8c96b27852fb WHIRLPOOL 0c7b1827e3e9ede6aebd45a00b63eac8cc3e7896d89c219fa2c467b4b6b10f48f2180aeb70d727f14620267943d59646daf4d0f09ddb1bd7b6b4b945d973dc03
DIST biber-2.2.tar.gz 2296128 SHA256 6dd93476b27ac7603bc9f224a3b00558f86617209f93b74f8cb4a51f54480c2f SHA512 508b5a8046a1ff7ef6482b5c1f86ce427fa47f669ca224ee52252109dd6488ff242ea5076cafd47f66f288fed994b5425eab4c2566346046e0b2f656ca679d7c WHIRLPOOL 2006b26277eaeb707211a1828e70c4bbfd04030f56e91062c57050a5b0479d317455352730976f3f9206eafbafdccc71d9f071f4e9dedace1c77e8c79ab826b4
+DIST biber-2.3.tar.gz 2288957 SHA256 7a85a7716f0dbe73b118d8d9b8ab26428a3505a1d5b366f2e954ede3e78563e3 SHA512 5d4c0ff32ba69d3f4591c167fc838972f39206a3ba7d73f9052ac10b9f528931a8fe6bdf37812a8e2634592f26a203e332bdc01e42997ce8bc49cf779eac2462 WHIRLPOOL 602acb26e4990e55024d21a7d4ed481133f27112dc7081c939b886c30cd33cb958abe59fc92e97e6a3e6f6fe1c9d4177dec36b0683f7a5b633f8eac9d7b778bc
diff --git a/dev-tex/biber/biber-2.2.ebuild b/dev-tex/biber/biber-2.2-r1.ebuild
index 47125b8f205a..d7ff6cfde1e8 100644
--- a/dev-tex/biber/biber-2.2.ebuild
+++ b/dev-tex/biber/biber-2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -42,7 +42,7 @@ RDEPEND=">=dev-lang/perl-5.16
>=dev-perl/Text-BibTeX-0.700.0
dev-perl/URI
dev-perl/Unicode-LineBreak
- dev-perl/Unicode-Normalize
+ virtual/perl-Unicode-Normalize
dev-perl/XML-LibXML-Simple
dev-perl/XML-LibXSLT
dev-perl/XML-SAX-Base
diff --git a/dev-tex/biber/biber-2.1.ebuild b/dev-tex/biber/biber-2.3-r1.ebuild
index e4268bbc6880..4060b1b406f0 100644
--- a/dev-tex/biber/biber-2.1.ebuild
+++ b/dev-tex/biber/biber-2.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$
@@ -42,14 +42,14 @@ RDEPEND=">=dev-lang/perl-5.16
>=dev-perl/Text-BibTeX-0.700.0
dev-perl/URI
dev-perl/Unicode-LineBreak
- dev-perl/Unicode-Normalize
+ >=virtual/perl-Unicode-Normalize-1.230.0
dev-perl/XML-LibXML-Simple
dev-perl/XML-LibXSLT
dev-perl/XML-SAX-Base
dev-perl/XML-Writer
- >=dev-tex/biblatex-3.0
+ >=dev-tex/biblatex-3.2
virtual/perl-IPC-Cmd
- >=virtual/perl-Unicode-Collate-1.120.0"
+ >=virtual/perl-Unicode-Collate-1.140.0"
DEPEND="${RDEPEND}
dev-perl/Config-AutoConf
dev-perl/Module-Build
@@ -61,7 +61,7 @@ DEPEND="${RDEPEND}
SRC_TEST="parallel"
src_prepare(){
- epatch "${FILESDIR}"/${P}-drop-mozilla-ca.patch
+ epatch "${FILESDIR}"/${PN}-2.1-drop-mozilla-ca.patch
}
src_install(){
diff --git a/dev-tex/biblatex/Manifest b/dev-tex/biblatex/Manifest
index c99fe8ecabf0..45361f54ed0d 100644
--- a/dev-tex/biblatex/Manifest
+++ b/dev-tex/biblatex/Manifest
@@ -1,3 +1,2 @@
-DIST biblatex-3.0.tds.tgz 18965624 SHA256 8de8554eea84dce59a652d61a11e5fcd52c89f303471eb9ca58304b82155e889 SHA512 a8db58907953010c0376bda823ef03250428a2df0172a6e74f2725b19212a8df95c8e742b27f5301a5ca401ccee394d1aa4485bafc2263c985fbde1ce5de4c93 WHIRLPOOL b444a55a0149a5147e1142c4ba8a4ee2251e1f92cece83a8ee7b6ff79a46d46bbb9a22b4f34cdb06aba55eb9b13efb9465d32de60753f27d5c48931044411719
DIST biblatex-3.1.tds.tgz 18983013 SHA256 96280c084f7f1a5ccde679130f80ae0b7e43265aa51b0ea083caadd01c5ec7d1 SHA512 62a4be3d875f70987c2faf83b7558b46ae936ef4e52afa357a2ac80a65afc15dfd783c1a4a4e140d9aa906bb49153ddec2b4e8233ed2d2a26599468190cde951 WHIRLPOOL 5e75313543b5b36a18e593dda68e3c655142e378877bb74513406ca6515a3d8eea5d67ef802594834a766af270d44e23d9f887f8d71e66e6fc8948c6180af864
DIST biblatex-3.2.tds.tgz 18986441 SHA256 b2eeface82991a8f6b3a37d42324ebaf5912768f33b059378df607657aca8ec1 SHA512 a2a1aa4a35199d6ab9684e456889816e1bd7df3fe63fe2bcf9c5071bc4e104a2f42d16290c424ba3e501f57b183c2ecef8b1358064cc01cd95ac2a58f68d00ae WHIRLPOOL 3e9f9e63e739aa95b430170fb48882e5cf88e840e6458e7b1a63e885d38364896b32171d7fe38f052f46ac3edc8da9755fb95cee4506541faca7e5f42d3309b2
diff --git a/dev-tex/biblatex/biblatex-3.0-r1.ebuild b/dev-tex/biblatex/biblatex-3.0-r1.ebuild
deleted file mode 100644
index 47aae74acd4c..000000000000
--- a/dev-tex/biblatex/biblatex-3.0-r1.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
-
-inherit latex-package
-
-DESCRIPTION="Reimplementation of the bibliographic facilities provided by LaTeX"
-HOMEPAGE="http://www.ctan.org/tex-archive/macros/latex/contrib/biblatex https://github.com/plk/biblatex/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tds.tgz"
-
-LICENSE="LPPL-1.3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-RDEPEND="dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-latexextra"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-TEXMF=/usr/share/texmf-site
-
-src_install() {
- insinto "${TEXMF}"
- doins -r bibtex tex
-
- dodoc doc/latex/biblatex/{README,RELEASE}
- use doc && { pushd doc/ ; latex-package_src_doinstall doc ; popd ; }
- if use examples ; then
- docinto examples
- dodoc -r doc/latex/biblatex/examples
- fi
-}
diff --git a/dev-tex/latexdiff/latexdiff-1.1.0.ebuild b/dev-tex/latexdiff/latexdiff-1.1.0.ebuild
index 12b68233b2e2..6b44cef9c335 100644
--- a/dev-tex/latexdiff/latexdiff-1.1.0.ebuild
+++ b/dev-tex/latexdiff/latexdiff-1.1.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://mirror.ctan.org/support/${PN}.zip -> ${P}.zip"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
diff --git a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2015.ebuild b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2015.ebuild
index 8d7aae358b1c..bdf6ea961c24 100644
--- a/dev-texlive/texlive-langeuropean/texlive-langeuropean-2015.ebuild
+++ b/dev-texlive/texlive-langeuropean/texlive-langeuropean-2015.ebuild
@@ -27,5 +27,6 @@ DEPEND=">=dev-texlive/texlive-basic-2015
!<dev-texlive/texlive-langother-2013
!dev-texlive/texlive-langswedish
!dev-texlive/texlive-langlithuanian
+!dev-texlive/texlive-langlatvian
"
RDEPEND="${DEPEND} "
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index ab8aac7458bf..d4bf9a3890b8 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -33,7 +33,7 @@ pkg_setup() {
}
python_compile_all() {
- [[ ${PV} == *9999 ]] && emake -C doc man
+ [[ ${PV} == *9999 ]] && esetup.py build_man
}
python_test() {
@@ -42,16 +42,10 @@ python_test() {
python_install_all() {
local DOCS=( AUTHORS NEWS.rst )
+ distutils-r1_python_install install_man
distutils-r1_python_install_all
-
- if [[ ${PV} == *9999 ]]; then
- emake -C doc PREFIX=/usr DESTDIR="${D}" install_man
- else
- doman man/*
- fi
}
pkg_postinst() {
- einfo "updating pkgcore plugin cache"
python_foreach_impl pplugincache pkgcheck.plugins
}
diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
index 6ef37bd6965b..6829e0b89208 100644
--- a/dev-util/trinity/Manifest
+++ b/dev-util/trinity/Manifest
@@ -1,5 +1 @@
-DIST trinity-1.1.tgz 115894 SHA256 926a1d6595d9fc29ad79075b6603e4bbfe42df3e04215bfce2502f4b554447cb SHA512 a10af383cf085e4ee3e22a66e0da79409570fa4e72f64b892566c499f04cf23122064e99984e7712c58fc81498300e38248b78c91d8e0397074714205af28b5a WHIRLPOOL dbc3ba3dc3248178652d0d32f787e51a0c617d31b54d9053632b9a8ae23e6dd7426d53c37fbfef7a48846e4afbb3a37b029a54ee98a81179cc90ab75f16dae0b
-DIST trinity-1.2.tgz 171946 SHA256 71132fca0ed016dcb39a3f1d9fa16a68971e2e9eff0b94bbacdf3d7ff101b6d5 SHA512 5a96db85ce0a34c345c803c6983bc4f191a8c25d54ff90f61eafeb6cb747a4170097821bf070a77920831a35a19b8d2bbc7b32d51194e45060abbd235a96b0d7 WHIRLPOOL 3713baba7a7e0a3f8996a8eee658d9905129aeb5d7f8a42179851c0e17b33aae9dbfaa206ff27b3b1786c47ccb8d4d45ba0732df09c689e1341133bcb3f0d119
-DIST trinity-1.3.tgz 192513 SHA256 53ea7ca66c022e1fd86b18a7a38f5dbbf3611a15e1bb1256ea6e8ac570378b0f SHA512 343dac85a2c7a433e3d1e71535e16285f766ded240d2e7ba0527e29ab46cb39e11e2134f95255e8792f0cd21a5fd55f90a34a3a9d348414d03e9e0bd06437f36 WHIRLPOOL c2ff46ad957ec6541f3898000a7e6982f9a34eaa0b849db601cf84a2570131baf1e7817f7c5bd517e8b492880c957d8d5527fec6944fefb5ba24e6c51f276fb8
-DIST trinity-1.4.tar.xz 156212 SHA256 a61fca0e35010820be4ba858dd7d103e6cc5975feef052f2cf56db71c8661ac1 SHA512 ffe7e5e9214056b39c0047ddd6463885701d075256a9416749cba638c625898eb7b0e2f74a17794fd4034dafdc949b8297e842815bb9b6d29392059a6a0d549b WHIRLPOOL 8df2d1a22e3259e00363f71010f723a421109022478dfe8bd318fa0304ec9baa705ad089e535545026066649e751d7c4d310ccfd92561a1dc0692c1df1695658
DIST trinity-1.5.tar.xz 171684 SHA256 e7b641d21954873bac7b5c27e7a9986837e83ec14fa20c55901c4333cce22655 SHA512 58884c8e226258de6037e06029b6c593a99b467e9b107562458557954fd4af185f88fbcacc04fc52f05318a860ebab4605c227e6a02b32253439807d4071cd8d WHIRLPOOL e737ac877b95a62e40a2cc9273f0b0d4dc79275b6dafab85b54815f1581c9c824189d88781cc26468c56166f6e87273fc5df1b786b69069b1dc4654d2a874f43
diff --git a/dev-util/trinity/files/trinity-1.1-flags.patch b/dev-util/trinity/files/trinity-1.1-flags.patch
deleted file mode 100644
index fd794c62dc67..000000000000
--- a/dev-util/trinity/files/trinity-1.1-flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- trinity-1.1/Makefile
-+++ trinity-1.1/Makefile
-@@ -3,7 +3,7 @@
- INSTALL_PREFIX ?= $(DESTDIR)
- INSTALL_PREFIX ?= $(HOME)
-
--CFLAGS = -Wall -W -g -O2 -I. -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE
-+CFLAGS += -Wall -W -I. -Wimplicit -D_GNU_SOURCE
- #CFLAGS += $(shell if $(CC) -m32 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-m32"; fi)
- CFLAGS += -Wdeclaration-after-statement
- CFLAGS += -Wformat=2
-@@ -49,7 +49,7 @@
- -include $(SRCS:%.c=$(DEPDIR)/%.d)
-
- trinity: test $(OBJS) $(HEADERS)
-- $(CC) $(CFLAGS) -o trinity $(OBJS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -o trinity $(OBJS)
- @mkdir -p tmp
-
- df = $(DEPDIR)/$(*F)
diff --git a/dev-util/trinity/files/trinity-1.2-btrfs-headers.patch b/dev-util/trinity/files/trinity-1.2-btrfs-headers.patch
deleted file mode 100644
index 81eb170fcbae..000000000000
--- a/dev-util/trinity/files/trinity-1.2-btrfs-headers.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2f51ba47d4e16aaa877956e2876f81ed50af5c5d Mon Sep 17 00:00:00 2001
-From: Andi Shyti <andi@etezian.org>
-Date: Wed, 24 Jul 2013 12:31:05 +0200
-Subject: [PATCH] ioctls: btrfs-control: fix header inclusion order
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This patch enables newer linux/btrfs.h in Kernel headers 3.11,
-where NULL is not recognized as a define. This is done by
-including stdlib.h before linux/btrfs.h. It gets rid of the
-following compiling error:
-
-In file included from ioctls/btrfs-control.c:5:0:
-/usr/include/linux/btrfs.h: In function ‘btrfs_err_str’:
-/usr/include/linux/btrfs.h:486:11: error: ‘NULL’ undeclared (first use in
- return NULL;
- ^
-
-Signed-off-by: Andi Shyti <andi@etezian.org>
----
- ioctls/btrfs-control.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ioctls/btrfs-control.c b/ioctls/btrfs-control.c
-index 35e5389..3b0b50a 100644
---- a/ioctls/btrfs-control.c
-+++ b/ioctls/btrfs-control.c
-@@ -2,6 +2,7 @@
-
- #ifdef USE_BTRFS
-
-+#include <stdlib.h>
- #include <linux/btrfs.h>
-
- #include "trinity.h"
---
-1.8.3.2
-
diff --git a/dev-util/trinity/files/trinity-1.2-videodev2-ioctls.patch b/dev-util/trinity/files/trinity-1.2-videodev2-ioctls.patch
deleted file mode 100644
index c7240b7c15c0..000000000000
--- a/dev-util/trinity/files/trinity-1.2-videodev2-ioctls.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 54c5f3cce91ed914b1abbd3bafe4877e413947fa Mon Sep 17 00:00:00 2001
-From: Andi Shyti <andi@etezian.org>
-Date: Wed, 24 Jul 2013 00:42:07 +0200
-Subject: [PATCH] ioctls: videodev2: check if defines are obsolete
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In kernel headers 3.11 the VIDIOC_DBG_G_CHIP_IDENT define is
-considered obsolete, therefore removed, generating the following
-compiling error:
-
-ioctls/videodev2.c:72:15: error: ‘VIDIOC_DBG_G_CHIP_IDENT’ undeclared here (not in a function)
- IOCTL(VIDIOC_DBG_G_CHIP_IDENT),
- ^
-
-Check the definition of it before using it
-
-Signed-off-by: Andi Shyti <andi@etezian.org>
----
- ioctls/videodev2.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/ioctls/videodev2.c b/ioctls/videodev2.c
-index 0d1473e..03a5ae5 100644
---- a/ioctls/videodev2.c
-+++ b/ioctls/videodev2.c
-@@ -69,7 +69,9 @@ static const struct ioctl videodev2_ioctls[] = {
- IOCTL(VIDIOC_TRY_ENCODER_CMD),
- IOCTL(VIDIOC_DBG_S_REGISTER),
- IOCTL(VIDIOC_DBG_G_REGISTER),
-+#ifdef VIDIOC_DBG_G_CHIP_IDENT
- IOCTL(VIDIOC_DBG_G_CHIP_IDENT),
-+#endif
- IOCTL(VIDIOC_S_HW_FREQ_SEEK),
- #ifdef VIDIOC_ENUM_DV_PRESETS
- IOCTL(VIDIOC_ENUM_DV_PRESETS),
---
-1.8.3.2
-
diff --git a/dev-util/trinity/files/trinity-1.4-flags.patch b/dev-util/trinity/files/trinity-1.4-flags.patch
deleted file mode 100644
index 5b639598044a..000000000000
--- a/dev-util/trinity/files/trinity-1.4-flags.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- trinity-1.4/Makefile
-+++ trinity-1.4/Makefile
-@@ -9,7 +9,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__
- ifneq ($(SYSROOT),)
- CFLAGS += --sysroot=$(SYSROOT)
- endif
-@@ -84,7 +84,7 @@
- df = $(DEPDIR)/$(*D)/$(*F)
-
- %.o : %.c
-- $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ -c $<
-+ $(QUIET_CC)$(CC) $(CFLAGS) -o $@ -c $<
- @mkdir -p $(DEPDIR)/$(*D)
- @$(CC) -MM $(CFLAGS) $*.c > $(df).d
- @mv -f $(df).d $(df).d.tmp
diff --git a/dev-util/trinity/trinity-1.1.ebuild b/dev-util/trinity/trinity-1.1.ebuild
deleted file mode 100644
index edd1d366294d..000000000000
--- a/dev-util/trinity/trinity-1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A Linux system call fuzz tester"
-HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
-SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="sys-kernel/linux-headers"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-flags.patch
- tc-export CC
-}
-
-src_configure() {
- ./configure.sh || die
-}
-
-src_install() {
- dobin ${PN}
- dodoc Documentation/* README
-}
diff --git a/dev-util/trinity/trinity-1.2.ebuild b/dev-util/trinity/trinity-1.2.ebuild
deleted file mode 100644
index 72989d906081..000000000000
--- a/dev-util/trinity/trinity-1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A Linux system call fuzz tester"
-HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
-SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="sys-kernel/linux-headers"
-
-src_prepare() {
- sed -e 's/^CFLAGS = /CFLAGS +=/' \
- -e 's/-g -O2//' \
- -e 's/-D_FORTIFY_SOURCE=2//' \
- -e '/-o trinity/s/$(CFLAGS)/\0 $(LDFLAGS)/' \
- -e '/^CFLAGS += -Werror/d' \
- -i Makefile || die
-
- epatch "${FILESDIR}"/${PN}-1.2-videodev2-ioctls.patch
- epatch "${FILESDIR}"/${PN}-1.2-btrfs-headers.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-util/trinity/trinity-1.3.ebuild b/dev-util/trinity/trinity-1.3.ebuild
deleted file mode 100644
index e5335daba0ea..000000000000
--- a/dev-util/trinity/trinity-1.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Linux system call fuzz tester"
-HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
-SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="sys-kernel/linux-headers"
-
-src_prepare() {
- sed -e 's/^CFLAGS := /CFLAGS +=/' \
- -e 's/-g -O2//' \
- -e 's/-D_FORTIFY_SOURCE=2//' \
- -e '/-o trinity/s/$(CFLAGS)/\0 $(LDFLAGS)/' \
- -i Makefile || die
-
- 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-util/trinity/trinity-1.4.ebuild b/dev-util/trinity/trinity-1.4.ebuild
deleted file mode 100644
index f303e35db1ab..000000000000
--- a/dev-util/trinity/trinity-1.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=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}-flags.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-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 3744305f029c..7b425a951cc4 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,5 +1 @@
-DIST umockdev-0.8.10.tar.xz 741364 SHA256 5105caf49c240148a826871ee6576e99ed902ea8b58d7908b0dfd121a9f8319d SHA512 74eb2bd58fad181c52a4a968d9cfd895f1723052d046b21a9381a8bf293a135173d1e218c55b824c4cd285fe0f6ae99764d4e4c0c35c55ee9bb08c3bea03292e WHIRLPOOL 912f814fb05520fdc7d18f81b10c1b0ecba0d890086735963b6becfcd685bb4e60d63953792a04d84483f47f54a74b81e20ad717c044305bf56b76d27b2b9bb2
DIST umockdev-0.8.11.tar.xz 741812 SHA256 222518a634c57b1d6d9f51b042e8c80641251260d9c43e6c6273d446d577ccb7 SHA512 dd6aa23873060c2778796f7300b61aa46e6f9bed8b2b2dc107eb747ade93f9d9027385a414f2107f3da4932065e1f7ec488cc91c6f24c3204a7abbbdf4cb8e84 WHIRLPOOL b736ca9d9f73294e5aabc3be75e006efcfdba8f8ecb96cdeb2fb88a12cc3ba53870c416c82c315acc7da7929d07a9efcdc6ceadaa324e0c63a9a60589d66148c
-DIST umockdev-0.8.2.tar.xz 733196 SHA256 8d7dad9ec6f9105773d1bb57eb844310e7a05ba850c0f28b9b520f848b2a2719 SHA512 a7674abcde7f570d92da4e54bbe7448ffde99515577c05664ea11ed45dcab7345e62b96d42f6e851b8dc5199dfaf7955a54156ae4bc9ffc983a5ccf312755514 WHIRLPOOL 0774f85f09d6e2d03fd500143a0b56a31cbda561e693b46b236d8641f336edc91d05206a36f408911baddce42c9a0aede9a4d6a71830b2e0f17a0859170ba028
-DIST umockdev-0.8.8.tar.xz 741304 SHA256 51fb5f81d895f99c3a3d81a18356db7e6d2cd075732477d8d4be4ffd97817e3f SHA512 5a8991111a7a108e965e4e1446c050dc544ddf7dc4a35db7374be0373b0f74415b3bcc1192547ce32a91ed91e373f5b750adb18a4c4efc2c587f9d03625d417c WHIRLPOOL c2c8dc304dcafbee9dfb8047a41b71ed1ee36905d7a0bcbe46fb2a67110580279bf5ff293636d2030e6cd43f4ab4ee885be76a3c44c76469967d10e1e7867dde
-DIST umockdev-0.8.9.tar.xz 740428 SHA256 5a4e6b43d99c6cad52bd22d7d713ff2d5dcc4db4147c01d08d174606de095adf SHA512 bac7b39eae1623e42db80dc39517d0f7f6c5264be65c089789d5cb17bd7f45584fab6e5930cd44d9b7e4dae987db31a2876b20310a9297f676c38b7461a1ab7b WHIRLPOOL b7253b50f130252c36c23079e454fc346ab9abc5131355c7abcb4573368bcf3d6a71af82563c79276df8c29e97210cadf6195ff498619b61b1734e1be86244ea
diff --git a/dev-util/umockdev/umockdev-0.8.10.ebuild b/dev-util/umockdev/umockdev-0.8.10.ebuild
deleted file mode 100644
index a65cd564be8b..000000000000
--- a/dev-util/umockdev/umockdev-0.8.10.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
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit python-any-r1 autotools-utils
-
-DESCRIPTION="Mock hardware devices for creating unit tests"
-HOMEPAGE="https://github.com/martinpitt/umockdev/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs test"
-
-RDEPEND="virtual/libgudev:=
- virtual/libudev:=
- >=dev-libs/glib-2.32:2"
-DEPEND="${RDEPEND}
- test? ( ${PYTHON_DEPS} )
- app-arch/xz-utils
- virtual/pkgconfig"
-
-RESTRICT="test"
diff --git a/dev-util/umockdev/umockdev-0.8.2.ebuild b/dev-util/umockdev/umockdev-0.8.2.ebuild
deleted file mode 100644
index a65cd564be8b..000000000000
--- a/dev-util/umockdev/umockdev-0.8.2.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
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit python-any-r1 autotools-utils
-
-DESCRIPTION="Mock hardware devices for creating unit tests"
-HOMEPAGE="https://github.com/martinpitt/umockdev/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs test"
-
-RDEPEND="virtual/libgudev:=
- virtual/libudev:=
- >=dev-libs/glib-2.32:2"
-DEPEND="${RDEPEND}
- test? ( ${PYTHON_DEPS} )
- app-arch/xz-utils
- virtual/pkgconfig"
-
-RESTRICT="test"
diff --git a/dev-util/umockdev/umockdev-0.8.8.ebuild b/dev-util/umockdev/umockdev-0.8.8.ebuild
deleted file mode 100644
index ad14f28e9bb9..000000000000
--- a/dev-util/umockdev/umockdev-0.8.8.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=( python{2_7,3_3,3_4} )
-
-inherit python-any-r1 autotools-utils
-
-DESCRIPTION="Mock hardware devices for creating unit tests"
-HOMEPAGE="https://github.com/martinpitt/umockdev/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs test"
-
-RDEPEND="virtual/libgudev:=
- virtual/libudev:=
- >=dev-libs/glib-2.32:2"
-DEPEND="${RDEPEND}
- test? ( ${PYTHON_DEPS} )
- app-arch/xz-utils
- virtual/pkgconfig"
-
-RESTRICT="test"
diff --git a/dev-util/umockdev/umockdev-0.8.9.ebuild b/dev-util/umockdev/umockdev-0.8.9.ebuild
deleted file mode 100644
index a65cd564be8b..000000000000
--- a/dev-util/umockdev/umockdev-0.8.9.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
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit python-any-r1 autotools-utils
-
-DESCRIPTION="Mock hardware devices for creating unit tests"
-HOMEPAGE="https://github.com/martinpitt/umockdev/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs test"
-
-RDEPEND="virtual/libgudev:=
- virtual/libudev:=
- >=dev-libs/glib-2.32:2"
-DEPEND="${RDEPEND}
- test? ( ${PYTHON_DEPS} )
- app-arch/xz-utils
- virtual/pkgconfig"
-
-RESTRICT="test"
diff --git a/dev-vcs/kdesvn/Manifest b/dev-vcs/kdesvn/Manifest
index 951567136e96..da15a4175a69 100644
--- a/dev-vcs/kdesvn/Manifest
+++ b/dev-vcs/kdesvn/Manifest
@@ -1 +1,2 @@
DIST kdesvn-1.6.0.tar.bz2 1863823 SHA256 05686f246b76810f90a9f80f1d45cdccf812b42e18fa10a16b14e7d27d370f96 SHA512 e8ac9a55a8003e5cf724fc49281355fa0b6926ed2c984cece3f3fa076bac03ad1e9f1ab0e258d91e547f8cb542a739e0933e57f64bc0b9fa06417a4bcc5ae8cd WHIRLPOOL 13921530f77db3b4b30a7cfef86468d9c4f94d900017b3747f81114b83c0dbc22a84cb63c76cefe51ef5a6823e0c8ceac31de77bc8279897b679608ea4c2b43f
+DIST kdesvn-1.7.0.tar.xz 1965064 SHA256 b3a9dc01e1730c880478aecd5c8d832a4b218468f791083985d325c0ef8a6ece SHA512 587e1f65af7fa0bf16c3b1892b155e588546e4229b7499d9c31abdbf22369fecde439805e7c32370b8f648a6f42f38293dc2fc67c7a7d605920afeebf4ad2db3 WHIRLPOOL 17dedce0941e486496718fa04f8e4bfb46d85d5fa9ef7da11244594291e2802aeebf610654e126a6e2a619a5aebdf91fec09011a05094e9d32d4c32d1350af01
diff --git a/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild b/dev-vcs/kdesvn/kdesvn-1.7.0.ebuild
new file mode 100644
index 000000000000..4804b7b0db1d
--- /dev/null
+++ b/dev-vcs/kdesvn/kdesvn-1.7.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
+
+KDE_HANDBOOK="optional"
+KDE_LINGUAS="cs de el es fr it ja lt pt_BR ro ru"
+KDE_LINGUAS_LIVE_OVERRIDE="true"
+inherit flag-o-matic kde4-base
+
+DESCRIPTION="A frontend to the subversion vcs"
+HOMEPAGE="http://kdesvn.alwins-world.de/"
+if [[ ${PV} != 9999* ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="4"
+IUSE="debug"
+
+DEPEND="
+ dev-libs/apr:1
+ dev-libs/apr-util:1
+ dev-qt/qtsql:4[sqlite]
+ >=dev-vcs/subversion-1.7
+ sys-devel/gettext
+"
+RDEPEND="${DEPEND}
+ !kde-apps/kdesdk-kioslaves:4[subversion(+)]
+"
+
+src_configure() {
+ append-cppflags -DQT_THREAD_SUPPORT
+
+ [[ ${PV} = 9999* ]] && local mycmakeargs=(-DDAILY_BUILD=ON)
+
+ kde4-base_src_configure
+}
diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch
new file mode 100644
index 000000000000..7c84c8d481fd
--- /dev/null
+++ b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-subversion1.9-private-api.patch
@@ -0,0 +1,129 @@
+Fix compile errors due to hiding of private API in subversion 1.9.
+See also:
+ https://bugs.gentoo.org/show_bug.cgi?id=558572
+ https://slackbuilds.org/cgit/slackbuilds/commit/?id=c2df77021b476ca9484772361003df04fa03038a
+ https://github.com/RapidSVN/RapidSVN/issues/6
+
+--- rapidsvn-0.12.1/src/svncpp/client_ls.cpp
++++ rapidsvn-0.12.1/src/svncpp/client_ls.cpp
+@@ -29,6 +29,7 @@
+ #include "svn_client.h"
+ #include "svn_path.h"
+ #include "svn_sorts.h"
++#include "svn_version.h"
+ //#include "svn_utf.h"
+
+ // svncpp
+@@ -37,6 +38,8 @@
+ #include "svncpp/exception.hpp"
+
+
++#if SVN_VER_MAJOR == 1 && SVN_VER_MINOR < 8
++
+ static int
+ compare_items_as_paths(const svn_sort__item_t *a, const svn_sort__item_t *b)
+ {
+@@ -90,6 +93,72 @@
+ }
+ }
+
++#else
++
++#include <algorithm>
++
++static svn_error_t* store_entry(
++ void *baton,
++ const char *path,
++ const svn_dirent_t *dirent,
++ const svn_lock_t *,
++ const char *abs_path,
++ const char *,
++ const char *,
++ apr_pool_t *scratch_pool)
++{
++ svn::DirEntries *entries = reinterpret_cast<svn::DirEntries*>(baton);
++ if (path[0] == '\0') {
++ if (dirent->kind == svn_node_file) {
++ // for compatibility with svn_client_ls behaviour, listing a file
++ // stores that file name
++ entries->push_back(svn::DirEntry(svn_path_basename(abs_path, scratch_pool), dirent));
++ }
++ } else {
++ entries->push_back(svn::DirEntry(path, dirent));
++ }
++ return SVN_NO_ERROR;
++}
++
++static bool sort_by_path(svn::DirEntry const& a, svn::DirEntry const& b)
++{
++ return svn_path_compare_paths(a.name(), b.name()) < 0;
++}
++
++namespace svn
++{
++ DirEntries
++ Client::list(const char * pathOrUrl,
++ svn_opt_revision_t * revision,
++ bool recurse) throw(ClientException)
++ {
++ Pool pool;
++ DirEntries entries;
++
++ svn_error_t * error =
++ svn_client_list3(pathOrUrl,
++ revision,
++ revision,
++ SVN_DEPTH_INFINITY_OR_IMMEDIATES(recurse),
++ SVN_DIRENT_ALL,
++ FALSE, // fetch locks
++ FALSE, // include externals
++ &store_entry,
++ &entries,
++ *m_context,
++ pool);
++
++ if (error != SVN_NO_ERROR)
++ throw ClientException(error);
++
++ std::sort(entries.begin(), entries.end(), &sort_by_path);
++
++ return entries;
++ }
++}
++
++#endif
++
+ /* -----------------------------------------------------------------
+ * local variables:
+ * eval: (load-file "../../rapidsvn-dev.el")
+--- rapidsvn-0.12.1/include/svncpp/dirent.hpp
++++ rapidsvn-0.12.1/include/svncpp/dirent.hpp
+@@ -41,7 +41,7 @@
+ /**
+ * constructor for existing @a svn_dirent_t entries
+ */
+- DirEntry(const char * name, svn_dirent_t * dirEntry);
++ DirEntry(const char * name, const svn_dirent_t * dirEntry);
+
+ /**
+ * copy constructor
+--- rapidsvn-0.12.1/src/svncpp/dirent.cpp
++++ rapidsvn-0.12.1/src/svncpp/dirent.cpp
+@@ -47,7 +47,7 @@
+ {
+ }
+
+- Data(const char * _name, svn_dirent_t * dirEntry)
++ Data(const char * _name, const svn_dirent_t * dirEntry)
+ : name(_name), kind(dirEntry->kind), size(dirEntry->size),
+ hasProps(dirEntry->has_props != 0),
+ createdRev(dirEntry->created_rev), time(dirEntry->time)
+@@ -78,7 +78,7 @@
+ {
+ }
+
+- DirEntry::DirEntry(const char * name, svn_dirent_t * DirEntry)
++ DirEntry::DirEntry(const char * name, const svn_dirent_t * DirEntry)
+ : m(new Data(name, DirEntry))
+ {
+ }
diff --git a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch
index 4df855fb79b4..e26ecda15d9b 100644
--- a/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch
+++ b/dev-vcs/rapidsvn/files/rapidsvn-0.12.1-svncpp_link.patch
@@ -1,7 +1,7 @@
Index: src/svncpp/Makefile.am
===================================================================
---- src/svncpp/Makefile.am (revision 7100)
-+++ src/svncpp/Makefile.am (working copy)
+--- rapidsvn-0.12.1/src/svncpp/Makefile.am (revision 7100)
++++ rapidsvn-0.12.1/src/svncpp/Makefile.am (working copy)
@@ -27,3 +27,7 @@
url.cpp \
wc.cpp
diff --git a/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild
new file mode 100644
index 000000000000..ccaeca2f2fbb
--- /dev/null
+++ b/dev-vcs/rapidsvn/rapidsvn-0.12.1-r3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+WX_GTK_VER=3.0
+
+inherit autotools eutils fdo-mime flag-o-matic python-single-r1 versionator wxwidgets
+
+MY_PV=$(get_version_component_range 1-2)
+MY_REL="1"
+
+DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system"
+HOMEPAGE="http://rapidsvn.tigris.org/"
+SRC_URI="
+ http://www.rapidsvn.org/download/release/${PV}/${P}.tar.gz
+ doc? ( https://dev.gentoo.org/~jlec/distfiles/svncpp.dox.xz )"
+
+LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEP="
+ ${PYTHON_DEPS}
+ dev-libs/apr
+ dev-libs/apr-util
+ dev-vcs/subversion
+ x11-libs/wxGTK:${WX_GTK_VER}[X]"
+DEPEND="${COMMON_DEP}
+ doc? (
+ dev-libs/libxslt
+ app-text/docbook-sgml-utils
+ app-doc/doxygen
+ app-text/docbook-xsl-stylesheets
+ media-gfx/graphviz
+ )"
+RDEPEND="${COMMON_DEP}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-svncpp_link.patch"
+ "${FILESDIR}/${P}-locale.patch"
+ "${FILESDIR}/${P}-wx3.0.patch"
+ "${FILESDIR}/${P}-subversion1.9-private-api.patch"
+)
+
+DOCS=( HACKING.txt TRANSLATIONS )
+
+src_prepare() {
+ need-wxwidgets unicode
+ if use doc; then
+ mv "${WORKDIR}"/svncpp.dox doc/svncpp/ || die
+ fi
+ strip-linguas $(grep ^RAPIDSVN_LANGUAGES src/locale/Makefile.am | sed 's:RAPIDSVN_LANGUAGES=::g')
+ sed \
+ -e "/^RAPIDSVN_LANGUAGES/s:=.*:=${LINGUAS}:g" \
+ -i src/locale/Makefile.am || die
+
+ mv configure.in configure.ac || die
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ append-cppflags $( apr-1-config --cppflags )
+ econf \
+ $(use_enable static-libs static) \
+ $(use_with doc manpage) \
+ $(use_with doc xsltproc) \
+ $(use_with doc doxygen) \
+ $(use_with doc dot) \
+ --with-wx-config="${WX_CONFIG}" \
+ --with-svn-lib="${EPREFIX}/usr/$(get_libdir)" \
+ --with-svn-include="${EPREFIX}/usr/include" \
+ --with-apr-config="${EPREFIX}/usr/bin/apr-1-config" \
+ --with-apu-config="${EPREFIX}/usr/bin/apu-1-config"
+}
+
+src_compile() {
+ default
+ use doc && emake -C doc/manpage manpage
+}
+
+src_install() {
+ default
+
+ doicon src/res/rapidsvn.ico src/res/bitmaps/${PN}*.png
+ make_desktop_entry rapidsvn "RapidSVN ${PV}" \
+ "${EPREFIX}/usr/share/pixmaps/rapidsvn_32x32.png" \
+ "RevisionControl;Development"
+
+ if use doc ; then
+ doman doc/manpage/${PN}.1
+ dodoc doc/svncpp/html/*
+ fi
+
+ prune_libtool_files
+}
+
+src_test() {
+ pushd src/tests/svncpp > /dev/null || die
+ default
+ ./svncpptest | grep OK || die
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/eclass/elisp-common.eclass b/eclass/elisp-common.eclass
index 15177886d6bf..101437eaa912 100644
--- a/eclass/elisp-common.eclass
+++ b/eclass/elisp-common.eclass
@@ -4,7 +4,7 @@
#
# @ECLASS: elisp-common.eclass
# @MAINTAINER:
-# Gentoo GNU Emacs project <emacs@gentoo.org>
+# Gentoo GNU Emacs project <gnu-emacs@gentoo.org>
# @AUTHOR:
# Matthew Kennedy <mkennedy@gentoo.org>
# Jeremy Maitin-Shepard <jbms@attbi.com>
diff --git a/eclass/elisp.eclass b/eclass/elisp.eclass
index 93a7d4bb2a37..660865c95cc0 100644
--- a/eclass/elisp.eclass
+++ b/eclass/elisp.eclass
@@ -4,7 +4,7 @@
#
# @ECLASS: elisp.eclass
# @MAINTAINER:
-# Gentoo GNU Emacs project <emacs@gentoo.org>
+# Gentoo GNU Emacs project <gnu-emacs@gentoo.org>
# @AUTHOR:
# Matthew Kennedy <mkennedy@gentoo.org>
# Jeremy Maitin-Shepard <jbms@attbi.com>
diff --git a/eclass/readme.gentoo.eclass b/eclass/readme.gentoo.eclass
index 97fe12d4b536..0ab9e8957a12 100644
--- a/eclass/readme.gentoo.eclass
+++ b/eclass/readme.gentoo.eclass
@@ -31,7 +31,6 @@ case "${EAPI:-0}" in
# from needing to export another pkg_preinst phase to save has_version
# result. Also relies on EAPI >=4 default src_install phase.
EXPORT_FUNCTIONS src_install pkg_postinst
- eqawarn "This eclass is DEPRECATED. Please use readme.gentoo-r1 instead."
;;
6)
die "Unsupported EAPI=${EAPI} for ${ECLASS}"
diff --git a/games-arcade/supertux/supertux-0.4.0.ebuild b/games-arcade/supertux/supertux-0.4.0.ebuild
index 435806842bd2..210b61b0cef9 100644
--- a/games-arcade/supertux/supertux-0.4.0.ebuild
+++ b/games-arcade/supertux/supertux-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/SuperTux/${PN}/releases/download/v${PV}/${P}.tar.bz2
LICENSE="GPL-2+ GPL-3+ ZLIB MIT CC-BY-SA-2.0 CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="debug"
RDEPEND="dev-games/physfs
diff --git a/mail-client/mutt/mutt-1.5.24-r2.ebuild b/mail-client/mutt/mutt-1.5.24-r2.ebuild
index 15eca4a062ff..153dc595bac9 100644
--- a/mail-client/mutt/mutt-1.5.24-r2.ebuild
+++ b/mail-client/mutt/mutt-1.5.24-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos libressl mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND="
app-misc/mime-types
nls? ( virtual/libintl )
diff --git a/mate-base/mate-panel/files/mate-panel-1.8.1-fix-networkmanager-flags.patch b/mate-base/mate-panel/files/mate-panel-1.8.1-fix-networkmanager-flags.patch
new file mode 100644
index 000000000000..f67726919792
--- /dev/null
+++ b/mate-base/mate-panel/files/mate-panel-1.8.1-fix-networkmanager-flags.patch
@@ -0,0 +1,53 @@
+From f03dff4c416d417238dcd625a24ea85e380e599c Mon Sep 17 00:00:00 2001
+From: Gokturk Yuksek <gokturk@binghamton.edu>
+Date: Sun, 3 Jan 2016 03:17:40 -0500
+Subject: [PATCH 1/1] applets/clock: add missing pkgconfig flags for
+ NetworkManager
+
+mate-panel-1.8 fails to compile with NetworkManager >=1.0.8 due to a
+missing include directive ('-I'). Substitute network manager CFLAGS
+and LIBS supplied by the pkgconfig macro in configure.ac and use it
+for applets/clock.
+
+Signed-off-by: Gokturk Yuksek <gokturk@binghamton.edu>
+---
+ applets/clock/Makefile.am | 2 ++
+ configure.ac | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
+index 950ecdd..bfb6b45 100644
+--- a/applets/clock/Makefile.am
++++ b/applets/clock/Makefile.am
+@@ -39,6 +39,7 @@ CLOCK_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ $(LIBMATE_PANEL_APPLET_CFLAGS) \
+ $(CLOCK_CFLAGS) \
++ $(NETWORK_MANAGER_CFLAGS) \
+ -I$(srcdir)/../../libmate-panel-applet \
+ -I$(top_builddir)/libmate-panel-applet \
+ -DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+@@ -51,6 +52,7 @@ CLOCK_LDADD = \
+ ../../libmate-panel-applet/libmate-panel-applet-4.la \
+ $(CLOCK_LIBS) \
+ $(LIBMATE_PANEL_APPLET_LIBS) \
++ $(NETWORK_MANAGER_LIBS) \
+ libsystem-timezone.la \
+ -lm
+
+diff --git a/configure.ac b/configure.ac
+index af5a422..6d1389e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -156,6 +156,8 @@ else
+ fi
+ if test "x$HAVE_NETWORK_MANAGER" = "xyes" ; then
+ AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Defined if NetworkManager support is enabled])
++ AC_SUBST(NETWORK_MANAGER_CFLAGS)
++ AC_SUBST(NETWORK_MANAGER_LIBS)
+ fi
+
+ # Make it possible to compile the applets in-process
+--
+2.4.10
+
diff --git a/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild b/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild
index 6bef4413a702..5acf34de129e 100644
--- a/mate-base/mate-panel/mate-panel-1.8.1-r1.ebuild
+++ b/mate-base/mate-panel/mate-panel-1.8.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$
@@ -60,7 +60,8 @@ src_prepare() {
# Disable python check.
sed -e '/AM_PATH_PYTHON/d' -i configure.ac || die
- epatch "${FILESDIR}/${P}-update_marco_wm_name.patch"
+ epatch "${FILESDIR}/${P}-update_marco_wm_name.patch" \
+ "${FILESDIR}/${P}-fix-networkmanager-flags.patch"
epatch_user
diff --git a/media-gfx/fbida/fbida-2.10-r1.ebuild b/media-gfx/fbida/fbida-2.10-r1.ebuild
new file mode 100644
index 000000000000..f43d6b97f193
--- /dev/null
+++ b/media-gfx/fbida/fbida-2.10-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
+HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/"
+SRC_URI="
+ http://www.kraxel.org/releases/${PN}/${P}.tar.gz
+ mirror://gentoo/ida.png.bz2
+"
+LICENSE="GPL-2 IJG"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp"
+REQUIRED_USE="
+ pdf? ( tiff )
+"
+
+RDEPEND="
+ !media-gfx/fbi
+ >=media-libs/fontconfig-2.2
+ >=media-libs/freetype-2.0
+ media-libs/libexif
+ curl? ( net-misc/curl )
+ gif? ( media-libs/giflib:= )
+ lirc? ( app-misc/lirc )
+ png? ( media-libs/libpng:* )
+ scanner? ( media-gfx/sane-backends )
+ tiff? ( media-libs/tiff:* )
+ virtual/jpeg:*
+ virtual/ttf-fonts
+ webp? ( media-libs/libwebp )
+ X? (
+ >=x11-libs/motif-2.3:0
+ x11-libs/libX11
+ x11-libs/libXpm
+ x11-libs/libXt
+ )
+"
+
+DEPEND="
+ ${RDEPEND}
+ X? ( x11-proto/xextproto x11-proto/xproto )
+ pdf? ( app-text/ghostscript-gpl )
+"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/ida-desktop.patch \
+ "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch \
+ "${FILESDIR}"/${PN}-2.10-fprintf-format.patch
+
+ tc-export CC CPP
+
+ # upstream omission?
+ echo ${PV} > VERSION
+}
+
+src_configure() {
+ # Let autoconf do its job and then fix things to build fbida
+ # according to our specifications
+ emake Make.config
+
+ gentoo_fbida() {
+ local useflag=${1}
+ local config=${2}
+
+ local option="no"
+ use ${useflag} && option="yes"
+
+ sed -i \
+ -e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \
+ "${S}/Make.config" || die
+ }
+
+ gentoo_fbida X MOTIF
+ gentoo_fbida curl LIBCURL
+ gentoo_fbida fbcon LINUX_FB_H
+ gentoo_fbida gif LIBUNGIF
+ gentoo_fbida lirc LIBLIRC
+ gentoo_fbida pdf LIBTIFF
+ gentoo_fbida png LIBPNG
+ gentoo_fbida scanner LIBSANE
+ gentoo_fbida tiff LIBTIFF
+ gentoo_fbida webp LIBWEBP
+}
+
+src_compile() {
+ emake verbose=yes
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ STRIP="" \
+ prefix=/usr \
+ install
+
+ dodoc README
+
+ if use fbcon && ! use pdf; then
+ rm "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 || die
+ fi
+
+ if use X ; then
+ doicon "${WORKDIR}"/ida.png
+ domenu desktop/ida.desktop
+ fi
+}
diff --git a/media-gfx/fbida/fbida-2.10.ebuild b/media-gfx/fbida/fbida-2.10.ebuild
index 9450035d19aa..008e060fbef2 100644
--- a/media-gfx/fbida/fbida-2.10.ebuild
+++ b/media-gfx/fbida/fbida-2.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
"
LICENSE="GPL-2 IJG"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ppc ppc64 ~sh ~sparc ~x86"
IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp"
REQUIRED_USE="
pdf? ( tiff )
diff --git a/media-gfx/fbida/files/fbida-2.10-fprintf-format.patch b/media-gfx/fbida/files/fbida-2.10-fprintf-format.patch
new file mode 100644
index 000000000000..d1c0b36dbfba
--- /dev/null
+++ b/media-gfx/fbida/files/fbida-2.10-fprintf-format.patch
@@ -0,0 +1,11 @@
+--- a/wr/write-ps.c
++++ b/wr/write-ps.c
+@@ -458,7 +458,7 @@
+ fprintf(fp,"\n");
+ }
+ }
+- fprintf(fp,footer);
++ fprintf(fp, "%s", footer);
+ return 0;
+ }
+
diff --git a/media-libs/cogl/cogl-1.22.0-r1.ebuild b/media-libs/cogl/cogl-1.22.0-r1.ebuild
new file mode 100644
index 000000000000..6252c25820ab
--- /dev/null
+++ b/media-libs/cogl/cogl-1.22.0-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2 multilib virtualx
+
+DESCRIPTION="A library for using 3D graphics hardware to draw pretty pictures"
+HOMEPAGE="http://www.cogl3d.org/"
+
+LICENSE="MIT BSD"
+SLOT="1.0/20" # subslot = .so version
+
+# doc and profile disable for now due to bugs #484750 and #483332
+IUSE="examples gles2 gstreamer +introspection +kms +opengl +pango test video_cards_fglrx wayland" # doc profile
+REQUIRED_USE="
+ wayland? ( gles2 )
+ || ( gles2 opengl )
+"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ x11-libs/cairo:=
+ >=x11-libs/gdk-pixbuf-2:2
+ x11-libs/libX11
+ >=x11-libs/libXcomposite-0.4
+ x11-libs/libXdamage
+ x11-libs/libXext
+ >=x11-libs/libXfixes-3
+ >=x11-libs/libXrandr-1.2
+ virtual/opengl
+ gles2? ( media-libs/mesa[gles2] )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0 )
+ introspection? ( >=dev-libs/gobject-introspection-1.34.2:= )
+ kms? (
+ media-libs/mesa[gbm]
+ x11-libs/libdrm:= )
+ pango? ( >=x11-libs/pango-1.20.0[introspection?] )
+ wayland? (
+ >=dev-libs/wayland-1.1.90
+ media-libs/mesa[egl,wayland] )
+"
+# before clutter-1.7, cogl was part of clutter
+RDEPEND="${COMMON_DEPEND}
+ !<media-libs/clutter-1.7
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-doc-am-1.13
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? (
+ app-eselect/eselect-opengl
+ media-libs/mesa[classic] )
+"
+
+# Need classic mesa swrast for tests, llvmpipe causes a test failure
+# For some reason GL3 conformance test all fails again...
+RESTRICT="test"
+
+src_prepare() {
+ # Upstream fixes from 1.22 branch
+ # winsys-egl-kms: bypass initial output setup if kms fd passed in
+ epatch "${FILESDIR}"/${P}-initial-output.patch
+
+ # kms-winsys: don't wait for a flip when page flipping fails
+ epatch "${FILESDIR}"/${P}-wait-flip.patch
+
+ # Let cogl work with fglrx driver, bug #567168
+ # https://bugzilla.gnome.org/show_bug.cgi?id=756306
+ use video_cards_fglrx && epatch "${FILESDIR}"/${PN}-1.22.0-fglrx.patch
+
+ # Do not build examples
+ sed -e "s/^\(SUBDIRS +=.*\)examples\(.*\)$/\1\2/" \
+ -i Makefile.am Makefile.in || die
+
+ if ! use test ; then
+ # For some reason the configure switch will not completely disable
+ # tests being built
+ sed -e "s/^\(SUBDIRS =.*\)test-fixtures\(.*\)$/\1\2/" \
+ -e "s/^\(SUBDIRS +=.*\)tests\(.*\)$/\1\2/" \
+ -e "s/^\(.*am__append.* \)tests\(.*\)$/\1\2/" \
+ -i Makefile.am Makefile.in || die
+ fi
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # TODO: think about quartz, sdl
+ # Prefer gl over gles2 if both are selected
+ # Profiling needs uprof, which is not available in portage yet, bug #484750
+ # FIXME: Doesn't provide prebuilt docs, but they can neither be rebuilt, bug #483332
+ gnome2_src_configure \
+ --disable-examples-install \
+ --disable-maintainer-flags \
+ --enable-cairo \
+ --enable-deprecated \
+ --enable-gdk-pixbuf \
+ --enable-glib \
+ $(use_enable opengl glx) \
+ $(use_enable opengl gl) \
+ $(use_enable gles2) \
+ $(use_enable gles2 cogl-gles2) \
+ $(use_enable gles2 xlib-egl-platform) \
+ $(usex gles2 --with-default-driver=$(usex opengl gl gles2)) \
+ $(use_enable gstreamer cogl-gst) \
+ $(use_enable introspection) \
+ $(use_enable kms kms-egl-platform) \
+ $(use_enable pango cogl-pango) \
+ $(use_enable test unit-tests) \
+ $(use_enable wayland wayland-egl-platform) \
+ $(use_enable wayland wayland-egl-server) \
+ --disable-profile
+# $(use_enable profile)
+}
+
+src_test() {
+ # Use swrast for tests, llvmpipe is incomplete and "test_sub_texture" fails
+ # NOTE: recheck if this is needed after every mesa bump
+ if [[ "$(eselect opengl show)" != "xorg-x11" ]]; then
+ ewarn "Skipping tests because a binary OpenGL library is enabled. To"
+ ewarn "run tests for ${PN}, you need to enable the Mesa library:"
+ ewarn "# eselect opengl set xorg-x11"
+ return
+ fi
+ LIBGL_DRIVERS_PATH="${EROOT}/usr/$(get_libdir)/mesa" Xemake check
+}
+
+src_install() {
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins examples/{*.c,*.jpg}
+ fi
+
+ gnome2_src_install
+
+ # Remove silly examples-data directory
+ rm -rvf "${ED}/usr/share/cogl/examples-data/" || die
+}
diff --git a/media-libs/cogl/files/cogl-1.22.0-fglrx.patch b/media-libs/cogl/files/cogl-1.22.0-fglrx.patch
new file mode 100644
index 000000000000..e213d584d2f6
--- /dev/null
+++ b/media-libs/cogl/files/cogl-1.22.0-fglrx.patch
@@ -0,0 +1,10 @@
+--- 122/cogl/driver/gl/gl/cogl-driver-gl.c 2015-09-02 18:39:02.000000000 +0200
++++ 122b/cogl/driver/gl/gl/cogl-driver-gl.c 2015-10-18 10:37:14.052350142 +0200
+@@ -419,7 +419,7 @@
+ if (COGL_CHECK_GL_VERSION (ctx->glsl_major, ctx->glsl_minor, 1, 2))
+ /* We want to use version 120 if it is available so that the
+ * gl_PointCoord can be used. */
+- ctx->glsl_version_to_use = 120;
++ ctx->glsl_version_to_use = 150;
+ else
+ ctx->glsl_version_to_use = 110;
diff --git a/media-libs/cogl/files/cogl-1.22.0-initial-output.patch b/media-libs/cogl/files/cogl-1.22.0-initial-output.patch
new file mode 100644
index 000000000000..d7f9d0ff99f4
--- /dev/null
+++ b/media-libs/cogl/files/cogl-1.22.0-initial-output.patch
@@ -0,0 +1,46 @@
+From 188752158701e3a406e7fd5850b3eaf9c4798cd7 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Fri, 13 Nov 2015 13:35:05 -0500
+Subject: winsys-egl-kms: bypass initial output setup if kms fd passed in
+
+if mutter is handling the output setup, then we shouldn't do it,
+too.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=758073
+---
+ cogl/winsys/cogl-winsys-egl-kms.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c
+index b460907..6d7049d 100644
+--- a/cogl/winsys/cogl-winsys-egl-kms.c
++++ b/cogl/winsys/cogl-winsys-egl-kms.c
+@@ -663,6 +663,14 @@ _cogl_winsys_egl_display_setup (CoglDisplay *display,
+ return FALSE;
+ }
+
++ /* Force a full modeset / drmModeSetCrtc on
++ * the first swap buffers call.
++ */
++ kms_display->pending_set_crtc = TRUE;
++
++ if (kms_renderer->opened_fd < 0)
++ return TRUE;
++
+ output0 = find_output (0,
+ kms_renderer->fd,
+ resources,
+@@ -736,10 +744,6 @@ _cogl_winsys_egl_display_setup (CoglDisplay *display,
+ kms_display->width = output0->mode.hdisplay;
+ kms_display->height = output0->mode.vdisplay;
+
+- /* We defer setting the crtc modes until the first swap_buffers request of a
+- * CoglOnscreen framebuffer. */
+- kms_display->pending_set_crtc = TRUE;
+-
+ return TRUE;
+ }
+
+--
+cgit v0.11.2
+
diff --git a/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch b/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch
new file mode 100644
index 000000000000..b7c4d99a2812
--- /dev/null
+++ b/media-libs/cogl/files/cogl-1.22.0-wait-flip.patch
@@ -0,0 +1,42 @@
+From a583492ea2aa3ea8e78c269bd5db3f52f82aa79c Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Wed, 21 Oct 2015 15:47:01 -0400
+Subject: kms-winsys: don't wait for a flip when page flipping fails
+
+If we get EACCES from drmPageFlip we're not going to get
+a flip event and shouldn't wait for one.
+
+This commit changes the EACCES path to silently ignore the
+failed flip request and just clean up the fb.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=756926
+---
+ cogl/winsys/cogl-winsys-egl-kms.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c
+index 20c325c..b460907 100644
+--- a/cogl/winsys/cogl-winsys-egl-kms.c
++++ b/cogl/winsys/cogl-winsys-egl-kms.c
+@@ -590,7 +590,7 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip, int fb_id)
+ for (l = kms_display->crtcs; l; l = l->next)
+ {
+ CoglKmsCrtc *crtc = l->data;
+- int ret;
++ int ret = 0;
+
+ if (crtc->count == 0 || crtc->ignore)
+ continue;
+@@ -610,7 +610,8 @@ flip_all_crtcs (CoglDisplay *display, CoglFlipKMS *flip, int fb_id)
+ }
+ }
+
+- flip->pending++;
++ if (ret == 0)
++ flip->pending++;
+ }
+
+ if (kms_renderer->page_flips_not_supported && needs_flip)
+--
+cgit v0.11.2
+
diff --git a/media-libs/iulib/files/iulib-0.4-default-arguments-declaration.patch b/media-libs/iulib/files/iulib-0.4-default-arguments-declaration.patch
new file mode 100644
index 000000000000..cbffdee0d547
--- /dev/null
+++ b/media-libs/iulib/files/iulib-0.4-default-arguments-declaration.patch
@@ -0,0 +1,25 @@
+Default arguments need to be specified in the class declaration and cannot be redeclared.
+https://bugs.gentoo.org/show_bug.cgi?id=570102
+
+--- iulib-0.4/imglib/imgops.cc
++++ iulib-0.4/imglib/imgops.cc
+@@ -133,7 +133,7 @@
+
+ template<class T,class V>
+ void addscaled(narray<T> &dest,narray<T> &src,
+- V scale=1,int dx=0,int dy=0) {
++ V scale,int dx,int dy) {
+ for (int i=0; i<dest.dim(0); i++)
+ for (int j=0; j<dest.dim(1); j++)
+ dest.unsafe_at(i,j) += (T)(scale*xref(src,i+dx,j+dy));
+--- iulib-0.4/imglib/imgops.h
++++ iulib-0.4/imglib/imgops.h
+@@ -67,7 +67,7 @@
+ }
+
+ template<class T, class V>
+- void addscaled(colib::narray<T> &, colib::narray<T> &, V, int, int);
++ void addscaled(colib::narray<T> &dest, colib::narray<T> &src, V scale=1, int dx=0, int dy=0);
+ template<class T>
+ void tighten(colib::narray<T> &image);
+ template<class T>
diff --git a/media-libs/iulib/files/iulib-0.4-scons-build-env.patch b/media-libs/iulib/files/iulib-0.4-scons-build-env.patch
index 3983d9c820b4..766795c8c15d 100644
--- a/media-libs/iulib/files/iulib-0.4-scons-build-env.patch
+++ b/media-libs/iulib/files/iulib-0.4-scons-build-env.patch
@@ -1,5 +1,5 @@
---- SConstruct
-+++ SConstruct
+--- iulib-0.4/SConstruct
++++ iulib-0.4/SConstruct
@@ -36,12 +36,25 @@
### Options exposed via SCons
diff --git a/media-libs/iulib/iulib-0.4-r1.ebuild b/media-libs/iulib/iulib-0.4-r1.ebuild
new file mode 100644
index 000000000000..2d57f637a09d
--- /dev/null
+++ b/media-libs/iulib/iulib-0.4-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit scons-utils toolchain-funcs
+
+DESCRIPTION="easy-to-use image and video I/O functions"
+HOMEPAGE="https://github.com/tmbdev/iulib"
+SRC_URI="https://iulib.googlecode.com/files/${P}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sdl"
+
+RDEPEND="sys-libs/zlib
+ media-libs/libpng:0=
+ virtual/jpeg:0
+ media-libs/tiff:0
+ sdl? (
+ media-libs/libsdl
+ media-libs/sdl-gfx
+ )"
+DEPEND="${RDEPEND}
+ dev-util/scons"
+
+PATCHES=(
+ "${FILESDIR}/${P}-scons-build-env.patch"
+ "${FILESDIR}/${P}-default-arguments-declaration.patch"
+)
+
+src_prepare() {
+ default
+ sed -i \
+ -e "/^have_sdl = 1/s:1:$(usex sdl 1 0):" \
+ -e '/tiff/s:inflate:TIFFOpen:' \
+ -e '/progs.Append(LIBS=libiulib)/s:Append:Prepend:' \
+ -e "/^libdir/s:/lib:/$(get_libdir):" \
+ SConstruct || die #297326 #308955 #310439
+ sed -i '/SDL.SDL_image.h/d' utils/dgraphics.cc || die #310443
+ tc-export AR CC CXX RANLIB
+}
+
+src_configure() {
+ # Avoid configure as we build/install with scons
+ :
+}
+
+src_compile() {
+ escons prefix=/usr
+}
+
+src_install() {
+ escons prefix="${D}"/usr install
+ dodoc CHANGES README TODO
+}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 57bffd8f3faa..86ee2a599465 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -2,4 +2,5 @@ DIST opencv-2.4.10.zip 91692581 SHA256 1bf4cb87283797fd91669d4f90b622a677a903c20
DIST opencv-2.4.11.zip 91671436 SHA256 af1952fd40fb0dc5e369725e073ac4650847e956fbf77c5f206b6da8ce2b1fea SHA512 748f6b939200a7ad2c2ae2531bf9bf38b82a576530f10691c13a0ad52568a7eb8b9d312e946ba8e78f592ef05ae389ecb982544f0c00cb83a2d87ae4b4da61b0 WHIRLPOOL 1c621b835fb144997ecbabddaa1b9a0cd0653e27c5a4f2abc43f3c6152a0b98eb0941d59263be33f69a6f3bccdffa484455c2ddaa747ed4a2bd2cd3192956d29
DIST opencv-2.4.9.zip 91684751 SHA256 803010848154988e9cbda8b3fa857fcbb27382c2946ed729e1a7e40600bb4c71 SHA512 8eb6ee11d8260428ae461e06348ce037979efc29b7e33d59c3d348a6b4bae95b7004df4527aba7c634e7356f7b5635c98493dc15a0b43479e8f10f7258540c62 WHIRLPOOL 5bb5e39678b3072b2e8b923216529c84982559dd69d5ec51b8703e65af3401f3a8ff31e4e3bfc076480d0605e333df0b03a61713a927ec058bfaf25b4fa8fd5e
DIST opencv-3.0.0.zip 100980799 SHA256 07094ea2f996f2622d572f0f3a162d698c8a547520341ca9109fbaf9363fb001 SHA512 108d0fdcc60b5688ebf61c930fb965ec81f0d3c36bb1797f6cc571fac35331f540773207fd1cb81b12c05c8f4d1af20c4a2452d9f75cd0cae4acd8131be92375 WHIRLPOOL 61cbbf5201b1dea75ffa998d1f55ee35f098bb8f76591cc9705de13b9f05eaefd19dcc74e93d2643d9b721e62483a36547617ec2e3d14fa6a2522e18ccf06747
+DIST opencv-3.1.0.zip 79186131 SHA256 1f6990249fdb82804fff40e96fa6d99949023ab0e3277eae4bd459b374e622a4 SHA512 b4915e8838fce8ba9e1af8b11e46678624435e9a41592e645413dfdc830993eaa017d337fe4c212a49f096421a6317a1892546087fbc3cfdab554522336c0f1a WHIRLPOOL 3c38715e2abc431781b724199c2cf06f844c7a889c51a06ecb64889a8ca36d9fd370a0738deec2995e24e453cb64f5db228238681714f62daf6eac50d95a4914
DIST opencv_contrib.zip 76144299 SHA256 ba780e61e9659aac299055d68c9fe40258e3fab7cb167892163eb5732387c4bb SHA512 9253a9d209368da5bea5f0138c55379132467b840d25fc5eaa1bc0103e6da61d6facf206456ff3f4bb68482d9c6381e23a566cb4dd155ac9ff9a259e54f7ffbf WHIRLPOOL 411febd3d5912ea28b570b217e3af41bee2d48daf5f47b0de6125b40cfbf435216c668545b3e0dfa48e4eef8d4a86135058ee72dc7b5a4244b661130a6916843
diff --git a/media-libs/opencv/files/opencv-3.1.0-cmake-no-opengl.patch b/media-libs/opencv/files/opencv-3.1.0-cmake-no-opengl.patch
new file mode 100644
index 000000000000..d6d70d717d3b
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.1.0-cmake-no-opengl.patch
@@ -0,0 +1,22 @@
+From cdb9c60dcb65e04e7c0bd6bef9b86841191c785a Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin <alexander.alekhin@itseez.com>
+Date: Thu, 31 Dec 2015 02:24:54 +0300
+Subject: [PATCH] gpu samples: fix REMOVE_ITEM error
+
+---
+ samples/gpu/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt
+index 6085cac..852a8c2 100644
+--- a/samples/gpu/CMakeLists.txt
++++ b/samples/gpu/CMakeLists.txt
+@@ -97,7 +97,7 @@ endif()
+ if(INSTALL_C_EXAMPLES AND NOT WIN32)
+ file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+ if(NOT WITH_OPENGL)
+- list(REMOVE_ITEM all_samples "opengl.cpp")
++ list(REMOVE_ITEM install_list "opengl.cpp")
+ endif(NOT WITH_OPENGL)
+ install(FILES ${install_list}
+ DESTINATION ${OPENCV_SAMPLES_SRC_INSTALL_PATH}/gpu
diff --git a/media-libs/opencv/files/opencv-3.1.0-fix-hal-headers.patch b/media-libs/opencv/files/opencv-3.1.0-fix-hal-headers.patch
new file mode 100644
index 000000000000..dd77571a60cf
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.1.0-fix-hal-headers.patch
@@ -0,0 +1,91 @@
+From f529a1df2b17bcada1179ddcaf1352e3a5ba97b8 Mon Sep 17 00:00:00 2001
+From: Maksim Shabunin <maksim.shabunin@itseez.com>
+Date: Tue, 15 Dec 2015 17:51:08 +0300
+Subject: [PATCH] Fixed HAL headers location
+
+diff --git opencv_contrib-master/modules/xfeatures2d/src/sift.cpp opencv_contrib-master/modules/xfeatures2d/src/sift.cpp
+index fc67c4d..9634fbb 100644
+--- opencv_contrib-master/modules/xfeatures2d/src/sift.cpp
++++ opencv_contrib-master/modules/xfeatures2d/src/sift.cpp
+@@ -105,6 +105,7 @@
+ #include "precomp.hpp"
+ #include <iostream>
+ #include <stdarg.h>
++#include <opencv2/core/hal/hal.hpp>
+
+ namespace cv
+ {
+@@ -337,9 +338,9 @@ static float calcOrientationHist( const Mat& img, Point pt, int radius,
+ len = k;
+
+ // compute gradient values, orientations and the weights over the pixel neighborhood
+- hal::exp(W, W, len);
+- hal::fastAtan2(Y, X, Ori, len, true);
+- hal::magnitude(X, Y, Mag, len);
++ cv::hal::exp32f(W, W, len);
++ cv::hal::fastAtan2(Y, X, Ori, len, true);
++ cv::hal::magnitude32f(X, Y, Mag, len);
+
+ for( k = 0; k < len; k++ )
+ {
+@@ -620,9 +621,9 @@ static void calcSIFTDescriptor( const Mat& img, Point2f ptf, float ori, float sc
+ }
+
+ len = k;
+- hal::fastAtan2(Y, X, Ori, len, true);
+- hal::magnitude(X, Y, Mag, len);
+- hal::exp(W, W, len);
++ cv::hal::fastAtan2(Y, X, Ori, len, true);
++ cv::hal::magnitude32f(X, Y, Mag, len);
++ cv::hal::exp32f(W, W, len);
+
+ for( k = 0; k < len; k++ )
+ {
+
+diff --git opencv_contrib-master/modules/optflow/src/motempl.cpp opencv_contrib-master/modules/optflow/src/motempl.cpp
+index ec18013..452ad63 100644
+--- opencv_contrib-master/modules/optflow/src/motempl.cpp
++++ opencv_contrib-master/modules/optflow/src/motempl.cpp
+@@ -41,6 +41,7 @@
+
+ #include "precomp.hpp"
+ #include "opencv2/core/utility.hpp"
++#include "opencv2/core/hal/hal.hpp"
+ #include "opencl_kernels_optflow.hpp"
+
+ namespace cv {
+@@ -212,7 +213,7 @@ void calcMotionGradient( InputArray _mhi, OutputArray _mask,
+ float* orient_row = orient.ptr<float>(y);
+ uchar* mask_row = mask.ptr<uchar>(y);
+
+- hal::fastAtan2(dY_max_row, dX_min_row, orient_row, size.width, true);
++ cv::hal::fastAtan2(dY_max_row, dX_min_row, orient_row, size.width, true);
+
+ // make orientation zero where the gradient is very small
+ for( x = 0; x < size.width; x++ )
+diff --git opencv_contrib-master/modules/ximgproc/src/fgs_filter.cpp opencv_contrib-master/modules/ximgproc/src/fgs_filter.cpp
+index e89eb8f..39307e5 100644
+--- opencv_contrib-master/modules/ximgproc/src/fgs_filter.cpp
++++ opencv_contrib-master/modules/ximgproc/src/fgs_filter.cpp
+@@ -35,7 +35,7 @@
+ */
+
+ #include "precomp.hpp"
+-#include "opencv2/hal/intrin.hpp"
++#include "opencv2/core/hal/intrin.hpp"
+ #include <vector>
+
+ namespace cv {
+diff --git opencv_contrib-master/modules/xphoto/src/grayworld_white_balance.cpp opencv_contrib-master/modules/xphoto/src/grayworld_white_balance.cpp
+index 4780497..15530d3 100644
+--- opencv_contrib-master/modules/xphoto/src/grayworld_white_balance.cpp
++++ opencv_contrib-master/modules/xphoto/src/grayworld_white_balance.cpp
+@@ -40,7 +40,7 @@
+ #include "opencv2/xphoto.hpp"
+
+ #include "opencv2/core.hpp"
+-#include "opencv2/hal/intrin.hpp"
++#include "opencv2/core/hal/intrin.hpp"
+
+ namespace cv { namespace xphoto {
+
diff --git a/media-libs/opencv/files/opencv-3.1.0-fix-ocl-declaration.patch b/media-libs/opencv/files/opencv-3.1.0-fix-ocl-declaration.patch
new file mode 100644
index 000000000000..e9a190c66324
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.1.0-fix-ocl-declaration.patch
@@ -0,0 +1,214 @@
+From ac8dd366e4a1877e0af16961a4094496bed955f7 Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin <alexander.alekhin@itseez.com>
+Date: Sun, 13 Sep 2015 21:18:47 +0300
+Subject: [PATCH] ocl: fix "off" mode
+
+diff --git opencv_contrib-master/modules/tracking/src/tldDetector.cpp opencv_contrib-master/modules/tracking/src/tldDetector.cpp
+index cbb783e..d61444b 100644
+--- opencv_contrib-master/modules/tracking/src/tldDetector.cpp
++++ opencv_contrib-master/modules/tracking/src/tldDetector.cpp
+@@ -104,6 +104,7 @@ namespace cv
+ return splus / (sminus + splus);
+ }
+
++#ifdef HAVE_OPENCL
+ double TLDDetector::ocl_Sr(const Mat_<uchar>& patch)
+ {
+ //int64 e1, e2, e3, e4;
+@@ -283,6 +284,7 @@ namespace cv
+ //t = (e2 - e1) / getTickFrequency()*1000.0;
+ //printf("Sr GPU: %f\n\n", t);
+ }
++#endif
+
+ // Calculate Conservative similarity of the patch (NN-Model)
+ double TLDDetector::Sc(const Mat_<uchar>& patch)
+@@ -337,6 +339,7 @@ namespace cv
+ return splus / (sminus + splus);
+ }
+
++#ifdef HAVE_OPENCL
+ double TLDDetector::ocl_Sc(const Mat_<uchar>& patch)
+ {
+ //int64 e1, e2, e3, e4;
+@@ -415,6 +418,7 @@ namespace cv
+ return 0.0;
+ return splus / (sminus + splus);
+ }
++#endif // HAVE_OPENCL
+
+ // Generate Search Windows for detector from aspect ratio of initial BBs
+ void TLDDetector::generateScanGrid(int rows, int cols, Size initBox, std::vector<Rect2d>& res, bool withScaling)
+@@ -565,6 +569,7 @@ namespace cv
+ return true;
+ }
+
++#ifdef HAVE_OPENCL
+ bool TLDDetector::ocl_detect(const Mat& img, const Mat& imgBlurred, Rect2d& res, std::vector<LabeledPatch>& patches, Size initSize)
+ {
+ patches.clear();
+@@ -696,6 +701,7 @@ namespace cv
+ res = maxScRect;
+ return true;
+ }
++#endif // HAVE_OPENCL
+
+ // Computes the variance of subimage given by box, with the help of two integral
+ // images intImgP and intImgP2 (sum of squares), which should be also provided.
+diff --git opencv_contrib-master/modules/tracking/src/tldDetector.hpp opencv_contrib-master/modules/tracking/src/tldDetector.hpp
+index 3e11895..1caff57 100644
+--- opencv_contrib-master/modules/tracking/src/tldDetector.hpp
++++ opencv_contrib-master/modules/tracking/src/tldDetector.hpp
+@@ -74,10 +74,12 @@ namespace cv
+ inline double ensembleClassifierNum(const uchar* data);
+ inline void prepareClassifiers(int rowstep);
+ double Sr(const Mat_<uchar>& patch);
+- double ocl_Sr(const Mat_<uchar>& patch);
+ double Sc(const Mat_<uchar>& patch);
++#ifdef HAVE_OPENCL
++ double ocl_Sr(const Mat_<uchar>& patch);
+ double ocl_Sc(const Mat_<uchar>& patch);
+ void ocl_batchSrSc(const Mat_<uchar>& patches, double *resultSr, double *resultSc, int numOfPatches);
++#endif
+
+ std::vector<TLDEnsembleClassifier> classifiers;
+ Mat *posExp, *negExp;
+diff --git opencv_contrib-master/modules/tracking/src/tldModel.cpp opencv_contrib-master/modules/tracking/src/tldModel.cpp
+index 0854022..47fc32a 100644
+--- opencv_contrib-master/modules/tracking/src/tldModel.cpp
++++ opencv_contrib-master/modules/tracking/src/tldModel.cpp
+@@ -246,6 +246,7 @@ namespace cv
+ dfprintf((stdout, "\n"));*/
+ }
+
++#ifdef HAVE_OPENCL
+ void TrackerTLDModel::ocl_integrateAdditional(const std::vector<Mat_<uchar> >& eForModel, const std::vector<Mat_<uchar> >& eForEnsemble, bool isPositive)
+ {
+ int positiveIntoModel = 0, negativeIntoModel = 0, positiveIntoEnsemble = 0, negativeIntoEnsemble = 0;
+@@ -315,6 +316,7 @@ namespace cv
+ dfprintf((stdout, "positiveIntoEnsemble = %d ", positiveIntoEnsemble));
+ dfprintf((stdout, "\n"));*/
+ }
++#endif // HAVE_OPENCL
+
+ //Push the patch to the model
+ void TrackerTLDModel::pushIntoModel(const Mat_<uchar>& example, bool positive)
+diff --git opencv_contrib-master/modules/tracking/src/tldModel.hpp opencv_contrib-master/modules/tracking/src/tldModel.hpp
+index be9141a..ba7c926 100644
+--- opencv_contrib-master/modules/tracking/src/tldModel.hpp
++++ opencv_contrib-master/modules/tracking/src/tldModel.hpp
+@@ -58,7 +58,9 @@ namespace cv
+ void setBoudingBox(Rect2d boundingBox){ boundingBox_ = boundingBox; }
+ void integrateRelabeled(Mat& img, Mat& imgBlurred, const std::vector<TLDDetector::LabeledPatch>& patches);
+ void integrateAdditional(const std::vector<Mat_<uchar> >& eForModel, const std::vector<Mat_<uchar> >& eForEnsemble, bool isPositive);
++#ifdef HAVE_OPENCL
+ void ocl_integrateAdditional(const std::vector<Mat_<uchar> >& eForModel, const std::vector<Mat_<uchar> >& eForEnsemble, bool isPositive);
++#endif
+ Size getMinSize(){ return minSize_; }
+ void printme(FILE* port = stdout);
+ Ptr<TLDDetector> detector;
+diff --git opencv_contrib-master/modules/tracking/src/tldTracker.cpp opencv_contrib-master/modules/tracking/src/tldTracker.cpp
+index 0f1e2f7..a5190f5 100644
+--- opencv_contrib-master/modules/tracking/src/tldTracker.cpp
++++ opencv_contrib-master/modules/tracking/src/tldTracker.cpp
+@@ -123,9 +123,11 @@ bool TrackerTLDImpl::updateImpl(const Mat& image, Rect2d& boundingBox)
+
+ if (i == 1)
+ {
++#ifdef HAVE_OPENCL
+ if (ocl::haveOpenCL())
+ DETECT_FLG = tldModel->detector->ocl_detect(imageForDetector, image_blurred, tmpCandid, detectorResults, tldModel->getMinSize());
+ else
++#endif
+ DETECT_FLG = tldModel->detector->detect(imageForDetector, image_blurred, tmpCandid, detectorResults, tldModel->getMinSize());
+ }
+
+@@ -211,17 +213,21 @@ bool TrackerTLDImpl::updateImpl(const Mat& image, Rect2d& boundingBox)
+ tldModel->integrateRelabeled(imageForDetector, image_blurred, detectorResults);
+ //dprintf(("%d relabeled by nExpert\n", negRelabeled));
+ pExpert.additionalExamples(examplesForModel, examplesForEnsemble);
+- if (ocl::haveOpenCL())
+- tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, true);
+- else
+- tldModel->integrateAdditional(examplesForModel, examplesForEnsemble, true);
++#ifdef HAVE_OPENCL
++ if (ocl::haveOpenCL())
++ tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, true);
++ else
++#endif
++ tldModel->integrateAdditional(examplesForModel, examplesForEnsemble, true);
+ examplesForModel.clear(); examplesForEnsemble.clear();
+ nExpert.additionalExamples(examplesForModel, examplesForEnsemble);
+
+- if (ocl::haveOpenCL())
+- tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, false);
+- else
+- tldModel->integrateAdditional(examplesForModel, examplesForEnsemble, false);
++#ifdef HAVE_OPENCL
++ if (ocl::haveOpenCL())
++ tldModel->ocl_integrateAdditional(examplesForModel, examplesForEnsemble, false);
++ else
++#endif
++ tldModel->integrateAdditional(examplesForModel, examplesForEnsemble, false);
+ }
+ else
+ {
+diff --git opencv_contrib-master/modules/xfeatures2d/src/surf.cpp opencv_contrib-master/modules/xfeatures2d/src/surf.cpp
+index 673817e..af5ceaf6 100644
+--- opencv_contrib-master/modules/xfeatures2d/src/surf.cpp
++++ opencv_contrib-master/modules/xfeatures2d/src/surf.cpp
+@@ -892,6 +892,7 @@ void SURF_Impl::detectAndCompute(InputArray _img, InputArray _mask,
+ CV_Assert(!_img.empty() && CV_MAT_DEPTH(imgtype) == CV_8U && (imgcn == 1 || imgcn == 3 || imgcn == 4));
+ CV_Assert(_descriptors.needed() || !useProvidedKeypoints);
+
++#ifdef HAVE_OPENCL
+ if( ocl::useOpenCL() )
+ {
+ SURF_OCL ocl_surf;
+@@ -918,6 +919,7 @@ void SURF_Impl::detectAndCompute(InputArray _img, InputArray _mask,
+ return;
+ }
+ }
++#endif // HAVE_OPENCL
+
+ Mat img = _img.getMat(), mask = _mask.getMat(), mask1, sum, msum;
+
+diff --git opencv_contrib-master/modules/xfeatures2d/src/surf.hpp opencv_contrib-master/modules/xfeatures2d/src/surf.hpp
+index 2c4e271..cf3fda1 100644
+--- opencv_contrib-master/modules/xfeatures2d/src/surf.hpp
++++ opencv_contrib-master/modules/xfeatures2d/src/surf.hpp
+@@ -64,6 +64,7 @@ class SURF_Impl : public SURF
+ bool upright;
+ };
+
++#ifdef HAVE_OPENCL
+ class SURF_OCL
+ {
+ public:
+@@ -145,6 +146,7 @@ class SURF_OCL
+
+ int status;
+ };
++#endif // HAVE_OPENCL
+
+ /*
+ template<typename _Tp> void copyVectorToUMat(const std::vector<_Tp>& v, UMat& um)
+diff --git opencv_contrib-master/modules/xfeatures2d/src/surf.ocl.cpp opencv_contrib-master/modules/xfeatures2d/src/surf.ocl.cpp
+index b12ebd3..3d9845d 100644
+--- opencv_contrib-master/modules/xfeatures2d/src/surf.ocl.cpp
++++ opencv_contrib-master/modules/xfeatures2d/src/surf.ocl.cpp
+@@ -43,6 +43,9 @@
+ //
+ //M*/
+ #include "precomp.hpp"
++
++#ifdef HAVE_OPENCL
++
+ #include "surf.hpp"
+
+ #include <cstdio>
+@@ -461,3 +464,4 @@ bool SURF_OCL::calcOrientation(UMat &keypoints)
+ }
+ }
+
++#endif // HAVE_OPENCL
diff --git a/media-libs/opencv/files/opencv-3.1.0-invalid-string-usage.patch b/media-libs/opencv/files/opencv-3.1.0-invalid-string-usage.patch
new file mode 100644
index 000000000000..c9f85a758583
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.1.0-invalid-string-usage.patch
@@ -0,0 +1,75 @@
+From 9862a8bac536981c1c1a74710741fb40db4beac7 Mon Sep 17 00:00:00 2001
+From: Alexander Alekhin <alexander.alekhin@itseez.com>
+Date: Wed, 23 Sep 2015 12:44:26 +0300
+Subject: [PATCH] fix invalid String usage
+
+---
+ modules/tracking/src/tldDetector.cpp | 6 +++---
+ modules/ximgproc/samples/live_demo.cpp | 12 ++++++------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git opencv_contrib-master/modules/tracking/src/tldDetector.cpp opencv_contrib-master/modules/tracking/src/tldDetector.cpp
+index cbb783e..0916092 100644
+--- opencv_contrib-master/modules/tracking/src/tldDetector.cpp
++++ opencv_contrib-master/modules/tracking/src/tldDetector.cpp
+@@ -122,7 +122,7 @@ namespace cv
+ ocl::Kernel k;
+ ocl::ProgramSource src = ocl::tracking::tldDetector_oclsrc;
+ String error;
+- ocl::Program prog(src, NULL, error);
++ ocl::Program prog(src, String(), error);
+ k.create("NCC", prog);
+ if (k.empty())
+ printf("Kernel create failed!!!\n");
+@@ -198,7 +198,7 @@ namespace cv
+ ocl::Kernel k;
+ ocl::ProgramSource src = ocl::tracking::tldDetector_oclsrc;
+ String error;
+- ocl::Program prog(src, NULL, error);
++ ocl::Program prog(src, String(), error);
+ k.create("batchNCC", prog);
+ if (k.empty())
+ printf("Kernel create failed!!!\n");
+@@ -355,7 +355,7 @@ namespace cv
+ ocl::Kernel k;
+ ocl::ProgramSource src = ocl::tracking::tldDetector_oclsrc;
+ String error;
+- ocl::Program prog(src, NULL, error);
++ ocl::Program prog(src, String(), error);
+ k.create("NCC", prog);
+ if (k.empty())
+ printf("Kernel create failed!!!\n");
+diff --git opencv_contrib-master/modules/ximgproc/samples/live_demo.cpp opencv_contrib-master/modules/ximgproc/samples/live_demo.cpp
+index dd5dc1b..8e16de3 100644
+--- opencv_contrib-master/modules/ximgproc/samples/live_demo.cpp
++++ opencv_contrib-master/modules/ximgproc/samples/live_demo.cpp
+@@ -189,7 +189,7 @@ int main()
+
+ //Thread trackbar
+ cv::setNumThreads(g_numberOfCPUs); //speedup filtering
+- createTrackbar("Threads", NULL, &g_numberOfCPUs, cv::getNumberOfCPUs(), changeNumberOfCpuCallback);
++ createTrackbar("Threads", String(), &g_numberOfCPUs, cv::getNumberOfCPUs(), changeNumberOfCpuCallback);
+
+ //Buttons to choose different modes
+ createButton("Mode Details Enhancement", changeModeCallback, (void*)filterDetailEnhancement, QT_RADIOBOX, true);
+@@ -199,15 +199,15 @@ int main()
+
+ //sliders for Details Enhancement mode
+ g_filterOp = filterDetailEnhancement; //set Details Enhancement as default filter
+- createTrackbar("Detail contrast", NULL, &g_contrastBase, 200);
+- createTrackbar("Detail level" , NULL, &g_detailsLevel, 200);
++ createTrackbar("Detail contrast", String(), &g_contrastBase, 200);
++ createTrackbar("Detail level" , String(), &g_detailsLevel, 200);
+
+ //sliders for Stylizing mode
+- createTrackbar("Style gamma", NULL, &g_edgesGamma, 300);
++ createTrackbar("Style gamma", String(), &g_edgesGamma, 300);
+
+ //sliders for every mode
+- createTrackbar("Sigma Spatial", NULL, &g_sigmaSpatial, 200);
+- createTrackbar("Sigma Color" , NULL, &g_sigmaColor, 200);
++ createTrackbar("Sigma Spatial", String(), &g_sigmaSpatial, 200);
++ createTrackbar("Sigma Color" , String(), &g_sigmaColor, 200);
+
+ Mat rawFrame, outputFrame;
+ Mat srcFrame, processedFrame;
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index 12a445a13b4a..eb2d81e28e2d 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/metadata.xml
@@ -20,10 +20,12 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under
<flag name="contrib">Install user contributed scripts from opencv_contrib</flag>
<flag name="cuda">Enable NVIDIA Cuda computations support</flag>
<flag name="eigen">Enable usage of <pkg>dev-cpp/eigen</pkg> for computations</flag>
+ <flag name="gdal">Enable support for sci-libs/gdal library</flag>
<flag name="ipp">Enable Intel Integrated Primitive support</flag>
<flag name="opencl">Add support for OpenCL</flag>
<flag name="testprograms">Build and install programs for testing OpenCV (performance)</flag>
<flag name="vtk">Build new 3D visualization module viz based on sci-libs/vtk</flag>
+ <flag name="webp">Enable support for webp image format</flag>
</use>
<upstream>
<remote-id type="sourceforge">opencvlibrary</remote-id>
diff --git a/media-libs/opencv/opencv-3.1.0.ebuild b/media-libs/opencv/opencv-3.1.0.ebuild
new file mode 100644
index 000000000000..1477ef37d039
--- /dev/null
+++ b/media-libs/opencv/opencv-3.1.0.ebuild
@@ -0,0 +1,252 @@
+# 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_2,3_3,3_4} )
+
+inherit toolchain-funcs cmake-utils python-single-r1 java-pkg-opt-2 java-ant-2
+
+DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
+HOMEPAGE="http://opencv.org"
+
+SRC_URI="
+ mirror://sourceforge/opencvlibrary/opencv-unix/${PV}/${P}.zip
+ https://github.com/Itseez/${PN}/archive/${PV}.zip -> ${P}.zip
+ contrib? ( https://github.com/Itseez/${PN}_contrib/archive/${PV}.zip -> ${PN}_contrib.zip )"
+
+LICENSE="BSD"
+SLOT="0/3.0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="contrib cuda doc +eigen examples ffmpeg gdal gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff vaapi v4l vtk webp xine"
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ ?? ( qt4 qt5 )
+"
+
+# The following logic is intrinsic in the build system, but we do not enforce
+# it on the useflags since this just blocks emerging pointlessly:
+# gtk? ( !qt4 )
+# opengl? ( || ( gtk qt4 ) )
+# openmp? ( !threads )
+
+RDEPEND="
+ app-arch/bzip2
+ sys-libs/zlib
+ cuda? ( >=dev-util/nvidia-cuda-toolkit-5.5 )
+ ffmpeg? (
+ libav? ( media-video/libav:0= )
+ !libav? ( media-video/ffmpeg:0= )
+ )
+ gdal? ( sci-libs/gdal )
+ gphoto2? ( media-libs/libgphoto2 )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? (
+ dev-libs/glib:2
+ x11-libs/gtk+:2
+ opengl? ( x11-libs/gtkglext )
+ )
+ java? ( >=virtual/jre-1.6:* )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/jasper )
+ ieee1394? (
+ media-libs/libdc1394
+ sys-libs/libraw1394
+ )
+ ipp? ( sci-libs/ipp )
+ opencl? ( virtual/opencl )
+ openexr? ( media-libs/openexr )
+ opengl? ( virtual/opengl virtual/glu )
+ png? ( media-libs/libpng:0= )
+ python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
+ qt4? (
+ dev-qt/qtgui:4
+ dev-qt/qttest:4
+ opengl? ( dev-qt/qtopengl:4 )
+ )
+ qt5? (
+ dev-qt/qtgui:5
+ dev-qt/qttest:5
+ dev-qt/qtconcurrent:5
+ opengl? ( dev-qt/qtopengl:5 )
+ )
+ threads? ( dev-cpp/tbb )
+ tiff? ( media-libs/tiff:0 )
+ v4l? ( >=media-libs/libv4l-0.8.3 )
+ vtk? ( sci-libs/vtk[rendering] )
+ webp? ( media-libs/libwebp )
+ xine? ( media-libs/xine-lib )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ eigen? ( dev-cpp/eigen:3 )
+ java? ( >=virtual/jdk-1.6 )
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+
+ epatch "${FILESDIR}/${PN}-3.0.0-gles.patch" \
+ "${FILESDIR}/${PN}-3.1.0-cmake-no-opengl.patch"
+
+ # remove bundled stuff
+ rm -rf 3rdparty
+ sed -i \
+ -e '/add_subdirectory(.*3rdparty.*)/ d' \
+ CMakeLists.txt cmake/*cmake || die
+
+ if use contrib; then
+
+ cd "${WORKDIR}"
+ epatch "${FILESDIR}/${PN}-3.1.0-fix-hal-headers.patch" \
+ "${FILESDIR}/${PN}-3.1.0-fix-ocl-declaration.patch" \
+ "${FILESDIR}/${PN}-3.1.0-invalid-string-usage.patch"
+ fi
+
+ java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+ if use openmp; then
+ tc-has-openmp || die "Please switch to an openmp compatible compiler"
+ fi
+
+ JAVA_ANT_ENCODING="iso-8859-1"
+ # set encoding so even this cmake build will pick it up.
+ export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
+ java-ant-2_src_configure
+
+ # please dont sort here, order is the same as in CMakeLists.txt
+ local mycmakeargs=(
+ # the optinal dependency libraries
+ $(cmake-utils_use_with ieee1394 1394)
+ -DWITH_AVFOUNDATION=OFF # IOS
+ -DWITH_CARBON=OFF # APPLE
+ $(cmake-utils_use_with eigen)
+ $(cmake-utils_use_with ffmpeg)
+ -DWITH_VFW=OFF # video windows support
+ $(cmake-utils_use_with gstreamer)
+ -DWITH_GSTREAMER_0_10=OFF
+ $(cmake-utils_use_with gtk)
+ -DWITH_GTK_2_X=OFF
+ $(cmake-utils_use_with ipp)
+ $(cmake-utils_use_with java)
+ $(cmake-utils_use_with jpeg2k JASPER)
+ $(cmake-utils_use_with jpeg)
+ $(cmake-utils_use_with webp)
+ $(cmake-utils_use_with opencl)
+ $(cmake-utils_use_with gphoto2)
+ $(cmake-utils_use_with openexr)
+ $(cmake-utils_use_with opengl)
+ $(cmake-utils_use_with openmp)
+ -DWITH_OPENNI=OFF #not packaged
+ -DWITH_OPENNI2=OFF #not packaged
+ $(cmake-utils_use_with png)
+ $(cmake-utils_use_build python opencv_python)
+ -DWITH_PVAPI=OFF # not packaged
+ -DWITH_GIGEAPI=OFF
+ -DWITH_QUICKTIME=OFF
+ -DWITH_WIN32UI=OFF
+ $(cmake-utils_use_with threads TBB)
+ -DWITH_CSTRIPES=OFF
+ -DWITH_PTHREADS_PF=ON
+ $(cmake-utils_use_with tiff)
+ -DWITH_UNICAP=OFF # not packaged
+ $(cmake-utils_use_with v4l V4L)
+ $(cmake-utils_use_with vtk VTK)
+ -DWITH_LIBV4L=ON
+ -DWITH_DSHOW=ON # direct show supp
+ -DWITH_MSMF=OFF
+ -DWITH_VIDEOINPUT=OFF # windows only
+ -DWITH_XIMEA=OFF # windows only
+ $(cmake-utils_use_with xine)
+ -DWITH_CLP=OFF
+ $(cmake-utils_use_with opencl)
+ -DWITH_OPENCL_SVM=OFF
+ $(cmake-utils_use_with opencl OPENCLAMDFFT)
+ $(cmake-utils_use_with opencl OPENCLAMDBLAS)
+ -DWITH_DIRECTX=OFF
+ -DWITH_INTELPERC=OFF
+ -DWITH_IPP_A=OFF
+ -DWITH_MATLAB=ON #default
+ $(cmake-utils_use_with vaapi VA)
+ $(cmake-utils_use_with vaapi VA_INTEL)
+ $(cmake-utils_use_with gdal gdal)
+ #
+ # OpenCV build components
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_ANDROID_EXAMPLES=OFF
+ $(cmake-utils_use_build doc DOCS)
+ $(cmake-utils_use_build examples)
+ $(cmake-utils_use_build java opencv_java) #for -java bug #555650
+ -DBUILD_PERF_TESTS=OFF
+ $(cmake-utils_use_build testprograms TESTS)
+ # install examples, tests etc
+ $(cmake-utils_use examples INSTALL_C_EXAMPLES)
+ $(cmake-utils_use testprograms INSTALL_TESTS)
+ # build options
+ $(cmake-utils_use_enable pch PRECOMPILED_HEADERS)
+ -DOPENCV_EXTRA_FLAGS_RELEASE="" # black magic
+ )
+
+ if use qt4; then
+ mycmakeargs+=( "-DWITH_QT=4" )
+ elif use qt5; then
+ mycmakeargs+=( "-DWITH_QT=5" )
+ else
+ mycmakeargs+=( "-DWITH_QT=OFF" )
+ fi
+
+ if use contrib; then
+ mycmakeargs+=( "-DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-master/modules" )
+ fi
+
+ if use cuda; then
+ mycmakeargs+=( "-DWITH_CUDA=ON" )
+ mycmakeargs+=( "-DWITH_CUBLAS=ON" )
+ mycmakeargs+=( "-DWITH_CUFFT=ON" )
+ mycmakeargs+=( "-DWITH_NVCUVID=ON" ) #Nvidia video decoding library supp
+ else
+ mycmakeargs+=( "-DWITH_CUDA=OFF" )
+ mycmakeargs+=( "-DWITH_CUBLAS=OFF" )
+ mycmakeargs+=( "-DWITH_CUFFT=OFF" )
+ mycmakeargs+=( "-DWITH_NVCUVID=OFF" )
+ fi
+
+ if use examples && use python; then
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=ON" )
+ else
+ mycmakeargs+=( "-DINSTALL_PYTHON_EXAMPLES=OFF" )
+ fi
+
+ # things we want to be hard off or not yet figured out
+ mycmakeargs+=(
+ "-DOPENCV_BUILD_3RDPARTY_LIBS=OFF"
+ "-DBUILD_LATEX_DOCS=OFF"
+ "-DBUILD_PACKAGE=OFF"
+ "-DENABLE_PROFILING=OFF"
+ )
+
+ # things we want to be hard enabled not worth useflag
+ mycmakeargs+=(
+ "-DCMAKE_SKIP_RPATH=ON"
+ "-DOPENCV_DOC_INSTALL_PATH=${EPREFIX}/usr/share/doc/${PF}"
+ )
+
+ # hardcode cuda paths
+ mycmakeargs+=(
+ "-DCUDA_NPP_LIBRARY_ROOT_DIR=/opt/cuda"
+ )
+
+ # workaround for bug 413429
+ tc-export CC CXX
+
+ cmake-utils_src_configure
+}
diff --git a/media-libs/plib/files/plib-1.8.5-CVE-2011-4552.patch b/media-libs/plib/files/plib-1.8.5-CVE-2011-4552.patch
new file mode 100644
index 000000000000..78f1b22ae129
--- /dev/null
+++ b/media-libs/plib/files/plib-1.8.5-CVE-2011-4552.patch
@@ -0,0 +1,54 @@
+--- plib-1.8.5/src/ssg/ssgParser.cxx~
++++ plib-1.8.5/src/ssg/ssgParser.cxx
+@@ -57,18 +57,16 @@ void _ssgParser::error( const char *form
+ char msgbuff[ 255 ];
+ va_list argp;
+
+- char* msgptr = msgbuff;
+- if (linenum)
+- {
+- msgptr += sprintf ( msgptr,"%s, line %d: ",
+- path, linenum );
+- }
+-
+ va_start( argp, format );
+- vsprintf( msgptr, format, argp );
++ vsnprintf( msgbuff, sizeof(msgbuff), format, argp );
+ va_end( argp );
+
+- ulSetError ( UL_WARNING, "%s", msgbuff ) ;
++ if (linenum)
++ {
++ ulSetError ( UL_WARNING, "%s, line %d: %s", path, linenum, msgbuff ) ;
++ } else {
++ ulSetError ( UL_WARNING, "%s", msgbuff ) ;
++ }
+ }
+
+
+@@ -78,18 +76,16 @@ void _ssgParser::message( const char *fo
+ char msgbuff[ 255 ];
+ va_list argp;
+
+- char* msgptr = msgbuff;
+- if (linenum)
+- {
+- msgptr += sprintf ( msgptr,"%s, line %d: ",
+- path, linenum );
+- }
+-
+ va_start( argp, format );
+- vsprintf( msgptr, format, argp );
++ vsnprintf( msgbuff, sizeof(msgbuff), format, argp );
+ va_end( argp );
+
+- ulSetError ( UL_DEBUG, "%s", msgbuff ) ;
++ if (linenum)
++ {
++ ulSetError ( UL_DEBUG, "%s, line %d: %s", path, linenum, msgbuff ) ;
++ } else {
++ ulSetError ( UL_DEBUG, "%s", msgbuff ) ;
++ }
+ }
+
+ // Opens the file and does a few internal calculations based on the spec.
diff --git a/media-libs/plib/files/plib-1.8.5-CVE-2011-4620.patch b/media-libs/plib/files/plib-1.8.5-CVE-2011-4620.patch
new file mode 100644
index 000000000000..41fac5fe4c66
--- /dev/null
+++ b/media-libs/plib/files/plib-1.8.5-CVE-2011-4620.patch
@@ -0,0 +1,11 @@
+--- plib-1.8.5/src/util/ulError.cxx~ 2008-03-11 03:06:23.000000000 +0100
++++ plib-1.8.5/src/util/ulError.cxx 2011-12-27 15:38:25.305676650 +0100
+@@ -39,7 +39,7 @@ void ulSetError ( enum ulSeverity severi
+ {
+ va_list argp;
+ va_start ( argp, fmt ) ;
+- vsprintf ( _ulErrorBuffer, fmt, argp ) ;
++ vsnprintf ( _ulErrorBuffer, sizeof(_ulErrorBuffer), fmt, argp ) ;
+ va_end ( argp ) ;
+
+ if ( _ulErrorCB )
diff --git a/media-libs/plib/files/plib-1.8.5-X11.patch b/media-libs/plib/files/plib-1.8.5-X11.patch
index 86bccc31c0e6..1d9e05360d37 100644
--- a/media-libs/plib/files/plib-1.8.5-X11.patch
+++ b/media-libs/plib/files/plib-1.8.5-X11.patch
@@ -1,5 +1,5 @@
---- configure.in.old 2014-10-14 12:23:00.422971952 +0200
-+++ configure.in 2014-10-14 12:23:24.806746868 +0200
+--- configure.in.old
++++ configure.in
@@ -276,7 +276,7 @@
LDFLAGS="$LDFLAGS $X_LIBS"
diff --git a/media-libs/plib/plib-1.8.5-r1.ebuild b/media-libs/plib/plib-1.8.5-r1.ebuild
new file mode 100644
index 000000000000..f9045ab6a2a3
--- /dev/null
+++ b/media-libs/plib/plib-1.8.5-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit flag-o-matic eutils autotools
+
+DESCRIPTION="multimedia library used by many games"
+HOMEPAGE="http://plib.sourceforge.net/"
+SRC_URI="http://plib.sourceforge.net/dist/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+
+DEPEND="virtual/opengl"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-X11.patch \
+ "${FILESDIR}"/${P}-CVE-2011-4552.patch \
+ "${FILESDIR}"/${P}-CVE-2011-4620.patch
+
+ eautoreconf
+ # Since plib only provides static libraries, force
+ # building as PIC or plib is useless to amd64/etc...
+ append-flags -fPIC
+}
+
+src_install() {
+ default
+ dodoc AUTHORS ChangeLog KNOWN_BUGS NOTICE README* TODO*
+}
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index 101c1d91f531..0899c07d90aa 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -7,3 +7,4 @@ DIST live.2015.10.29.tar.gz 627327 SHA256 05bb03b58c9a758a735a2c5bb0b993c5e157d7
DIST live.2015.11.09.tar.gz 617651 SHA256 33dc683aae4cab9dd7cb05ff25ad35ddbd5ff6769f588a910644dced90e64ce8 SHA512 4c96f81a4c9379f7d1e2d63fa8db75bad6fba914862f538a4cb283ce7d7594f450682276ac684aa74b612d646eb05c0729eae48e00709f71215acb706c8a653f WHIRLPOOL c973a49fd0e5ed195dc4747e796a06b25d401792db3f469c8e8393b0407f3cefc3fdcaea2392bc59a7dd8762c99377adb8022f5fa1fd128cd8b62c86f03d2c1b
DIST live.2015.12.22.tar.gz 5644431 SHA256 d0a8a0d13b79a8e34057d4c5c0a65572c2eba4948fcf5548d9d53ce994e14b91 SHA512 e5cec29b769e8c10dcc932c1ed96f88d216a3643b2301d36d8df58b8db9bf823247876f2b4cbccac0fcb61ae098eebff3df3b767b1710e5b8b279ffc3bec4eb1 WHIRLPOOL 46b7f3f5885115d5b7c4b024cd7ce95b1c47a8f7055c2640357f5beb6f1c0d0270a34a176b1ff8e7942394ede41ef2fc486238b1355860b7ee0a5ff3cf481df1
DIST live.2016.01.16.tar.gz 630314 SHA256 980f67cbf353e36275a4019277926f66b8d3d34c87f3a036706130760d4c4415 SHA512 160c1e43e783ec9de70eaf925ea8b26c9deaa72061b3ed89987418f6fd6c0600a98caeff192d7b1b8c165c60d1f21eb5a784f282a35b8ad7a5a9b6f10f29fb6e WHIRLPOOL 27e01f1f9088070651cd56417236f03cbaf3d9134b618ba46d6c184eec196f59ea0edcdf0534c732c2fe56acd3d493157615540aeb2c417990d9258fa4497314
+DIST live.2016.01.20.tar.gz 630353 SHA256 ab12dc388c750cee2d275dd4dd767448e2375178a77f4576f5fbd994befdcad4 SHA512 129a74745ccde26b5e929057e259c0ff549e2e42129c37d411c98f5fd97736e8385e09612ae9aedda32fc78fe29a9d49d69c0fa771cc0dc81fd764e2b153c60a WHIRLPOOL c89819d8b1fa1fb1984624afe91e391ba16764f2b193ee1fd7ddfd55856f1d374a468e35d287d15c2373b235093a8d512820c5866df1cbbc47e4ce38977b964c
diff --git a/media-plugins/live/live-2016.01.20.ebuild b/media-plugins/live/live-2016.01.20.ebuild
new file mode 100644
index 000000000000..a787b3130fd0
--- /dev/null
+++ b/media-plugins/live/live-2016.01.20.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-radio/cwdaemon/cwdaemon-0.10.2.ebuild b/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild
index c27eb1ba3290..26633ed5d523 100644
--- a/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild
+++ b/media-radio/cwdaemon/cwdaemon-0.10.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~x86"
IUSE=""
RDEPEND=">=media-radio/unixcw-3.3.1"
diff --git a/media-radio/fldigi/fldigi-3.23.06.ebuild b/media-radio/fldigi/fldigi-3.23.06.ebuild
index f7c21c7c178a..1310de5682d7 100644
--- a/media-radio/fldigi/fldigi-3.23.06.ebuild
+++ b/media-radio/fldigi/fldigi-3.23.06.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="hamlib nls portaudio pulseaudio sndfile"
RDEPEND="x11-libs/fltk:1[threads,xft]
diff --git a/media-radio/grig/grig-0.8.1.ebuild b/media-radio/grig/grig-0.8.1.ebuild
index f2c3326c633d..f431d7a52958 100644
--- a/media-radio/grig/grig-0.8.1.ebuild
+++ b/media-radio/grig/grig-0.8.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/groundstation/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
DEPEND="
diff --git a/media-radio/unixcw/unixcw-3.5.0.ebuild b/media-radio/unixcw/unixcw-3.5.0.ebuild
index 8f624adceba2..1450f102a5e7 100644
--- a/media-radio/unixcw/unixcw-3.5.0.ebuild
+++ b/media-radio/unixcw/unixcw-3.5.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~x86"
IUSE="alsa ncurses pulseaudio suid qt5"
RDEPEND="ncurses? ( sys-libs/ncurses:= )
diff --git a/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild b/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild
index 70075baba0db..3228509d61d7 100644
--- a/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild
+++ b/media-sound/mp3diags/mp3diags-1.2.02-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="LGPL-3 GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
DEPEND="
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 294f634bdc33..4b078c9915ba 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,5 +1,2 @@
-DIST pulseaudio-5.0.tar.xz 1455428 SHA256 99c13a8b1249ddbd724f195579df79484e9af6418cecf6a15f003a7f36caf939 SHA512 f3d64bd6e03a732fd812da466b6658004600b4f3d0b9760403b7e113b6d654d54387658bf3704f45f28ab700245433e23fe517e4579130886fc58647eb97be2b WHIRLPOOL c85829c78ded3bbef234e455bfd3778f2daf50de9d7627508dbf131d0c398e35ab3ae41a4b5136f0c0da09249bc9a600ad85d848ba4e1faba74875af0a787036
-DIST pulseaudio-6.0.tar.xz 1469248 SHA256 b50640e0b80b1607600accfad2e45aabb79d379bf6354c9671efa2065477f6f6 SHA512 4f2293b41c8278047a41be4609a6bc267766874001092a91e785b05d5224fd82810862402942dadbb54bed7f74689779c958ca512666dfe6755d29551583cc2d WHIRLPOOL d75724f2ada640dabd256dc9e9840def17e78f63116c31df711d266349e9f4b99efbc797a5108649c860a5bf8ec8199383eaede440d8b4b655ef09f4ce37984f
-DIST pulseaudio-7.0.tar.xz 1505864 SHA256 ca1ae1377e8926bfc3ffe2aeb9f657f6c363a16f72861166fcf9454e3eeae8fa SHA512 d5d6444df5429dd9f57c7653b1aebd6e257f5568511275cde087948f13fa6995ed41f8562d437bf30110a0c7fbd000d730925b6c0322d33d4ad8b82ed64393ae WHIRLPOOL d527530e9b4f1148990f0c7f197421573275fb2cc6c1952d0ad41f41421ce346bea1b6910455f79a0e83e1d7d3692a3d19b5ecaaab642183857282378f5701bc
DIST pulseaudio-7.1.tar.xz 1506504 SHA256 e667514a28328f92aceea754a224a0150dddfe7e9a71b4c6d31489220153b9d9 SHA512 21f621bd76268b9dd6e5be2231b0e779a8e0cfdece44c46c8ac96a4e1d4df52fe5b9791ef95a0909a3c177bbfa5eab7d52fed9b43362840a9c8a6001e821175e WHIRLPOOL 940801193832d6e9903ef547666ed1a84910a075ec8f42a32c038efdb1d111608ccf3aa97b35970d726e4157459f98edb5e228dc82cdeb3029bd15b3fd3fe691
DIST pulseaudio-8.0.tar.xz 1517656 SHA256 690eefe28633466cfd1ab9d85ebfa9376f6b622deec6bfee5091ac9737cd1989 SHA512 7008abf768f720839353038ffd3e35e442f82452aa7e27d446f75d403096b042643d2b2b1d153454302bd5a51f9217f4979c8995b80ba2695f141e6a29e164fa WHIRLPOOL 1b4efd629bfb5d1a40c4c4709854de1226f811345146e2bb34315d4690060d8b5ad691502c25d80272cb894473ba664b172b36a31ecb89b789a9bcd161392003
diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-crash-udp.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-crash-udp.patch
deleted file mode 100644
index d14da07459ff..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-5.0-crash-udp.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 26b9d22dd24c17eb118d0205bf7b02b75d435e3c Mon Sep 17 00:00:00 2001
-From: Alexander E. Patrakov <patrakov@gmail.com>
-Date: Thu, 05 Jun 2014 16:29:25 +0000
-Subject: rtp-recv: fix crash on empty UDP packets (CVE-2014-3970)
-
-On FIONREAD returning 0 bytes, we cannot return success, as the caller
-(rtpoll_work_cb in module-rtp-recv.c) would then try to
-pa_memblock_unref(chunk.memblock) and, because memblock is NULL, trigger
-an assertion.
-
-Also we have to read out the possible empty packet from the socket, so
-that the kernel doesn't tell us again and again about it.
-
-Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com>
----
-diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c
-index 570737e..7b75e0e 100644
---- a/src/modules/rtp/rtp.c
-+++ b/src/modules/rtp/rtp.c
-@@ -182,8 +182,29 @@ int pa_rtp_recv(pa_rtp_context *c, pa_memchunk *chunk, pa_mempool *pool, struct
- goto fail;
- }
-
-- if (size <= 0)
-- return 0;
-+ if (size <= 0) {
-+ /* size can be 0 due to any of the following reasons:
-+ *
-+ * 1. Somebody sent us a perfectly valid zero-length UDP packet.
-+ * 2. Somebody sent us a UDP packet with a bad CRC.
-+ *
-+ * It is unknown whether size can actually be less than zero.
-+ *
-+ * In the first case, the packet has to be read out, otherwise the
-+ * kernel will tell us again and again about it, thus preventing
-+ * reception of any further packets. So let's just read it out
-+ * now and discard it later, when comparing the number of bytes
-+ * received (0) with the number of bytes wanted (1, see below).
-+ *
-+ * In the second case, recvmsg() will fail, thus allowing us to
-+ * return the error.
-+ *
-+ * Just to avoid passing zero-sized memchunks and NULL pointers to
-+ * recvmsg(), let's force allocation of at least one byte by setting
-+ * size to 1.
-+ */
-+ size = 1;
-+ }
-
- if (c->memchunk.length < (unsigned) size) {
- size_t l;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-module-switch.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-module-switch.patch
deleted file mode 100644
index e8ff6e051ae4..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-5.0-module-switch.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From ef4a41e8b0ef81a53769d853dbc7679b25252327 Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson@canonical.com>
-Date: Fri, 28 Mar 2014 11:59:09 +0100
-Subject: [PATCH 36/38] module-switch-on-port-available: Don't switch profiles
- on uninitialized cards
-
-This could cause the HDMI port to become the default on some systems
-where analog output was available.
-
-BugLink: https://bugs.launchpad.net/ubuntu/+source/pulseaudio/+bug/1256511
-BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=73375
-Signed-off-by: David Henningsson <david.henningsson@canonical.com>
----
- src/modules/module-switch-on-port-available.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/modules/module-switch-on-port-available.c b/src/modules/module-switch-on-port-available.c
-index 2c7ad17..c560306 100644
---- a/src/modules/module-switch-on-port-available.c
-+++ b/src/modules/module-switch-on-port-available.c
-@@ -173,6 +173,11 @@ static pa_hook_result_t port_available_hook_callback(pa_core *c, pa_device_port
- return PA_HOOK_OK;
- }
-
-+ if (pa_idxset_size(card->sinks) == 0 && pa_idxset_size(card->sources) == 0)
-+ /* This card is not initialized yet. We'll handle it in
-+ sink_new / source_new callbacks later. */
-+ return PA_HOOK_OK;
-+
- find_sink_and_source(card, port, &sink, &source);
-
- is_active_profile = card->active_profile == pa_hashmap_get(port->profiles, card->active_profile->name);
---
-1.9.0
-
diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-1.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-1.patch
deleted file mode 100644
index d90399be3653..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d03ffdccdb7286021e53876ba5d4adf9a1edd0d0 Mon Sep 17 00:00:00 2001
-From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
-Date: Sat, 15 Mar 2014 09:37:05 +0200
-Subject: zeroconf-publish: Add locking around pa_mainloop_api_once()
-
-Commit e1e154c7377779377fa1a36655a10effd693f7b5 added locking around
-pa_mainloop_api_once() everywhere except pa__done(). This fixes that
-omission.
-
-diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
-index 0110e1d..35277c2 100644
---- a/src/modules/module-zeroconf-publish.c
-+++ b/src/modules/module-zeroconf-publish.c
-@@ -807,7 +807,9 @@ void pa__done(pa_module*m) {
- if (!(u = m->userdata))
- return;
-
-+ pa_threaded_mainloop_lock(u->mainloop);
- pa_mainloop_api_once(u->api, client_free, u);
-+ pa_threaded_mainloop_unlock(u->mainloop);
- pa_asyncmsgq_wait_for(u->thread_mq.outq, AVAHI_MESSAGE_SHUTDOWN_COMPLETE);
-
- pa_threaded_mainloop_stop(u->mainloop);
---
-cgit v0.10.2
-
diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-2.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-2.patch
deleted file mode 100644
index 7d4de455941f..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 37e73e10be9e42544a4cc160ff85ccada2cc9aa9 Mon Sep 17 00:00:00 2001
-From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
-Date: Sat, 15 Mar 2014 09:37:06 +0200
-Subject: zeroconf-publish: Don't react to messages while shutting down
-
-This fixes a case where pa__done() is called while
-AVAHI_MESSAGE_PUBLISH_ALL is waiting for processing. The
-pa_asyncmsgq_wait_for(AVAHI_MESSAGE_SHUTDOWN_COMPLETE) call will
-process all pending messages, and processing AVAHI_MESSAGE_PUBLISH_ALL
-causes publish_all_services(), and that in turn accesses u->services,
-which has been already freed at this point. If we are shutting down,
-we shouldn't react to any of the messages that the Avahi thread is
-sending to the main thread.
-
-BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=76184
-
-diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
-index 35277c2..db92850 100644
---- a/src/modules/module-zeroconf-publish.c
-+++ b/src/modules/module-zeroconf-publish.c
-@@ -141,6 +141,8 @@ struct userdata {
- pa_hook_slot *sink_new_slot, *source_new_slot, *sink_unlink_slot, *source_unlink_slot, *sink_changed_slot, *source_changed_slot;
-
- pa_native_protocol *native;
-+
-+ bool shutting_down;
- };
-
- /* Runs in PA mainloop context */
-@@ -638,6 +640,11 @@ static void unpublish_all_services(struct userdata *u, bool rem) {
- static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) {
- struct userdata *u = (struct userdata *) data;
-
-+ pa_assert(u);
-+
-+ if (u->shutting_down)
-+ return 0;
-+
- switch (code) {
- case AVAHI_MESSAGE_PUBLISH_ALL:
- publish_all_services(u);
-@@ -647,10 +654,6 @@ static int avahi_process_msg(pa_msgobject *o, int code, void *data, int64_t offs
- pa_module_unload(u->core, u->module, true);
- break;
-
-- case AVAHI_MESSAGE_SHUTDOWN_COMPLETE:
-- /* pa__done() is waiting for this */
-- break;
--
- default:
- pa_assert_not_reached();
- }
-@@ -797,7 +800,7 @@ static void client_free(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) {
- if (u->avahi_poll)
- pa_avahi_poll_free(u->avahi_poll);
-
-- pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, NULL, 0, NULL, NULL);
-+ pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, u, 0, NULL, NULL);
- }
-
- void pa__done(pa_module*m) {
-@@ -807,6 +810,8 @@ void pa__done(pa_module*m) {
- if (!(u = m->userdata))
- return;
-
-+ u->shutting_down = true;
-+
- pa_threaded_mainloop_lock(u->mainloop);
- pa_mainloop_api_once(u->api, client_free, u);
- pa_threaded_mainloop_unlock(u->mainloop);
---
-cgit v0.10.2
-
diff --git a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch b/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch
deleted file mode 100644
index 6bdd46415cd2..000000000000
--- a/media-sound/pulseaudio/files/pulseaudio-5.0-zeroconf-crash-3.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From b75a20db10c8605d98324a7782a7da6483ae9f14 Mon Sep 17 00:00:00 2001
-From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
-Date: Wed, 19 Mar 2014 09:50:39 +0200
-Subject: zeroconf-publish: Don't assume any particular defer event ordering
-
-Also, initialize userdata with zeros to avoid invalid pointers in
-client_free().
-
-This fixes a crash when client_free() is called before
-create_client(). The whole issue could be avoided by using some other
-mechanism than defer events for running the two functions, but I'll
-do that change later (I have also other cleanups planned for
-zeroconf-publish).
-
-BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=76184
-
-diff --git a/src/modules/module-zeroconf-publish.c b/src/modules/module-zeroconf-publish.c
-index db92850..be8806e 100644
---- a/src/modules/module-zeroconf-publish.c
-+++ b/src/modules/module-zeroconf-publish.c
-@@ -142,7 +142,8 @@ struct userdata {
-
- pa_native_protocol *native;
-
-- bool shutting_down;
-+ bool shutting_down; /* Used in the main thread. */
-+ bool client_freed; /* Used in the Avahi thread. */
- };
-
- /* Runs in PA mainloop context */
-@@ -707,6 +708,16 @@ static void create_client(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) {
- struct userdata *u = (struct userdata *) userdata;
- int error;
-
-+ /* create_client() and client_free() are called via defer events. If the
-+ * two defer events are created very quickly one after another, we can't
-+ * assume that the defer event that runs create_client() will be dispatched
-+ * before the defer event that runs client_free() (at the time of writing,
-+ * pa_mainloop actually always dispatches queued defer events in reverse
-+ * creation order). For that reason we must be prepared for the case where
-+ * client_free() has already been called. */
-+ if (u->client_freed)
-+ return;
-+
- pa_thread_mq_install(&u->thread_mq);
-
- if (!(u->client = avahi_client_new(u->avahi_poll, AVAHI_CLIENT_NO_FAIL, client_callback, u, &error))) {
-@@ -733,7 +744,7 @@ int pa__init(pa_module*m) {
- goto fail;
- }
-
-- m->userdata = u = pa_xnew(struct userdata, 1);
-+ m->userdata = u = pa_xnew0(struct userdata, 1);
- u->core = m->core;
- u->module = m;
- u->native = pa_native_protocol_get(u->core);
-@@ -757,8 +768,6 @@ int pa__init(pa_module*m) {
- u->source_changed_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_PROPLIST_CHANGED], PA_HOOK_LATE, (pa_hook_cb_t) device_new_or_changed_cb, u);
- u->source_unlink_slot = pa_hook_connect(&m->core->hooks[PA_CORE_HOOK_SOURCE_UNLINK], PA_HOOK_LATE, (pa_hook_cb_t) device_unlink_cb, u);
-
-- u->main_entry_group = NULL;
--
- un = pa_get_user_name_malloc();
- hn = pa_get_host_name_malloc();
- u->service_name = pa_truncate_utf8(pa_sprintf_malloc("%s@%s", un, hn), AVAHI_LABEL_MAX-1);
-@@ -801,6 +810,8 @@ static void client_free(pa_mainloop_api *api PA_GCC_UNUSED, void *userdata) {
- pa_avahi_poll_free(u->avahi_poll);
-
- pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->msg), AVAHI_MESSAGE_SHUTDOWN_COMPLETE, u, 0, NULL, NULL);
-+
-+ u->client_freed = true;
- }
-
- void pa__done(pa_module*m) {
---
-cgit v0.10.2
-
diff --git a/media-sound/pulseaudio/files/svolume-fix_param_loading_undefined_beh.patch b/media-sound/pulseaudio/files/svolume-fix_param_loading_undefined_beh.patch
deleted file mode 100644
index 4e22f5e95d1c..000000000000
--- a/media-sound/pulseaudio/files/svolume-fix_param_loading_undefined_beh.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Wim Taymans
-Date: Wed, 7 Jan 2015 11:20:01 +0100
-Subject: [PATCH] svolume.orc: avoid parameter loading undefined behaviour
-
-In some cases, depending on the instruction that performs the load, orc
-ignores the size of the parameter when loading it for the first time.
-Explicitly load the parameter into a temp to make sure it is loaded
-correctly, like we do for the 2ch case.
-
-See https://bugzilla.gnome.org/show_bug.cgi?id=742271
----
- src/pulsecore/svolume.orc | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/pulsecore/svolume.orc b/src/pulsecore/svolume.orc
-index 0edbefb..f869893 100644
---- a/src/pulsecore/svolume.orc
-+++ b/src/pulsecore/svolume.orc
-@@ -45,13 +45,15 @@
-
- .function pa_volume_s16ne_orc_1ch
- .dest 2 samples int16_t
--.param 4 v int32_t
-+.param 4 vols int32_t
-+.temp 4 v
- .temp 2 vh
- .temp 4 s
- .temp 4 mh
- .temp 4 ml
- .temp 4 signc
-
-+loadpl v, vols
- convuwl s, samples
- x2 cmpgtsw signc, 0, s
- x2 andw signc, signc, v
---
-1.9.3
diff --git a/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild b/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild
deleted file mode 100644
index 60af38bda9b6..000000000000
--- a/media-sound/pulseaudio/pulseaudio-5.0-r4.ebuild
+++ /dev/null
@@ -1,356 +0,0 @@
-# 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 flag-o-matic linux-info readme.gentoo systemd user versionator udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/"
-SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="+alsa +asyncns avahi bluetooth +caps dbus doc equalizer +gdbm +glib gnome
-gtk ipv6 jack libsamplerate lirc neon +orc oss qt4 realtime ssl systemd
-system-wide tcpd test +udev +webrtc-aec +X xen"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="bluetooth? ( dbus )
- udev? ( || ( alsa oss ) )"
-
-# libpcre needed in some cases, bug #472228
-RDEPEND="
- || (
- elibc_glibc? ( virtual/libc )
- elibc_uclibc? ( virtual/libc )
- dev-libs/libpcre
- )
- >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
- X? (
- >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
- x11-libs/libSM[${MULTILIB_USEDEP}]
- x11-libs/libICE[${MULTILIB_USEDEP}]
- x11-libs/libXtst[${MULTILIB_USEDEP}]
- )
- caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
- alsa? ( >=media-libs/alsa-lib-1.0.19 )
- glib? ( >=dev-libs/glib-2.4.0[${MULTILIB_USEDEP}] )
- avahi? ( >=net-dns/avahi-0.6.12[dbus] )
- jack? ( >=media-sound/jack-audio-connection-kit-0.117 )
- tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
- lirc? ( app-misc/lirc )
- dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
- gtk? ( x11-libs/gtk+:3 )
- gnome? ( >=gnome-base/gconf-2.4.0 )
- bluetooth? (
- net-wireless/bluez:=
- >=sys-apps/dbus-1.0.0
- media-libs/sbc
- )
- asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
- udev? ( >=virtual/udev-143[hwdb(+)] )
- realtime? ( sys-auth/rtkit )
- equalizer? ( sci-libs/fftw:3.0 )
- orc? ( >=dev-lang/orc-0.4.15 )
- ssl? ( dev-libs/openssl:0 )
- >=media-libs/speex-1.2_rc1
- gdbm? ( sys-libs/gdbm )
- webrtc-aec? ( media-libs/webrtc-audio-processing )
- xen? ( app-emulation/xen-tools )
- systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
- dev-libs/json-c[${MULTILIB_USEDEP}]
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
- || (
- dev-libs/libltdl:0
- ( >=sys-devel/libtool-2.4.2 <sys-devel/libtool-2.4.3-r2 )
- )
-"
-# it's a valid RDEPEND, libltdl.so is used for native abi
-
-DEPEND="${RDEPEND}
- sys-devel/m4
- doc? ( app-doc/doxygen )
- test? ( dev-libs/check )
- X? (
- x11-proto/xproto[${MULTILIB_USEDEP}]
- >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
- )
- dev-libs/libatomic_ops
- virtual/pkgconfig
- system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
- dev-util/intltool
- >=sys-devel/gettext-0.18.1
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="alsa? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio] )"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt4 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
- equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
- system-wide? (
- alsa? ( media-sound/alsa-utils )
- bluetooth? ( net-wireless/bluez:= )
- )
-"
-
-pkg_pretend() {
- CONFIG_CHECK="~HIGH_RES_TIMERS"
- WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
- check_extra_config
-
- if linux_config_exists; then
- local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
- if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
- ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
- ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
- fi
- fi
-}
-
-pkg_setup() {
- linux-info_pkg_setup
-
- enewgroup audio 18 # Just make sure it exists
-
- if use system-wide; then
- enewgroup pulse-access
- enewgroup pulse
- enewuser pulse -1 -1 /var/run/pulse pulse,audio
- fi
-}
-
-src_prepare() {
- # Skip test that cannot work with sandbox, bug #501846
- sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
-
- # Fix CVE-2014-3970, bug #512516
- epatch "${FILESDIR}/${P}-crash-udp.patch"
-
- # module-switch-on-port-available: Don't switch profiles on uninitialized cards (from 'master')
- epatch "${FILESDIR}/${P}-module-switch.patch"
-
- epatch_user
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf=()
-
- if use gdbm; then
- myconf+=( --with-database=gdbm )
- #elif use tdb; then
- # myconf+=( --with-database=tdb )
- else
- myconf+=( --with-database=simple )
- fi
-
- if use bluetooth; then
- if has_version '<net-wireless/bluez-5'; then
- myconf+=( --disable-bluez5 --enable-bluez4 )
- else
- myconf+=( --enable-bluez5 --disable-bluez4 )
- fi
- else
- myconf+=( --disable-bluez5 --disable-bluez4 )
- fi
-
- myconf+=(
- --enable-largefile
- $(use_enable glib glib2)
- --disable-solaris
- $(use_enable asyncns)
- $(use_enable oss oss-output)
- $(use_enable alsa)
- $(use_enable lirc)
- $(use_enable neon neon-opt)
- $(use_enable tcpd tcpwrap)
- $(use_enable jack)
- $(use_enable avahi)
- $(use_enable dbus)
- $(use_enable gnome gconf)
- $(use_enable gtk gtk3)
- $(use_enable libsamplerate samplerate)
- $(use_enable orc)
- $(use_enable X x11)
- $(use_enable test default-build-tests)
- $(use_enable udev)
- $(use_enable systemd)
- $(use_enable systemd systemd-journal)
- $(use_enable ipv6)
- $(use_enable ssl openssl)
- $(use_enable webrtc-aec)
- $(use_enable xen)
- $(use_with caps)
- $(use_with equalizer fftw)
- --disable-adrian-aec
- --disable-esound
- --localstatedir="${EPREFIX}"/var
- --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
- )
-
- if ! multilib_is_native_abi; then
- # disable all the modules and stuff
- myconf+=(
- --disable-oss-output
- --disable-alsa
- --disable-lirc
- --disable-jack
- --disable-avahi
- --disable-gconf
- --disable-gtk3
- --disable-samplerate
- --disable-bluez4
- --disable-bluez5
- --disable-udev
- --disable-systemd
- --disable-openssl
- --disable-orc
- --disable-webrtc-aec
- --disable-xen
- --without-fftw
-
- # tests involve random modules, so just do them for the native
- --disable-default-build-tests
-
- # hack around unnecessary checks
- # (results don't matter, we're not building anything using it)
- ac_cv_lib_ltdl_lt_dladvise_init=yes
- --with-database=simple
- LIBSPEEX_CFLAGS=' '
- LIBSPEEX_LIBS=' '
- )
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- local targets=( libpulse.la libpulse-simple.la )
- use glib && targets+=( libpulse-mainloop-glib.la )
- emake -C src ${targets[@]}
- fi
-}
-
-src_compile() {
- multilib-minimal_src_compile
-
- if use doc; then
- pushd doxygen
- doxygen doxygen.conf
- popd
- fi
-}
-
-multilib_src_test() {
- # We avoid running the toplevel check target because that will run
- # po/'s tests too, and they are broken. Officially, it should work
- # with intltool 0.41, but that doesn't look like a stable release.
- if multilib_is_native_abi; then
- emake -C src check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
- else
- local targets=( libpulse.la libpulse-simple.la )
- use glib && targets+=( libpulse-mainloop-glib.la )
- emake DESTDIR="${D}" install-pkgconfigDATA
- emake DESTDIR="${D}" -C src \
- install-libLTLIBRARIES \
- lib_LTLIBRARIES="${targets[*]}" \
- install-pulseincludeHEADERS
- fi
-}
-
-multilib_src_install_all() {
- # Drop the script entirely if X is disabled
- use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
-
- if use system-wide; then
- newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
- use_define() {
- local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
- use "$1" && echo "-D$define" || echo "-U$define"
- }
-
- unifdef $(use_define avahi) \
- $(use_define alsa) \
- $(use_define bluetooth) \
- $(use_define udev) \
- "${FILESDIR}/pulseaudio.init.d-5" \
- > "${T}/pulseaudio"
-
- doinitd "${T}/pulseaudio"
-
- systemd_dounit "${FILESDIR}/${PN}.service"
- fi
-
- use avahi && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
-
- dodoc NEWS README todo
-
- if use doc; then
- pushd doxygen/html
- dohtml *
- popd
- fi
-
- # Create the state directory
- use prefix || diropts -o pulse -g pulse -m0755
-
- # We need /var/run/pulse, bug #442852
- use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-
- # Prevent warnings when system-wide is not used, bug #447694
- use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
-
- prune_libtool_files --all
-}
-
-pkg_postinst() {
- if use system-wide; then
- elog "You have enabled the 'system-wide' USE flag for pulseaudio."
- elog "This mode should only be used on headless servers, embedded systems,"
- elog "or thin clients. It will usually require manual configuration, and is"
- elog "incompatible with many expected pulseaudio features."
- elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
- elog "For more information, see"
- elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
- elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
- elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
- if use gnome ; then
- elog
- elog "By enabling gnome USE flag, you enabled gconf support. Please note"
- elog "that you might need to remove the gnome USE flag or disable the"
- elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
- elog "with a system-wide instance."
- fi
- fi
-
- if use equalizer && ! use qt4; then
- elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
- elog "This will build the equalizer module, but the 'qpaeq' tool"
- elog "which is required to set equalizer levels will not work."
- fi
-}
diff --git a/media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild b/media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild
deleted file mode 100644
index 731060b641f1..000000000000
--- a/media-sound/pulseaudio/pulseaudio-5.0-r7.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# 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 flag-o-matic gnome2-utils linux-info readme.gentoo systemd user versionator udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/"
-SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
-gnome gtk ipv6 jack libsamplerate lirc neon +orc oss qt4 realtime ssl systemd
-system-wide tcpd test +udev +webrtc-aec +X xen zeroconf"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="bluetooth? ( dbus )
- udev? ( || ( alsa oss ) )"
-
-# libpcre needed in some cases, bug #472228
-RDEPEND="
- || (
- elibc_glibc? ( virtual/libc )
- elibc_uclibc? ( virtual/libc )
- dev-libs/libpcre
- )
- >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
- X? (
- >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
- x11-libs/libSM[${MULTILIB_USEDEP}]
- x11-libs/libICE[${MULTILIB_USEDEP}]
- x11-libs/libXtst[${MULTILIB_USEDEP}]
- )
- caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
- alsa? ( >=media-libs/alsa-lib-1.0.19 )
- glib? ( >=dev-libs/glib-2.4.0[${MULTILIB_USEDEP}] )
- zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
- jack? ( >=media-sound/jack-audio-connection-kit-0.117 )
- tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
- lirc? ( app-misc/lirc )
- dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
- gtk? ( x11-libs/gtk+:3 )
- gnome? ( >=gnome-base/gconf-2.4.0 )
- bluetooth? (
- net-wireless/bluez:=
- >=sys-apps/dbus-1.0.0
- media-libs/sbc
- )
- asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
- udev? ( >=virtual/udev-143[hwdb(+)] )
- realtime? ( sys-auth/rtkit )
- equalizer? ( sci-libs/fftw:3.0 )
- orc? ( >=dev-lang/orc-0.4.15 )
- ssl? ( dev-libs/openssl:0 )
- >=media-libs/speex-1.2_rc1
- gdbm? ( sys-libs/gdbm )
- webrtc-aec? ( media-libs/webrtc-audio-processing )
- xen? ( app-emulation/xen-tools )
- systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
- dev-libs/json-c[${MULTILIB_USEDEP}]
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
- dev-libs/libltdl:0
-"
-# it's a valid RDEPEND, libltdl.so is used for native abi
-
-DEPEND="${RDEPEND}
- sys-devel/m4
- doc? ( app-doc/doxygen )
- test? ( dev-libs/check )
- X? (
- x11-proto/xproto[${MULTILIB_USEDEP}]
- >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
- )
- dev-libs/libatomic_ops
- virtual/pkgconfig
- system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
- dev-util/intltool
- >=sys-devel/gettext-0.18.1
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="alsa? ( alsa-plugin? (
- >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}]
-) )"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt4 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
- equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
- system-wide? (
- alsa? ( media-sound/alsa-utils )
- bluetooth? ( net-wireless/bluez:= )
- )
-"
-
-pkg_pretend() {
- CONFIG_CHECK="~HIGH_RES_TIMERS"
- WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
- check_extra_config
-
- if linux_config_exists; then
- local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
- if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
- ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
- ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
- fi
- fi
-}
-
-pkg_setup() {
- gnome2_environment_reset
- linux-info_pkg_setup
-
- enewgroup audio 18 # Just make sure it exists
-
- if use system-wide; then
- enewgroup pulse-access
- enewgroup pulse
- enewuser pulse -1 -1 /var/run/pulse pulse,audio
- fi
-}
-
-src_prepare() {
- # Skip test that cannot work with sandbox, bug #501846
- sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
-
- # Fix CVE-2014-3970, bug #512516 (from 'master')
- epatch "${FILESDIR}/${P}-crash-udp.patch"
-
- # module-switch-on-port-available: Don't switch profiles on uninitialized cards (from 'master')
- epatch "${FILESDIR}/${P}-module-switch.patch"
-
- # Fix module-zeroconf-publish crashes, bug #504612 (from 'master')
- epatch "${FILESDIR}"/${P}-zeroconf-crash-{1,2,3}.patch
-
- # svolume.orc: avoid parameter loading undefined behaviour
- # orc-0.4.23 triggers a bug on certain volume changes with PA, leading to distorted sounds
- # http://lists.freedesktop.org/archives/pulseaudio-discuss/2015-January/022905.html
- # Gentoo bug 534144
- epatch "${FILESDIR}"/svolume-fix_param_loading_undefined_beh.patch
-
- epatch_user
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf=()
-
- if use gdbm; then
- myconf+=( --with-database=gdbm )
- #elif use tdb; then
- # myconf+=( --with-database=tdb )
- else
- myconf+=( --with-database=simple )
- fi
-
- if use bluetooth; then
- if has_version '<net-wireless/bluez-5'; then
- myconf+=( --disable-bluez5 --enable-bluez4 )
- else
- myconf+=( --enable-bluez5 --disable-bluez4 )
- fi
- else
- myconf+=( --disable-bluez5 --disable-bluez4 )
- fi
-
- myconf+=(
- --enable-largefile
- $(use_enable glib glib2)
- --disable-solaris
- $(use_enable asyncns)
- $(use_enable oss oss-output)
- $(use_enable alsa)
- $(use_enable lirc)
- $(use_enable neon neon-opt)
- $(use_enable tcpd tcpwrap)
- $(use_enable jack)
- $(use_enable zeroconf avahi)
- $(use_enable dbus)
- $(use_enable gnome gconf)
- $(use_enable gtk gtk3)
- $(use_enable libsamplerate samplerate)
- $(use_enable orc)
- $(use_enable X x11)
- $(use_enable test default-build-tests)
- $(use_enable udev)
- $(use_enable systemd)
- $(use_enable systemd systemd-journal)
- $(use_enable ipv6)
- $(use_enable ssl openssl)
- $(use_enable webrtc-aec)
- $(use_enable xen)
- $(use_with caps)
- $(use_with equalizer fftw)
- --disable-adrian-aec
- --disable-esound
- --localstatedir="${EPREFIX}"/var
- --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
- )
-
- if ! multilib_is_native_abi; then
- # disable all the modules and stuff
- myconf+=(
- --disable-oss-output
- --disable-alsa
- --disable-lirc
- --disable-jack
- --disable-avahi
- --disable-gconf
- --disable-gtk3
- --disable-samplerate
- --disable-bluez4
- --disable-bluez5
- --disable-udev
- --disable-systemd
- --disable-openssl
- --disable-orc
- --disable-webrtc-aec
- --disable-xen
- --without-fftw
-
- # tests involve random modules, so just do them for the native
- --disable-default-build-tests
-
- # hack around unnecessary checks
- # (results don't matter, we're not building anything using it)
- ac_cv_lib_ltdl_lt_dladvise_init=yes
- --with-database=simple
- LIBSPEEX_CFLAGS=' '
- LIBSPEEX_LIBS=' '
- )
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- local targets=( libpulse.la libpulse-simple.la )
- use glib && targets+=( libpulse-mainloop-glib.la )
- emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la
- fi
-}
-
-src_compile() {
- multilib-minimal_src_compile
-
- if use doc; then
- pushd doxygen
- doxygen doxygen.conf
- popd
- fi
-}
-
-multilib_src_test() {
- # We avoid running the toplevel check target because that will run
- # po/'s tests too, and they are broken. Officially, it should work
- # with intltool 0.41, but that doesn't look like a stable release.
- if multilib_is_native_abi; then
- emake -C src check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
- else
- local targets=( libpulse.la libpulse-simple.la )
- use glib && targets+=( libpulse-mainloop-glib.la )
- emake DESTDIR="${D}" install-pkgconfigDATA
- emake DESTDIR="${D}" -C src \
- install-libLTLIBRARIES \
- install-padsplibLTLIBRARIES \
- lib_LTLIBRARIES="${targets[*]}" \
- install-pulseincludeHEADERS
- fi
-}
-
-multilib_src_install_all() {
- # Drop the script entirely if X is disabled
- use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
-
- if use system-wide; then
- newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
- use_define() {
- local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
- use "$1" && echo "-D$define" || echo "-U$define"
- }
-
- unifdef $(use_define zeroconf AVAHI) \
- $(use_define alsa) \
- $(use_define bluetooth) \
- $(use_define udev) \
- "${FILESDIR}/pulseaudio.init.d-5" \
- > "${T}/pulseaudio"
-
- doinitd "${T}/pulseaudio"
-
- systemd_dounit "${FILESDIR}/${PN}.service"
- fi
-
- use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
-
- dodoc NEWS README todo
-
- if use doc; then
- pushd doxygen/html
- dohtml *
- popd
- fi
-
- # Create the state directory
- use prefix || diropts -o pulse -g pulse -m0755
-
- # We need /var/run/pulse, bug #442852
- use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-
- # Prevent warnings when system-wide is not used, bug #447694
- use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
-
- prune_libtool_files --all
-}
-
-pkg_postinst() {
- if use system-wide; then
- elog "You have enabled the 'system-wide' USE flag for pulseaudio."
- elog "This mode should only be used on headless servers, embedded systems,"
- elog "or thin clients. It will usually require manual configuration, and is"
- elog "incompatible with many expected pulseaudio features."
- elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
- elog "For more information, see"
- elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
- elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
- elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
- if use gnome ; then
- elog
- elog "By enabling gnome USE flag, you enabled gconf support. Please note"
- elog "that you might need to remove the gnome USE flag or disable the"
- elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
- elog "with a system-wide instance."
- fi
- fi
-
- if use equalizer && ! use qt4; then
- elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
- elog "This will build the equalizer module, but the 'qpaeq' tool"
- elog "which is required to set equalizer levels will not work."
- fi
-}
diff --git a/media-sound/pulseaudio/pulseaudio-6.0.ebuild b/media-sound/pulseaudio/pulseaudio-6.0.ebuild
deleted file mode 100644
index 8d6743476192..000000000000
--- a/media-sound/pulseaudio/pulseaudio-6.0.ebuild
+++ /dev/null
@@ -1,389 +0,0 @@
-# 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 flag-o-matic gnome2-utils linux-info readme.gentoo systemd user versionator udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/"
-SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
- gnome gtk ipv6 jack libsamplerate lirc native-headset neon ofono-headset
- +orc oss qt4 realtime selinux ssl systemd system-wide tcpd test +udev
- +webrtc-aec +X xen zeroconf"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="bluetooth? ( dbus )
- ofono-headset? ( bluetooth )
- native-headset? ( bluetooth )
- udev? ( || ( alsa oss ) )"
-
-# libpcre needed in some cases, bug #472228
-RDEPEND="
- || (
- elibc_glibc? ( virtual/libc )
- elibc_uclibc? ( virtual/libc )
- dev-libs/libpcre
- )
- >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
- X? (
- >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
- x11-libs/libSM[${MULTILIB_USEDEP}]
- x11-libs/libICE[${MULTILIB_USEDEP}]
- x11-libs/libXtst[${MULTILIB_USEDEP}]
- )
- caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
- alsa? ( >=media-libs/alsa-lib-1.0.19 )
- glib? ( >=dev-libs/glib-2.4.0[${MULTILIB_USEDEP}] )
- zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
- jack? ( >=media-sound/jack-audio-connection-kit-0.117 )
- tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
- lirc? ( app-misc/lirc )
- dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
- gtk? ( x11-libs/gtk+:3 )
- gnome? ( >=gnome-base/gconf-2.4.0 )
- bluetooth? (
- net-wireless/bluez:=
- >=sys-apps/dbus-1.0.0
- media-libs/sbc
- )
- asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
- udev? ( >=virtual/udev-143[hwdb(+)] )
- realtime? ( sys-auth/rtkit )
- equalizer? ( sci-libs/fftw:3.0 )
- ofono-headset? ( >=net-misc/ofono-1.13 )
- orc? ( >=dev-lang/orc-0.4.15 )
- ssl? ( dev-libs/openssl:0 )
- >=media-libs/speex-1.2_rc1
- gdbm? ( sys-libs/gdbm )
- webrtc-aec? ( media-libs/webrtc-audio-processing )
- xen? ( app-emulation/xen-tools )
- systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
- >=dev-libs/json-c-0.11[${MULTILIB_USEDEP}]
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
- dev-libs/libltdl:0
- selinux? ( sec-policy/selinux-pulseaudio )
-"
-# it's a valid RDEPEND, libltdl.so is used for native abi
-
-DEPEND="${RDEPEND}
- sys-devel/m4
- doc? ( app-doc/doxygen )
- test? ( dev-libs/check )
- X? (
- x11-proto/xproto[${MULTILIB_USEDEP}]
- >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
- )
- dev-libs/libatomic_ops
- virtual/pkgconfig
- system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
- dev-util/intltool
- >=sys-devel/gettext-0.18.1
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="alsa? ( alsa-plugin? (
- >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}]
-) )"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt4 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
- equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
- system-wide? (
- alsa? ( media-sound/alsa-utils )
- bluetooth? ( net-wireless/bluez:= )
- )
-"
-
-pkg_pretend() {
- CONFIG_CHECK="~HIGH_RES_TIMERS"
- WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
- check_extra_config
-
- if linux_config_exists; then
- local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
- if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
- ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
- ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
- fi
- fi
-}
-
-pkg_setup() {
- linux-info_pkg_setup
- gnome2_environment_reset #543364
-
- enewgroup audio 18 # Just make sure it exists
-
- if use system-wide; then
- enewgroup pulse-access
- enewgroup pulse
- enewuser pulse -1 -1 /var/run/pulse pulse,audio
- fi
-}
-
-src_prepare() {
- # Skip test that cannot work with sandbox, bug #501846
- sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
-
- # Fix CVE-2014-3970, bug #512516 (from 'master')
- #epatch "${FILESDIR}/${P}-crash-udp.patch"
-
- # module-switch-on-port-available: Don't switch profiles on uninitialized cards (from 'master')
- #epatch "${FILESDIR}/${P}-module-switch.patch"
-
- # Fix module-zeroconf-publish crashes, bug #504612 (from 'master')
- #epatch "${FILESDIR}"/${P}-zeroconf-crash-{1,2,3}.patch
-
- epatch_user
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf=()
-
- if use gdbm; then
- myconf+=( --with-database=gdbm )
- #elif use tdb; then
- # myconf+=( --with-database=tdb )
- else
- myconf+=( --with-database=simple )
- fi
-
- if use bluetooth; then
- if multilib_is_native_abi; then
- if has_version '<net-wireless/bluez-5'; then
- myconf+=( --disable-bluez5 --enable-bluez4 )
- else
- myconf+=( --enable-bluez5 --disable-bluez4
- $(use_enable native-headset bluez5-native-headset)
- $(use_enable ofono-headset bluez5-ofono-headset) )
- fi
- fi
- else
- myconf+=( --disable-bluez5 --disable-bluez4 )
- fi
-
- myconf+=(
- --enable-largefile
- $(use_enable glib glib2)
- --disable-solaris
- $(use_enable asyncns)
- $(use_enable oss oss-output)
- $(use_enable alsa)
- $(use_enable lirc)
- $(use_enable neon neon-opt)
- $(use_enable tcpd tcpwrap)
- $(use_enable jack)
- $(use_enable zeroconf avahi)
- $(use_enable dbus)
- $(use_enable gnome gconf)
- $(use_enable gtk gtk3)
- $(use_enable libsamplerate samplerate)
- $(use_enable orc)
- $(use_enable X x11)
- $(use_enable test default-build-tests)
- $(use_enable udev)
- $(use_enable systemd systemd-daemon)
- $(use_enable systemd systemd-login)
- $(use_enable systemd systemd-journal)
- $(use_enable ipv6)
- $(use_enable ssl openssl)
- $(use_enable webrtc-aec)
- $(use_enable xen)
- $(use_with caps)
- $(use_with equalizer fftw)
- --disable-adrian-aec
- --disable-esound
- --localstatedir="${EPREFIX}"/var
- --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
- --with-systemduserunitdir=$(systemd_get_userunitdir)
- )
-
- if ! multilib_is_native_abi; then
- # disable all the modules and stuff
- myconf+=(
- --disable-oss-output
- --disable-alsa
- --disable-lirc
- --disable-jack
- --disable-avahi
- --disable-gconf
- --disable-gtk3
- --disable-samplerate
- --disable-bluez4
- --disable-bluez5
- --disable-udev
- --disable-openssl
- --disable-orc
- --disable-webrtc-aec
- --disable-xen
- --without-fftw
-
- # tests involve random modules, so just do them for the native
- --disable-default-build-tests
-
- # hack around unnecessary checks
- # (results don't matter, we're not building anything using it)
- ac_cv_lib_ltdl_lt_dladvise_init=yes
- --with-database=simple
- LIBSPEEX_CFLAGS=' '
- LIBSPEEX_LIBS=' '
- )
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- local targets=( libpulse.la libpulse-simple.la )
- use glib && targets+=( libpulse-mainloop-glib.la )
- emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la
- fi
-}
-
-src_compile() {
- multilib-minimal_src_compile
-
- if use doc; then
- pushd doxygen
- doxygen doxygen.conf
- popd
- fi
-}
-
-multilib_src_test() {
- # We avoid running the toplevel check target because that will run
- # po/'s tests too, and they are broken. Officially, it should work
- # with intltool 0.41, but that doesn't look like a stable release.
- if multilib_is_native_abi; then
- emake -C src check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
- else
- local targets=( libpulse.la libpulse-simple.la )
- use glib && targets+=( libpulse-mainloop-glib.la )
- emake DESTDIR="${D}" install-pkgconfigDATA
- emake DESTDIR="${D}" -C src \
- install-libLTLIBRARIES \
- install-padsplibLTLIBRARIES \
- lib_LTLIBRARIES="${targets[*]}" \
- install-pulseincludeHEADERS
- fi
-}
-
-multilib_src_install_all() {
- # Drop the script entirely if X is disabled
- use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
-
- if use system-wide; then
- newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
- use_define() {
- local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
- use "$1" && echo "-D$define" || echo "-U$define"
- }
-
- unifdef $(use_define zeroconf AVAHI) \
- $(use_define alsa) \
- $(use_define bluetooth) \
- $(use_define udev) \
- "${FILESDIR}/pulseaudio.init.d-5" \
- > "${T}/pulseaudio"
-
- doinitd "${T}/pulseaudio"
-
- systemd_dounit "${FILESDIR}/${PN}.service"
- fi
-
- use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
-
- dodoc NEWS README todo
-
- if use doc; then
- pushd doxygen/html
- dohtml *
- popd
- fi
-
- # Create the state directory
- use prefix || diropts -o pulse -g pulse -m0755
-
- # We need /var/run/pulse, bug #442852
- use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-
- # Prevent warnings when system-wide is not used, bug #447694
- use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
-
- prune_libtool_files --all
-}
-
-pkg_postinst() {
- if use system-wide; then
- elog "You have enabled the 'system-wide' USE flag for pulseaudio."
- elog "This mode should only be used on headless servers, embedded systems,"
- elog "or thin clients. It will usually require manual configuration, and is"
- elog "incompatible with many expected pulseaudio features."
- elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
- elog "For more information, see"
- elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
- elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
- elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
- if use gnome ; then
- elog
- elog "By enabling gnome USE flag, you enabled gconf support. Please note"
- elog "that you might need to remove the gnome USE flag or disable the"
- elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
- elog "with a system-wide instance."
- fi
- fi
-
- if use equalizer && ! use qt4; then
- elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
- elog "This will build the equalizer module, but the 'qpaeq' tool"
- elog "which is required to set equalizer levels will not work."
- fi
-
- if use native-headset && use ofono-headset; then
- elog "You have enabled both native and ofono headset profiles. The runtime decision"
- elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
- fi
-
- if use libsamplerate; then
- elog "The libsamplerate based resamplers are now deprecated, because they offer no"
- elog "particular advantage over speex. Upstream suggests disabling them."
- fi
-
- # Needed for pulseaudio-6.0 update from older versions
- if use udev; then
- if ! version_is_at_least 6.0 ${REPLACING_VERSIONS}; then
- udevadm control --reload && udevadm trigger
- fi
- fi
-}
diff --git a/media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild
deleted file mode 100644
index 284d4f05056d..000000000000
--- a/media-sound/pulseaudio/pulseaudio-7.0-r1.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info readme.gentoo systemd user versionator udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/"
-SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-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"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
-gnome gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
-+orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
-+webrtc-aec +X xen zeroconf"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
- bluetooth? ( dbus )
- ofono-headset? ( bluetooth )
- native-headset? ( bluetooth )
- udev? ( || ( alsa oss ) )
-"
-
-# libpcre needed in some cases, bug #472228
-RDEPEND="
- || (
- elibc_glibc? ( virtual/libc )
- elibc_uclibc? ( virtual/libc )
- dev-libs/libpcre
- )
- >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
- X? (
- >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
- x11-libs/libSM[${MULTILIB_USEDEP}]
- x11-libs/libICE[${MULTILIB_USEDEP}]
- x11-libs/libXtst[${MULTILIB_USEDEP}]
- )
- caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
- alsa? ( >=media-libs/alsa-lib-1.0.19 )
- glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
- zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
- jack? ( >=media-sound/jack-audio-connection-kit-0.117 )
- tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
- lirc? ( app-misc/lirc )
- dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
- gtk? ( x11-libs/gtk+:3 )
- gnome? ( >=gnome-base/gconf-2.4.0 )
- bluetooth? (
- net-wireless/bluez:=
- >=sys-apps/dbus-1.0.0
- media-libs/sbc
- )
- asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
- udev? ( >=virtual/udev-143[hwdb(+)] )
- realtime? ( sys-auth/rtkit )
- equalizer? ( sci-libs/fftw:3.0 )
- ofono-headset? ( >=net-misc/ofono-1.13 )
- orc? ( >=dev-lang/orc-0.4.15 )
- sox? ( >=media-libs/soxr-0.1.1 )
- ssl? (
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl )
- )
- >=media-libs/speex-1.2_rc1
- gdbm? ( sys-libs/gdbm )
- webrtc-aec? ( media-libs/webrtc-audio-processing )
- xen? ( app-emulation/xen-tools )
- systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
- >=dev-libs/json-c-0.11[${MULTILIB_USEDEP}]
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
- dev-libs/libltdl:0
- selinux? ( sec-policy/selinux-pulseaudio )
-"
-# it's a valid RDEPEND, libltdl.so is used for native abi
-
-DEPEND="${RDEPEND}
- sys-devel/m4
- doc? ( app-doc/doxygen )
- test? ( dev-libs/check )
- X? (
- x11-proto/xproto[${MULTILIB_USEDEP}]
- >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
- )
- dev-libs/libatomic_ops
- virtual/pkgconfig
- system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
- dev-util/intltool
- >=sys-devel/gettext-0.18.1
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
- alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt4 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
- equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
- system-wide? (
- alsa? ( media-sound/alsa-utils )
- bluetooth? ( net-wireless/bluez:= )
- )
-"
-
-pkg_pretend() {
- CONFIG_CHECK="~HIGH_RES_TIMERS"
- WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
- check_extra_config
-
- if linux_config_exists; then
- local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
- if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
- ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
- ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
- fi
- fi
-}
-
-pkg_setup() {
- linux-info_pkg_setup
- gnome2_environment_reset #543364
-
- enewgroup audio 18 # Just make sure it exists
-
- if use system-wide; then
- enewgroup pulse-access
- enewgroup pulse
- enewuser pulse -1 -1 /var/run/pulse pulse,audio
- fi
-}
-
-src_prepare() {
- # Skip test that cannot work with sandbox, bug #501846
- sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
-
- epatch_user
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf=()
-
- if use gdbm; then
- myconf+=( --with-database=gdbm )
- else
- myconf+=( --with-database=simple )
- fi
-
- if use bluetooth; then
- if multilib_is_native_abi; then
- if has_version '<net-wireless/bluez-5'; then
- myconf+=( --disable-bluez5 --enable-bluez4 )
- else
- myconf+=( --enable-bluez5 --disable-bluez4
- $(use_enable native-headset bluez5-native-headset)
- $(use_enable ofono-headset bluez5-ofono-headset) )
- fi
- fi
- else
- myconf+=( --disable-bluez5 --disable-bluez4 )
- fi
-
- myconf+=(
- --enable-largefile
- $(use_enable glib glib2)
- --disable-solaris
- $(use_enable asyncns)
- $(use_enable oss oss-output)
- $(use_enable alsa)
- $(use_enable lirc)
- $(use_enable neon neon-opt)
- $(use_enable tcpd tcpwrap)
- $(use_enable jack)
- $(use_enable zeroconf avahi)
- $(use_enable dbus)
- $(use_enable gnome gconf)
- $(use_enable gtk gtk3)
- $(use_enable libsamplerate samplerate)
- $(use_enable orc)
- $(use_enable X x11)
- $(use_enable test default-build-tests)
- $(use_enable udev)
- $(use_with sox soxr)
- $(use_enable systemd systemd-daemon)
- $(use_enable systemd systemd-login)
- $(use_enable systemd systemd-journal)
- $(use_enable ipv6)
- $(use_enable ssl openssl)
- $(use_enable webrtc-aec)
- $(use_enable xen)
- $(use_with caps)
- $(use_with equalizer fftw)
- --disable-adrian-aec
- --disable-esound
- --localstatedir="${EPREFIX}"/var
- --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
- --with-systemduserunitdir=$(systemd_get_userunitdir)
- )
-
- if ! multilib_is_native_abi; then
- # disable all the modules and stuff
- myconf+=(
- --disable-oss-output
- --disable-alsa
- --disable-lirc
- --disable-jack
- --disable-avahi
- --disable-gconf
- --disable-gtk3
- --disable-samplerate
- --disable-bluez4
- --disable-bluez5
- --disable-udev
- --disable-openssl
- --disable-orc
- --disable-webrtc-aec
- --disable-xen
- --without-fftw
- --without-soxr
-
- # tests involve random modules, so just do them for the native
- --disable-default-build-tests
-
- # hack around unnecessary checks
- # (results don't matter, we're not building anything using it)
- ac_cv_lib_ltdl_lt_dladvise_init=yes
- --with-database=simple
- LIBSPEEX_CFLAGS=' '
- LIBSPEEX_LIBS=' '
- )
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- use doc && emake doxygen
- else
- local targets=( libpulse.la libpulse-simple.la )
- use glib && targets+=( libpulse-mainloop-glib.la )
- emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la
- fi
-}
-
-multilib_src_test() {
- # We avoid running the toplevel check target because that will run
- # po/'s tests too, and they are broken. Officially, it should work
- # with intltool 0.41, but that doesn't look like a stable release.
- if multilib_is_native_abi; then
- emake -C src check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
- use doc && dohtml -r doxygen/html/
- else
- local targets=( libpulse.la libpulse-simple.la )
- use glib && targets+=( libpulse-mainloop-glib.la )
- emake DESTDIR="${D}" install-pkgconfigDATA
- emake DESTDIR="${D}" -C src \
- install-libLTLIBRARIES \
- install-padsplibLTLIBRARIES \
- lib_LTLIBRARIES="${targets[*]}" \
- install-pulseincludeHEADERS
- fi
-}
-
-multilib_src_install_all() {
- # Drop the script entirely if X is disabled
- use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
-
- if use system-wide; then
- newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
- use_define() {
- local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
- use "$1" && echo "-D$define" || echo "-U$define"
- }
-
- unifdef $(use_define zeroconf AVAHI) \
- $(use_define alsa) \
- $(use_define bluetooth) \
- $(use_define udev) \
- "${FILESDIR}/pulseaudio.init.d-5" \
- > "${T}/pulseaudio"
-
- doinitd "${T}/pulseaudio"
-
- systemd_dounit "${FILESDIR}/${PN}.service"
- fi
-
- use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
-
- dodoc NEWS README todo
-
- # Create the state directory
- use prefix || diropts -o pulse -g pulse -m0755
-
- # We need /var/run/pulse, bug #442852
- use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-
- # Prevent warnings when system-wide is not used, bug #447694
- use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
-
- prune_libtool_files --all
-}
-
-pkg_postinst() {
- if use system-wide; then
- elog "You have enabled the 'system-wide' USE flag for pulseaudio."
- elog "This mode should only be used on headless servers, embedded systems,"
- elog "or thin clients. It will usually require manual configuration, and is"
- elog "incompatible with many expected pulseaudio features."
- elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
- elog "For more information, see"
- elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
- elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
- elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
- if use gnome ; then
- elog
- elog "By enabling gnome USE flag, you enabled gconf support. Please note"
- elog "that you might need to remove the gnome USE flag or disable the"
- elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
- elog "with a system-wide instance."
- fi
- fi
-
- if use equalizer && ! use qt4; then
- elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
- elog "This will build the equalizer module, but the 'qpaeq' tool"
- elog "which is required to set equalizer levels will not work."
- fi
-
- if use native-headset && use ofono-headset; then
- elog "You have enabled both native and ofono headset profiles. The runtime decision"
- elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
- fi
-
- if use libsamplerate; then
- elog "The libsamplerate based resamplers are now deprecated, because they offer no"
- elog "particular advantage over speex. Upstream suggests disabling them."
- fi
-
- # Needed for pulseaudio-6.0 update from older versions
- if use udev; then
- if ! version_is_at_least 6.0 ${REPLACING_VERSIONS}; then
- udevadm control --reload && udevadm trigger
- fi
- fi
-}
diff --git a/media-sound/pulseaudio/pulseaudio-7.0.ebuild b/media-sound/pulseaudio/pulseaudio-7.0.ebuild
deleted file mode 100644
index a441fda7d4cb..000000000000
--- a/media-sound/pulseaudio/pulseaudio-7.0.ebuild
+++ /dev/null
@@ -1,368 +0,0 @@
-# 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 flag-o-matic gnome2-utils linux-info readme.gentoo systemd user versionator udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="http://www.pulseaudio.org/"
-SRC_URI="http://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
-gnome gtk ipv6 jack libsamplerate lirc native-headset neon ofono-headset
-+orc oss qt4 realtime selinux sox ssl systemd system-wide tcpd test +udev
-+webrtc-aec +X xen zeroconf"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
- bluetooth? ( dbus )
- ofono-headset? ( bluetooth )
- native-headset? ( bluetooth )
- udev? ( || ( alsa oss ) )
-"
-
-# libpcre needed in some cases, bug #472228
-RDEPEND="
- || (
- elibc_glibc? ( virtual/libc )
- elibc_uclibc? ( virtual/libc )
- dev-libs/libpcre
- )
- >=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
- X? (
- >=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
- x11-libs/libSM[${MULTILIB_USEDEP}]
- x11-libs/libICE[${MULTILIB_USEDEP}]
- x11-libs/libXtst[${MULTILIB_USEDEP}]
- )
- caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
- alsa? ( >=media-libs/alsa-lib-1.0.19 )
- glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
- zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
- jack? ( >=media-sound/jack-audio-connection-kit-0.117 )
- tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
- lirc? ( app-misc/lirc )
- dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
- gtk? ( x11-libs/gtk+:3 )
- gnome? ( >=gnome-base/gconf-2.4.0 )
- bluetooth? (
- net-wireless/bluez:=
- >=sys-apps/dbus-1.0.0
- media-libs/sbc
- )
- asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
- udev? ( >=virtual/udev-143[hwdb(+)] )
- realtime? ( sys-auth/rtkit )
- equalizer? ( sci-libs/fftw:3.0 )
- ofono-headset? ( >=net-misc/ofono-1.13 )
- orc? ( >=dev-lang/orc-0.4.15 )
- sox? ( >=media-libs/soxr-0.1.1 )
- ssl? ( dev-libs/openssl:0 )
- >=media-libs/speex-1.2_rc1
- gdbm? ( sys-libs/gdbm )
- webrtc-aec? ( media-libs/webrtc-audio-processing )
- xen? ( app-emulation/xen-tools )
- systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
- >=dev-libs/json-c-0.11[${MULTILIB_USEDEP}]
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1
- !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
- dev-libs/libltdl:0
- selinux? ( sec-policy/selinux-pulseaudio )
-"
-# it's a valid RDEPEND, libltdl.so is used for native abi
-
-DEPEND="${RDEPEND}
- sys-devel/m4
- doc? ( app-doc/doxygen )
- test? ( dev-libs/check )
- X? (
- x11-proto/xproto[${MULTILIB_USEDEP}]
- >=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
- )
- dev-libs/libatomic_ops
- virtual/pkgconfig
- system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
- dev-util/intltool
- >=sys-devel/gettext-0.18.1
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
- alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt4 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
- equalizer? ( qt4? ( dev-python/PyQt4[dbus] ) )
- system-wide? (
- alsa? ( media-sound/alsa-utils )
- bluetooth? ( net-wireless/bluez:= )
- )
-"
-
-pkg_pretend() {
- CONFIG_CHECK="~HIGH_RES_TIMERS"
- WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
- check_extra_config
-
- if linux_config_exists; then
- local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
- if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
- ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
- ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
- fi
- fi
-}
-
-pkg_setup() {
- linux-info_pkg_setup
- gnome2_environment_reset #543364
-
- enewgroup audio 18 # Just make sure it exists
-
- if use system-wide; then
- enewgroup pulse-access
- enewgroup pulse
- enewuser pulse -1 -1 /var/run/pulse pulse,audio
- fi
-}
-
-src_prepare() {
- # Skip test that cannot work with sandbox, bug #501846
- sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
-
- epatch_user
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf=()
-
- if use gdbm; then
- myconf+=( --with-database=gdbm )
- else
- myconf+=( --with-database=simple )
- fi
-
- if use bluetooth; then
- if multilib_is_native_abi; then
- if has_version '<net-wireless/bluez-5'; then
- myconf+=( --disable-bluez5 --enable-bluez4 )
- else
- myconf+=( --enable-bluez5 --disable-bluez4
- $(use_enable native-headset bluez5-native-headset)
- $(use_enable ofono-headset bluez5-ofono-headset) )
- fi
- fi
- else
- myconf+=( --disable-bluez5 --disable-bluez4 )
- fi
-
- myconf+=(
- --enable-largefile
- $(use_enable glib glib2)
- --disable-solaris
- $(use_enable asyncns)
- $(use_enable oss oss-output)
- $(use_enable alsa)
- $(use_enable lirc)
- $(use_enable neon neon-opt)
- $(use_enable tcpd tcpwrap)
- $(use_enable jack)
- $(use_enable zeroconf avahi)
- $(use_enable dbus)
- $(use_enable gnome gconf)
- $(use_enable gtk gtk3)
- $(use_enable libsamplerate samplerate)
- $(use_enable orc)
- $(use_enable X x11)
- $(use_enable test default-build-tests)
- $(use_enable udev)
- $(use_with sox soxr)
- $(use_enable systemd systemd-daemon)
- $(use_enable systemd systemd-login)
- $(use_enable systemd systemd-journal)
- $(use_enable ipv6)
- $(use_enable ssl openssl)
- $(use_enable webrtc-aec)
- $(use_enable xen)
- $(use_with caps)
- $(use_with equalizer fftw)
- --disable-adrian-aec
- --disable-esound
- --localstatedir="${EPREFIX}"/var
- --with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
- --with-systemduserunitdir=$(systemd_get_userunitdir)
- )
-
- if ! multilib_is_native_abi; then
- # disable all the modules and stuff
- myconf+=(
- --disable-oss-output
- --disable-alsa
- --disable-lirc
- --disable-jack
- --disable-avahi
- --disable-gconf
- --disable-gtk3
- --disable-samplerate
- --disable-bluez4
- --disable-bluez5
- --disable-udev
- --disable-openssl
- --disable-orc
- --disable-webrtc-aec
- --disable-xen
- --without-fftw
- --without-soxr
-
- # tests involve random modules, so just do them for the native
- --disable-default-build-tests
-
- # hack around unnecessary checks
- # (results don't matter, we're not building anything using it)
- ac_cv_lib_ltdl_lt_dladvise_init=yes
- --with-database=simple
- LIBSPEEX_CFLAGS=' '
- LIBSPEEX_LIBS=' '
- )
- fi
-
- ECONF_SOURCE=${S} \
- econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- use doc && emake doxygen
- else
- local targets=( libpulse.la libpulse-simple.la )
- use glib && targets+=( libpulse-mainloop-glib.la )
- emake -C src libpulse{,dsp,-simple,-mainloop-glib}.la
- fi
-}
-
-multilib_src_test() {
- # We avoid running the toplevel check target because that will run
- # po/'s tests too, and they are broken. Officially, it should work
- # with intltool 0.41, but that doesn't look like a stable release.
- if multilib_is_native_abi; then
- emake -C src check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
- use doc && dohtml -r doxygen/html/
- else
- local targets=( libpulse.la libpulse-simple.la )
- use glib && targets+=( libpulse-mainloop-glib.la )
- emake DESTDIR="${D}" install-pkgconfigDATA
- emake DESTDIR="${D}" -C src \
- install-libLTLIBRARIES \
- install-padsplibLTLIBRARIES \
- lib_LTLIBRARIES="${targets[*]}" \
- install-pulseincludeHEADERS
- fi
-}
-
-multilib_src_install_all() {
- # Drop the script entirely if X is disabled
- use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
-
- if use system-wide; then
- newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
- use_define() {
- local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
- use "$1" && echo "-D$define" || echo "-U$define"
- }
-
- unifdef $(use_define zeroconf AVAHI) \
- $(use_define alsa) \
- $(use_define bluetooth) \
- $(use_define udev) \
- "${FILESDIR}/pulseaudio.init.d-5" \
- > "${T}/pulseaudio"
-
- doinitd "${T}/pulseaudio"
-
- systemd_dounit "${FILESDIR}/${PN}.service"
- fi
-
- use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
-
- dodoc NEWS README todo
-
- # Create the state directory
- use prefix || diropts -o pulse -g pulse -m0755
-
- # We need /var/run/pulse, bug #442852
- use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-
- # Prevent warnings when system-wide is not used, bug #447694
- use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
-
- prune_libtool_files --all
-}
-
-pkg_postinst() {
- if use system-wide; then
- elog "You have enabled the 'system-wide' USE flag for pulseaudio."
- elog "This mode should only be used on headless servers, embedded systems,"
- elog "or thin clients. It will usually require manual configuration, and is"
- elog "incompatible with many expected pulseaudio features."
- elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
- elog "For more information, see"
- elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
- elog " http://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
- elog " https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
- if use gnome ; then
- elog
- elog "By enabling gnome USE flag, you enabled gconf support. Please note"
- elog "that you might need to remove the gnome USE flag or disable the"
- elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
- elog "with a system-wide instance."
- fi
- fi
-
- if use equalizer && ! use qt4; then
- elog "You've enabled the 'equalizer' USE-flag but not the 'qt4' USE-flag."
- elog "This will build the equalizer module, but the 'qpaeq' tool"
- elog "which is required to set equalizer levels will not work."
- fi
-
- if use native-headset && use ofono-headset; then
- elog "You have enabled both native and ofono headset profiles. The runtime decision"
- elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
- fi
-
- if use libsamplerate; then
- elog "The libsamplerate based resamplers are now deprecated, because they offer no"
- elog "particular advantage over speex. Upstream suggests disabling them."
- fi
-
- # Needed for pulseaudio-6.0 update from older versions
- if use udev; then
- if ! version_is_at_least 6.0 ${REPLACING_VERSIONS}; then
- udevadm control --reload && udevadm trigger
- fi
- fi
-}
diff --git a/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff b/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff
index 603901868e6f..3a5335bdbb81 100644
--- a/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff
+++ b/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff
@@ -1,5 +1,5 @@
---- splay.cc~ 2005-04-03 19:56:37.000000000 -0300
-+++ splay.cc 2005-04-03 19:58:24.000000000 -0300
+--- splay-0.9.5.2/apps/splay.cc
++++ splay-0.9.5.2/apps/splay.cc
@@ -184,9 +184,11 @@
delete mytag;
diff --git a/media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch b/media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch
new file mode 100644
index 000000000000..286228af449f
--- /dev/null
+++ b/media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch
@@ -0,0 +1,211 @@
+--- splay-0.9.5.2/apps/common.cc
++++ splay-0.9.5.2/apps/common.cc
+@@ -34,7 +34,7 @@
+ int splay_threadnum=50;
+ #endif
+
+-char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
++const char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
+ { "Failed to open sound device.",
+ "Sound device is busy.",
+ "Buffersize of sound device is wrong.",
+--- splay-0.9.5.2/apps/splay.cc
++++ splay-0.9.5.2/apps/splay.cc
+@@ -16,20 +16,23 @@
+
+ #include <sys/types.h>
+ #include <sys/wait.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #ifdef HAVE_LIBID3
+ #include <id3/tag.h>
+ #include <id3/misc_support.h>
+ #endif /* HAVE_LIBID3 */
+
+-#include <iomanip.h>
++#include <iomanip>
++
++using std::cout;
++using std::endl;
+
+ #include "mpegsound.h"
+
+ #include "splay.h"
+
+-static char *help=
++static const char *help=
+ "\t-2 : playing with half frequency.\n"
+ "\t-e : exit when playing is done. (only XSPLAY)\n"
+ "\t-f : display frame and time info (played and remaining).\n"
+--- splay-0.9.5.2/apps/splay.h
++++ splay-0.9.5.2/apps/splay.h
+@@ -20,7 +20,7 @@
+ splay_forcetomonoflag,
+ splay_frameinfo;
+
+-extern char *splay_Sounderrors[];
++extern const char *splay_Sounderrors[];
+
+ #ifdef PTHREADEDMPEG
+ extern int splay_threadnum;
+--- splay-0.9.5.2/apps/xsplay.cc
++++ splay-0.9.5.2/apps/xsplay.cc
+@@ -29,8 +29,8 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++#include <iomanip>
+
+ #include "mpegsound.h"
+ #include "xsplay.h"
+--- splay-0.9.5.2/libs/fileplayer.cc
++++ splay-0.9.5.2/libs/fileplayer.cc
+@@ -10,7 +10,7 @@
+ #endif
+
+ #include <string.h>
+-#include <iostream.h>
++#include <iostream>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+@@ -18,6 +18,10 @@
+
+ #include "mpegsound.h"
+
++using std::cout;
++using std::cerr;
++using std::endl;
++
+ // File player superclass
+ Fileplayer::Fileplayer()
+ {
+@@ -43,7 +47,7 @@
+ if(server)delete server;
+ }
+
+-bool Mpegfileplayer::openfile(char *filename,char *device)
++bool Mpegfileplayer::openfile(char *filename, const char *device)
+ {
+ // Player
+ if(device==NULL){
+@@ -188,7 +192,7 @@
+
+ void Mpegfileplayer::showverbose(int )
+ {
+- static char *modestring[4]={"stereo","joint stereo","dual channel","mono"};
++ static const char *modestring[4]={"stereo","joint stereo","dual channel","mono"};
+
+ fprintf(stderr,"\tMPEG-%d Layer %d, %s,\n\t%dHz%s, %dkbit/s, ",
+ server->getversion()+1,
+--- splay-0.9.5.2/libs/mpegsound.h
++++ splay-0.9.5.2/libs/mpegsound.h
+@@ -230,7 +230,7 @@
+ Soundplayer() {__errorcode=SOUND_ERROR_OK;};
+ virtual ~Soundplayer();
+
+- virtual bool initialize(char *filename) =0;
++ virtual bool initialize(const char *filename) =0;
+ virtual void abort(void);
+ virtual int getprocessed(void);
+
+@@ -255,7 +255,7 @@
+ public:
+ ~Rawtofile();
+
+- bool initialize(char *filename);
++ bool initialize(const char *filename);
+ bool setsoundtype(int stereo,int samplesize,int speed);
+ bool putblock(void *buffer,int size);
+
+@@ -270,7 +270,7 @@
+ public:
+ ~Rawplayer();
+
+- bool initialize(char *filename);
++ bool initialize(const char *filename);
+ void abort(void);
+ int getprocessed(void);
+
+@@ -284,7 +284,7 @@
+ void setquota(int q){quota=q;};
+ int getquota(void) {return quota;};
+
+- static char *defaultdevice;
++ static const char *defaultdevice;
+ static int setvolume(int volume);
+
+ private:
+@@ -573,7 +573,7 @@
+
+ int geterrorcode(void) {return __errorcode;};
+
+- virtual bool openfile(char *filename,char *device)=0;
++ virtual bool openfile(char *filename, const char *device)=0;
+ virtual void setforcetomono(bool flag) =0;
+ virtual bool playing(int verbose,bool frameinfo, int startframe) =0;
+
+@@ -593,7 +593,7 @@
+ Mpegfileplayer();
+ ~Mpegfileplayer();
+
+- bool openfile(char *filename,char *device);
++ bool openfile(char *filename, const char *device);
+ void setforcetomono(bool flag);
+ void setdownfrequency(int value);
+ bool playing(int verbose, bool frameinfo, int startframe);
+--- splay-0.9.5.2/libs/mpegtoraw.cc
++++ splay-0.9.5.2/libs/mpegtoraw.cc
+@@ -552,7 +552,7 @@
+ #endif
+
+
+-#include <iostream.h>
++#include <iostream>
+ // Convert mpeg to raw
+ bool Mpegtoraw::run(int frames)
+ {
+--- splay-0.9.5.2/libs/rawplayer.cc
++++ splay-0.9.5.2/libs/rawplayer.cc
+@@ -24,7 +24,7 @@
+ #define IOCTL(a,b,c) (c = ioctl(a,b,c) )
+ #endif
+
+-char *Rawplayer::defaultdevice="/dev/dsp";
++const char *Rawplayer::defaultdevice="/dev/dsp";
+
+ /* Volume */
+ int Rawplayer::setvolume(int volume)
+@@ -57,7 +57,7 @@
+ close(audiohandle);
+ }
+
+-bool Rawplayer::initialize(char *filename)
++bool Rawplayer::initialize(const char *filename)
+ {
+ int flag;
+
+@@ -172,7 +172,7 @@
+
+ if(quota)
+ while(getprocessed()>quota)usleep(3);
+- write(audiohandle,buffer,modifiedsize);
++ if(write(audiohandle,buffer,modifiedsize)) {}
+
+ return true;
+ }
+--- splay-0.9.5.2/libs/rawtofile.cc
++++ splay-0.9.5.2/libs/rawtofile.cc
+@@ -20,7 +20,7 @@
+ close(filehandle);
+ }
+
+-bool Rawtofile::initialize(char *filename)
++bool Rawtofile::initialize(const char *filename)
+ {
+ if(filename==NULL)filehandle=1;
+ else if((filehandle=creat(filename,0644))==-1)
diff --git a/media-sound/splay/splay-0.9.5.2-r1.ebuild b/media-sound/splay/splay-0.9.5.2-r1.ebuild
new file mode 100644
index 000000000000..711310617779
--- /dev/null
+++ b/media-sound/splay/splay-0.9.5.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="An audio player, primarily for the console"
+HOMEPAGE="http://splay.sourceforge.net/"
+SRC_URI="http://splay.sourceforge.net/tgz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+PATCHES=(
+ "${FILESDIR}/${P}-external-id3lib.diff"
+ "${FILESDIR}/${P}-gcc43-2.patch"
+ "${FILESDIR}/${P}-modernize-cpp.patch"
+)
+
+src_prepare() {
+ mv configure.{in,ac} || die
+ default
+ eautoreconf
+}
diff --git a/media-sound/wavegain/Manifest b/media-sound/wavegain/Manifest
index c85b8d0afed4..55fc42df221f 100644
--- a/media-sound/wavegain/Manifest
+++ b/media-sound/wavegain/Manifest
@@ -1,2 +1 @@
-DIST wavegain-1.3.0srcs.zip 75536 SHA256 0845abed38d361b240ecc061eb9fdf60c7d61908fec943e4c181930ae519c214 SHA512 00c30e37c157cb31e9cc3220a06e9687205fe74f6fe73f81efcdc31fa8ca4abb2654845cdc405edcb7104fbd295ad4e3aff9e61dec12b1706950b53791365e12 WHIRLPOOL 95865bca2cf7223de89dc45e690eda862b105722c5d52de4958e170c8ef4c21e6c0b2a0c04afe83cd2c3afa7abfe386858f3071d4f570917d374b0f37fadff94
DIST wavegain-1.3.1srcs.zip 72180 SHA256 773aaa8e18a0c130714f4bf21afb9ee0ba29d6c5742002191bfdf52f25b48da0 SHA512 5d0d589259e362a415a5cd5e42464b5e7c7e79c62082ebd423457b6e2d9c3d15300d854e57e2c51c66f1579394bbcdc3d754bb8363d809c2d8d5f03b09dce054 WHIRLPOOL 2a36c8b8b076e0250547041ff7fff01c240677376992aab1edb7a2e09971c39c5b33aa6731d8d34b108a55cdbb666f0bebf165daffcd6ebff59f4cdcbff271d4
diff --git a/media-sound/wavegain/wavegain-1.3.0.ebuild b/media-sound/wavegain/wavegain-1.3.0.ebuild
deleted file mode 100644
index 1ab07bbe554d..000000000000
--- a/media-sound/wavegain/wavegain-1.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="ReplayGain for WAVE audio files"
-HOMEPAGE="http://www.rarewares.org/files/others/"
-SRC_URI="http://www.rarewares.org/files/others/${P}srcs.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-S=${WORKDIR}/${P/wavegain/WaveGain}
-
-src_compile(){
- $(tc-getCC) ${LDFLAGS} ${CFLAGS} *.c -o ${PN} \
- -DHAVE_CONFIG_H -lm || die "build failed"
-}
-
-src_install(){
- dobin ${PN}
-}
diff --git a/media-tv/tvbrowser/files/3.4.3-build.xml.patch b/media-tv/tvbrowser/files/3.4.3-build.xml.patch
new file mode 100644
index 000000000000..570bff32db76
--- /dev/null
+++ b/media-tv/tvbrowser/files/3.4.3-build.xml.patch
@@ -0,0 +1,109 @@
+--- build.xml.orig 2015-03-24 17:34:18.753531031 +0000
++++ build.xml 2015-03-24 17:38:48.013509290 +0000
+@@ -105,32 +105,6 @@
+ | Task definitions
+ |
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+-
+- <!-- Creates an .app file for Mac OS X (http://informagen.com/JarBundler/) -->
+- <taskdef name="jarbundler"
+- classpath="deployment/macosx/jarbundler-2.0.0.jar"
+- classname="net.sourceforge.jarbundler.JarBundler" />
+-
+- <!-- Creates a Windows Executable using launch4j (http://launch4j.sf.net) -->
+- <taskdef name="launch4j"
+- classname="net.sf.launch4j.ant.Launch4jTask"
+- classpath="${deployment.dir}/win/launch4j/launch4j.jar:${deployment.dir}/win/launch4j/lib/xstream.jar" />
+-
+- <!-- Creates a linux desktopEntry-->
+- <taskdef name="desktopEntry"
+- classname="com.googlecode.ant_deb_task.DesktopEntry"
+- classpathref="ant-deb.classpath"/>
+-
+- <!-- Creates an Ubuntu package-->
+- <taskdef name="deb"
+- classname="com.googlecode.ant_deb_task.Deb"
+- classpathref="ant-deb.classpath"/>
+-
+- <!-- Creates a RedHad package-->
+- <taskdef name="rrpm"
+- classname="org.redline_rpm.RedlineTask"
+- classpathref="ant-rpm.classpath"/>
+-
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ |
+ | Display all targets
+@@ -329,6 +303,7 @@
+ <echo message="Creating the jars ..."/>
+
+ <!-- Extract the libraries for the tvbrowser.jar into the temp.dir -->
++ <!--
+ <unjar src="${lib.dir}/${lib.skinlf.name}-${lib.skinlf.version}.jar" dest="${unpacked.dir}/${lib.skinlf.name}.jar"/>
+ <unjar src="${lib.dir}/${lib.bsh.name}-${lib.bsh.version}.jar" dest="${unpacked.dir}/${lib.bsh.name}.jar"/>
+ <unjar src="${lib.dir}/${lib.jgoodies-common.name}-${lib.jgoodies-common.version}.jar" dest="${unpacked.dir}/${lib.jgoodies-common.name}.jar"/>
+@@ -343,6 +318,7 @@
+ <unjar src="${lib.dir}/${lib.texhyphj.name}-${lib.texhyphj.version}.jar" dest="${unpacked.dir}/${lib.texhyphj.name}.jar" />
+ <unjar src="${lib.dir}/${lib.substance.name}-${lib.substance.version}.jar" dest="${unpacked.dir}/${lib.substance.name}.jar" />
+ <unjar src="${lib.dir}/${lib.trident.name}-${lib.trident.version}.jar" dest="${unpacked.dir}/${lib.trident.name}.jar" />
++ -->
+
+ <!-- Pack the tvbrowser.jar -->
+ <jar jarfile="${tvbrowser-default.runtime.dir}/tvbrowser.jar"
+@@ -357,6 +333,7 @@
+ <fileset dir="${classes.dir}" includes="tvdataservice/**"/>
+ <fileset dir="${classes.dir}" includes="util/**"/>
+ <fileset dir="${classes.dir}" includes="com/**"/>
++ <!--
+ <fileset dir="${classes.dir}/imgs" includes="splash.png"/>
+ <fileset dir="${unpacked.dir}/${lib.skinlf.name}.jar" includes="com/**"/>
+ <fileset dir="${unpacked.dir}/${lib.skinlf.name}.jar" includes="org/**"/>
+@@ -373,6 +350,7 @@
+ <fileset dir="${unpacked.dir}/${lib.texhyphj.name}.jar" includes="net/**"/>
+ <fileset dir="${unpacked.dir}/${lib.substance.name}.jar" includes="org/**"/>
+ <fileset dir="${unpacked.dir}/${lib.trident.name}.jar" includes="org/**"/>
++ -->
+ </jar>
+
+ <!-- Copy the other stuff -->
+@@ -431,7 +409,9 @@
+
+ <!-- Extract the libraries for the tvbrowser.jar into the temp.dir -->
+ <mkdir dir="${unpacked.dir}/${lib.commons.net.name}.jar"/>
++ <!--
+ <unjar src="${lib.dir}/${lib.commons.net.name}-${lib.commons.net.version}.jar" dest="${unpacked.dir}/${lib.commons.net.name}.jar"/>
++ -->
+
+ </target>
+
+@@ -555,6 +535,7 @@
+
+ <!-- Creates the desktop entry file for Linux platforms -->
+ <target name="tvbrowser-desktop-entry">
++ <!--
+ <desktopEntry
+ toFile="${tvbrowser-linux.runtime.dir}/tvbrowser.desktop"
+ name="TV-Browser"
+@@ -571,6 +552,7 @@
+ <comment lang="de" value="Anpassbare und einfach zu benutzende TV-Zeitschrift - geschrieben in Java"/>
+ </desktopEntry>
+ <echo file="${tvbrowser-linux.runtime.dir}/tvbrowser.desktop" append="true">StartupWMClass=tvbrowser-TVBrowser</echo>
++ -->
+ </target>
+
+ <!-- Creates the desktop entry file for Ubuntu platform -->
+@@ -752,6 +734,7 @@
+
+ <!-- Creates the windows exe file -->
+ <target name="exe" depends="runtime-win">
++ <!--
+ <launch4j configFile="${deployment.dir}/win/launch4j/tvbrowser.xml"
+ fileversion="${tvbrowser.version.file}"
+ productversion="${tvbrowser.version.file}"
+@@ -762,6 +745,7 @@
+ productversion="${tvbrowser.version.file}"
+ txtfileversion="${tvbrowser.version}"
+ txtproductversion="${tvbrowser.version}"/>
++ -->
+ </target>
+
+ <!-- Creates the windows transportable exe file -->
diff --git a/media-tv/tvbrowser/files/3.4.3-remove-registrykey.patch b/media-tv/tvbrowser/files/3.4.3-remove-registrykey.patch
new file mode 100644
index 000000000000..2c52ddada29a
--- /dev/null
+++ b/media-tv/tvbrowser/files/3.4.3-remove-registrykey.patch
@@ -0,0 +1,150 @@
+--- src/tvbrowser/TVBrowser.java.orig 2015-03-24 17:41:56.811494046 +0000
++++ src/tvbrowser/TVBrowser.java 2015-03-24 17:43:30.625486471 +0000
+@@ -113,9 +113,6 @@
+ import util.ui.UIThreadRunner;
+ import util.ui.UiUtilities;
+ import util.ui.textcomponentpopup.TextComponentPopupEventQueue;
+-import ca.beq.util.win32.registry.RegistryKey;
+-import ca.beq.util.win32.registry.RegistryValue;
+-import ca.beq.util.win32.registry.RootKey;
+
+ import com.jgoodies.looks.LookUtils;
+ import com.l2fprod.gui.plaf.skin.SkinLookAndFeel;
+@@ -567,77 +564,6 @@
+ public void run() {
+ ChannelList.completeChannelLoading();
+ initializeAutomaticDownload();
+- if (Launch.isOsWindowsNtBranch()) {
+- try {
+- RegistryKey desktopSettings = new RegistryKey(
+- RootKey.HKEY_CURRENT_USER, "Control Panel\\Desktop");
+- RegistryValue autoEnd = desktopSettings
+- .getValue("AutoEndTasks");
+-
+- if (autoEnd.getData().equals("1")) {
+- RegistryValue killWait = desktopSettings
+- .getValue("WaitToKillAppTimeout");
+-
+- int i = Integer.parseInt(killWait.getData().toString());
+-
+- if (i < 5000) {
+- JOptionPane pane = new JOptionPane();
+-
+- String cancel = mLocalizer.msg("registryCancel",
+- "Close TV-Browser");
+- String dontDoIt = mLocalizer.msg("registryJumpOver",
+- "Not this time");
+-
+- pane.setOptions(new String[] {
+- Localizer.getLocalization(Localizer.I18N_OK), dontDoIt,
+- cancel });
+- pane.setOptionType(JOptionPane.YES_NO_CANCEL_OPTION);
+- pane.setMessageType(JOptionPane.WARNING_MESSAGE);
+- pane
+- .setMessage(mLocalizer
+- .msg(
+- "registryWarning",
+- "The fast shutdown of Windows is activated.\nThe timeout to wait for before Windows is closing an application is too short,\nto give TV-Browser enough time to save all settings.\n\nThe setting hasn't the default value. It was changed by a tool or by you.\nTV-Browser will now try to change the timeout.\n\nIf you don't want to change this timeout select 'Not this time' or 'Close TV-Browser'."));
+-
+- pane.setInitialValue(mLocalizer.msg("registryCancel",
+- "Close TV-Browser"));
+-
+- JDialog d = pane.createDialog(UiUtilities
+- .getLastModalChildOf(mainFrame), UIManager
+- .getString("OptionPane.messageDialogTitle"));
+- d.setModal(true);
+- UiUtilities.centerAndShow(d);
+-
+- if (pane.getValue() == null
+- || pane.getValue().equals(cancel)) {
+- mainFrame.quit();
+- } else if (!pane.getValue().equals(dontDoIt)) {
+- try {
+- killWait.setData("5000");
+- desktopSettings.setValue(killWait);
+- JOptionPane
+- .showMessageDialog(
+- UiUtilities.getLastModalChildOf(mainFrame),
+- mLocalizer
+- .msg("registryChanged",
+- "The timeout was changed successfully.\nPlease reboot Windows!"));
+- } catch (Exception registySetting) {
+- JOptionPane
+- .showMessageDialog(
+- UiUtilities.getLastModalChildOf(mainFrame),
+- mLocalizer
+- .msg(
+- "registryNotChanged",
+- "<html>The Registry value couldn't be changed. Maybe you haven't the right to do it.<br>If it is so contact you Administrator and let him do it for you.<br><br><b><Attention:/b> The following description is for experts. If you change or delete the wrong value in the Registry you could destroy your Windows installation.<br><br>To get no warning on TV-Browser start the Registry value <b>WaitToKillAppTimeout</b> in the Registry path<br><b>HKEY_CURRENT_USER\\Control Panel\\Desktop</b> have to be at least <b>5000</b> or the value for <b>AutoEndTasks</b> in the same path have to be <b>0</b>.</html>"),
+- Localizer.getLocalization(Localizer.I18N_ERROR),
+- JOptionPane.ERROR_MESSAGE);
+- }
+- }
+- }
+- }
+- } catch (Throwable registry) {
+- }
+- }
+
+ if (currentVersion != null
+ && currentVersion.compareTo(new Version(2, 71, false)) < 0) {
+--- src/tvbrowser/ui/settings/StartupSettingsTab.java.orig 2015-03-24 17:51:54.418445794 +0000
++++ src/tvbrowser/ui/settings/StartupSettingsTab.java 2015-03-24 17:52:23.370443456 +0000
+@@ -50,8 +50,6 @@
+ import tvbrowser.ui.mainframe.PeriodItem;
+ import util.ui.Localizer;
+ import util.ui.UiUtilities;
+-import ca.beq.util.win32.registry.RegistryKey;
+-import ca.beq.util.win32.registry.RootKey;
+
+ import com.jgoodies.forms.builder.PanelBuilder;
+ import com.jgoodies.forms.factories.Borders;
+@@ -163,41 +161,6 @@
+ .getBoolean());
+ mSettingsPn.add(mShowStartScreenChB, cc.xy(2, ++y));
+
+- if (System.getProperty("os.name").toLowerCase().startsWith("windows") && !TVBrowser.isTransportable()) {
+- layout.insertRow(++y, RowSpec.decode("1dlu"));
+- layout.insertRow(++y, RowSpec.decode("pref"));
+-
+- try {
+- RegistryKey shellFolders = new RegistryKey(RootKey.HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders");
+- String path = shellFolders.getValue("Startup").getData().toString();
+-
+- if(path == null || path.length() < 1 || !(new File(path)).isDirectory()) {
+- throw new Exception();
+- }
+-
+- mLinkFileFile = new File(path,"TV-Browser.url");
+-
+- try {
+- mLinkFile = new LinkFile(mLinkFileFile);
+-
+- if(mLinkFileFile.isFile()) {
+- try {
+- if (!mLinkFile.hasTarget((new File("tvbrowser.exe")).getAbsoluteFile())) {
+- createLink(mLinkFile);
+- }
+- }catch(Exception linkException) {
+- mLinkFileFile.delete();
+- }
+- }
+- }catch(FileNotFoundException fe) {}
+-
+- mAutostartWithWindows = new JCheckBox(mLocalizer.msg("autostart","Start TV-Browser with Windows"),
+- mLinkFileFile.isFile());
+-
+- mSettingsPn.add(mAutostartWithWindows, cc.xy(2, y));
+- } catch (Throwable e) {e.printStackTrace();}
+- }
+-
+ y++;
+
+ mSettingsPn.add(createRefreshPanel(), cc.xyw(1,++y,5));
+@@ -513,4 +476,4 @@
+ return new File(mTarget).equals(file);
+ }
+ }
+-}
+\ No newline at end of file
++}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index f4be704a3490..ef9db8d940ba 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -79,7 +79,7 @@ FFMPEG_FLAG_MAP=(
# decoders
amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
- mmal modplug:libmodplug opus:libopus quvi:libquvi librtmp ssh:libssh
+ mmal modplug:libmodplug opus:libopus librtmp ssh:libssh
schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
zvbi:libzvbi
# libavfilter options
@@ -173,7 +173,7 @@ RDEPEND="
faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
- nvenc? ( >=media-video/nvenc-5 )
+ nvenc? ( media-video/nvidia_video_sdk )
openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
theora? (
@@ -224,7 +224,6 @@ RDEPEND="
)
opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
- quvi? ( media-libs/libquvi:0.4[${MULTILIB_USEDEP}] )
librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index b6a029730825..93c6e4f940d1 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -46,7 +46,7 @@ REQUIRED_USE="
opengl? ( X )
uchardet? ( iconv )
v4l? ( || ( alsa oss ) )
- vaapi? ( || ( X wayland ) )
+ vaapi? ( || ( gbm X wayland ) )
vdpau? ( X )
wayland? ( egl )
xinerama? ( X )
@@ -94,7 +94,7 @@ COMMON_DEPEND="
samba? ( net-fs/samba )
sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
v4l? ( media-libs/libv4l )
- vaapi? ( >=x11-libs/libva-1.4.0[X?,wayland?] )
+ vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] )
wayland? (
>=dev-libs/wayland-1.6.0
>=x11-libs/libxkbcommon-0.3.0
@@ -239,6 +239,7 @@ src_configure() {
$(use_enable vaapi) # See below for vaapi-x-egl
$(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
$(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+ $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
$(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
$(use_enable libcaca caca)
$(use_enable jpeg)
diff --git a/media-video/nvenc/Manifest b/media-video/nvenc/Manifest
deleted file mode 100644
index 51661d5b7a5b..000000000000
--- a/media-video/nvenc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nvenc_5.0.1_sdk.zip 96524757 SHA256 0e9c575b4cf94bda3ae22cfaa4ce9eb931e566cc2046c3db63b92cbda5edf22d SHA512 ba6b61a2dad97c206ac0f7f72395b0ca0fc52ee2b82b0e662cb3dcf983af8c3b43f7d369d77e7c974fa310346d73620332fa3d1251e7aa503da66f2ba5654417 WHIRLPOOL ce012b578942d8494923b3189e34c34bd3e2ec54543aed3b6d5978729c7c892061268a5dfff47222e64d0ba9c806dd2b04033a98f20dbc89814012ab9d6366d8
diff --git a/media-video/nvidia_video_sdk/Manifest b/media-video/nvidia_video_sdk/Manifest
new file mode 100644
index 000000000000..e8382b4e8403
--- /dev/null
+++ b/media-video/nvidia_video_sdk/Manifest
@@ -0,0 +1 @@
+DIST nvidia_video_sdk_6.0.1.zip 21310785 SHA256 05227ee4015dc9bdf52b4fe8b3ba5a077d80962f35fa3b76d25288adb1dd0122 SHA512 1ab398010f5018482170bf722d84278b1920f003119143911fbb0a811e6f1237a039b4120011cc141728f3fd3d7667295ce8703717eafad82b4675bb3211df87 WHIRLPOOL 4af12758753221975dddc917fc9753b065f526b8cceacd0ab8d82ad3fd88ae7a8c53d4d49f0cce3be4073f6fd4f7ec7261a0d700d0b93f914b263c4c5403ff35
diff --git a/media-video/nvenc/metadata.xml b/media-video/nvidia_video_sdk/metadata.xml
index 4e013435e0a0..bb54234cd05d 100644
--- a/media-video/nvenc/metadata.xml
+++ b/media-video/nvidia_video_sdk/metadata.xml
@@ -7,6 +7,5 @@
</maintainer>
<use>
<flag name="tools">Build and install example tools.</flag>
- <flag name="samples">Install video samples to use with the tools.</flag>
</use>
</pkgmetadata>
diff --git a/media-video/nvenc/nvenc-5.0.1-r1.ebuild b/media-video/nvidia_video_sdk/nvidia_video_sdk-6.0.1.ebuild
index 27357de4c3f5..4223dc49d73c 100644
--- a/media-video/nvenc/nvenc-5.0.1-r1.ebuild
+++ b/media-video/nvidia_video_sdk/nvidia_video_sdk-6.0.1.ebuild
@@ -6,29 +6,29 @@ EAPI=5
inherit versionator toolchain-funcs
-MY_P="${PN}_${PV}_sdk"
+MY_P="${PN}_${PV}"
-DESCRIPTION="NVIDIA Encoder (NVENC) API"
+DESCRIPTION="NVIDIA Video Codec SDK"
HOMEPAGE="https://developer.nvidia.com/nvidia-video-codec-sdk"
-SRC_URI="http://developer.download.nvidia.com/compute/nvenc/v$(get_version_component_range "1-2")/${MY_P}.zip"
+SRC_URI="https://developer.nvidia.com/video-sdk-$(replace_all_version_separators '') -> ${MY_P}.zip"
-LICENSE="NVIDIA-CODEC-SDK"
+LICENSE="MIT tools? ( NVIDIA-CODEC-SDK )"
SLOT="0"
KEYWORDS="~amd64"
-IUSE="+tools samples"
+IUSE="tools"
-RDEPEND=">=x11-drivers/nvidia-drivers-347.09
- tools? ( >=dev-util/nvidia-cuda-toolkit-6.5 )"
+RDEPEND="
+ !media-video/nvenc
+ >=x11-drivers/nvidia-drivers-347.09"
DEPEND="${RDEPEND}
app-arch/unzip"
S="${WORKDIR}/${MY_P}"
-TOOLS="NvEncoder NvEncoderPerf NvTranscoder"
+TOOLS="NvEncoder NvEncoderPerf NvTranscoder NvEncoderLowLatency"
src_compile() {
if use tools ; then
- export CUDA_PATH=/opt/cuda
export EXTRA_LDFLAGS="${LDFLAGS}"
for i in ${TOOLS} ; do
pushd "${S}/Samples/${i}" || die
@@ -43,16 +43,11 @@ src_install() {
for i in ${TOOLS}; do
dobin "${S}/Samples/${i}/${i}"
done
+ dodoc "${S}/Samples/NVIDIA_Video_Codec_SDK_Samples_Guide.pdf"
fi
- dodoc doc/*.pdf
-
- if use samples ; then
- dodoc Samples/NVENC_Samples_Guide.pdf
- insinto /usr/share/${PN}
- doins -r Samples/YUV
- fi
+ dodoc doc/*.pdf ReadMe.txt Release_notes.txt
insinto /usr/include
- doins Samples/common/inc/nv*.h
+ doins Samples/common/inc/nvEncodeAPI.h
}
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index a9878a37fadd..458ad8e56083 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -15,6 +15,7 @@
<flag name="avformat">Enables libformat support for reading and writing various media containers. libavformat is part of FFmpeg.</flag>
<flag name="bluray">Enables libbluray for Blu-ray disc support.</flag>
<flag name="chromaprint">Enables libchromaprint for Chromaprint based audio fingerprinter support.</flag>
+ <flag name="chromecast">Enable experimental support for Google Chromecast.</flag>
<flag name="dc1394">Enables IIDC cameras support.</flag>
<flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
<flag name="directx">Enable Win32 DirectX support.</flag>
@@ -40,6 +41,7 @@
<flag name="macosx-audio">Enables Mac OS X audio module.</flag>
<flag name="macosx-dialog-provider">Enables Mac OS X dialog module.</flag>
<flag name="macosx-eyetv">Enables Mac OS X EyeTV (TNT Tuner) module.</flag>
+ <flag name="macosx-notifications">Enables Mac OS X notifications module (formerly growl).</flag>
<flag name="macosx-quartztext">Enables Mac OS X quartz text module.</flag>
<flag name="macosx-qtkit">Enables Mac OS X qtkit module: qtcapture (video) and qtsound (audio) module.</flag>
<flag name="macosx-vout">Enables Mac OS X video output module.</flag>
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index e4d7563742a6..1ebdcad75a3a 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-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$
@@ -38,18 +38,18 @@ if [[ ${PV} != *9999 ]] ; then
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
fi
-IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
- +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
+IUSE="a52 aalib alsa altivec +audioqueue +avcodec
+ +avformat bidi bluray cddb chromaprint chromecast dbus dc1394 debug
directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk
- fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
- growl httpd ieee1394 jack jpeg kate kde libass libav libcaca libnotify
+ fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnutls httpd
+ ieee1394 jack jpeg kate kde libass libav libcaca libnotify
+libsamplerate libtiger linsys libtar lirc live lua
- macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit
- matroska media-library cpu_flags_x86_mmx modplug mp3 mpeg
- mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus
+ macosx-dialog-provider macosx-eyetv macosx-notifications macosx-quartztext macosx-qtkit
+ matroska media-library cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack
+ ncurses neon ogg omxil opencv opengl optimisememory opus
png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale
- taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
+ taglib theora tremor truetype twolame udev upnp vaapi v4l vcd vdpau
vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zvbi zeroconf"
RDEPEND="
@@ -73,6 +73,7 @@ RDEPEND="
bluray? ( >=media-libs/libbluray-0.3:0 )
cddb? ( >=media-libs/libcddb-1.2:0 )
chromaprint? ( >=media-libs/chromaprint-0.6:0 )
+ chromecast? ( >=dev-libs/protobuf-2.5.0 )
dbus? ( >=sys-apps/dbus-1.6:0 )
dc1394? ( >=sys-libs/libraw1394-2.0.1:0 >=media-libs/libdc1394-2.1:2 )
directfb? ( dev-libs/DirectFB:0 sys-libs/zlib:0 )
@@ -87,7 +88,6 @@ RDEPEND="
fontconfig? ( media-libs/fontconfig:1.0 )
gcrypt? ( >=dev-libs/libgcrypt-1.2.0:0= )
gme? ( media-libs/game-music-emu:0 )
- gnome? ( gnome-base/gnome-vfs:2 dev-libs/glib:2 )
gnutls? ( >=net-libs/gnutls-3.0.20:0 )
ieee1394? ( >=sys-libs/libraw1394-2.0.1:0 >=sys-libs/libavc1394-0.5.3:0 )
jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1:0 )
@@ -149,10 +149,10 @@ RDEPEND="
v4l? ( media-libs/libv4l:0 )
vaapi? (
x11-libs/libva:0[X,drm]
- !libav? ( media-video/ffmpeg:0=[vaapi] )
+ !libav? ( <media-video/ffmpeg-2.9:0=[vaapi] )
libav? ( media-video/libav:0=[vaapi] )
)
- vcdx? ( >=dev-libs/libcdio-0.78.2:0 >=media-video/vcdimager-0.7.22:0 )
+ vcd? ( >=dev-libs/libcdio-0.78.2:0 )
zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
"
@@ -161,7 +161,10 @@ RDEPEND="
RDEPEND="${RDEPEND}
vdpau? (
>=x11-libs/libvdpau-0.6:0
- !libav? ( >=media-video/ffmpeg-2.2:0= )
+ !libav? (
+ >=media-video/ffmpeg-2.2:0=
+ <media-video/ffmpeg-2.9:0=
+ )
libav? ( >=media-video/libav-10:0= )
)
vnc? ( >=net-libs/libvncserver-0.9.9:0 )
@@ -187,7 +190,6 @@ DEPEND="${RDEPEND}
REQUIRED_USE="
aalib? ( X )
bidi? ( truetype )
- cddb? ( cdda )
dvb? ( dvbpsi )
dxva2? ( avcodec )
ffmpeg? ( avcodec avformat swscale postproc )
@@ -315,15 +317,14 @@ src_configure() {
$(use_enable aalib aa) \
$(use_enable alsa) \
$(use_enable altivec) \
- $(use_enable atmo) \
$(use_enable audioqueue) \
$(use_enable avcodec) \
$(use_enable avformat) \
$(use_enable bidi fribidi) \
$(use_enable bluray) \
- $(use_enable cdda vcd) \
$(use_enable cddb libcddb) \
$(use_enable chromaprint) \
+ $(use_enable chromecast) \
$(use_enable dbus) \
$(use_enable directfb) \
$(use_enable directx) \
@@ -341,9 +342,7 @@ src_configure() {
$(use_enable fontconfig) \
$(use_enable gcrypt libgcrypt) \
$(use_enable gme) \
- $(use_enable gnome gnomevfs) \
$(use_enable gnutls) \
- $(use_enable growl) \
$(use_enable httpd) \
$(use_enable ieee1394 dv1394) \
$(use_enable jack) \
@@ -362,6 +361,7 @@ src_configure() {
$(use_enable lua) \
$(use_enable macosx-dialog-provider) \
$(use_enable macosx-eyetv) \
+ $(use_enable macosx-notifications osx-notifications) \
$(use_enable macosx-qtkit) \
$(use_enable macosx-quartztext) \
$(use_enable matroska mkv) \
@@ -373,11 +373,10 @@ src_configure() {
$(use_enable musepack mpc) \
$(use_enable ncurses) \
$(use_enable neon) \
- $(use_enable ogg) $(use_enable ogg mux_ogg) \
+ $(use_enable ogg) $(use_enable ogg) \
$(use_enable omxil) \
$(use_enable omxil omxil-vout) \
$(use_enable opencv) \
- $(use_enable opengl glspectrum) \
$(use_enable opus) \
$(use_enable optimisememory optimize-memory) \
$(use_enable png) \
@@ -410,7 +409,7 @@ src_configure() {
$(use_enable upnp) \
$(use_enable v4l v4l2) \
$(use_enable vaapi libva) \
- $(use_enable vcdx) \
+ $(use_enable vcd) \
$(use_enable vdpau) \
$(use_enable vlm) \
$(use_enable vnc) \
@@ -438,8 +437,7 @@ src_configure() {
--disable-maintainer-mode \
--disable-merge-ffmpeg \
--disable-mfx \
- --disable-mmal-codec \
- --disable-mmal-vout \
+ --disable-mmal \
--disable-opensles \
--disable-oss \
--disable-quicktime \
@@ -462,7 +460,7 @@ src_test() {
Xemake check-TESTS
}
-DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt"
+DOCS="AUTHORS THANKS NEWS README doc/fortunes.txt"
src_install() {
default
@@ -474,7 +472,6 @@ src_install() {
pkg_postinst() {
if [ "$ROOT" = "/" ] && [ -x "/usr/$(get_libdir)/vlc/vlc-cache-gen" ] ; then
einfo "Running /usr/$(get_libdir)/vlc/vlc-cache-gen on /usr/$(get_libdir)/vlc/plugins/"
- "/usr/$(get_libdir)/vlc/vlc-cache-gen" -f "/usr/$(get_libdir)/vlc/plugins/"
else
ewarn "We cannot run vlc-cache-gen (most likely ROOT!=/)"
ewarn "Please run /usr/$(get_libdir)/vlc/vlc-cache-gen manually"
diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest
index eb0a4d148c88..78ef7d57d1a4 100644
--- a/net-analyzer/bwm-ng/Manifest
+++ b/net-analyzer/bwm-ng/Manifest
@@ -1 +1,2 @@
+DIST bwm-ng-0.6.1.tar.gz 162620 SHA256 027cf3c960cd96fc9ffacdf7713df62d0fc55eeef4a1388289f8a62ae5e50df0 SHA512 3f8d4a10f5cbf743d6aee9c6170f334c4274224a2f1886f04338c9a1bf0cf13af5be4aaea0445c9e5b5d361915cc3a93bbfe7c4abf69a0d24e42bc414d8056cd WHIRLPOOL a83569acf0f4f24f98e5b65733e0a02de2db4a4249ece24eaf457b20a4eed4a6f425256a13477e8d3844c251b4818fc8b1e34243a975cce7e20ec27b3af8e413
DIST bwm-ng-0.6.tar.gz 141564 SHA256 c1134358e268329d438b0996399003b0f0b966034fb4b5b138761c2f3c62ffdd SHA512 7327ec848b0c18d68b2cb0a0ca570bb4d783b534186868d13b453346dbf3ddbcd7e1070803406ff207dc1fd00aa91c06187b0ea7fea28c6c006b44165331c21b WHIRLPOOL 45cc30b6a99ed9c267095e6dca170380be3da698e7b8aab50436d51ea914714facf954b9c26e465f47a1bcd59ca3fbd5511cd654b42fd9d4a5131e2f5bbca233
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild
new file mode 100644
index 000000000000..ae30fbd3d4f7
--- /dev/null
+++ b/net-analyzer/bwm-ng/bwm-ng-0.6.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor"
+SRC_URI="http://www.gropp.org/bwm-ng/${P}.tar.gz"
+HOMEPAGE="http://www.gropp.org/"
+
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="html csv"
+
+DEPEND="sys-libs/ncurses:0=
+ >=sys-apps/net-tools-1.60-r1"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-buildsystem.patch"
+)
+
+src_prepare() {
+ mv configure.{in,ac} || die
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --enable-ncurses \
+ --with-procnetdev \
+ $(use_enable html) \
+ $(use_enable csv)
+}
diff --git a/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
new file mode 100644
index 000000000000..85f2819786e2
--- /dev/null
+++ b/net-analyzer/bwm-ng/files/bwm-ng-0.6.1-fix-buildsystem.patch
@@ -0,0 +1,82 @@
+* Fix broken buildsystem
+* Fix ncurses underlinking caused by missing "-ltinfo" in $LIBS
+https://bugs.gentoo.org/show_bug.cgi?id=561718
+
+--- bwm-ng-0.6.1/configure.ac
++++ bwm-ng-0.6.1/configure.ac
+@@ -3,7 +3,7 @@
+
+ AC_INIT([bwm-ng],[0.6.1],[bwmng@gropp.org],[bwm-ng])
+ AC_CONFIG_SRCDIR(src/bwm-ng.c)
+-AM_INIT_AUTOMAKE([gnu])
++AM_INIT_AUTOMAKE([gnu subdir-objects])
+ AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR(./)
+ AC_LANG([C])
+@@ -28,44 +28,12 @@
+ AC_CHECK_TYPES(unsigned long long)
+
+ # Checks for libraries.
+-CURSES_CHECKED="0"
++AC_ARG_ENABLE([ncurses],
++ AS_HELP_STRING([--enable-ncurses], [Enable feature ncurses]))
+
+-AC_ARG_WITH([curses],AS_HELP_STRING([--with-curses],[with curses (ARG=PATH)]),[
+-if [ test $withval != "no" ]; then
+- OLD_CPPFLAGS=$CPPFLAGS
+- if [ test $withval != "yes" ]; then
+- CPPFLAGS="$CPPFLAGS -I$withval"
+- fi
+- AC_CHECK_LIB([curses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
+- CURSES_CHECKED="1"
+-else
+- CURSES_CHECKED="1"
+-fi
+-])
+-
+-
+-if [ test $CURSES_CHECKED != "1" ]; then
+-AC_ARG_WITH([ncurses],AS_HELP_STRING([--with-ncurses],[prefer ncurses over curses (ARG=PATH)]),[
+-if [ test $withval != "no" ]; then
+- OLD_CPPFLAGS=$CPPFLAGS
+- if [ test $withval != "yes" ]; then
+- CPPFLAGS="$CPPFLAGS -I$withval"
+- fi
+- AC_CHECK_LIB([ncurses],[newterm,timeout],,[ CPPFLAGS=$OLD_CPPFLAGS ])
+- CURSES_CHECKED="1"
+-else
+- CURSES_CHECKED="1"
+-fi
++AS_IF([test "x$enable_ncurses" != "xno"], [
++ PKG_CHECK_MODULES([NCURSES], [ncurses])
+ ])
+-fi
+-
+-
+-
+-if [ test $CURSES_CHECKED != "1" ]; then
+-AC_CHECK_LIB([curses],[initscr,timeout],,[
+- AC_CHECK_LIB([ncurses],[newterm,timeout])
+-])
+-fi
+
+ AC_CHECK_FUNCS([wattron])
+ AC_CHECK_FUNCS([curs_set])
+--- bwm-ng-0.6.1/src/Makefile.am
++++ bwm-ng-0.6.1/src/Makefile.am
+@@ -2,12 +2,10 @@
+
+ bin_PROGRAMS = bwm-ng
+
+-bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c
++bwm_ng_SOURCES = bwm-ng.c process.c output.c options.c help.c curses_tools.c input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c
+
+-EXTRA_bwm_ng_SOURCES = input/retrieve.c input/devstat.c input/libkstat.c input/netstat.c input/proc_net_dev.c input/sysctl.c input/ioservice.c input/libstatgrab.c input/proc_diskstats.c input/win32.c input/getifaddrs.c
+-
+-bwm_ng_LDADD = retrieve.$(OBJEXT) $(INPUT_SYSTEM)
+-bwm_ng_DEPENDENCIES = retrieve.$(OBJEXT) $(INPUT_SYSTEM)
++bwm_ng_CPPFLAGS = @NCURSES_CFLAGS@
++bwm_ng_LDADD = @NCURSES_LIBS@
+
+ noinst_HEADERS = bwm-ng.h process.h output.h options.h help.h curses_tools.h types.h defines.h global_vars.h input/devstat.h input/libkstat.h input/netstat.h input/proc_net_dev.h input/sysctl.h input/ioservice.h input/libstatgrab.h input/proc_diskstats.h input/retrieve.h input/win32.h input/getifaddrs.h
+
diff --git a/net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild b/net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild
new file mode 100644
index 000000000000..ba113ec6cd71
--- /dev/null
+++ b/net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Tool to analyze and detect suspicious traffic from IP and alert about it"
+HOMEPAGE="http://dark-zone.eu/resources/unix/dosdetector/"
+SRC_URI="http://dark-zone.eu/resources/unix/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="net-libs/libpcap"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-isdigit.patch \
+ "${FILESDIR}"/${P}-sizeof.patch
+}
diff --git a/net-analyzer/dosdetector/files/dosdetector-20060621-sizeof.patch b/net-analyzer/dosdetector/files/dosdetector-20060621-sizeof.patch
new file mode 100644
index 000000000000..aea9cfba19ee
--- /dev/null
+++ b/net-analyzer/dosdetector/files/dosdetector-20060621-sizeof.patch
@@ -0,0 +1,11 @@
+--- a/src/main.c
++++ b/src/main.c
+@@ -306,8 +306,6 @@
+ hosts = calloc(2, sizeof(struct host));
+ rules = calloc(1, sizeof(struct rule));
+ rules_num = 0;
+- bzero(hosts, sizeof(hosts));
+- bzero(rules, sizeof(rules));
+
+ /* Init rules table */
+ if (init_rules(opt.rules) != 0) {
diff --git a/net-analyzer/greenbone-security-assistant/Manifest b/net-analyzer/greenbone-security-assistant/Manifest
index 6e399b6aea99..60bd670f5103 100644
--- a/net-analyzer/greenbone-security-assistant/Manifest
+++ b/net-analyzer/greenbone-security-assistant/Manifest
@@ -1,2 +1 @@
-DIST greenbone-security-assistant-6.0.6.tar.gz 1469343 SHA256 3df98355dc599b2efe24f1d3d1ca4f04b1380eb8996e3814f60b9a56fcc153fb SHA512 68eac5a41206d8c1bb43e84129987c7dd8ab922743c8f40f261ddcf49a1ac6245b17cac859af0d1cdc6061e3156170c88ec5b258ea8ed8a3828513ed8ef64af3 WHIRLPOOL 0d219cd83ecbf00907facbd4153d768d2aacbcd305831e01aaf66740ecae4bf5e798b651f782fa1ef39396fe0faac78976095992d302afcd77b3e676d920bf9f
DIST greenbone-security-assistant-6.0.8.tar.gz 1475498 SHA256 1dc23cc24dcd7adc84aaed218e0d9651e032b930ab897c571bf16eb0b155b1ff SHA512 4126e05fc9c7c3272200a070d849fb21c680f49390d5305dc433aa16bf4365525a2c6047575fc11ca53668f87ce5d2a1aef5e63e782cea9d403129ab86aafa8d WHIRLPOOL 91f38c495d99a1c54132e276c321f536abe2ca9a08d9caba716457d2ffb7b63025bb687ff1e6640912d41aed7b39875f1e5a4d2acba4ab7d48248cdf373414fc
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.6-r1.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.6-r1.ebuild
deleted file mode 100644
index c29e335dc57f..000000000000
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.6-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils systemd
-
-MY_PN=gsad
-
-DL_ID=2200
-
-DESCRIPTION="Greenbone Security Assistant for openvas"
-HOMEPAGE="http://www.openvas.org/"
-SRC_URI="http://wald.intevation.org/frs/download.php/${DL_ID}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+ BSD MIT"
-KEYWORDS=" ~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
- dev-libs/libgcrypt:0
- dev-libs/libxslt
- >=net-analyzer/openvas-libraries-8.0.3
- net-libs/libmicrohttpd[messages]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.0.3-run.patch
- )
-
-S="${WORKDIR}"/${P}
-
-src_prepare() {
- sed \
- -e '/^install.*OPENVAS_CACHE_DIR.*/d' \
- -i CMakeLists.txt || die
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLOCALSTATEDIR="${EPREFIX}/var"
- -DSYSCONFDIR="${EPREFIX}/etc"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- newinitd "${FILESDIR}"/${MY_PN}.init ${MY_PN}
-
- insinto /etc/openvas
- doins "${FILESDIR}"/${MY_PN}-daemon.conf
- dosym ../openvas/${MY_PN}-daemon.conf /etc/conf.d/${MY_PN}
-
- insinto /etc/logrotate.d
- doins "${FILESDIR}"/${MY_PN}.logrotate
-
- systemd_newtmpfilesd "${FILESDIR}"/${MY_PN}.tmpfiles.d ${MY_PN}.conf
- systemd_dounit "${FILESDIR}"/${MY_PN}.service
-}
diff --git a/net-firewall/fwknop/Manifest b/net-firewall/fwknop/Manifest
index d7709562e818..7237b4578a70 100644
--- a/net-firewall/fwknop/Manifest
+++ b/net-firewall/fwknop/Manifest
@@ -1,2 +1 @@
-DIST fwknop-2.6.7.tar.gz 2849006 SHA256 e96c13f725a4c3829c842743b14aedf591d30570df5c06556862a900b64def86 SHA512 8a8c5e76740c495342fd914309de564576ce5c7fda90dc0f0322782ace5f28ccbb4bcef4c0a3353a564b13ef7298a5cd75dcd4d26986b2fb5ec000b641fbf848 WHIRLPOOL 6de45c31cc39b7b44d0531dc19bd2727bc721cf156a04d830c295573fe40d95296c1591e3bd5ae2b597bea9a6015744061351655f1cf04a5d6a5cae6678d1126
DIST fwknop-2.6.8.tar.gz 2860231 SHA256 96e6ba8b7e29aaf65bd06eaa823896ab66169b2aaced8123375378ff4b76a2d6 SHA512 aed4081652a95f3276468d58476d093a6dd76abbe5b4047930fc32a0d46f3dc341a3b0d9b7c81dc6c466f468f06c94607f2dadc89867127d0b4878175e32b6d6 WHIRLPOOL d394b43c5eb96a4172ec005dc8ec13985e8b70bd342eabfdd95d0fd7a6425ddc294d24900f6b85b4ce7c595cf45622b28ee08583fb222c7d5d9f74f87a10c1cc
diff --git a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild b/net-firewall/fwknop/fwknop-2.6.8-r1.ebuild
index 582a81b605dd..f55d709a1f93 100644
--- a/net-firewall/fwknop/fwknop-2.6.7-r2.ebuild
+++ b/net-firewall/fwknop/fwknop-2.6.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ DISTUTILS_OPTIONAL=1
# See https://github.com/mrash/fwknop/issues/167
PYTHON_COMPAT=( python2_7 )
-inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
+inherit autotools-utils eutils distutils-r1 linux-info readme.gentoo-r1 systemd
DESCRIPTION="Single Packet Authorization and Port Knocking application"
HOMEPAGE="http://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop"
diff --git a/net-firewall/fwknop/fwknop-2.6.8.ebuild b/net-firewall/fwknop/fwknop-2.6.8.ebuild
deleted file mode 100644
index 582a81b605dd..000000000000
--- a/net-firewall/fwknop/fwknop-2.6.8.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-DISABLE_AUTOFORMATTING=1
-
-DISTUTILS_OPTIONAL=1
-# Python extension supports only Python2
-# See https://github.com/mrash/fwknop/issues/167
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils distutils-r1 linux-info readme.gentoo systemd
-
-DESCRIPTION="Single Packet Authorization and Port Knocking application"
-HOMEPAGE="http://www.cipherdyne.org/fwknop/ https://github.com/mrash/fwknop"
-SRC_URI="https://github.com/mrash/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="client extras firewalld gdbm gpg iptables python server udp-server"
-
-DEPEND="
- client? ( net-misc/wget[ssl] )
- firewalld? ( net-firewall/firewalld[${PYTHON_USEDEP}] )
- gdbm? ( sys-libs/gdbm )
- gpg? (
- app-crypt/gpgme
- dev-libs/libassuan
- dev-libs/libgpg-error
- )
- iptables? ( net-firewall/iptables )
- python? ( ${PYTHON_DEPS} )
- server? ( !udp-server? ( net-libs/libpcap ) )
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="
- python? ( ${PYTHON_REQUIRED_USE} )
- firewalld? ( server )
- iptables? ( server )
- server? ( ^^ ( firewalld iptables ) )
- udp-server? ( server )
-"
-
-DOCS=( ChangeLog README.md )
-
-DOC_CONTENTS="
-Example configuration files were installed in /etc/fwknopd directory.
-Please edit them to fit your needs and then remove the .example suffix.
-
-fwknopd supports several backends: firewalld, iptables, ipfw, pf, ipf.
-You can set the desired backend via FIREWALL_EXE option in fwknopd.conf
-instead of the default one chosen at compile time.
-"
-
-pkg_pretend() {
- if use server; then
- if ! linux_config_exists || ! linux_chkconfig_present NETFILTER_XT_MATCH_COMMENT; then
- ewarn "fwknopd uses the iptables 'comment' match to expire SPA rules,"
- ewarn "which is a major security feature and is enabled by default."
- ewarn "Please either enable NETFILTER_XT_MATCH_COMMENT support in your"
- ewarn "kernel, or set the appropriate ENABLE_{FIREWD,IPT}_COMMENT_CHECK"
- ewarn "to 'N' in your fwknopd.conf file."
- fi
- fi
-}
-
-src_prepare() {
- # Install example configs with .example suffix
- if use server; then
- sed -i -e 's/conf;/conf.example;/g' "${S}"/Makefile.am || die
- fi
-
- autotools-utils_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- --localstatedir=/run
- --enable-digest-cache
- $(use_enable client)
- $(use_enable !gdbm file-cache)
- $(use_enable server)
- $(use_enable udp-server)
- $(use_with gpg gpgme)
- )
- use firewalld && myeconfargs+=(--with-firewalld=/usr/sbin/firewalld)
- use iptables && myeconfargs+=(--with-iptables=/sbin/iptables)
-
- autotools-utils_src_configure
-}
-
-src_compile() {
- autotools-utils_src_compile
-
- if use python; then
- cd "${S}"/python || die
- distutils-r1_src_compile
- fi
-}
-
-src_install() {
- autotools-utils_src_install
- prune_libtool_files --modules
-
- if use server; then
- newinitd "${FILESDIR}/fwknopd.init" fwknopd
- newconfd "${FILESDIR}/fwknopd.confd" fwknopd
- systemd_dounit extras/systemd/fwknopd.service
- systemd_newtmpfilesd extras/systemd/fwknopd.tmpfiles.conf fwknopd.conf
- readme.gentoo_create_doc
- fi
-
- use extras && dodoc "${S}/extras/apparmor/usr.sbin.fwknopd"
-
- if use python; then
- # Unset DOCS since distutils-r1.eclass interferes
- local DOCS=()
- cd "${S}"/python || die
- distutils-r1_src_install
- fi
-}
-
-pkg_postinst() {
- use server && readme.gentoo_print_elog
-}
diff --git a/net-ftp/lftp/lftp-4.6.5.ebuild b/net-ftp/lftp/lftp-4.6.5.ebuild
index 01871bd74ae9..9743ffec5131 100644
--- a/net-ftp/lftp/lftp-4.6.5.ebuild
+++ b/net-ftp/lftp/lftp-4.6.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}ftp/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="convert-mozilla-cookies +gnutls idn ipv6 nls openssl socks5 +ssl verify-file"
LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru uk zh_CN zh_HK zh_TW )
diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml
index 2b661cf5a454..3385d266e58d 100644
--- a/net-im/ejabberd/metadata.xml
+++ b/net-im/ejabberd/metadata.xml
@@ -2,6 +2,14 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>net-im</herd>
+ <maintainer>
+ <email>aidecoe@gentoo.org</email>
+ <name>Amadeusz Żołnowski</name>
+ </maintainer>
+ <maintainer>
+ <email>hanno@gentoo.org</email>
+ <name>Hanno Böck</name>
+ </maintainer>
<longdescription>
Free and Open Source distributed fault-tolerant Jabber server. It's
mostly written in Erlang, and works on many platforms.
diff --git a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
index e9076dbbdfb9..8feed88b8343 100644
--- a/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
+++ b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
@@ -5,7 +5,7 @@
EAPI=5
inherit eutils flag-o-matic multilib user
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
DESCRIPTION="Courier authentication library"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
diff --git a/net-libs/net6/net6-1.3.14-r1.ebuild b/net-libs/net6/net6-1.3.14-r1.ebuild
index 5043967e0bea..f49b1843a277 100644
--- a/net-libs/net6/net6-1.3.14-r1.ebuild
+++ b/net-libs/net6/net6-1.3.14-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://releases.0x539.de/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ~x86"
+KEYWORDS="amd64 ~arm hppa ppc ~x86"
IUSE="nls static-libs"
RDEPEND="dev-libs/libsigc++:2
diff --git a/net-libs/rb_libtorrent/rb_libtorrent-1.0.8.ebuild b/net-libs/rb_libtorrent/rb_libtorrent-1.0.8.ebuild
index 6a42760e43f1..69fdcfad59ba 100644
--- a/net-libs/rb_libtorrent/rb_libtorrent-1.0.8.ebuild
+++ b/net-libs/rb_libtorrent/rb_libtorrent-1.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$
@@ -56,7 +56,7 @@ src_configure() {
else
boost_py3=""
fi
-
+
if use python_targets_python2_7 ;then
boost_py2="--with-boost-python=2.7"
else
@@ -79,9 +79,9 @@ src_configure() {
if use python ;then
python_setup
fi
-
+
autotools-utils_src_configure
-
+
if use python ;then
cd "${BUILD_DIR}"/bindings/python || die && \
distutils-r1_src_configure
@@ -90,7 +90,7 @@ src_configure() {
src_compile() {
autotools-utils_src_compile
-
+
if use python ;then
cd "${BUILD_DIR}"/bindings/python || die && \
distutils-r1_src_compile
@@ -101,7 +101,7 @@ src_install() {
if use doc ;then
HTML_DOCS=( "${S}"/docs/. )
fi
-
+
autotools-utils_src_install
if use python ;then
diff --git a/net-mail/notmuch/notmuch-0.21.ebuild b/net-mail/notmuch/notmuch-0.21.ebuild
index 92ee3ffd5467..8fe5d334f5b4 100644
--- a/net-mail/notmuch/notmuch-0.21.ebuild
+++ b/net-mail/notmuch/notmuch-0.21.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-3"
# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is
# meant to be binary backward compatible.
SLOT="0/4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
REQUIRED_USE="
nmbug? ( python )
python? ( ${PYTHON_REQUIRED_USE} )
diff --git a/net-misc/chrony/chrony-2.2.1.ebuild b/net-misc/chrony/chrony-2.2.1.ebuild
index 57ce62bbd514..7920c32bd9cc 100644
--- a/net-misc/chrony/chrony-2.2.1.ebuild
+++ b/net-misc/chrony/chrony-2.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm hppa ~mips ~ppc ppc64 ~sparc ~x86"
IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux +adns"
REQUIRED_USE="
?? ( libedit readline )
diff --git a/net-misc/icecast/Manifest b/net-misc/icecast/Manifest
index 559ddcd2139d..823056d83204 100644
--- a/net-misc/icecast/Manifest
+++ b/net-misc/icecast/Manifest
@@ -1 +1,2 @@
DIST icecast-2.4.2.tar.gz 2388381 SHA256 aa1ae2fa364454ccec61a9247949d19959cb0ce1b044a79151bf8657fd673f4f SHA512 6fc5a54b97f1efd63f0d3ea17fc7124cb30cfafae70615f5afdf878df9e3f57ca7882757a0691329d63ee4fc7555c695fefa415f2deb955d01244afc4528a260 WHIRLPOOL bbc369f1a5b35aec364a42aab28e92499fc0cb3a5fcef469899c77d801cd2123637328227d206c2bf9427a2c8c958036d706f61507677e240b6ef8e3546cb037
+DIST icecast-2.4.3.tar.gz 2393358 SHA256 c85ca48c765d61007573ee1406a797ae6cb31fb5961a42e7f1c87adb45ddc592 SHA512 70e755ee935e738f2b7310333823992517747897692d101b67d73d5cd40d6385a20c25d089a0430806c116021e6e2055761efee9fec27cd9bccb2b58a2bfd446 WHIRLPOOL ab75b4f09bff4725fa2bf27f6a49c7f8dd7c9f66e9333e6cfe3ec92e4e84a0562648407ebb891ec7fea8d7bc9680204572972875c76d20f131f43f3748ca5347
diff --git a/net-misc/icecast/icecast-2.4.3.ebuild b/net-misc/icecast/icecast-2.4.3.ebuild
new file mode 100644
index 000000000000..caecb9b2443e
--- /dev/null
+++ b/net-misc/icecast/icecast-2.4.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools systemd user
+
+DESCRIPTION="An opensource alternative to shoutcast that supports mp3, ogg (vorbis/theora) and aac streaming"
+HOMEPAGE="http://www.icecast.org/"
+SRC_URI="http://downloads.xiph.org/releases/icecast/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="kate logrotate +speex +ssl +theora +yp"
+
+#Although there is a --with-ogg and --with-orbis configure option, they're
+#only useful for specifying paths, not for disabling.
+DEPEND="dev-libs/libxslt
+ dev-libs/libxml2
+ media-libs/libogg
+ media-libs/libvorbis
+ kate? ( media-libs/libkate )
+ logrotate? ( app-admin/logrotate )
+ speex? ( media-libs/speex )
+ theora? ( media-libs/libtheora )
+ yp? ( net-misc/curl )
+ ssl? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ enewuser icecast -1 -1 -1 nogroup
+}
+
+src_prepare() {
+ # bug #368539
+ epatch "${FILESDIR}"/${PN}-2.3.3-libkate.patch
+ # bug #430434
+ epatch "${FILESDIR}"/${PN}-2.3.3-fix-xiph_openssl.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ --docdir=/usr/share/doc/${PF} \
+ --sysconfdir=/etc/icecast2 \
+ $(use_enable kate) \
+ $(use_with theora) \
+ $(use_with speex) \
+ $(use_with yp curl) \
+ $(use_with ssl openssl) \
+ $(use_enable yp)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS README TODO HACKING NEWS conf/icecast.xml.dist
+ dohtml -A chm,hhc,hhp doc/*
+
+ newinitd "${FILESDIR}"/init.d.icecast-2 icecast
+ systemd_dounit "${FILESDIR}"/${PN}.service
+
+ insinto /etc/icecast2
+ doins "${FILESDIR}"/icecast.xml
+ fperms 600 /etc/icecast2/icecast.xml
+
+ if use logrotate; then
+ dodir /etc/logrotate.d
+ insopts -m0644
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/${PN}.logrotate ${PN}
+ fi
+ diropts -m0764 -o icecast -g nogroup
+ dodir /var/log/icecast
+ keepdir /var/log/icecast
+ rm -rf "${D}"/usr/share/doc/icecast
+}
+
+pkg_postinst() {
+ touch "${ROOT}"var/log/icecast/{access,error}.log
+ chown icecast:nogroup "${ROOT}"var/log/icecast/{access,error}.log
+}
diff --git a/net-misc/tor/tor-0.2.7.6.ebuild b/net-misc/tor/tor-0.2.7.6.ebuild
index cdd4563dfda8..10f4b6e9e2e3 100644
--- a/net-misc/tor/tor-0.2.7.6.ebuild
+++ b/net-misc/tor/tor-0.2.7.6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PF}"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="amd64 arm ~mips ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
IUSE="-bufferevents libressl scrypt seccomp selinux stats systemd tor-hardening transparent-proxy test web"
DEPEND="
diff --git a/net-proxy/bfilter/bfilter-1.1.4-r3.ebuild b/net-proxy/bfilter/bfilter-1.1.4-r3.ebuild
new file mode 100644
index 000000000000..767c009b2428
--- /dev/null
+++ b/net-proxy/bfilter/bfilter-1.1.4-r3.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 autotools flag-o-matic user
+
+DESCRIPTION="Ad-filtering web proxy featuring an effective heuristic ad-detection algorithm"
+HOMEPAGE="http://bfilter.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bfilter/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X debug"
+
+RDEPEND="sys-libs/zlib
+ dev-libs/ace:=
+ dev-libs/libsigc++:2
+ X? ( dev-cpp/gtkmm:2.4 x11-libs/libX11 )
+ dev-libs/boost:="
+
+DEPEND="${RDEPEND}
+ dev-util/scons
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${P}-glib-2.32.patch"
+ "${FILESDIR}/${P}-external-boost.patch"
+ "${FILESDIR}/${P}-gtkmm-X11-underlinking.patch"
+)
+
+RESTRICT="test" # boost's test API has changed
+
+src_prepare() {
+ default
+
+ # Some includes are missing and this breaks updates of ACE
+ sed -i \
+ -e "/#include <ace\/Synch.h>/a#include <ace\/Condition_T.h>\n#include <ace\/Guard_T.cpp>" \
+ libjs/nspr_impl/private.h \
+ main/*.h \
+ main/cache/*.h || die
+
+ mv configure.{in,ac} || die
+ rm -r boost || die
+
+ eautoreconf
+}
+
+src_configure() {
+ append-cxxflags -std=c++11
+ # Required to prevent narrowing conversion in lexcode.cpp, #572072
+ append-cxxflags -funsigned-char
+ econf \
+ $(use_enable debug) \
+ $(use_with X gui) \
+ --without-builtin-boost
+}
+
+src_install() {
+ default
+
+ insinto /etc/bfilter
+ doins "${FILESDIR}/forwarding.xml"
+
+ dodoc "${FILESDIR}/forwarding-proxy.xml"
+ dodoc -r doc/*
+
+ newinitd "${FILESDIR}/bfilter.init" bfilter
+ newconfd "${FILESDIR}/bfilter.conf" bfilter
+}
+
+pkg_preinst() {
+ enewgroup bfilter
+ enewuser bfilter -1 -1 -1 bfilter
+}
+
+pkg_postinst() {
+ elog "The documentation is available at"
+ elog " http://bfilter.sourceforge.net/documentation.php"
+ elog "For forwarding bfilter service traffic through a proxy,"
+ elog "see forwarding-proxy.xml example installed in the doc directory."
+}
diff --git a/net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch b/net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch
index 26937a042c2b..b678e6d6be44 100644
--- a/net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch
+++ b/net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch
@@ -2,8 +2,8 @@ Fixing as-needed issues
http://bugs.gentoo.org/show_bug.cgi?id=318135
---- irdadump/Makefile
-+++ irdadump/Makefile
+--- irda-utils-0.9.18/irdadump/Makefile
++++ irda-utils-0.9.18/irdadump/Makefile
@@ -40,7 +40,7 @@
irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
diff --git a/net-wireless/irda-utils/files/irda-utils-0.9.18-headers.patch b/net-wireless/irda-utils/files/irda-utils-0.9.18-headers.patch
index 1c40edc7cd7e..a9814b3167ad 100644
--- a/net-wireless/irda-utils/files/irda-utils-0.9.18-headers.patch
+++ b/net-wireless/irda-utils/files/irda-utils-0.9.18-headers.patch
@@ -1,5 +1,5 @@
---- tekram/Makefile.orig 2010-11-02 22:41:43.000000000 +0100
-+++ tekram/Makefile 2010-11-02 22:41:53.000000000 +0100
+--- irda-utils-0.9.18/tekram/Makefile.orig 2010-11-02 22:41:43.000000000 +0100
++++ irda-utils-0.9.18/tekram/Makefile 2010-11-02 22:41:53.000000000 +0100
@@ -38,7 +38,7 @@
#
# System stuff
diff --git a/net-wireless/irda-utils/files/irda-utils-0.9.18-smcinit.diff b/net-wireless/irda-utils/files/irda-utils-0.9.18-smcinit.diff
index dd06efec02a8..bd4936259dc7 100644
--- a/net-wireless/irda-utils/files/irda-utils-0.9.18-smcinit.diff
+++ b/net-wireless/irda-utils/files/irda-utils-0.9.18-smcinit.diff
@@ -1,5 +1,5 @@
---- smcinit/smcinit.c.orig 2006-07-11 08:16:06.000000000 +0200
-+++ smcinit/smcinit.c 2008-03-22 05:49:38.000000000 +0100
+--- irda-utils-0.9.18/smcinit/smcinit.c.orig 2006-07-11 08:16:06.000000000 +0200
++++ irda-utils-0.9.18/smcinit/smcinit.c 2008-03-22 05:49:38.000000000 +0100
@@ -292,9 +292,9 @@
}
diff --git a/net-wireless/irda-utils/irda-utils-0.9.18-r5.ebuild b/net-wireless/irda-utils/irda-utils-0.9.18-r5.ebuild
new file mode 100644
index 000000000000..d04d69f2086d
--- /dev/null
+++ b/net-wireless/irda-utils/irda-utils-0.9.18-r5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic toolchain-funcs udev
+
+DESCRIPTION="IrDA management and handling utilities"
+HOMEPAGE="http://irda.sourceforge.net"
+SRC_URI="mirror://sourceforge/irda/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sh ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/glib:2
+ >=sys-apps/pciutils-2.2.7-r1
+ sys-process/procps
+ sys-apps/setserial
+ sys-apps/grep
+ virtual/udev
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ !app-laptop/smcinit
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-rh1.patch"
+ "${FILESDIR}/${P}-makefile.diff"
+ "${FILESDIR}/${P}-smcinit.diff"
+ "${FILESDIR}/${P}-io.h.diff"
+ "${FILESDIR}/${P}-dofail.patch"
+ "${FILESDIR}/${P}-asneeded.patch"
+ "${FILESDIR}/${P}-ldflags.patch"
+ "${FILESDIR}/${P}-headers.patch"
+)
+
+src_prepare() {
+ # TODO: switch to 'default' once udev.eclass is EAPI=6 clean
+ epatch -p1 "${PATCHES[@]}"
+
+ append-flags "-fno-strict-aliasing" # bug????
+
+ # fix Bug 570488 by restoring pre-GCC5 inline semantics
+ append-cflags -std=gnu89
+
+ # fix crosscompile, respect CFLAGS (Bug 200295)
+ sed -i -e "/^CC/s:gcc:$(tc-getCC):" \
+ -e "/^LD/s:ld:$(tc-getLD):" \
+ -e "/^AR/s:ar:$(tc-getAR):" \
+ -e "/^RANLIB/s:ranlib:$(tc-getRANLIB):" \
+ -e "/^CFLAGS/s:-O2:${CFLAGS}:" Makefile */Makefile || die
+
+ # fix compile when pciutils is compiled with USE=zlib (Bug 200295)
+ sed -i -e "s:-lpci:$(pkg-config --libs libpci):g" smcinit/Makefile || die
+
+ # disable etc subdir in Makefile
+ sed -i -e "s:^\(DIRS.*=.* \)etc \(.*\):\1\2:g" Makefile || die
+
+ # disable write_pid(), because we don't need it
+ sed -i -e "s:\(write_pid();\):/* \1 */:g" irattach/util.c || die
+}
+
+src_compile() {
+ emake RPM_OPT_FLAGS="${CFLAGS}" RPM_BUILD_ROOT="${D}" ROOT="${D}"
+}
+
+src_install () {
+ dodir /usr/bin
+ dodir /usr/sbin
+
+ emake install RPM_OPT_FLAGS="${CFLAGS}" ROOT="${D}" \
+ MANDIR="${D}usr/share/man"
+
+ newdoc ethereal/README README.wireshark
+ newdoc irattach/README README.irattach
+ newdoc irdadump/README README.irdadump
+ newdoc irdaping/README README.irdaping
+ newdoc irsockets/README README.irsockets
+ newdoc tekram/README README.tekram
+ newdoc smcinit/README README.smcinit
+ newdoc smcinit/README.Peri README.smcinit.Peri
+ newdoc smcinit/README.Rob README.smcinit.Rob
+ newdoc smcinit/README.Tom README.smcinit.Tom
+ newdoc irattach/ChangeLog ChangeLog.irattach
+ newdoc irdadump/ChangeLog ChangeLog.irdadump
+ newdoc smcinit/ChangeLog ChangeLog.smcinit
+ dohtml smcinit/RobMiller-irda.html
+ dodoc README
+
+ newconfd "${FILESDIR}/irda.confd" irda
+ newinitd "${FILESDIR}/irda.initd" irda
+
+ insinto /etc/modprobe.d
+ newins "${FILESDIR}/irda.modsd" irda.conf
+
+ udev_newrules "${FILESDIR}/irda.rules" 53-irda.rules
+ exeinto "$(get_udevdir)"
+ newexe "${FILESDIR}/irda-setup.sh" irda-setup
+ newexe "${FILESDIR}/irda-usb.sh" irda-usb
+}
diff --git a/perl-core/Devel-PPPort/Devel-PPPort-3.310.0.ebuild b/perl-core/Devel-PPPort/Devel-PPPort-3.310.0.ebuild
index ee9df503d38f..7c8e6b82394a 100644
--- a/perl-core/Devel-PPPort/Devel-PPPort-3.310.0.ebuild
+++ b/perl-core/Devel-PPPort/Devel-PPPort-3.310.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Perl/Pollution/Portability"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~amd64-linux ~arm ~arm64 ~hppa ~hppa-hpux ~ia64 ~ia64-hpux ~ia64-linux ~m68k ~m68k-mint ~mips ~ppc ~ppc64 ~ppc-aix ~ppc-macos ~s390 ~sh ~sparc ~sparc64-solaris ~sparc-solaris ~x64-freebsd ~x64-macos ~x64-solaris ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~x86-linux ~x86-macos ~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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/perl-core/Module-Metadata/Module-Metadata-1.0.26.ebuild b/perl-core/Module-Metadata/Module-Metadata-1.0.26.ebuild
index 770b3459e99b..66b8f6fc72a1 100644
--- a/perl-core/Module-Metadata/Module-Metadata-1.0.26.ebuild
+++ b/perl-core/Module-Metadata/Module-Metadata-1.0.26.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Gather package and POD information from perl module files"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~amd64-linux ~arm ~arm64 ~hppa ~hppa-hpux ~ia64 ~ia64-hpux ~ia64-linux ~m68k ~m68k-mint ~mips ~ppc ~ppc64 ~ppc-aix ~ppc-macos ~s390 ~sh ~sparc ~sparc64-solaris ~sparc-solaris ~x64-freebsd ~x64-macos ~x64-solaris ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~x86-linux ~x86-macos ~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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=virtual/perl-version-0.870"
diff --git a/dev-perl/Unicode-Normalize/Manifest b/perl-core/Unicode-Normalize/Manifest
index 7492a8ab809d..bb98a22d29f7 100644
--- a/dev-perl/Unicode-Normalize/Manifest
+++ b/perl-core/Unicode-Normalize/Manifest
@@ -1 +1,2 @@
DIST Unicode-Normalize-1.18.tar.gz 19856 SHA256 c3058b55f77f648af9f3557f6e66d328ced8e0e211a7d633ff97c21e94da6874 SHA512 e76adbada2ba21306bd34d1296af63f6ad9994c88789338104ff64d1983895a4aeb7b7c66b0f483429450ba2683759d58818380aa8452cde966ee539a7352e75 WHIRLPOOL 18730140b50fb3189099b09141218675b8ca330659ee8dd06136c0881a2a665fbf0a650ed855dc190b8e07f0fe070d27eb0a0d0cd286aab9d2db61528802628e
+DIST Unicode-Normalize-1.25.tar.gz 40530 SHA256 00b33a75d3b356ade2e09391ea2d32fac881671c18b1eb26b9ca31273d5b046c SHA512 f28c19e0293cf75cc0aab669ae0a0543f6a1a39e1e50ff32ab37abd8e85efc73e8b9075e581212b6da576ecbf8c0e9ddb7b9b352674aa3a04c77f9aaf4717866 WHIRLPOOL 69abc1765cfba33ea851ebc03a2ab9b0f6c762da5ec491bdf19c8865e701150c4639cc00365d88ad913e96eb51f9f4ad8217661163c0cd95d55f979613b28835
diff --git a/dev-perl/Unicode-Normalize/Unicode-Normalize-1.180.0.ebuild b/perl-core/Unicode-Normalize/Unicode-Normalize-1.180.0.ebuild
index 653e0de8eadc..b446afa89e4c 100644
--- a/dev-perl/Unicode-Normalize/Unicode-Normalize-1.180.0.ebuild
+++ b/perl-core/Unicode-Normalize/Unicode-Normalize-1.180.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$
diff --git a/perl-core/Unicode-Normalize/Unicode-Normalize-1.250.0.ebuild b/perl-core/Unicode-Normalize/Unicode-Normalize-1.250.0.ebuild
new file mode 100644
index 000000000000..9ae1c30f0a68
--- /dev/null
+++ b/perl-core/Unicode-Normalize/Unicode-Normalize-1.250.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MODULE_AUTHOR=KHW
+MODULE_VERSION=1.25
+inherit perl-module
+
+DESCRIPTION="Unicode Normalization Forms"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ virtual/perl-Carp
+ virtual/perl-Exporter
+ virtual/perl-File-Spec
+"
+DEPEND="${RDEPEND}
+ virtual/perl-ExtUtils-MakeMaker
+"
+SRC_TEST="do"
diff --git a/dev-perl/Unicode-Normalize/metadata.xml b/perl-core/Unicode-Normalize/metadata.xml
index 36ee0f08c67c..36ee0f08c67c 100644
--- a/dev-perl/Unicode-Normalize/metadata.xml
+++ b/perl-core/Unicode-Normalize/metadata.xml
diff --git a/profiles/package.mask b/profiles/package.mask
index 2c298217e2e0..c8ec61ea9203 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -861,11 +861,6 @@ virtual/python-imaging
# the suggested replacement for the meantime.
sys-fs/bedup
-# Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (29 Oct 2015)
-# Mask until it is decided how to address xorg-server file collisions #564358
-=x11-drivers/xf86-input-evdev-2.10.0
-=x11-drivers/xf86-input-evdev-2.10.1
-
# Ian Delaney <idella4@gentoo.org> (27 Oct 2015)
# fails to build dev-lisp/sbcl-1.2.16 #563812
# mgorny: dev-lisp/uiop as version-bound revdep
diff --git a/profiles/prefix/darwin/macos/10.10/x64/make.defaults b/profiles/prefix/darwin/macos/10.10/x64/make.defaults
index d91e8091f9ae..020901043602 100644
--- a/profiles/prefix/darwin/macos/10.10/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.10/x64/make.defaults
@@ -8,6 +8,3 @@ ACCEPT_KEYWORDS="~x64-macos"
USE="mmx mmxext sse sse2"
CPU_FLAGS_X86="mmx mmxext sse sse2"
-# set arch to nocona for all MacTel users, as this enables SSE and MMX
-# support in GCC, nocona = Core2Duo = 64-bits
-CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.10/x86/make.defaults b/profiles/prefix/darwin/macos/10.10/x86/make.defaults
index 1c0df4a5c34a..c372b5cae740 100644
--- a/profiles/prefix/darwin/macos/10.10/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.10/x86/make.defaults
@@ -8,6 +8,3 @@ ACCEPT_KEYWORDS="~x86-macos"
USE="mmx mmxext sse sse2"
CPU_FLAGS_X86="mmx mmxext sse sse2"
-# normally we set arch to prescott for all MacTel users, as this enables
-# SSE and MMX support in GCC
-CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.11/x64/make.defaults b/profiles/prefix/darwin/macos/10.11/x64/make.defaults
index bc129813548d..b9464e7a2a0e 100644
--- a/profiles/prefix/darwin/macos/10.11/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.11/x64/make.defaults
@@ -8,6 +8,3 @@ ACCEPT_KEYWORDS="~x64-macos"
USE="mmx mmxext sse sse2"
CPU_FLAGS_X86="mmx mmxext sse sse2"
-# set arch to nocona for all MacTel users, as this enables SSE and MMX
-# support in GCC, nocona = Core2Duo = 64-bits
-CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.11/x86/make.defaults b/profiles/prefix/darwin/macos/10.11/x86/make.defaults
index 918b7eb99708..2e9a6dee39d3 100644
--- a/profiles/prefix/darwin/macos/10.11/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.11/x86/make.defaults
@@ -8,6 +8,3 @@ ACCEPT_KEYWORDS="~x86-macos"
USE="mmx mmxext sse sse2"
CPU_FLAGS_X86="mmx mmxext sse sse2"
-# normally we set arch to prescott for all MacTel users, as this enables
-# SSE and MMX support in GCC
-CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.4/x86/make.defaults b/profiles/prefix/darwin/macos/10.4/x86/make.defaults
index 881ead4e2bb6..ff7d41e9b6ed 100644
--- a/profiles/prefix/darwin/macos/10.4/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.4/x86/make.defaults
@@ -8,6 +8,3 @@ ACCEPT_KEYWORDS="~x86-macos"
USE="mmx mmxext sse sse2"
CPU_FLAGS_X86="mmx mmxext sse sse2"
-# set arch to prescott for all MacTel users, as this enables SSE and MMX
-# support in GCC
-CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.5/x64/make.defaults b/profiles/prefix/darwin/macos/10.5/x64/make.defaults
index fc7ab94d55c3..1c265fd79b9a 100644
--- a/profiles/prefix/darwin/macos/10.5/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.5/x64/make.defaults
@@ -8,6 +8,3 @@ ACCEPT_KEYWORDS="~x64-macos"
USE="mmx mmxext sse sse2"
CPU_FLAGS_X86="mmx mmxext sse sse2"
-# set arch to nocona for all MacTel users, as this enables SSE and MMX
-# support in GCC, nocona = Core2Duo = 64-bits
-CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.5/x86/make.defaults b/profiles/prefix/darwin/macos/10.5/x86/make.defaults
index e2de73106745..701853b9bfd7 100644
--- a/profiles/prefix/darwin/macos/10.5/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.5/x86/make.defaults
@@ -8,6 +8,3 @@ ACCEPT_KEYWORDS="~x86-macos"
USE="mmx mmxext sse sse2"
CPU_FLAGS_X86="mmx mmxext sse sse2"
-# set arch to prescott for all MacTel users, as this enables SSE and MMX
-# support in GCC
-CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.6/x64/make.defaults b/profiles/prefix/darwin/macos/10.6/x64/make.defaults
index 23a4c84da2b8..de733d2806a3 100644
--- a/profiles/prefix/darwin/macos/10.6/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.6/x64/make.defaults
@@ -8,6 +8,3 @@ ACCEPT_KEYWORDS="~x64-macos"
USE="mmx mmxext sse sse2"
CPU_FLAGS_X86="mmx mmxext sse sse2"
-# set arch to nocona for all MacTel users, as this enables SSE and MMX
-# support in GCC, nocona = Core2Duo = 64-bits
-CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.6/x86/make.defaults b/profiles/prefix/darwin/macos/10.6/x86/make.defaults
index ef3a3932cb02..7cd2a2caba26 100644
--- a/profiles/prefix/darwin/macos/10.6/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.6/x86/make.defaults
@@ -8,6 +8,3 @@ ACCEPT_KEYWORDS="~x86-macos"
USE="mmx mmxext sse sse2"
CPU_FLAGS_X86="mmx mmxext sse sse2"
-# normally we set arch to prescott for all MacTel users, as this enables
-# SSE and MMX support in GCC
-CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.7/x64/make.defaults b/profiles/prefix/darwin/macos/10.7/x64/make.defaults
index 69a5d6a640c1..34a480e2f1a1 100644
--- a/profiles/prefix/darwin/macos/10.7/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.7/x64/make.defaults
@@ -8,6 +8,3 @@ ACCEPT_KEYWORDS="~x64-macos"
USE="mmx mmxext sse sse2"
CPU_FLAGS_X86="mmx mmxext sse sse2"
-# set arch to nocona for all MacTel users, as this enables SSE and MMX
-# support in GCC, nocona = Core2Duo = 64-bits
-CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.7/x86/make.defaults b/profiles/prefix/darwin/macos/10.7/x86/make.defaults
index 2097d6872ee5..a0835e2ad871 100644
--- a/profiles/prefix/darwin/macos/10.7/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.7/x86/make.defaults
@@ -8,6 +8,3 @@ ACCEPT_KEYWORDS="~x86-macos"
USE="mmx mmxext sse sse2"
CPU_FLAGS_X86="mmx mmxext sse sse2"
-# normally we set arch to prescott for all MacTel users, as this enables
-# SSE and MMX support in GCC
-CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.8/x64/make.defaults b/profiles/prefix/darwin/macos/10.8/x64/make.defaults
index 013e22939e11..f606f1fbdc5a 100644
--- a/profiles/prefix/darwin/macos/10.8/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.8/x64/make.defaults
@@ -8,6 +8,3 @@ ACCEPT_KEYWORDS="~x64-macos"
USE="mmx mmxext sse sse2"
CPU_FLAGS_X86="mmx mmxext sse sse2"
-# set arch to nocona for all MacTel users, as this enables SSE and MMX
-# support in GCC, nocona = Core2Duo = 64-bits
-CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.8/x86/make.defaults b/profiles/prefix/darwin/macos/10.8/x86/make.defaults
index c3dd43c71325..23d3fd2b8948 100644
--- a/profiles/prefix/darwin/macos/10.8/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.8/x86/make.defaults
@@ -8,6 +8,3 @@ ACCEPT_KEYWORDS="~x86-macos"
USE="mmx mmxext sse sse2"
CPU_FLAGS_X86="mmx mmxext sse sse2"
-# normally we set arch to prescott for all MacTel users, as this enables
-# SSE and MMX support in GCC
-CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/10.9/x64/make.defaults b/profiles/prefix/darwin/macos/10.9/x64/make.defaults
index b10fb531d25f..e8831181e701 100644
--- a/profiles/prefix/darwin/macos/10.9/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.9/x64/make.defaults
@@ -8,6 +8,3 @@ ACCEPT_KEYWORDS="~x64-macos"
USE="mmx mmxext sse sse2"
CPU_FLAGS_X86="mmx mmxext sse sse2"
-# set arch to nocona for all MacTel users, as this enables SSE and MMX
-# support in GCC, nocona = Core2Duo = 64-bits
-CFLAGS="-march=nocona"
diff --git a/profiles/prefix/darwin/macos/10.9/x86/make.defaults b/profiles/prefix/darwin/macos/10.9/x86/make.defaults
index 95b47fbd2d64..092253cac5a2 100644
--- a/profiles/prefix/darwin/macos/10.9/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.9/x86/make.defaults
@@ -8,6 +8,3 @@ ACCEPT_KEYWORDS="~x86-macos"
USE="mmx mmxext sse sse2"
CPU_FLAGS_X86="mmx mmxext sse sse2"
-# normally we set arch to prescott for all MacTel users, as this enables
-# SSE and MMX support in GCC
-CFLAGS="-march=prescott"
diff --git a/profiles/prefix/darwin/macos/arch/x64/make.defaults b/profiles/prefix/darwin/macos/arch/x64/make.defaults
index aff95e51d922..8b994140ed32 100644
--- a/profiles/prefix/darwin/macos/arch/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/arch/x64/make.defaults
@@ -8,3 +8,5 @@ DEFAULT_ABI="amd64"
ABI="amd64"
IUSE_IMPLICIT="abi_x86_64"
LIBDIR_amd64="lib"
+# We use Clang, let it figure out what is the best to use
+CFLAGS="-march=native"
diff --git a/profiles/prefix/darwin/macos/arch/x86/make.defaults b/profiles/prefix/darwin/macos/arch/x86/make.defaults
index 4e6b922ab1b8..3a38bd918d51 100644
--- a/profiles/prefix/darwin/macos/arch/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/arch/x86/make.defaults
@@ -8,3 +8,5 @@ DEFAULT_ABI="x86"
ABI="x86"
IUSE_IMPLICIT="abi_x86_32"
LIBDIR_x86="lib"
+# We use Clang, let it figure out what is the best to use
+CFLAGS="-march=native"
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 420213889d35..6df7d62d8b6b 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -45,6 +45,7 @@ kde-apps/kdebase-runtime-meta:4 -crash-reporter minimal
kde-apps/kdesu -handbook
kde-apps/knetattach -handbook
kde-apps/kwalletmanager:4 minimal
+kde-apps/libkipi:4 minimal
kde-apps/solid-runtime -bluetooth
kde-base/baloo minimal
kde-base/kactivities minimal
@@ -77,6 +78,7 @@ net-news/rssguard -qt4
>=net-news/quiterss-0.17.7 -qt4
net-p2p/bitcoin-qt -qt4
>=net-p2p/qbittorrent-3.2.0 -qt4
+net-p2p/transmission -qt4
>=net-wireless/wpa_supplicant-2.5 -qt4
>=sci-geosciences/qlandkartegt-1.8.0 -qt4
sci-visualization/kst -qt4
diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016
index 61d347679bf2..78d5ee324e27 100644
--- a/profiles/updates/1Q-2016
+++ b/profiles/updates/1Q-2016
@@ -1,3 +1,5 @@
slotmove net-irc/kvirc 4 0
move x11-apps/xtitle x11-misc/xtitle
move kde-base/kde-meta kde-apps/kde-meta
+move dev-perl/Unicode-Normalize perl-core/Unicode-Normalize
+move media-video/nvenc media-video/nvidia_video_sdk
diff --git a/ros-meta/audio_common/Manifest b/ros-meta/audio_common/Manifest
index 967f52c1efcd..96e69cfbc981 100644
--- a/ros-meta/audio_common/Manifest
+++ b/ros-meta/audio_common/Manifest
@@ -1,3 +1,4 @@
+DIST audio_common-0.2.10.tar.gz 182304 SHA256 1b847a49d37b82c9c9e20d789bb7900735f649871aacb5f03caa6b258d38fad3 SHA512 04db08b32d5870159b144b5e590c91812133104c2a987ddfb0508f1413d80844d0dafd9a137cd4292654c992293b8fe4a21246ff3430ebaa518a15bbfab0647b WHIRLPOOL f9b70c3b7fed32f1db1b538c4d6330868c0e0e9d1d1190ca5fa5bf5488798177c8243ad1d870b8b7fe1f3962e66411295da73623270d3b7f4b8ec847826821c4
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.10.ebuild b/ros-meta/audio_common/audio_common-0.2.10.ebuild
new file mode 100644
index 000000000000..618c77ecf99b
--- /dev/null
+++ b/ros-meta/audio_common/audio_common-0.2.10.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/image_common/Manifest b/ros-meta/image_common/Manifest
index 9f4e04e22607..41fb70890369 100644
--- a/ros-meta/image_common/Manifest
+++ b/ros-meta/image_common/Manifest
@@ -1,3 +1,4 @@
+DIST image_common-1.11.10.tar.gz 52212 SHA256 a0d31e59f3cd67ae37be980b8e208d7315b483b025b8f01de17757d045ccf111 SHA512 dac26cf9f3a7f0660f513fdcfbcf42ff2b772aaa03dd7422e5b7ede6f2f5724e7ba6c50bdddd2511168fbb7f576d05beda786eec1ac86b3b31b6429341dc1657 WHIRLPOOL 4dad1490313d9e2e27a72c5bb47c5ff2425332a22c88f64fff5c9e68fd7479cea715fd6d1b09b047b28ef2b40391a3649b5aa8bf77adfc18b4da23035b4989af
DIST image_common-1.11.7.tar.gz 49437 SHA256 1a739aef8ea597f6e7eaad26c031ad90e797efcb9cae764cd352bb124e9744ca SHA512 7408b641c75b6227130218862674609521d8465680ac15d45fc296de6ad3372ef1dde225a812740e0d5200f5923b52b4e9c2fca4dd4f96104f0bfe901400f456 WHIRLPOOL 1c8aee3e738ced0d4b45695a7dd10b1140a330abd8b121c91e2816bed329fc23a1ae39b8150fc81f81b9b586d3a747a9e4d6541914f1caabf6df06cf7cf57441
DIST image_common-1.11.8.tar.gz 49596 SHA256 14b5a067791c74d922ab39fbf773a08fc98b3ca3d6f920c8798713e4e551711c SHA512 448a10466c6ac04d2193ce87741658073c70f629b554df484decfba107c5bc67d9fcf660a12a1dc31ce2c570d69004207c47249e5523276a425e38f330d17f35 WHIRLPOOL 9b0c7fed36bfabf0f7126a887fc3926989fc178ad4f49192ee47fc9538816c55516b4624a542e13cfcb88515bc4927718ec26cb9212775e54f304bd9c665833b
DIST image_common-1.11.9.tar.gz 52035 SHA256 a01db99c066ba9e69132368c47427297d51865880899dff428bae1c3e78a457c SHA512 465b66731197384105dff0c499b89ab48d68859aae95411cf7d675fcb911018c7f2d79d3825b17ebcba8297b244491ef848b1b0cf70e620b93b9d73dc9b5bd77 WHIRLPOOL e946257a988e735969744093f1d5c5eba974ed0660c850fc5e04370580f59957070530fd539d35c2490091deccb99ffc2c57008ce6ec750c492edf275e7af68e
diff --git a/ros-meta/image_common/image_common-1.11.10.ebuild b/ros-meta/image_common/image_common-1.11.10.ebuild
new file mode 100644
index 000000000000..37bda88f6397
--- /dev/null
+++ b/ros-meta/image_common/image_common-1.11.10.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-perception/image_common"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Common code for working with images in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ dev-ros/camera_calibration_parsers
+ dev-ros/camera_info_manager
+ dev-ros/image_transport
+ dev-ros/polled_camera
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.7-entry.patch b/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.7-entry.patch
index 37fa0c02aa77..104662e7c608 100644
--- a/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.7-entry.patch
+++ b/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.7-entry.patch
@@ -1,7 +1,7 @@
Update to latest freedesktop spec.
---- data/qalculate-gtk.desktop.in
-+++ data/qalculate-gtk.desktop.in
+--- qalculate-gtk-0.9.7/data/qalculate-gtk.desktop.in
++++ qalculate-gtk-0.9.7/data/qalculate-gtk.desktop.in
@@ -1,11 +1,9 @@
[Desktop Entry]
-Encoding=UTF-8
diff --git a/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.7-wformat-security.patch b/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.7-wformat-security.patch
new file mode 100644
index 000000000000..dee57dd54503
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/files/qalculate-gtk-0.9.7-wformat-security.patch
@@ -0,0 +1,48 @@
+Fix -Werror=format-security errors
+https://bugs.gentoo.org/show_bug.cgi?id=541986
+
+callbacks.cc: In function ‘void show_message(const gchar*, GtkWidget*)’:
+callbacks.cc:391:137: error: format not a string literal and no format arguments [-Werror=format-security]
+ GtkWidget *edialog = gtk_message_dialog_new(GTK_WINDOW(win), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, text);
+
+--- qalculate-gtk-0.9.7/src/callbacks.cc
++++ qalculate-gtk-0.9.7/src/callbacks.cc
+@@ -388,12 +388,12 @@
+ }
+
+ void show_message(const gchar *text, GtkWidget *win) {
+- GtkWidget *edialog = gtk_message_dialog_new(GTK_WINDOW(win), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, text);
++ GtkWidget *edialog = gtk_message_dialog_new(GTK_WINDOW(win), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", text);
+ gtk_dialog_run(GTK_DIALOG(edialog));
+ gtk_widget_destroy(edialog);
+ }
+ bool ask_question(const gchar *text, GtkWidget *win) {
+- GtkWidget *edialog = gtk_message_dialog_new(GTK_WINDOW(win), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_YES_NO, text);
++ GtkWidget *edialog = gtk_message_dialog_new(GTK_WINDOW(win), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_YES_NO, "%s", text);
+ int question_answer = gtk_dialog_run(GTK_DIALOG(edialog));
+ gtk_widget_destroy(edialog);
+ return question_answer == GTK_RESPONSE_YES;
+@@ -654,6 +654,7 @@
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_INFO,
+ GTK_BUTTONS_CLOSE,
++ "%s",
+ CALCULATOR->message()->message().c_str());
+ gtk_dialog_run(GTK_DIALOG(edialog));
+ gtk_widget_destroy(edialog);
+@@ -667,6 +668,7 @@
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
++ "%s",
+ str.c_str());
+ } else {
+ edialog = gtk_message_dialog_new(
+@@ -674,6 +676,7 @@
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_WARNING,
+ GTK_BUTTONS_CLOSE,
++ "%s",
+ str.c_str());
+ }
+
diff --git a/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.7-r1.ebuild b/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..90f4170ae297
--- /dev/null
+++ b/sci-calculators/qalculate-gtk/qalculate-gtk-0.9.7-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG=no
+inherit eutils gnome2
+
+DESCRIPTION="Modern multi-purpose calculator"
+HOMEPAGE="http://qalculate.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qalculate/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="gnome"
+
+RDEPEND=">=sci-libs/libqalculate-0.9.7
+ >=sci-libs/cln-1.2
+ x11-libs/gtk+:2
+ gnome-base/libglade:2.0
+ gnome? ( >=gnome-base/libgnome-2 )"
+DEPEND="${RDEPEND}
+ app-text/rarian
+ sys-devel/gettext
+ dev-util/intltool
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${P}-entry.patch"
+ "${FILESDIR}/${P}-wformat-security.patch"
+)
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_prepare() {
+ # Required by src_test() and `make check`
+ echo data/periodictable.glade > po/POTFILES.skip || die
+ epatch -p1 "${PATCHES[@]}"
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure $(use_with gnome libgnome)
+}
diff --git a/sci-chemistry/gsim/gsim-21.3-r1.ebuild b/sci-chemistry/gsim/gsim-21.3-r1.ebuild
new file mode 100644
index 000000000000..27a8e5362106
--- /dev/null
+++ b/sci-chemistry/gsim/gsim-21.3-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic qmake-utils toolchain-funcs
+
+DESCRIPTION="Visualisation and processing of experimental and simulated NMR spectra"
+HOMEPAGE="http://sourceforge.net/projects/gsim/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_x86_sse3 emf opengl"
+REQUIRED_USE="cpu_flags_x86_sse3"
+
+RDEPEND="
+ dev-cpp/muParser
+ media-libs/freetype
+ sci-libs/libcmatrix
+ sci-libs/minuit
+ virtual/blas
+ dev-qt/qtsvg:4
+ emf? ( media-libs/libemf )
+ opengl? ( dev-qt/qtopengl:4 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${P}-build.conf.patch"
+)
+DOCS="release.txt README_GSIM.* quickstart.* changes.log programming.*"
+
+src_prepare() {
+ edos2unix ${PN}.pro
+
+ default
+
+ # C{,XX}FLAGS need to explicitly enable SSE3 support
+ # bug #555972
+ filter-flags -mno-sse3
+ append-cflags -msse3
+ append-cxxflags -msse3
+
+ cat >> build.conf <<- EOF
+ INCLUDEPATH += "${EPREFIX}/usr/include/libcmatrixR3/" \
+ "${EPREFIX}/usr/include/Minuit2" \
+ "${EPREFIX}/usr/include"
+ LIBS += -lcmatrix -lMinuit2 -lmuparser $($(tc-getPKG_CONFIG) --libs cblas)
+ EOF
+
+ use opengl && echo "CONFIG+=use_opengl" >> build.conf
+
+ if use emf; then
+ cat >> build.conf <<- EOF
+ CONFIG+=use_emf
+ DEFINES+=USE_EMF_OUTPUT
+ LIBS += -L\"${EPREFIX}/usr/include/libEMF\" -lEMF
+ EOF
+ fi
+ sed \
+ -e "s:quickstart.pdf:../share/doc/${PF}/quickstart.pdf:g" \
+ -e "s:README_GSIM.pdf:../share/doc/${PF}/README_GSIM.pdf:g" \
+ -i mainform.h || die
+}
+
+src_configure() {
+ eqmake4 ${PN}.pro
+}
+
+src_install() {
+ default
+ dobin ${PN}
+ insinto /usr/share/${PN}
+ doins -r images ${PN}.ico
+ insinto /usr/share/${PN}/ui
+ doins *.ui
+}
diff --git a/sci-chemistry/mpqc/files/mpqc-2.3.1-wformat-security.patch b/sci-chemistry/mpqc/files/mpqc-2.3.1-wformat-security.patch
new file mode 100644
index 000000000000..7f25a92ad891
--- /dev/null
+++ b/sci-chemistry/mpqc/files/mpqc-2.3.1-wformat-security.patch
@@ -0,0 +1,71 @@
+Fix -Werror=format-security errors
+https://bugs.gentoo.org/show_bug.cgi?id=542278
+
+--- mpqc-2.3.1/src/lib/chemistry/molecule/atominfo.cc
++++ mpqc-2.3.1/src/lib/chemistry/molecule/atominfo.cc
+@@ -493,7 +493,7 @@
+ if (iname != symbol_to_Z_.end()) return iname->second;
+
+ if (allow_exceptions) {
+- ExEnv::err0() << sprintf("AtomInfo: invalid name: %s\n",name.c_str());
++ ExEnv::err0() << fprintf(stderr, "AtomInfo: invalid name: %s\n",name.c_str());
+ throw std::runtime_error("invalid atom name");
+ }
+
+--- mpqc-2.3.1/src/lib/chemistry/molecule/atominfo.h
++++ mpqc-2.3.1/src/lib/chemistry/molecule/atominfo.h
+@@ -49,8 +49,8 @@
+ struct atom
+ {
+ int Z;
+- char *name;
+- char *symbol;
++ const char *name;
++ const char *symbol;
+ };
+
+ static struct atom elements_[Nelement];
+--- mpqc-2.3.1/src/lib/chemistry/molecule/simple.cc
++++ mpqc-2.3.1/src/lib/chemistry/molecule/simple.cc
+@@ -214,7 +214,7 @@
+ os << scprintf(" %4d", atoms[i]);
+
+ if (mol.nonnull()) {
+- char *separator = " ";
++ const char *separator = " ";
+ os << " ";
+ for (i=0; i<(4-natoms()); i++) {
+ os << " ";
+--- mpqc-2.3.1/src/lib/chemistry/qc/psi/psiexenv.cc
++++ mpqc-2.3.1/src/lib/chemistry/qc/psi/psiexenv.cc
+@@ -147,7 +147,7 @@
+ return 0;
+ }
+
+-int PsiExEnv::run_psi_module(char *module)
++int PsiExEnv::run_psi_module(const char *module)
+ {
+ int errcod;
+ char *module_cmd = new char[2*cwd_.size()+strlen(module)+psiprefix_.size()+fileprefix_.size()+stdout_.size()+stderr_.size()+40];
+--- mpqc-2.3.1/src/lib/chemistry/qc/psi/psiexenv.h
++++ mpqc-2.3.1/src/lib/chemistry/qc/psi/psiexenv.h
+@@ -57,7 +57,7 @@
+ /// Executes Psi input+driver
+ int run_psi();
+ /// Executes a Psi module
+- int run_psi_module(char *);
++ int run_psi_module(const char *);
+
+ /// Returns current working directory
+ string get_cwd() const { return cwd_;};
+--- mpqc-2.3.1/src/lib/chemistry/qc/psi/psiwfn.cc
++++ mpqc-2.3.1/src/lib/chemistry/qc/psi/psiwfn.cc
+@@ -44,7 +44,7 @@
+ bytes = 2000000;
+ int bytes_str_len = (int)ceil(log10((long double)bytes));
+ memory_ = new char[bytes_str_len+5];
+- sprintf(memory_,"(%ld B)",bytes);
++ sprintf(memory_,"(%d B)",bytes);
+ }
+
+ PsiWavefunction::~PsiWavefunction()
diff --git a/sci-chemistry/mpqc/mpqc-2.3.1-r4.ebuild b/sci-chemistry/mpqc/mpqc-2.3.1-r4.ebuild
new file mode 100644
index 000000000000..1cf3fd5c09a7
--- /dev/null
+++ b/sci-chemistry/mpqc/mpqc-2.3.1-r4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="The Massively Parallel Quantum Chemistry Program"
+HOMEPAGE="http://www.mpqc.org/"
+SRC_URI="mirror://sourceforge/mpqc/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc mpi threads static-libs tk"
+
+RDEPEND="
+ virtual/blas
+ virtual/lapack
+ mpi? ( virtual/mpi[cxx] )
+ tk? ( dev-lang/tk:0 )"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ sys-devel/flex
+ sys-apps/sed
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-as-needed.patch"
+ "${FILESDIR}/${P}-respect-ldflags.patch"
+ "${FILESDIR}/${P}-test-failure-hack.patch"
+ "${FILESDIR}/${P}-blas.patch"
+ "${FILESDIR}/${P}-wformat-security.patch"
+)
+DOCS=(CHANGES CITATION README)
+
+src_prepare() {
+ # do not install tkmolrender if not requested
+ if ! use tk; then
+ sed \
+ -e "s:.*/bin/molrender/tkmolrender.*::" \
+ -e "s:.*\$(INSTALLBINOPT) tkmolrender.*::" \
+ -e "s:/bin/rm -f tkmolrender::" \
+ -i "./src/bin/molrender/Makefile" \
+ || die "failed to disable tkmolrender"
+ fi
+ default
+ mv configure.{in,ac} || die
+ eautoreconf
+}
+
+src_configure() {
+ tc-export CC CXX
+ if use mpi; then
+ export CC=mpicc
+ export CXX=mpicxx
+ fi
+
+ econf \
+ $(use_enable threads) \
+ $(use_enable mpi parallel) \
+ $(use_enable static-libs static)
+
+ sed \
+ -e "s:^CFLAGS =.*$:CFLAGS=${CFLAGS}:" \
+ -e "s:^FFLAGS =.*$:FFLAGS=${FFLAGS:- -O2}:" \
+ -e "s:^CXXFLAGS =.*$:CXXFLAGS=${CXXFLAGS}:" \
+ -i lib/LocalMakefile || die
+}
+
+src_test() {
+ cd src/bin/mpqc/validate || die
+
+ # we'll only run the small test set, since the
+ # medium and large ones take >10h and >24h on my
+ # 1.8Ghz P4M
+ emake -j1 check1
+}
+
+src_install() {
+ emake installroot="${D}" install install_devel install_inc
+
+ # make extended docs
+ if use doc; then
+ cd doc || die
+ emake all
+ doman man/man1/* man/man3/*
+ dodoc -r html/
+ fi
+}
+
+pkg_postinst() {
+ echo
+ einfo "MPQC can be picky with regard to compilation flags."
+ einfo "If during mpqc runs you have trouble converging or "
+ einfo "experience oscillations during SCF interations, "
+ einfo "consider recompiling with less aggressive CFLAGS/CXXFLAGS."
+ einfo "Particularly, replacing -march=pentium4 by -march=pentium3"
+ einfo "might help if you encounter problems with correlation "
+ einfo "consistent basis sets."
+ echo
+}
diff --git a/sci-libs/geos/geos-3.5.0.ebuild b/sci-libs/geos/geos-3.5.0.ebuild
index 787c58215946..dfdd7bb03935 100644
--- a/sci-libs/geos/geos-3.5.0.ebuild
+++ b/sci-libs/geos/geos-3.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://download.osgeo.org/geos/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="amd64 arm ppc ~ppc64 ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
IUSE="doc php python ruby static-libs"
RDEPEND="
diff --git a/sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch b/sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch
index 7d83b6d0dfc1..50b6b478bdb1 100644
--- a/sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch
+++ b/sci-libs/netcdf-cxx/files/netcdf-cxx-4.2-config.patch
@@ -1,5 +1,5 @@
---- ncxx4-config.in.orig 2013-01-10 10:47:00.595224631 -0800
-+++ ncxx4-config.in 2013-01-10 10:49:22.856926765 -0800
+--- netcdf-cxx4-4.2.1/ncxx4-config.in.orig 2013-01-10 10:47:00.595224631 -0800
++++ netcdf-cxx4-4.2.1/ncxx4-config.in 2013-01-10 10:49:22.856926765 -0800
@@ -5,7 +5,7 @@
prefix=@prefix@
@@ -18,8 +18,8 @@
flibs="-L${libdir} @NC_FLIBS@"
has_dap="@HAS_DAP@"
has_nc2="@HAS_NC2@"
---- netcdf-cxx4.pc.in.orig 2013-01-10 10:46:50.995177250 -0800
-+++ netcdf-cxx4.pc.in 2013-01-10 10:49:45.030036161 -0800
+--- netcdf-cxx4-4.2.1/netcdf-cxx4.pc.in.orig 2013-01-10 10:46:50.995177250 -0800
++++ netcdf-cxx4-4.2.1/netcdf-cxx4.pc.in 2013-01-10 10:49:45.030036161 -0800
@@ -10,4 +10,4 @@
Version: @PACKAGE_VERSION@
Libs: -L${libdir} @NC_LIBS@
diff --git a/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1-r1.ebuild b/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..39264444b673
--- /dev/null
+++ b/sci-libs/netcdf-cxx/netcdf-cxx-4.2.1-r1.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 eutils
+
+MYP=${PN}4-${PV}
+
+DESCRIPTION="C++ library for netCDF"
+HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/"
+SRC_URI="https://github.com/Unidata/netcdf-cxx4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UCAR-Unidata"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples static-libs"
+
+RDEPEND=">=sci-libs/netcdf-4.2:=[hdf5]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MYP}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.2-config.patch"
+)
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+ prune_libtool_files
+}
diff --git a/sci-libs/netcdf-fortran/Manifest b/sci-libs/netcdf-fortran/Manifest
index c9285d5daea5..1d5f05ff3c1e 100644
--- a/sci-libs/netcdf-fortran/Manifest
+++ b/sci-libs/netcdf-fortran/Manifest
@@ -1,2 +1,3 @@
DIST netcdf-fortran-4.2.tar.gz 2479928 SHA256 069e1a0fb50972f28309210987a51563369a6ddb4ac768ef76e599354d384ae9 SHA512 af5d489df7b3ff5c3208115af4abdbf12d74d6bc0b9e3c729cfd24b55efafc3766de21c0f9957e037c25726637e9129a1f7009676e81d7e59650fec56d6e776e WHIRLPOOL 7fd0b2e0025b298a221521987132d389e6fc1bb285318d732b238ebcceedd721741f715848d63266c4a20189f4b0d211585af33e2efed2cac89dd893b07a2418
DIST netcdf-fortran-4.4.2.tar.gz 1246344 SHA256 f2264174074af0cf332b8dd09e4e184517a2d54f0ca5500e17691152c1ed73aa SHA512 c3f025c0f5a08a0141fa09f570c647fc63992f9fd707969b37c7b0590c3578172200e45ecee497ed054129366fd1c73e3cd069aba879015b13a143e77a181c0f WHIRLPOOL 119345cf7563c15e9d088fc734c3dcbe27c2f76a52ea4479fb771d652815e1cda38914368478f055d2b5d705e7b1779e0954b2f26bb54dab4a995b8c6ebace8a
+DIST netcdf-fortran-4.4.3.tar.gz 1286951 SHA256 4170fc018c9ee8222e317215c6a273542623185f5f6ee00d37bbb4e024e4e998 SHA512 94f51b4be889d6a9d6a86e3fcb2639ac58288969160d0f334ed6965e3c9cbacff7289b1fc54ed06e6ec8b845b19f5c409fbdcab432c8edf5c96efde887920924 WHIRLPOOL 941da12bc082ca75e33a1481aeb9992b16f3e95cf3f95bacc8ab1f56b95da7d9bb80d1f36b2a6d478f859d03bec5acec4a12ee13b218dc023ecdab5d0ecef788
diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.4.3.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.4.3.ebuild
new file mode 100644
index 000000000000..5b6e55d51f04
--- /dev/null
+++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.4.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+FORTRAN_STANDARD="77 90"
+
+inherit autotools eutils fortran-2
+
+DESCRIPTION="Scientific library and interface for array oriented data access"
+HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/"
+SRC_URI="https://github.com/Unidata/netcdf-fortran/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UCAR-Unidata"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples static-libs"
+
+RDEPEND="sci-libs/netcdf"
+DEPEND="${RDEPEND}
+ dev-lang/cfortran
+"
+
+src_prepare() {
+ # use system cfortran
+ rm libsrc/cfortran.h || die
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+ prune_libtool_files
+}
diff --git a/sci-libs/netcdf/netcdf-4.4.0-r1.ebuild b/sci-libs/netcdf/netcdf-4.4.0-r1.ebuild
new file mode 100644
index 000000000000..d82570b39285
--- /dev/null
+++ b/sci-libs/netcdf/netcdf-4.4.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Scientific library and interface for array oriented data access"
+HOMEPAGE="http://www.unidata.ucar.edu/software/netcdf/"
+SRC_URI="https://github.com/Unidata/netcdf-c/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UCAR-Unidata"
+SLOT="0/11"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+dap examples hdf +hdf5 mpi static-libs szip test tools"
+
+RDEPEND="
+ dap? ( net-misc/curl:0= )
+ hdf? ( sci-libs/hdf:0= sci-libs/hdf5:0= )
+ hdf5? ( sci-libs/hdf5:0=[mpi=,szip=,zlib] )"
+DEPEND="${RDEPEND}"
+# doc generation is missing many doxygen files in tar ball
+# doc? ( app-doc/doxygen[dot] )"
+
+REQUIRED_USE="test? ( tools ) szip? ( hdf5 ) mpi? ( hdf5 )"
+
+S="${WORKDIR}/${PN}-c-${PV}"
+
+src_configure() {
+ local myconf
+ if use mpi; then
+ export CC=mpicc
+ myconf="--enable-parallel"
+ use test && myconf+=" --enable-parallel-tests"
+ fi
+ econf "${myconf}" \
+ --disable-examples \
+ --disable-dap-remote-tests \
+ $(use_enable dap) \
+ $(use_enable hdf hdf4) \
+ $(use_enable hdf5 netcdf-4) \
+ $(use_enable static-libs static) \
+ $(use_enable tools utilities)
+}
+
+src_install() {
+ default
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+ prune_libtool_files
+}
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 82b44837cb2a..488365d659fe 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,2 +1,3 @@
DIST coq-8.4pl5.tar.gz 4070062 SHA256 35815ab78a58d72799eacaab155427620ab071677882ca6c98d7bfec97d25245 SHA512 0965ff409933d601a5c96963ea805ce20dd22f1fd9a9473898de1b376403b4e7a9a86b36b58eb1480cfb3a25970626e1dcd225899c089f5a301f4809e7f8f242 WHIRLPOOL 6dea97e7fe655a33757e8f031b28f91f98558e53205890d6b9d928d5641c05814f8d743cb02c39b26dcf93aa4076c5bbd9710a7dfd9f6a3456e38039b0cb8220
DIST coq-8.4pl6.tar.gz 4099815 SHA256 a540a231a9970a49353ca039f3544616ff86a208966ab1c593779ae13c91ebd6 SHA512 238bc6e28348f40f5619aa28d2e871179d9edeb6eb3f2521af6f407e24a889c8c68fa11c8b12e026f016f0fb7d5006447c3ab7eeae0804fc082d65774aefe0ef WHIRLPOOL 2120dcddce773d90ba024e97fc00df3d563edf398eaf0bbb3dc1df1265b5e657cb4044d334f598898c30a88f0579b35b38f1d6bad4ea5e373a0a30826b245e99
+DIST coq-8.5.tar.gz 5346653 SHA256 89a92fb8b91e7cb0797d41c87cd13e4b63bee76c32a6dcc3d7c8055ca6a9ae3d SHA512 28835a9dc4c926f97b14d23fe746e45e17942003e29807ec59f301eb0b697d704f05afc4cccd31b83bc27e9877d079d00e94a2101ba16ae32f4134e90ad011fb WHIRLPOOL 30925b92f71ba606e43f1b46368822e8d6f6e6c1ae500c8fe1fc912c4ef0608c6db3c070d37ffabbd0e054eac0ff7d1b1e46eae33b73149bf238101b20a0f6d2
diff --git a/sci-mathematics/coq/coq-8.5.ebuild b/sci-mathematics/coq/coq-8.5.ebuild
new file mode 100644
index 000000000000..1dffb390cc78
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils multilib
+
+MY_PV=${PV/_p/pl}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Proof assistant written in O'Caml"
+HOMEPAGE="http://coq.inria.fr/"
+SRC_URI="http://${PN}.inria.fr/distrib/V${MY_PV}/files/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk debug +ocamlopt doc camlp5"
+
+RDEPEND="
+ >=dev-lang/ocaml-3.11.2:=[ocamlopt?]
+ camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] )
+ !camlp5? ( dev-ml/camlp4:= )
+ gtk? ( >=dev-ml/lablgtk-2.10.1:=[sourceview,ocamlopt?] )"
+DEPEND="${RDEPEND}
+ doc? (
+ media-libs/netpbm[png,zlib]
+ virtual/latex-base
+ dev-tex/hevea
+ dev-tex/xcolor
+ dev-texlive/texlive-pictures
+ dev-texlive/texlive-mathextra
+ dev-texlive/texlive-latexextra
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-8.5-do-not-install-revision.patch"
+ epatch "${FILESDIR}/${PN}-8.4_p5-no-clean-before-test.patch"
+}
+
+src_configure() {
+ ocaml_lib=$(ocamlc -where)
+ local myconf=(
+ -prefix /usr
+ -bindir /usr/bin
+ -libdir /usr/$(get_libdir)/coq
+ -mandir /usr/share/man
+ -emacslib /usr/share/emacs/site-lisp
+ -coqdocdir /usr/$(get_libdir)/coq/coqdoc
+ -docdir /usr/share/doc/${PF}
+ -configdir /etc/xdg/${PN}
+ -lablgtkdir ${ocaml_lib}/lablgtk2
+ )
+
+ use debug && myconf+=( -debug )
+ use doc || myconf+=( -with-doc no )
+
+ if use gtk; then
+ if use ocamlopt; then
+ myconf+=( -coqide opt )
+ else
+ myconf+=( -coqide byte )
+ fi
+ else
+ myconf+=( -coqide no )
+ fi
+
+ use ocamlopt || myconf+=( -byte-only )
+
+ if use camlp5; then
+ myconf+=( -usecamlp5 -camlp5dir ${ocaml_lib}/camlp5 )
+ else
+ myconf+=( -usecamlp4 )
+ fi
+
+ export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
+ ./configure ${myconf[@]} || die "configure failed"
+}
+
+src_compile() {
+ emake STRIP="true" -j1 world VERBOSE=1
+}
+
+src_test() {
+ emake STRIP="true" check VERBOSE=1
+}
+
+src_install() {
+ emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1
+ dodoc README CREDITS CHANGES
+
+ use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
+}
diff --git a/sci-mathematics/coq/files/coq-8.5-do-not-install-revision.patch b/sci-mathematics/coq/files/coq-8.5-do-not-install-revision.patch
new file mode 100644
index 000000000000..37b05fd114db
--- /dev/null
+++ b/sci-mathematics/coq/files/coq-8.5-do-not-install-revision.patch
@@ -0,0 +1,19 @@
+Index: coq-8.5/Makefile.build
+===================================================================
+--- coq-8.5.orig/Makefile.build
++++ coq-8.5/Makefile.build
+@@ -787,14 +787,10 @@ endif
+ # it with libraries
+ -$(MKDIR) $(FULLCOQLIB)/plugins/micromega
+ $(INSTALLBIN) $(CSDPCERT) $(FULLCOQLIB)/plugins/micromega
+- rm -f $(FULLCOQLIB)/revision
+- -$(INSTALLLIB) revision $(FULLCOQLIB)
+
+ install-library-light:
+ $(MKDIR) $(FULLCOQLIB)
+ $(INSTALLSH) $(FULLCOQLIB) $(LIBFILESLIGHT) $(INITPLUGINS)
+- rm -f $(FULLCOQLIB)/revision
+- -$(INSTALLLIB) revision $(FULLCOQLIB)
+ ifndef CUSTOM
+ $(INSTALLLIB) $(DLLCOQRUN) $(FULLCOQLIB)
+ endif
diff --git a/sci-physics/lammps/lammps-20151207.ebuild b/sci-physics/lammps/lammps-20151207.ebuild
index e692e6fc4cb5..2158b5f7de0b 100644
--- a/sci-physics/lammps/lammps-20151207.ebuild
+++ b/sci-physics/lammps/lammps-20151207.ebuild
@@ -21,7 +21,7 @@ SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc examples gzip lammps-memalign mpi python static-libs"
DEPEND="
diff --git a/sys-apps/man-db/man-db-2.7.5.ebuild b/sys-apps/man-db/man-db-2.7.5.ebuild
index 5af150cd4fae..b6fd78958923 100644
--- a/sys-apps/man-db/man-db-2.7.5.ebuild
+++ b/sys-apps/man-db/man-db-2.7.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 ~arm-linux ~x86-linux"
IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib"
CDEPEND=">=dev-libs/libpipeline-1.4.0
diff --git a/sys-apps/openrc/openrc-0.19.1.ebuild b/sys-apps/openrc/openrc-0.19.1.ebuild
index 4a580f9741bb..85bd365bb80d 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/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 0cf496271090..a0bfcfd76956 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -41,8 +41,7 @@ pkg_setup() {
}
python_compile_all() {
- [[ ${PV} == *9999 ]] && esetup.py build_man
- use doc && esetup.py build_docs
+ esetup.py build_man $(usex doc "build_docs" "")
}
python_test() {
diff --git a/sys-auth/keystone/keystone-8.0.1.ebuild b/sys-auth/keystone/keystone-8.0.1.ebuild
index 1c62ec745baa..673cc49cf940 100644
--- a/sys-auth/keystone/keystone-8.0.1.ebuild
+++ b/sys-auth/keystone/keystone-8.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+sqlite memcached mongo mysql postgres ldap test"
REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index 5985734d25d8..d840164387c8 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,2 +1,3 @@
DIST partitionmanager-1.1.1.tar.xz 1738132 SHA256 4cf3fa71bd20b06755d36bb9aa7692fa4770a1d84ec8eb72654cb58fdea563de SHA512 3cae1d0c34c2d8a245094ff85131def5c48e4247462104a84c4dcac2230e115df61cc72b6acdf735b1755f921b8f17adb1b2a5f97a9b3fa9a0628619e7e34117 WHIRLPOOL b4bb73a8d7c5f157c7bd95ba1f907b81955206c283a09cd84397f5db5ad33ec25e55a9a5a0cb8742008396bb574b05a5b9df04030b24c0b76aaf064a31031bb2
DIST partitionmanager-1.2.1.tar.xz 1794200 SHA256 eb5b8b00ab6f0a2c5ef494b1c70441100ff70bf691006c4aa95f39d00b43e4e0 SHA512 9d33847e307df65081966d4aea2b2efeb7e1befe911268c71e678d196bf0fb9160b9812c7df2021dca2a3a4a5e9efffcf435d242b3496e6e7c7b1d89fea15441 WHIRLPOOL 945676c27a5aa80b6551d75c8324ed3d85328fbfea6f2447e0345e0d1a5ba9d45165ce36332c444b3aea5076f80060b47f4568699fc5bb59e18222af0d7a56c7
+DIST partitionmanager-2.0.0.tar.xz 1488312 SHA256 26f880c0955797778612223d3cd68345bc47ec4903b4c541dd04e7998d3083c6 SHA512 20537c55004c353a903977a37077752a99a50c6b439699eb4b209c64e704c47de98645f77ab6efdebd70139c8af2226c8e431eb47cd1730a2060b643eb272705 WHIRLPOOL 4ee5b13015730f09aa050369fa5b65c9afa4d41e99711bfb7e6a4a1b9d3643a7d46834b5af5bd32dbd414843407514dc6df690a90fbbf52bc024053e15e8cd0d
diff --git a/sys-block/partitionmanager/partitionmanager-2.0.0.ebuild b/sys-block/partitionmanager/partitionmanager-2.0.0.ebuild
new file mode 100644
index 000000000000..cf3af5e6b5e9
--- /dev/null
+++ b/sys-block/partitionmanager/partitionmanager-2.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE utility for management of partitions and file systems"
+HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ sys-apps/util-linux
+ sys-libs/kpmcore
+"
+RDEPEND="${DEPEND}
+ $(add_plasma_dep kde-cli-tools kdesu 5.5.2)
+ !sys-block/partitionmanager:0
+"
+
+src_prepare() {
+ kde5_src_prepare
+
+ sed -i -e 's/"kdesu"/"kdesu5"/' src/util/guihelpers.cpp || die
+}
diff --git a/sys-block/zram-init/zram-init-3.6.ebuild b/sys-block/zram-init/zram-init-3.6.ebuild
index ab1468e62fa1..665d820ce343 100644
--- a/sys-block/zram-init/zram-init-3.6.ebuild
+++ b/sys-block/zram-init/zram-init-3.6.ebuild
@@ -3,7 +3,6 @@
# $Id$
EAPI=6
-RESTRICT="mirror"
inherit readme.gentoo-r1 systemd
DESCRIPTION="Scripts to support compressed swap devices or ramdisks with zram"
diff --git a/sys-cluster/cinder/cinder-7.0.1.ebuild b/sys-cluster/cinder/cinder-7.0.1.ebuild
index bf4eb5d8faba..226a65584f8b 100644
--- a/sys-cluster/cinder/cinder-7.0.1.ebuild
+++ b/sys-cluster/cinder/cinder-7.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test"
REQUIRED_USE="|| ( mysql postgres sqlite )"
diff --git a/sys-cluster/neutron/neutron-7.0.1.ebuild b/sys-cluster/neutron/neutron-7.0.1.ebuild
index 60a223df5400..6b243ca55168 100644
--- a/sys-cluster/neutron/neutron-7.0.1.ebuild
+++ b/sys-cluster/neutron/neutron-7.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="compute-only dhcp doc ipv6 l3 metadata openvswitch linuxbridge server test sqlite mysql postgres"
REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
diff --git a/sys-cluster/nova/nova-12.0.1.ebuild b/sys-cluster/nova/nova-12.0.1.ebuild
index 9d49c42bd7c6..9d353a2c3a0b 100644
--- a/sys-cluster/nova/nova-12.0.1.ebuild
+++ b/sys-cluster/nova/nova-12.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite test xen"
REQUIRED_USE="
!compute-only? ( || ( mysql postgres sqlite ) )
diff --git a/sys-fs/ddrescue/ddrescue-1.20.ebuild b/sys-fs/ddrescue/ddrescue-1.20.ebuild
index 638980d95b7a..66ab44044d75 100644
--- a/sys-fs/ddrescue/ddrescue-1.20.ebuild
+++ b/sys-fs/ddrescue/ddrescue-1.20.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux"
IUSE="static"
DEPEND="$(unpacker_src_uri_depends)"
diff --git a/sys-fs/eudev/eudev-3.1.5.ebuild b/sys-fs/eudev/eudev-3.1.5.ebuild
index 9b47accafc72..a7458d2c2a89 100644
--- a/sys-fs/eudev/eudev-3.1.5.ebuild
+++ b/sys-fs/eudev/eudev-3.1.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-2
else
SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
- KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
+ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
fi
DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 5f9eb11de84e..3e4c9e1a7a9c 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,32 +1,17 @@
DIST deblob-4.0 129952 SHA256 c3d8e9a9728d5c1fc11b1112f5343b14e46a8cf2880e10399a840bc94b6e2ad3 SHA512 055205394487dbc0022f9531fb76d0be51ca3ec4e119232cc0972790d1532c680e1367eb36a9f40529f0ab1d76f64240b1e8a07cb02d3605d594c06e3547f1bb WHIRLPOOL db32b66231e552ac6e3651152eb2b3212ef0863842cd352bd2f1b1080b9ea5543f1f7ed0e7958a9f4b115559233dc1817560e896c789378ea7b68b527b721ca8
DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebebf424f778eb08fa359bc SHA512 a27e3530cd3028041445cf8c5f49ad7827a7cf2b511de28851d2b09c28347cf2be667a7494bd698939c007fb77595699c1f61fb76249ae87658e1d12e855d2a1 WHIRLPOOL 953d8e6eed10971ed67a4573449b9a536ad693a2130153a6fc7cc9ea3e2daea21ca002c8df80126f7e318f75bec82c3f6e99fe43155817e2e2a52b5949dc5d2d
-DIST genpatches-3.10-97.base.tar.xz 1299308 SHA256 d5407d2f91744519c407e1f74773e1861cf1ce46d82d5c0353333035a86e8189 SHA512 2a91d0772002a079691ba1c0810fd3ac38e4b893a4da28c53b62bba790d402e36389275dbbc8df6d0bd76634cdfc319a6221da2a1bf07abf0657fc419084d141 WHIRLPOOL b2a5a758695fdd6fa78926cd3eff3f7d3b074fb0d3ac35a51393662d6724f0abc2fd21647096a8a0a9805bde706314d085169ff10d8999af73d55934d4b66359
-DIST genpatches-3.10-97.experimental.tar.xz 60148 SHA256 c0d7145c053c8165b8a0036c3d6d823300319ac7d7766d0c2c431b7f2f558a13 SHA512 b9d78f88ef57cd4ba43dec4b9dab1ea72c39947e1de5369060cb044b9d5eaa4ed81731d3f26280d5f7fb47d84c4c439c2024f870f5324bff09a32538fa15e072 WHIRLPOOL ca93d5351300ca4166b20021ed14c31ced9c9743fbdcc0b676a43c1853d3e868209fb747f31a0e1a9eb5f4dce8a9e3ae3299dfbb312a35e1459e268a8e300306
-DIST genpatches-3.10-97.extras.tar.xz 17832 SHA256 6eb6942f08071bd467bdb13218975f1670c385a21cfa41226454ea4b4f03036c SHA512 240549a6ea1d6f119a563de6676628d8c0a3207f7be685a8a7903a04d0bfce639d02858896b4dda95cf0fba48bb22d0feadbc176c5f00bbaebdd5edc68c0b87c WHIRLPOOL 19ff955983a322086feaeeecb3c664f13b6ee1faaecb6745bbff0e6f2acb1937ea7212cd23869146e0a5c59ca83370a61437b691fc5ba8224d2d2cc69cb70a39
-DIST genpatches-3.10-98.base.tar.xz 1303112 SHA256 51a91a0d98ceb9c77c900aa4ad86b51113341a2823ccb90c3bd926bb3009b07b SHA512 621cdf1e7ffa02d4e9b0996681f8d60bcf26a30ac4bf8d00145806047a7ace8cbf60195840ba858d775c64107356cbc1efd4b601f6e0219bd2e9552b71d6540b WHIRLPOOL c054f0b2c7de4ba83d0bb53838b0b11564fb7950c081bc65c27f99efaba2e8495f90b62c4c477cbe7f0a47ab20832c070cfe747b526d30481a11839d5a5738d2
-DIST genpatches-3.10-98.experimental.tar.xz 60160 SHA256 663505a20e625da9160d279fb42dc578490050d85e83a5b1addde985c456f205 SHA512 8efc7c68eaf21a57e85a76deffc87596eab82988868616ee5e8ee0fc041ef16352fce6c0ac456b10c015416bfbd1b2b8f48cc2d3032c194fa0a097f6a488b432 WHIRLPOOL 49bb906de3a71bc098f3efd686193dfb68b99f110e3025ff3f10fd964ee238be7c46abc4e642b41dda4f579a870b5448c87bf0bb1580dabc6a04b9928cc34b7b
-DIST genpatches-3.10-98.extras.tar.xz 17840 SHA256 b8207c98fa54727f8c5ad98fa9c36d64ed1b6e035749e969c2c7b9c40d63fff4 SHA512 6c9f9c980de8b160a5ee32d69889bb224c5715eca8412b51bb24f5f24565e28c8ea200d28f26332709e7aada9981867aff76731cec12997e730481f82f09b455 WHIRLPOOL 419b8657351293fa04b0c41bdfbc025e51602f149866fe05cc47c7cbe746c31a2cdd652d652df327949707550f04a0558b442c1815f5e1f596ef830efebe4fd8
-DIST genpatches-3.10-99.base.tar.xz 1308444 SHA256 f8b6ed7dfd6481a1086065881f1693e0d57233827a70c4ca2537c8411ef911ec SHA512 4e2a5788e2a18090dcfaef78d97a9e95cdc27584f5cf71004ff842f47ad5a89b9123f54bfd9be44dc354474151d9beb575df2572a3d47cf9a3452811ba592dad WHIRLPOOL 8a8e44d2e4246d627d6ccf04cd48498bbbd48dd859f41fe07e5492ea929cf0b50f0b1938353ec5dc17bcfa23ca68097330465f5bec2189188983ef930f5ad024
-DIST genpatches-3.10-99.experimental.tar.xz 60164 SHA256 a8bb27a7292a8cf63285743478830b88b70be2ee5ad4beeb9d713e39f4f10ead SHA512 5e81bc456813429eb23f90ec8c7ebe0214e7e376da16ddc622c00a83210372cc0807306272a98754d2480746d8421025eb5b5ba3ea6e879aecf3aae21007caa5 WHIRLPOOL 907641fc4789490ced829b51f0fcc1a3e324a0d97e0b1edb581da91674830cbd59dbe16027573035203a6a24e8a3da680f1f6ee921107a8f2a6958c337c7c710
-DIST genpatches-3.10-99.extras.tar.xz 17840 SHA256 f959a2835307736a3bd1306a2733c677f30f3b245a2aea301440e50220734980 SHA512 4f8c2f6af332be76ffe543d5ce0225ba1b5c8624d4945cfd56043892a2ffc61e65592387938be8fddc73e89d1382ec47524f6f6ff4b61bfeca977a267d72b131 WHIRLPOOL 052dfe64463f5950426dccab6dcaa21abc5abadae27fa0182902bfeac8410fc38bf32d41bce58e585f324287b49d6aec9e59abc19515212f6940007222fa3212
-DIST genpatches-3.12-46.base.tar.xz 1477068 SHA256 62f8e7101afdf671a51e3beb9b01f8c06cc3df6b12274fdbfdb1bacf2d3f2952 SHA512 8464d356a7267f41a5d4b8eaae24b3ba391d51157adb3b5b7d6bd626b1569e5c565f4383e138bd3d939d4a2bc3dfde349f74c2b421365205d98132cb79442612 WHIRLPOOL 50aa1c4ccb5bf46e54ef1cbf699c7af27f00252325b09bf25e8f9cead1faf346a94bce29e4cc556e7eb3e339b627e8fd321acc320221a8a208fcff4493eaaa29
-DIST genpatches-3.12-46.experimental.tar.xz 46524 SHA256 48069be9b5b0a4ba7f1da5dc046770e2e36a52951bd6815a00907cd721881b25 SHA512 6daf5d04d5cf569eb5b0bedd5feee8f3869938ceb9093f109f82ec8e4fed5349a5dfd445f89a9f5c5459b2524bc4d00707c4fbfa449783ef63a65204755546e3 WHIRLPOOL e51be15d4756dcc8ec59179809584bc1232ff20148a1bb2143947138a8591311a7bc7162b29ea3db81c0781551a186b7650f597ad850864b1ffd2f7dc975b00f
-DIST genpatches-3.12-46.extras.tar.xz 18240 SHA256 7cf508f807c15884428573ec210eeefb53470504bfef2eca8357e60d82cbfc4c SHA512 11736da85ec15ae89dff6c850ea730fe5ca62bfa24d864df3d7c832fb20fc4321485306124b516037b3121e1b8c5a47bc0610f17767867babc9f8cab4ee599e0 WHIRLPOOL c5164b37852f78ef0297c70a41f984ff6647eced6e980f7718d924622f28c8ccb325b32cc04f0cb14b01fde029ed09f0b2b6d0ed41126140061e010aa4e95405
-DIST genpatches-3.12-47.base.tar.xz 1507660 SHA256 3b780da7ce93ca89b6aa8143f198dee2d7bb13ca8e25aaae4ec06d010a9168b8 SHA512 5ff8c98768001bddbb62e9deb78cec00b3f27b73b64ce3c925deb3886aae1bdb139761bb5ee3277e3aca2b5229436a2e4497baf911d838b1fbc28202300fd2aa WHIRLPOOL e235c90c899acd0df9bbfb6fa4f8e2607d439c8f510a5d9345913fc8a8b5031ab1938c7b5ed6d5bc33d89c51929aae33135f29c6e0f38151f19a69193710a145
-DIST genpatches-3.12-47.experimental.tar.xz 46536 SHA256 2d0838c242b9316cb4cbad557cdde1b02cf9a6bd286c2ec6930628079770ca52 SHA512 c8ed7f89a02e0b5faf53e301440b1fd6a046c72e4dd7edd654b1709805fff47e681bc58401de2a10dac7fbf7d52a2093cc5d48019d69dbffe1f9bcc3c9d8f6e0 WHIRLPOOL ced6040bd9125dfe512db9b704b44cacb596f88f8091c23d3bd70700adb1ce89bfd7d240b33e6256fe7d2b2d0531ddd84c0fa5904c3623ae7c80bad93cdfd89f
-DIST genpatches-3.12-47.extras.tar.xz 18240 SHA256 1ef9c22bc285daa1fcb24f7e5ba34f83eeff90b5be47a21a0d9a37c741015828 SHA512 8c07e5d4f1a8187f3c07d5c5d236aff74b817122bb51ae6e92458dbc1707d32f2eab894550c51eda42d8260a52c081178bc02c43a4fe5d44c8042d7a66d5d12b WHIRLPOOL a7ba2bba83e772331a40d68512162402c858f46c0e0bc1d08ed2037df0500ad02d8749044f90ff0a87ff1ff5b2ffe937310fd23151d4665ce69a779398c1f291
-DIST genpatches-3.12-48.base.tar.xz 1544548 SHA256 365449bdf6dc7c0521234055c55773a25e2bb7559305da8e00fb2a918244c2a1 SHA512 0f1783d09112489947d7f373a1a3e4939f9aa4248c90a8abd6280055bb25e4e800bd67faf11c129e359dc40858f632e2a844b733ed3619d97972b5262158843d WHIRLPOOL 6de33f1d94bf34c81cf8ee94efd8ebd484cba35cb7f0c4cd55328da92181771a27ef1b738fa8ff2abdc6de6edaa3cc052b16002c99963e86f74b2f91ee54a2c2
-DIST genpatches-3.12-48.experimental.tar.xz 46536 SHA256 4e5fe3d493f4b93a71488202b3a2923ed49dc1bb97c3e6459d782234c8eea261 SHA512 1c79daa3ba465b2d74acce8bf8e0fe5c710640b67f5957ab715967e4ebcaa4735e29b52a34ff6dd3da36554f4ad245f995c8976b28503b5fb12076c6a49417dc WHIRLPOOL 3b27044738ffa23ec581d177796e699a003add8c83c3dea80ac6aab39458a788b90ff266f6434cabdd8ad822798f7f1d83c98b3cf528027c2d76fcd0efae81b2
-DIST genpatches-3.12-48.extras.tar.xz 18244 SHA256 331081906d8187f8c0d882f4b7edfcb86523351fc5955b0b8cd5222d00ecc8ec SHA512 282400f962bf2a6bb76f5bea3f3d6388b69e4ecd785f4d9ec7aa3955ec0d97253015455294595be21ed5d3d66a9bc7ec1e2c36663522dd294677e759a2294a07 WHIRLPOOL f2ebfafe9aa1c6b78ca0759452c3a71a1f358a2c32653a002a157d40af1804b623324c85057872001be074928fb0ceea617d0a4b5abf8f49b532026d6e027340
+DIST genpatches-3.10-100.base.tar.xz 1315848 SHA256 3173e7f08f92619f6cbe72cbe1ca057dcd47b16d0dea3eae8f47cf8c626fe484 SHA512 0d3fbe9bf88370a60f750da6daa973bf8dab6f4039f007649985d50baf4a5c30d0f3f7495d07c369c5c31e101cf5af7fa673737f72eb432a48e303c59906fbae WHIRLPOOL d80764b8f61b582c0901071ed91b8c4de420339101819b2d8ca610facd2927d283e1107394006c5c981a3ec70f4e2555e845d99b88ca6ac371d6da47c3bb8958
+DIST genpatches-3.10-100.experimental.tar.xz 60176 SHA256 dac68be2307878e46a29f3d0209c6cc3ce42d25441345e92e7a3564ea90d4aaf SHA512 f645210f454312ffd9fa34665ccecb512c34628b822cb9e29e84e85bf291954a3bc609e48841a5295c13334efdf0f42d0e33284fd022319e257bdc81763ef687 WHIRLPOOL 7b063586942c02935ceb9564e7a5a012ce2bc41fd184e6e3f8b48999b030070c7cf199cc59be18c615a7b40e893b1447ab7965671a8419d9b7995ec18ac8e501
+DIST genpatches-3.10-100.extras.tar.xz 17844 SHA256 fcfeae8c28d10aa043b86c5f272193e54c8757aa9f7d1068f6ac157a856fb8d4 SHA512 8e8b0f2b1b3a7dde4262ef4825c7efc718930d74aebfc5a80820acb301e1f37f29fcd72ada6269d2ec579b260d3f4d0d2caa17f68d1bf0569fc3967d436ea0ed WHIRLPOOL b67b0f8314f6f9421631398caecb3177df8b1cb5023447a892c0b809192252158a3ae9728abcaa14905eea76fe9b9f78a51e988abf9ce32903685115729875ef
DIST genpatches-3.12-49.base.tar.xz 1545256 SHA256 f9503fdf958458692b841b95fcdbc561a7ef4ecceeab1c2e532c0740305a25d1 SHA512 4475cc1e1faee3975598115937869564274053cff1a9dfbefe41b9535846f1dae04abd784541af5925e805e9878ce1590cc2eea999c06cb3ca67b80df94f23e5 WHIRLPOOL 25758cf3bad2a875668950923edd3ab481c8fe7f4faa2512a2ad70acf3f4f360dfad0c10bd4599efa60bcb681c29cfb2db5f4b3f8bc82cc792a369517891bf02
DIST genpatches-3.12-49.experimental.tar.xz 46536 SHA256 927d367eeddb6823534004c5a4c96093fe822acd5856d262003045935617a741 SHA512 3ab1222cbd073437af8697b9407ff2dd4a1890be5acaf70d9e14ff6c6e908615a7f6c8a8b3c0def7660e925edca457c6b31fea64b2ec73200c36512df6efa3f1 WHIRLPOOL 7d600343ae9e5109e04507176b7914ce2421bf250e2a5f9812122820760060093fbf9112fa9e906f8185c99eb14fd873f198f38da4a3ed7b92c884ce0ff01358
DIST genpatches-3.12-49.extras.tar.xz 18232 SHA256 5800be892a1828498d914ca9315cc5315c2493f900390eb493f7ef45bc7d346c SHA512 b3cad4524b15e15867ed4ae56efed8e59be1d570fe9e822ac381dff7d5c7cfe35af730511a1693ee6f82a48f2e2dc9718b39c37f5530aa00fe18f23d142df4e9 WHIRLPOOL fd8b5bef919d3c155aa49d7c4587c3e3af785ccf1bbff47d0e67fe05fd3d9e4abae8626ba7d44bcded366acac04f4f0ed3244a8ccbcfd886840ebc1663fa7bbf
-DIST genpatches-3.14-62.base.tar.xz 1104664 SHA256 d7790182dab0aba591fc5e9bed4f1dc4420a3b484ce3cf8af57769318d1a3229 SHA512 8cc76af4175f2e9d54ac1c7255b870df250ff3b28ac7000b32ce7b3348830f7072f13a8b25b0b6ab7fe49ca3ad5c6aeba62a899e43869a97677dfec017b32b02 WHIRLPOOL c77640e5fd36af50d78f49f00de79c2c986c99b8997d42c9a4888a0c6afc9f10833a87ec7acf5a4e228f483d35aeae9f767fb8f27fbfbfaa1b06d0443fc6d593
-DIST genpatches-3.14-62.experimental.tar.xz 60300 SHA256 564892b993deadbb2d47f936d924d7d1e6891de329b5bd04d2b3ecb126690401 SHA512 942d099b41c4e041570e23ae97006fcc5c6dafefe42d9d694c373b9a5398ff5b7c20f58edc8d339a6ef56cce240cc47f07958f59208165233e39ab573f611717 WHIRLPOOL bd7f6519d20137f18e086871a8dfd7cd06ddd7b9170badee7a31496cb6fa0669723a433ef7c159e037c15b3f31ccf0744afe6a76cb680bf8e9a1faf6df14b842
-DIST genpatches-3.14-62.extras.tar.xz 18252 SHA256 6702160c63ae9de7eb95279ffbe3e5b08fcc6d016803f18e3c09183f1ce309ba SHA512 8fe48eaecf72c257a6642a51dcabe8a0b76e5dd352dca0ff99ff4098db59151f622357beb14830aca7a7f16132b41f8b35d337933f38d8ce1c60531487b3d843 WHIRLPOOL e9e9790a84b432bb90b50e27a369cdd6777b5df67cc5175c4542ff6c15cb8ff7ba650b7046756dcade77742c595b8f9037f49c28e82ecb623742ed3073d74f1e
DIST genpatches-3.14-65.base.tar.xz 1118344 SHA256 fdbaf042acdacca6c02b602638980ec661cbce979600391e94cca031d45ef6f2 SHA512 28bb3f51b5d0b45bc18d54fc04eb975a7c61bf5c28539cc6a6466bc22611ec3b91ecf5b9f79053082e3907e0980c2d97a1e22eb25e75157e4dc54ccf1d9a16bc WHIRLPOOL f776e32318fe8e4c468cacc907aa32554b74dac0f5a1ce785acb80a40b52643977c283b469d6d5ba895ead477f246e409a99d6e686cd3686b4b6ecaff4a97ef0
DIST genpatches-3.14-65.experimental.tar.xz 60300 SHA256 f0e047dc68af01750fc2b2cfb76694cecb391e4de657810b2de2a9092bbb0eeb SHA512 c2125a73aba4fe51c1efc6a73a86088964bff398c2409e256148d0f13e8106b56e6c8137e0943332be2524b3230f522e0b76b265d20ef075d852a5a3ca21edf0 WHIRLPOOL 5042375ab3541e65f609deb48a03d186b53d583b4512c27ece06130c0ac4fcebeb8256bf9cb38276720e8fc6610dc8663819ec5acd3bdcc57232a1d2082f25b5
DIST genpatches-3.14-65.extras.tar.xz 18256 SHA256 9220e49d4a95d876373ec40fae2e026bcd76efb5e33106bf2350026120b28244 SHA512 2699115a2a176a34570b1045f1ca6f5f23e46eb974c9c4953607919f7e5668e1b317b197cd39aa375347460110e9c67231b0315eddb9ed4d8fb631b453f802bf WHIRLPOOL ecb98ae1bca845efbd5dc32bfba31268bef55c73ad35092796c8c4d3661a72341e1a179833ef76d701ede477b9d436a2c45c16ca9b2bc23bec413e0186848285
+DIST genpatches-3.14-66.base.tar.xz 1126824 SHA256 8442fb8d0341756056aa948f6b6ea9c91cc69525d5016d48531ffd6b13c3a215 SHA512 0f9c715cad9ceec62cb589be155da3f1e081ebdfc6456c9081321b244f3a9c61163ba11dc23f34ac4f6ccb0c3d32d737ca0b58845f7cd9d8d69e05c68ffce4e0 WHIRLPOOL cbc24a82d40e1dfe8bf1e0ab8fc029186fd5b7b32cc808c1c6548df6e2d36c9f13f620fe287d139a31727eec8c6e8c9d1293cb90deb550a3f83f12728b655fc6
+DIST genpatches-3.14-66.experimental.tar.xz 60296 SHA256 143a7337e4a941b7049aa8f2e4cd5e377a6f0a4d314cc9137f28f0ad63be7826 SHA512 87233a2e9367412900bd2e8c2c12c202d55ad29c520609c1e4e69206c6b21392995ac66424ca62973c69d92a0cb74c781695884fa58cc06d79fa3d0de666b268 WHIRLPOOL 4c5f49114bd3400f4b5dc4686c9bd589e851e41cd7dc869f0826850b33dfe8da193f1c7c8fbf1d76a4742eeefda8a5336e9f9c9fdb03284c983be4305b3fcb5b
+DIST genpatches-3.14-66.extras.tar.xz 18256 SHA256 ca4d2b5f371c96a85c29f5ecf6a746c8362b49a256a720428e9caa5c4ca9ea09 SHA512 bd588cb8668d70e7b25a28f2196d7ea314e49c13e864d20f20e8024380547a62a0b1042b6851d5f850d428b1c6a1eced5442dedcb79efafd199569513d4f0c68 WHIRLPOOL f86d4f65bcf86352960e1194d1af7c9f97bab0ecac772c53021993b949122c5cf9d53fe9c6d508206a3caa91ee6b26a19efb5e36cc4ec61553fd164960f79dcb
DIST genpatches-3.18-26.base.tar.xz 753528 SHA256 0a3d2a302b64284353accbff19ff1a78128e900f0d4cbb0e70920034b68b4bba SHA512 723a29074dbd6970b43974655539902a92b5ba3447cba754f5719971848e2d2ca450d888a83d41fe35770806e842615bb5c5425aebf8a7118e5cd39470aafcac WHIRLPOOL 17e49e01f19a9710e6c3f6b6bb3b50ab96829a18dd60a57eb10058656845ba8e497ba4c3043f3824d69f79cb5c911c5fab6f4b8e28aa39acaa5083fca732dad0
DIST genpatches-3.18-26.experimental.tar.xz 61608 SHA256 e72de3a8865519ed658a2a769b42e2b4592ba5a6e5c98a699fbe4109f3567532 SHA512 75cd10ac41180cd5f4a1e70ea49b260a141b875f3f46dfa5edd668e507b27fe7244033c76d1e895dea58c8fc69c43ce21dc8e711884438c10b686d53c0b4c8a4 WHIRLPOOL 267a2c1abcda2d41ebf64a6034c60e73249dc4c0984326f516ac92eb16145f493549e690bfcf8f6c515984ab56368437e392fba3648f4bcc57db0351d5ee6863
DIST genpatches-3.18-26.extras.tar.xz 16188 SHA256 af0d5013a7cb6e0ec78bb5821bb4f83048d953cd10734b57085439fcdc44683d SHA512 effb9ef5722a956a9db49582b3c8aa85f5838a8573138ce867e0575348a291ccc6163e7bb8ce1698f9b5d799e81e151546c1bad59388f80b984e86f98ee8424a WHIRLPOOL 52adaba3ba161e7d1bcc8234edc9efd06bedca2211085990069b1ea8e1a35ab443e5ebfb49a7d56c3d572f9e7e69de1bdfc463abf455ba7e3155eabcdff3786a
@@ -44,12 +29,15 @@ DIST genpatches-4.1-16.extras.tar.xz 16176 SHA256 a6e00246f5e8feef952529d7be5110
DIST genpatches-4.1-20.base.tar.xz 452816 SHA256 74b7e3355fdd999b17ed0cd955a20551ddaa0cc4d8608f5b80d31f8059a79549 SHA512 fd2d6c1ce75c899254b944798d230144c25caa8e36103388fa4dd3aa1a1a9e310435b442535be13a933b16d1a142c125bd5e754fb4aa621573599c36b6ac4bfd WHIRLPOOL a22aa9175d0cdf315c345ab60655476b141a472c4ebe505838440402b1bd65802ab21e6ad897f7883bf2846b61b9b414b2f55af29ee9372ea30d62df3257fc73
DIST genpatches-4.1-20.experimental.tar.xz 61652 SHA256 155bbcf04d07d2b02523c9e64323f000ea24fa2b06d1472ceaf125e70e2ece25 SHA512 5f03d99b5c35384a158a2568516a41b9bfba8c373f1b004e1493bb2071b4de321b66ddd623bf71cd6fd85f4c3af1d2d45316dd3b2424b113f292ff4104e976c3 WHIRLPOOL ff6668b2f2301e34ba3a387a1216d8ab65f720acc6b2a6218f2d883c2ac0c1fa608e1cd0b07033eb6e114e4ae9a88ad7e3ef6ce7a4f6da8b241149ae08a8ec23
DIST genpatches-4.1-20.extras.tar.xz 16180 SHA256 8f44981c6574aedf1484c7e643cfa3dfc1362fdce415947382c77098082d34d7 SHA512 5ae28d62ece98e9f39b68e6ffbc205c3c7e47b9048a67e461f944f1b05e39de865973c11a4fa6dcf34dea65e2cf883f537be4aaf24c704ff311c0769c68a286a WHIRLPOOL 58c8389b43898e4700d81fd12496acbf954152e6879e0f2d0535686ebeded273032080569c18fd739a8e2c07c6b55f8fe58adc2ff21c436c33d20e2a8eed6fdf
+DIST genpatches-4.1-21.base.tar.xz 462148 SHA256 0ec07c9617ee2e5f9d1f4f071c5b5696274f2a0275508a7e527ee94565b81ac4 SHA512 59d306ed7275c20e41f2056b92b180c364be645af2d0a570e35b83dece8aa314a558503d1d9cec5c0113585ad6a72297d1396d16aa82ac7cb22fe83648b104c4 WHIRLPOOL f8f35d173c1ca70b9fc6e7acb39ddcec1fece29d7a6ee51e586147aef4c2d2f1846c98a35d0cf5024687fa5f2e87031b47f6b4819764fa7cef0916018b5ba411
+DIST genpatches-4.1-21.experimental.tar.xz 61644 SHA256 4237ac2effb4817c73a27a33f20cfa6704bbcc715a247754abf63dd980071f73 SHA512 8443ca5be9c2403d8d28a0ebeb3402f8d28b5f056564706addb9bb0e8255b8c095a2586b273186e1d6ca82b44fba73ffe5ed6590eb439603c5bed61809804a5c WHIRLPOOL a7b6c456e510569b3acfdeb675e51d902b39997d1d5923c66c6f446f634e45c219e7d7f90a66f0bad9267d1328a3a83a470cd7ee503884b201affea88340561b
+DIST genpatches-4.1-21.extras.tar.xz 16180 SHA256 f1e5767b655aa56d66b182001fbf5108294f8675bd022bbff5c470064b23c1d1 SHA512 8aacd4f8dd9fab6a106f4733872d37ce1784d309263eb4c55558bb80086ae944b85f47bc7d518f7a8798d620dd2b776ea9744f9c69d22b90a4298f5d930c4d7b WHIRLPOOL 12245af4d94106aabf55319a616cba3f089b7f11ead5cc9947e1a593ebace164bc29c813254e941f7ddfb0cc98ef6bd1844896d708f78efda06af4ba1e018610
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
-DIST genpatches-4.4-1.base.tar.xz 3460 SHA256 d8c94ed4b71deb4c138ab3234d9ffed1303b133f7ae2bbd6891615f0af86f849 SHA512 1b9e565f9bb173da5c9d7a4d657abb6f6f0470f8ee0cf671d638f27c9f52005b33d4984793ad8f4424215b87ab18a6fa46b2119a2d5146ccda1e9eb420525f30 WHIRLPOOL dfd911a7dbacd37e9e6c3a81501b9cfbd03ce1338c9b597f0da1e3363abf752dccdab85ebb3a494333bcdaef1fc04f9ab2f2df6797b55ce6e5f1c733be2fc737
-DIST genpatches-4.4-1.experimental.tar.xz 4900 SHA256 1593bfb10d2efa52519d74b2727a4560e11ab5d6ddea2d0f0c0bc8ac59e941f6 SHA512 7523e6de6d4f58b5ebf7d46e6beee58efb96fe4711060bdb358781d95c928a16e63abc26007690df6f25addd8bb07d2034d6040e52938278a0ee8bf4aa8d3db2 WHIRLPOOL b4703ca1a8f4e79a30d1f9ef7e3457c3e6c591c2f6f626a009b609b6396764b6a03939b8fda7debf3c4e3e4f996fc6a9c6a63048f607ab96d6fbc55946f4c303
-DIST genpatches-4.4-1.extras.tar.xz 16292 SHA256 b96ca9230b7dd3e91d571bf82da1ba76050cd5925c7cb537be089d5794e3a1a9 SHA512 a4826a8a652d8155665a8f39c842c0d38757230ab475e0288ce75394b2e62b88dc601b1ddb2ac5169d256ce95a9acc5ceeadc084c774d919f3ddb9e166a59067 WHIRLPOOL a53e9c415af0a8030b507479a7e8a2ff669a7bb409fc960b19b2348e367ed1f841d6339066ff211f16586965fdcaea074b50649d94120ebebdb0ca675ec3329b
+DIST genpatches-4.3-6.base.tar.xz 90396 SHA256 ca44364c8a8f4efa483926ad9c562f569c08fb713a1a3aaafa1e4adf10da6312 SHA512 1272acfc097f50af8af0906893a2054dfa86c5ea7a123ab63b0d43f9b403832bf043164b0c242ddb8ad61688d01d453442de4cf24cd5f1fb897763ace293ed1b WHIRLPOOL 310a5e84dff7e88613a563e6e791526f8e1766e81b084514153c8c69a615e6097e597f8ac967db929b79f0ddde5ff9dd843b54dded23cdf14642dccd26a3e949
+DIST genpatches-4.3-6.experimental.tar.xz 61624 SHA256 344f1cefc1e7738451d3433fbcce3974e5599c3e8a416473e4340806b8b8323f SHA512 44411406af51d593b6fdc30c883b85acbc38b3561849dc893fb0d25094a2d4db47e55eade394645724fa9529e79410219568b830f7160abab5ecca10313e3327 WHIRLPOOL 8105c64f9d6a2c2fa7529ef1ffae78b3ab48a2790a49d3436078155b33c719192ae11c7de76c46293ab5ad3214fcb3af10792eeef8f01645c5f4392a2862e7ed
+DIST genpatches-4.3-6.extras.tar.xz 16280 SHA256 fc90c37419df393f084a5fbbe2d681d80aa9620c13984fb6a68b578b79504ecf SHA512 a4e347ad2181d5f2e4031f2392c33e17fb3704215ae25420a5953f9a8f8f0e5168617537c3fa07ad684540b9a8d15c7d1cb5bed62dcd8c72e75d07595d053833 WHIRLPOOL d6d736e2a3f2b816ca232caf2f9baf5e5305c1343e78fafd75d1f985d158fcc4baa438ca09c5ad34aae8b38f159c1245ab68ae872ba1455c324b13e93a4a6d74
DIST genpatches-4.4-2.base.tar.xz 4416 SHA256 fbcbba8098ffea5957652a91de15ac41eb197443e7403b7aeb32b38b8a0d8bc7 SHA512 65cf7fc10a76be780134680811ebdbb2ed2deede73203688e5b32bef764eb2dec6bfc3399eb245082204cf571b06742dec90f9ee7cea6b34692f694cf0bc7bc6 WHIRLPOOL 554b3287f7011c62e3efe4a8e06cf635bd3768f9228fdabe25fb01b6f1acc1a47a7c96587fffe79e8aadcfe181b934c59512918453cfb27f867d5dd2d3a022d6
DIST genpatches-4.4-2.experimental.tar.xz 4904 SHA256 f1b7bf2d00c34b573d195e841efe5dfb29354d901d2b73066e57c19fd9c7b8fe SHA512 5c98ea98c4648dd2fecaf7cfc364da04d136f4b084d9c1b0b2527deb7cb52d226d5709ab0324e22d75e56d44e42cffc66add0a432639a817b59e97b275f9c232 WHIRLPOOL ab0e36bc830de699d59be6f08d6293283668a3742f216f8189dcb695ccb293c3a60ea468836321835d0bfe3336f6731647698d8252630d06f8fd96886099d2e3
DIST genpatches-4.4-2.extras.tar.xz 16272 SHA256 707735f41624d33489b10c771db536f119bcc5f0d13cbcc38e91977b8b12ec41 SHA512 4f3d9463a9e6f618e6a3a66d4b9f1ca7ffbafa2d0c13308493dd5abbb23147abbc37c0e68a38b0c11c1f424fa1b2086aae88e820a824a1313ea9531507f7f91b WHIRLPOOL d9aeba2ce4e4db0697813bf116e27ec6e91f614316b8643539fefc28f5f522532fd746a56c91e706cf6f9e621019f050dd22f60f420d2aa15d2121383fdcfe1d
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.92.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.95.ebuild
index 28b1e89d4a99..7f17c3366d68 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.92.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.10.95.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"
ETYPE="sources"
K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="97"
+K_GENPATCHES_VER="100"
K_DEBLOB_AVAILABLE="0"
inherit kernel-2
detect_version
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.49.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.49.ebuild
deleted file mode 100644
index cd170b0d27ee..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.49.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="46"
-K_DEBLOB_AVAILABLE="0"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="alpha amd64 arm 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-3.12.50.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.50.ebuild
deleted file mode 100644
index 484f1ce90ff8..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.50.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="47"
-K_DEBLOB_AVAILABLE="0"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~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-3.12.52-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.52-r1.ebuild
index ef8e54698b0e..dd5ad0d1c902 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.52-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.12.52-r1.ebuild
@@ -11,7 +11,7 @@ inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.12.52.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.52.ebuild
deleted file mode 100644
index 60c24feba7ff..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.12.52.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="48"
-K_DEBLOB_AVAILABLE="0"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~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-3.14.56.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.56.ebuild
deleted file mode 100644
index 10ae47f390a5..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.14.56.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="62"
-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-3.14.58-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.58-r1.ebuild
index 535876012586..da3f101fa598 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.14.58-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.14.58-r1.ebuild
@@ -11,7 +11,7 @@ inherit kernel-2
detect_version
detect_arch
-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"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.94.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.14.59.ebuild
index dc54d6bbcadf..b996d30987c1 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.94.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-3.14.59.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"
ETYPE="sources"
K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="99"
+K_GENPATCHES_VER="66"
K_DEBLOB_AVAILABLE="0"
inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
@@ -22,7 +22,6 @@ pkg_postinst() {
kernel-2_pkg_postinst
einfo "For more info on this patchset, and how to report problems, see:"
einfo "${HOMEPAGE}"
-
}
pkg_postrm() {
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-3.10.93.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.16.ebuild
index 56d5e69b1209..db3aab974deb 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.93.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.1.16.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2015 Gentoo Foundation
+# 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="98"
+K_GENPATCHES_VER="21"
K_DEBLOB_AVAILABLE="0"
+K_KDBUS_AVAILABLE="0"
+
inherit kernel-2
detect_version
detect_arch
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
IUSE="experimental"
@@ -22,7 +24,6 @@ pkg_postinst() {
kernel-2_pkg_postinst
einfo "For more info on this patchset, and how to report problems, see:"
einfo "${HOMEPAGE}"
-
}
pkg_postrm() {
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.3.4.ebuild
index 89354dac4d1f..de88aa5e1ec5 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.0.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.3.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"
ETYPE="sources"
K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="1"
+K_GENPATCHES_VER="6"
K_DEBLOB_AVAILABLE="0"
K_KDBUS_AVAILABLE="0"
diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
new file mode 100644
index 000000000000..7bb2cfd6b130
--- /dev/null
+++ b/sys-libs/kpmcore/Manifest
@@ -0,0 +1 @@
+DIST kpmcore-2.0.0.tar.xz 350352 SHA256 aa4a89c8a3745b2c06971f916aef30d87b3393a3b8c55ffc791cf46eb86b2454 SHA512 91e76bf5c7dc53f11c5cbd452ea6a1d08ea55c29024a48dde10936834b63640cb86d01376b9b5c4f4bd1b300aac9652867efd0517e34e846dd3c0202f6f925fc WHIRLPOOL b8c744b6a7b6d91d9d348910425a9b73f68e75a507690111ad4682b745797d25e59532ee27683f946a3c7987c5ee6d46a1967671322ab14a888fa33ad5f1cad6
diff --git a/sys-libs/kpmcore/kpmcore-2.0.0.ebuild b/sys-libs/kpmcore/kpmcore-2.0.0.ebuild
new file mode 100644
index 000000000000..24f9a58f9616
--- /dev/null
+++ b/sys-libs/kpmcore/kpmcore-2.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde5
+
+DESCRIPTION="Library for managing partitions"
+HOMEPAGE="https://www.kde.org/applications/system/kdepartitionmanager"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-3"
+KEYWORDS=" ~amd64 ~x86"
+IUSE=""
+
+CDEPEND="
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kservice)
+ dev-libs/libatasmart
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ sys-apps/util-linux
+ >=sys-block/parted-3
+"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+ !<sys-block/partitionmanager-2.0.0
+"
diff --git a/sys-libs/kpmcore/metadata.xml b/sys-libs/kpmcore/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/sys-libs/kpmcore/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>kde</herd>
+</pkgmetadata>
diff --git a/sys-power/cpudyn/cpudyn-1.0.1-r1.ebuild b/sys-power/cpudyn/cpudyn-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..c3dd5eec3f66
--- /dev/null
+++ b/sys-power/cpudyn/cpudyn-1.0.1-r1.ebuild
@@ -0,0 +1,48 @@
+# 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="A daemon to control laptop power consumption via cpufreq and disk standby"
+HOMEPAGE="http://freecode.com/projects/cpudyn/"
+SRC_URI="http://mnm.uib.es/~gallir/${PN}/download/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.99.0-init_conf_updates.patch"
+)
+
+src_prepare() {
+ # fix #570082 by restoring pre-GCC5 inline semantics
+ append-cflags -std=gnu89
+
+ default
+}
+
+src_compile() {
+ emake LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" cpudynd
+}
+
+src_install() {
+ dosbin cpudynd
+
+ doman cpudynd.8
+ dodoc INSTALL README VERSION changelog
+ dodoc *.html
+
+ newinitd "${FILESDIR}"/cpudyn.init cpudyn
+ newconfd debian/cpudyn.conf cpudyn
+}
+
+pkg_postinst() {
+ einfo "Configuration file is /etc/conf.d/cpudyn."
+}
diff --git a/sys-power/cpudyn/files/cpudyn-0.99.0-init_conf_updates.patch b/sys-power/cpudyn/files/cpudyn-0.99.0-init_conf_updates.patch
index fcfb55294d33..f6aca0b7a9f8 100644
--- a/sys-power/cpudyn/files/cpudyn-0.99.0-init_conf_updates.patch
+++ b/sys-power/cpudyn/files/cpudyn-0.99.0-init_conf_updates.patch
@@ -1,5 +1,5 @@
---- gentoo/cpudyn.conf.orig 2004-01-08 17:20:39.575230665 +0100
-+++ gentoo/cpudyn.conf 2004-01-08 17:20:37.450290151 +0100
+--- cpudyn/debian/cpudyn.conf.orig 2004-01-08 17:20:39.575230665 +0100
++++ cpudyn/debian/cpudyn.conf 2004-01-08 17:20:37.450290151 +0100
@@ -32,6 +32,12 @@
THROTTLING_LOW=7
diff --git a/sys-process/cronbase/cronbase-0.3.7-r1.ebuild b/sys-process/cronbase/cronbase-0.3.7-r1.ebuild
index 19d517135c08..3a748e8e1523 100644
--- a/sys-process/cronbase/cronbase-0.3.7-r1.ebuild
+++ b/sys-process/cronbase/cronbase-0.3.7-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gentoo.org/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE=""
S=${WORKDIR}
diff --git a/virtual/editor/metadata.xml b/virtual/editor/metadata.xml
index 472bbacc8c4c..d3514926a04f 100644
--- a/virtual/editor/metadata.xml
+++ b/virtual/editor/metadata.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
-<herd>xemacs</herd>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<herd>vim</herd>
<herd>base-system</herd>
</pkgmetadata>
diff --git a/virtual/emacs-flim/metadata.xml b/virtual/emacs-flim/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/virtual/emacs-flim/metadata.xml
+++ b/virtual/emacs-flim/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/emacs/metadata.xml b/virtual/emacs/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/virtual/emacs/metadata.xml
+++ b/virtual/emacs/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/jdk/jdk-1.7.0-r1.ebuild b/virtual/jdk/jdk-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..2ab126fd721b
--- /dev/null
+++ b/virtual/jdk/jdk-1.7.0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+DESCRIPTION="Virtual for Java Development Kit (JDK)"
+SLOT="1.7"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="|| (
+ dev-java/icedtea-bin:7
+ dev-java/icedtea:7
+ dev-java/oracle-jdk-bin:1.7
+ dev-java/soylatte-jdk-bin:1.7
+ )"
diff --git a/virtual/jdk/jdk-1.8.0.ebuild b/virtual/jdk/jdk-1.8.0-r1.ebuild
index 73c1d4139080..55de6b72df73 100644
--- a/virtual/jdk/jdk-1.8.0.ebuild
+++ b/virtual/jdk/jdk-1.8.0-r1.ebuild
@@ -1,13 +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"
DESCRIPTION="Virtual for Java Development Kit (JDK)"
SLOT="1.8"
-# TODO: Temporarily dropped ~sparc-solaris and ~x86-solaris as oracle-jdk-bin
-# no longer provides them. Also temporarily dropped ~ia64.
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
-RDEPEND="=dev-java/oracle-jdk-bin-1.8.0*"
+RDEPEND="|| (
+ dev-java/icedtea-bin:8
+ dev-java/icedtea:8
+ dev-java/oracle-jdk-bin:1.8
+ )"
diff --git a/virtual/jre/jre-1.7.0-r1.ebuild b/virtual/jre/jre-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..2d9cf3ea4728
--- /dev/null
+++ b/virtual/jre/jre-1.7.0-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
+SLOT="1.7"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="|| (
+ virtual/jdk:1.7
+ dev-java/oracle-jre-bin:1.7
+ )"
diff --git a/virtual/jre/jre-1.8.0.ebuild b/virtual/jre/jre-1.8.0-r1.ebuild
index 79271225d7d2..ae9a4efc446e 100644
--- a/virtual/jre/jre-1.8.0.ebuild
+++ b/virtual/jre/jre-1.8.0-r1.ebuild
@@ -1,17 +1,14 @@
-# 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"
DESCRIPTION="Virtual for Java Runtime Environment (JRE)"
SLOT="1.8"
-# TODO: Temporarily dropped ~sparc-solaris and ~x86-solaris as oracle-jre-bin
-# no longer provides them. Also temporarily dropped ~ia64.
KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
RDEPEND="|| (
- =virtual/jdk-1.8.0*
- =dev-java/oracle-jre-bin-1.8.0*
+ virtual/jdk:1.8
+ dev-java/oracle-jre-bin:1.8
)"
-DEPEND=""
diff --git a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.310.0.ebuild b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.310.0.ebuild
index fb425f9a6a36..ec624604c24f 100644
--- a/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.310.0.ebuild
+++ b/virtual/perl-Devel-PPPort/perl-Devel-PPPort-3.310.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE=""
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=""
DEPEND=""
diff --git a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.26.ebuild b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.26.ebuild
index 1ecbd779ed7e..0e544eca237c 100644
--- a/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.26.ebuild
+++ b/virtual/perl-Module-Metadata/perl-Module-Metadata-1.0.26.ebuild
@@ -10,7 +10,7 @@ SRC_URI=""
LICENSE=""
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=""
RDEPEND="
diff --git a/virtual/perl-Unicode-Normalize/metadata.xml b/virtual/perl-Unicode-Normalize/metadata.xml
new file mode 100644
index 000000000000..36ee0f08c67c
--- /dev/null
+++ b/virtual/perl-Unicode-Normalize/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>perl</herd>
+</pkgmetadata>
diff --git a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.170.0.ebuild b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.170.0.ebuild
new file mode 100644
index 000000000000..d5aaaed144fe
--- /dev/null
+++ b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.170.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ || ( =dev-lang/perl-5.20* ~perl-core/${PN#perl-}-${PV} )
+ !<perl-core/${PN#perl-}-${PV}
+ !>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.180.0.ebuild b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.180.0.ebuild
new file mode 100644
index 000000000000..68bc34586d19
--- /dev/null
+++ b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.180.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~amd64-fbsd ~amd64-linux ~arm ~arm64 ~hppa ~hppa-hpux ~ia64 ~ia64-hpux ~ia64-linux ~m68k ~m68k-mint ~mips ~ppc ~ppc64 ~ppc-aix ~ppc-macos ~s390 ~sh ~sparc ~sparc64-solaris ~sparc-solaris ~x64-freebsd ~x64-macos ~x64-solaris ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~x86-linux ~x86-macos ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ || ( =dev-lang/perl-5.22* ~perl-core/${PN#perl-}-${PV} )
+ !<perl-core/${PN#perl-}-${PV}
+ !>perl-core/${PN#perl-}-${PV}-r999
+"
diff --git a/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.250.0.ebuild b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.250.0.ebuild
new file mode 100644
index 000000000000..2b6d253b17f9
--- /dev/null
+++ b/virtual/perl-Unicode-Normalize/perl-Unicode-Normalize-1.250.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Virtual for ${PN#perl-}"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+ ~perl-core/${PN#perl-}-${PV}
+"
diff --git a/www-apps/jekyll/jekyll-2.5.3.ebuild b/www-apps/jekyll/jekyll-2.5.3.ebuild
index 56ba15507092..c1830aa2e267 100644
--- a/www-apps/jekyll/jekyll-2.5.3.ebuild
+++ b/www-apps/jekyll/jekyll-2.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 ruby21"
+USE_RUBY="ruby20 ruby21"
inherit ruby-fakegem
diff --git a/www-apps/tt-rss/Manifest b/www-apps/tt-rss/Manifest
index b0f59c443675..82a168822fe2 100644
--- a/www-apps/tt-rss/Manifest
+++ b/www-apps/tt-rss/Manifest
@@ -1,2 +1,2 @@
-DIST tt-rss-20150624.tar.bz2 2071177 SHA256 544833ffbdb83497270aa3c3599ad78f58b23bbaf9d492a3b73bd156b806edc7 SHA512 270f88ae84778cf2a5df1dcda2bdc58a0ed8f4988c124728d4aad29324dc86b1b0245c5b651c738febc9447a5533ca68e2655966409a45651c6df3a08e203c1e WHIRLPOOL 8e30b32beb6eba33e6f87c06900804f6f1f3a11ec0ce4c565e7558577f2bea813e082e7d76acb83f0c0aa5a387ef8266f3fc218def482e9508c492e7df5b3b7a
DIST tt-rss-20150924.tar.bz2 2089704 SHA256 e66521e806014c094181839c9d446fdfbae18a91cfaaaa99fccc9e9f6d27f46d SHA512 b97cf54e4988caac67c5a0985ce7dac9ac2c60f9bedc86d29c83e939082f988cea0de02433b72d9238980e6bb32dea1e10a867ca8cd9ad084f8d7690bf76d3c9 WHIRLPOOL 7add018455697283f11471f3ae967bdb48b447d492972b8a92b77b0f034d6ad297c30c49173233f0b54985837ba51799ad1195a482da86939392e6629b6c89c2
+DIST tt-rss-20160124.tar.bz2 2059978 SHA256 90706f133db74d86aba3f8488c99ed1c886948a92c64bdb7ecaca3c3129ddf59 SHA512 d41ae8b2086e1e0ff2d69427fe9ccb8d0710e5acffe3137c408c01fc20cc3fbb30f2d4859624c14ac0ba4429deea91fa57f54b2a56a2e480f0352509610c3a25 WHIRLPOOL 09b4c5515c8a19c3cfcd330761fcb9534185df8cb3ef7832c28f0200d15846b031817e72204cf28881101ad2ecc867ad4369f22afef9947b8b82521feb07083b
diff --git a/www-apps/tt-rss/tt-rss-20150624.ebuild b/www-apps/tt-rss/tt-rss-20160124.ebuild
index a8c52616c543..a8c52616c543 100644
--- a/www-apps/tt-rss/tt-rss-20150624.ebuild
+++ b/www-apps/tt-rss/tt-rss-20160124.ebuild
diff --git a/www-client/dwb/Manifest b/www-client/dwb/Manifest
index fd8929d10e4a..517ea6659c6f 100644
--- a/www-client/dwb/Manifest
+++ b/www-client/dwb/Manifest
@@ -1,2 +1 @@
-DIST dwb-2013.03.30.tar.gz 410020 SHA256 bb12964be76d991f7b71d6c917eeecc3b356784b4a74194ffbf5f643d6cf2312 SHA512 2e9fa8cb18cadd8a27783851a825011ba5662a9e1b8ae3109e354b30f2f9e439fafd6034888a2d4d8195c8ff10b9ea70651981ea00938efb48d01256130cf9a6 WHIRLPOOL 3bb598b132a70029f1bbed4b794ba97efce1849e7fd77ea11531f14f1dc978f81aee34f1afcdedaca50153eb980278080cac48219c0bc8d5e4fd8779a5dddc0b
DIST dwb-2014.03.07.tar.gz 474179 SHA256 bfbe3e366b27c969876f9ee7954f138b1d49a270aa84a14ce43e01591ab69b62 SHA512 7d3eb353ab7f7aa50bd678c75d72d1bbab0e5831991a1f4a1b2c4a8e134ccc90ab699932f5fd64efba157049c4863f258e329738529b7e03e2a56da737ca03a1 WHIRLPOOL 1864778d89d7fade7bf1fbeea4c5adf99cb11d63a56d255706fb3d15f19c9b0ce77ec124ad406b01b7fde8d39764ebda1f4fa70ee106731dea8f796b4e38a3ce
diff --git a/www-client/dwb/dwb-2013.03.30.ebuild b/www-client/dwb/dwb-2013.03.30.ebuild
deleted file mode 100644
index 6b6ab7bf12c5..000000000000
--- a/www-client/dwb/dwb-2013.03.30.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Dynamic web browser based on WebKit and GTK+"
-HOMEPAGE="https://portix.bitbucket.org/dwb/"
-SRC_URI="https://www.bitbucket.org/portix/dwb/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples gtk3"
-
-RDEPEND=">=net-libs/libsoup-2.32:2.4
- dev-libs/json-c
- net-libs/gnutls
- !gtk3? (
- >=net-libs/webkit-gtk-1.8.0:2
- x11-libs/gtk+:2
- )
- gtk3? (
- >=net-libs/webkit-gtk-1.8.0:3
- x11-libs/gtk+:3
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-verbose-build.patch
- epatch "${FILESDIR}"/${P}-json-c.patch
-
- sed -i '/^CFLAGS += -\(pipe\|g\|O2\)/d' config.mk || die
-}
-
-src_compile() {
- local myconf
- use gtk3 && myconf+=" GTK=3"
-
- # uclibc and other systems don't have execinfo.h (bug #465170)
- if ! (echo '#include <execinfo.h>' | $(tc-getCC) -E - &>/dev/null) ; then
- myconf+=" WITHOUT_EXECINFO=1"
- fi
-
- emake CC="$(tc-getCC)" ${myconf}
-}
-
-src_install() {
- default
-
- if use examples ; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/www-client/dwb/dwb-2014.03.07.ebuild b/www-client/dwb/dwb-2014.03.07.ebuild
deleted file mode 100644
index ce603735031f..000000000000
--- a/www-client/dwb/dwb-2014.03.07.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Dynamic web browser based on WebKit and GTK+"
-HOMEPAGE="https://portix.bitbucket.org/dwb/"
-SRC_URI="https://www.bitbucket.org/portix/dwb/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples gtk3"
-
-RDEPEND=">=net-libs/libsoup-2.32:2.4
- dev-libs/json-c
- net-libs/gnutls
- !gtk3? (
- >=net-libs/webkit-gtk-1.8.0:2
- x11-libs/gtk+:2
- )
- gtk3? (
- >=net-libs/webkit-gtk-1.8.0:3
- x11-libs/gtk+:3
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-verbose-build.patch
-
- sed -i '/^CFLAGS += -\(pipe\|g\|O2\)/d' config.mk || die
-}
-
-src_compile() {
- local myconf
- use gtk3 && myconf+=" GTK=3"
-
- emake CC="$(tc-getCC)" ${myconf}
-}
-
-src_install() {
- default
-
- if use examples ; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/www-client/qupzilla/qupzilla-1.8.9.ebuild b/www-client/qupzilla/qupzilla-1.8.9.ebuild
index 13f0d94ef1df..44bafc0a5221 100644
--- a/www-client/qupzilla/qupzilla-1.8.9.ebuild
+++ b/www-client/qupzilla/qupzilla-1.8.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${MY_PN}/${PN}/releases/download/v${PV}/${MY_P}.tar.
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 arm ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~ppc64 ~x86"
IUSE="dbus debug gnome-keyring kde libressl nonblockdialogs +qt4 qt5"
REQUIRED_USE="^^ ( qt4 qt5 )
kde? ( qt4 )"
diff --git a/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild
new file mode 100644
index 000000000000..2eeca6902c03
--- /dev/null
+++ b/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Meta package containing deps on all xorg drivers"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="metapackage"
+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"
+
+IUSE_INPUT_DEVICES="
+ input_devices_acecad
+ input_devices_aiptek
+ input_devices_elographics
+ input_devices_evdev
+ input_devices_fpit
+ input_devices_hyperpen
+ input_devices_joystick
+ input_devices_keyboard
+ input_devices_libinput
+ input_devices_mouse
+ input_devices_mutouch
+ input_devices_penmount
+ input_devices_tslib
+ input_devices_vmmouse
+ input_devices_void
+ input_devices_synaptics
+ input_devices_wacom
+"
+IUSE_VIDEO_CARDS="
+ video_cards_amdgpu
+ video_cards_apm
+ video_cards_ast
+ video_cards_chips
+ video_cards_cirrus
+ video_cards_dummy
+ video_cards_epson
+ video_cards_fbdev
+ video_cards_freedreno
+ video_cards_geode
+ video_cards_glint
+ video_cards_i128
+ video_cards_i740
+ video_cards_intel
+ video_cards_mach64
+ video_cards_mga
+ video_cards_neomagic
+ video_cards_nouveau
+ video_cards_nv
+ video_cards_omap
+ video_cards_omapfb
+ video_cards_qxl
+ video_cards_r128
+ video_cards_radeon
+ video_cards_radeonsi
+ video_cards_rendition
+ video_cards_s3
+ video_cards_s3virge
+ video_cards_savage
+ video_cards_siliconmotion
+ video_cards_sisusb
+ video_cards_sunbw2
+ video_cards_suncg14
+ video_cards_suncg3
+ video_cards_suncg6
+ video_cards_sunffb
+ video_cards_sunleo
+ video_cards_suntcx
+ video_cards_tdfx
+ video_cards_tegra
+ video_cards_tga
+ video_cards_trident
+ video_cards_tseng
+ video_cards_vesa
+ video_cards_via
+ video_cards_virtualbox
+ video_cards_vmware
+ video_cards_voodoo
+ video_cards_fglrx
+ video_cards_nvidia
+"
+
+IUSE="${IUSE_VIDEO_CARDS} ${IUSE_INPUT_DEVICES}"
+
+PDEPEND="
+ input_devices_acecad? ( x11-drivers/xf86-input-acecad )
+ input_devices_aiptek? ( x11-drivers/xf86-input-aiptek )
+ input_devices_elographics? ( x11-drivers/xf86-input-elographics )
+ input_devices_evdev? ( x11-drivers/xf86-input-evdev )
+ input_devices_fpit? ( x11-drivers/xf86-input-fpit )
+ input_devices_hyperpen? ( x11-drivers/xf86-input-hyperpen )
+ input_devices_joystick? ( x11-drivers/xf86-input-joystick )
+ input_devices_keyboard? ( x11-drivers/xf86-input-keyboard )
+ input_devices_libinput? ( x11-drivers/xf86-input-libinput )
+ input_devices_mouse? ( x11-drivers/xf86-input-mouse )
+ input_devices_mutouch? ( x11-drivers/xf86-input-mutouch )
+ input_devices_penmount? ( x11-drivers/xf86-input-penmount )
+ input_devices_tslib? ( x11-drivers/xf86-input-tslib )
+ input_devices_vmmouse? ( x11-drivers/xf86-input-vmmouse )
+ input_devices_void? ( x11-drivers/xf86-input-void )
+ input_devices_synaptics? ( x11-drivers/xf86-input-synaptics )
+ input_devices_wacom? ( x11-drivers/xf86-input-wacom )
+
+ video_cards_amdgpu? ( x11-drivers/xf86-video-amdgpu )
+ video_cards_apm? ( x11-drivers/xf86-video-apm )
+ video_cards_ast? ( x11-drivers/xf86-video-ast )
+ video_cards_chips? ( x11-drivers/xf86-video-chips )
+ video_cards_cirrus? ( x11-drivers/xf86-video-cirrus )
+ video_cards_dummy? ( x11-drivers/xf86-video-dummy )
+ video_cards_fbdev? ( x11-drivers/xf86-video-fbdev )
+ video_cards_freedreno? ( x11-drivers/xf86-video-freedreno )
+ video_cards_geode? ( x11-drivers/xf86-video-geode )
+ video_cards_glint? ( x11-drivers/xf86-video-glint )
+ video_cards_i128? ( x11-drivers/xf86-video-i128 )
+ video_cards_i740? ( x11-drivers/xf86-video-i740 )
+ video_cards_intel? ( x11-drivers/xf86-video-intel )
+ video_cards_mach64? ( x11-drivers/xf86-video-mach64 )
+ video_cards_mga? ( x11-drivers/xf86-video-mga )
+ video_cards_neomagic? ( x11-drivers/xf86-video-neomagic )
+ video_cards_nouveau? ( x11-drivers/xf86-video-nouveau )
+ video_cards_nv? ( x11-drivers/xf86-video-nv )
+ video_cards_omap? ( x11-drivers/xf86-video-omap )
+ video_cards_omapfb? ( x11-drivers/xf86-video-omapfb )
+ video_cards_qxl? ( x11-drivers/xf86-video-qxl )
+ video_cards_nvidia? ( x11-drivers/nvidia-drivers )
+ video_cards_fglrx? ( x11-drivers/ati-drivers )
+ video_cards_r128? ( x11-drivers/xf86-video-r128 )
+ video_cards_radeon? ( x11-drivers/xf86-video-ati )
+ video_cards_radeonsi? ( x11-drivers/xf86-video-ati[glamor] )
+ video_cards_rendition? ( x11-drivers/xf86-video-rendition )
+ video_cards_s3? ( x11-drivers/xf86-video-s3 )
+ video_cards_s3virge? ( x11-drivers/xf86-video-s3virge )
+ video_cards_savage? ( x11-drivers/xf86-video-savage )
+ video_cards_siliconmotion? ( x11-drivers/xf86-video-siliconmotion )
+ video_cards_sisusb? ( x11-drivers/xf86-video-sisusb )
+ video_cards_suncg14? ( x11-drivers/xf86-video-suncg14 )
+ video_cards_suncg3? ( x11-drivers/xf86-video-suncg3 )
+ video_cards_suncg6? ( x11-drivers/xf86-video-suncg6 )
+ video_cards_sunffb? ( x11-drivers/xf86-video-sunffb )
+ video_cards_sunleo? ( x11-drivers/xf86-video-sunleo )
+ video_cards_suntcx? ( x11-drivers/xf86-video-suntcx )
+ video_cards_tdfx? ( x11-drivers/xf86-video-tdfx )
+ video_cards_tegra? ( x11-drivers/xf86-video-opentegra )
+ video_cards_tga? ( x11-drivers/xf86-video-tga )
+ video_cards_trident? ( x11-drivers/xf86-video-trident )
+ video_cards_tseng? ( x11-drivers/xf86-video-tseng )
+ video_cards_vesa? ( x11-drivers/xf86-video-vesa )
+ video_cards_via? ( x11-drivers/xf86-video-openchrome )
+ video_cards_virtualbox? ( x11-drivers/xf86-video-virtualbox )
+ video_cards_vmware? ( x11-drivers/xf86-video-vmware )
+ video_cards_voodoo? ( x11-drivers/xf86-video-voodoo )
+
+ !x11-drivers/xf86-input-citron
+ !x11-drivers/xf86-video-cyrix
+ !x11-drivers/xf86-video-impact
+ !x11-drivers/xf86-video-nsc
+ !x11-drivers/xf86-video-sunbw2
+ !<=x11-drivers/xf86-video-ark-0.7.5
+ !<=x11-drivers/xf86-video-newport-0.2.4
+ !<=x11-drivers/xf86-video-sis-0.10.7
+ !<=x11-drivers/xf86-video-v4l-0.2.0
+ !<x11-drivers/xf86-input-evdev-2.10.0
+ !<x11-drivers/xf86-video-ati-7.6.1
+ !<x11-drivers/xf86-video-intel-2.99.917_p20160122
+ !<x11-drivers/xf86-video-nouveau-1.0.12
+"
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index f26dfacaf8c9..6c1c052c5ec4 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -4,3 +4,4 @@ DIST xorg-server-1.15.2.tar.bz2 5551426 SHA256 3c0585607c654ded836da43a45a75492f
DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 47d8c9bb79c829389e7599aef1110d43afbc5bf744dbcf73d8f3cf01796d287a SHA512 f8b55c009166883b3e6ec2c8c7a2ff4ed61df6970afcc4f0efb9efa36741af194456a368d4b1c7ba9345ef973fb139a48eb50cb5a7ebc144b43749b9ffdb1f7b WHIRLPOOL 2f8b26c018f4ad4cf780ed7dcb0b844de64e7a612adc30c622d1956dfcee710086ffcc837ff0a64cdcc14d47720d82d8797374488bf0b52d77ca63adf6806885
DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74 WHIRLPOOL 63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33
DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376 WHIRLPOOL c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab
+DIST xorg-server-1.18.0.tar.bz2 5818703 SHA256 195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e SHA512 c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768 WHIRLPOOL 439cfc2da70f3234facd4684e8ef5cea8b0b2d73251280de4a705bd31c2498df814c189f01ec057da3b810d994dc1e30e1faceec4b059ef428e137c8584450d9
diff --git a/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
new file mode 100644
index 000000000000..0a611456a1f7
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.18-support-multiple-Files-sections.patch
@@ -0,0 +1,53 @@
+See http://lists.x.org/archives/xorg-devel/2015-February/045755.html
+
+diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c
+index 849bf92..5cc3ec7 100644
+--- a/hw/xfree86/parser/Files.c
++++ b/hw/xfree86/parser/Files.c
+@@ -76,14 +76,18 @@ static xf86ConfigSymTabRec FilesTab[] = {
+ #define CLEANUP xf86freeFiles
+
+ XF86ConfFilesPtr
+-xf86parseFilesSection(void)
++xf86parseFilesSection(XF86ConfFilesPtr ptr)
+ {
+ int i, j;
+ int k, l;
+ char *str;
+ int token;
+
+- parsePrologue(XF86ConfFilesPtr, XF86ConfFilesRec)
++ if (!ptr) {
++ if( (ptr=calloc(1,sizeof(XF86ConfFilesRec))) == NULL ) {
++ return NULL;
++ }
++ }
+
+ while ((token = xf86getToken(FilesTab)) != ENDSECTION) {
+ switch (token) {
+diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h
+index 171f8e8..e8199fe 100644
+--- a/hw/xfree86/parser/configProcs.h
++++ b/hw/xfree86/parser/configProcs.h
+@@ -36,7 +36,7 @@ void xf86freeDeviceList(XF86ConfDevicePtr ptr);
+ int xf86validateDevice(XF86ConfigPtr p);
+
+ /* Files.c */
+-XF86ConfFilesPtr xf86parseFilesSection(void);
++XF86ConfFilesPtr xf86parseFilesSection(XF86ConfFilesPtr ptr);
+ void xf86printFileSection(FILE * cf, XF86ConfFilesPtr ptr);
+ void xf86freeFiles(XF86ConfFilesPtr p);
+
+diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c
+index 327c02a..e0d6139 100644
+--- a/hw/xfree86/parser/read.c
++++ b/hw/xfree86/parser/read.c
+@@ -110,7 +110,7 @@ xf86readConfigFile(void)
+ if (xf86nameCompare(xf86_lex_val.str, "files") == 0) {
+ free(xf86_lex_val.str);
+ xf86_lex_val.str = NULL;
+- HANDLE_RETURN(conf_files, xf86parseFilesSection());
++ HANDLE_RETURN(conf_files, xf86parseFilesSection(ptr->conf_files));
+ }
+ else if (xf86nameCompare(xf86_lex_val.str, "serverflags") == 0) {
+ free(xf86_lex_val.str);
diff --git a/x11-base/xorg-server/xorg-server-1.18.0.ebuild b/x11-base/xorg-server/xorg-server-1.18.0.ebuild
new file mode 100644
index 000000000000..d222570d4365
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-1.18.0.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2 multilib versionator flag-o-matic
+EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/xserver"
+
+DESCRIPTION="X.Org X servers"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+
+IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
+IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind wayland"
+
+CDEPEND=">=app-eselect/eselect-opengl-1.3.0
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ media-libs/freetype
+ >=x11-apps/iceauth-1.0.2
+ >=x11-apps/rgb-1.0.3
+ >=x11-apps/xauth-1.0.3
+ x11-apps/xkbcomp
+ >=x11-libs/libdrm-2.4.46
+ >=x11-libs/libpciaccess-0.12.901
+ >=x11-libs/libXau-1.0.4
+ >=x11-libs/libXdmcp-1.0.2
+ >=x11-libs/libXfont-1.4.2
+ >=x11-libs/libxkbfile-1.0.4
+ >=x11-libs/libxshmfence-1.1
+ >=x11-libs/pixman-0.27.2
+ >=x11-libs/xtrans-1.3.5
+ >=x11-misc/xbitmaps-1.0.1
+ >=x11-misc/xkeyboard-config-2.4.1-r3
+ dmx? (
+ x11-libs/libXt
+ >=x11-libs/libdmx-1.0.99.1
+ >=x11-libs/libX11-1.1.5
+ >=x11-libs/libXaw-1.0.4
+ >=x11-libs/libXext-1.0.99.4
+ >=x11-libs/libXfixes-5.0
+ >=x11-libs/libXi-1.2.99.1
+ >=x11-libs/libXmu-1.0.3
+ x11-libs/libXrender
+ >=x11-libs/libXres-1.0.3
+ >=x11-libs/libXtst-1.0.99.2
+ )
+ glamor? (
+ media-libs/libepoxy
+ >=media-libs/mesa-10.3.4-r1[egl,gbm]
+ !x11-libs/glamor
+ )
+ kdrive? (
+ >=x11-libs/libXext-1.0.5
+ x11-libs/libXv
+ )
+ xephyr? (
+ x11-libs/libxcb
+ x11-libs/xcb-util
+ x11-libs/xcb-util-image
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-renderutil
+ x11-libs/xcb-util-wm
+ )
+ !minimal? (
+ >=x11-libs/libX11-1.1.5
+ >=x11-libs/libXext-1.0.5
+ >=media-libs/mesa-10.3.4-r1
+ )
+ tslib? ( >=x11-libs/tslib-1.0 )
+ udev? ( >=virtual/udev-150 )
+ unwind? ( sys-libs/libunwind )
+ wayland? (
+ >=dev-libs/wayland-1.3.0
+ media-libs/libepoxy
+ )
+ >=x11-apps/xinit-1.3.3-r1
+ systemd? (
+ sys-apps/dbus
+ sys-apps/systemd
+ )"
+
+DEPEND="${CDEPEND}
+ sys-devel/flex
+ >=x11-proto/bigreqsproto-1.1.0
+ >=x11-proto/compositeproto-0.4
+ >=x11-proto/damageproto-1.1
+ >=x11-proto/fixesproto-5.0
+ >=x11-proto/fontsproto-2.1.3
+ >=x11-proto/glproto-1.4.17-r1
+ >=x11-proto/inputproto-2.3
+ >=x11-proto/kbproto-1.0.3
+ >=x11-proto/randrproto-1.5.0
+ >=x11-proto/recordproto-1.13.99.1
+ >=x11-proto/renderproto-0.11
+ >=x11-proto/resourceproto-1.2.0
+ >=x11-proto/scrnsaverproto-1.1
+ >=x11-proto/trapproto-3.4.3
+ >=x11-proto/videoproto-2.2.2
+ >=x11-proto/xcmiscproto-1.2.0
+ >=x11-proto/xextproto-7.2.99.901
+ >=x11-proto/xf86dgaproto-2.0.99.1
+ >=x11-proto/xf86rushproto-1.1.2
+ >=x11-proto/xf86vidmodeproto-2.2.99.1
+ >=x11-proto/xineramaproto-1.1.3
+ >=x11-proto/xproto-7.0.28
+ >=x11-proto/presentproto-1.0
+ >=x11-proto/dri3proto-1.0
+ dmx? (
+ >=x11-proto/dmxproto-2.2.99.1
+ doc? (
+ || (
+ www-client/links
+ www-client/lynx
+ www-client/w3m
+ )
+ )
+ )
+ !minimal? (
+ >=x11-proto/xf86driproto-2.1.0
+ >=x11-proto/dri2proto-2.8
+ )"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-xserver )
+ !x11-drivers/xf86-video-modesetting
+"
+
+PDEPEND="
+ xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
+
+REQUIRED_USE="!minimal? (
+ || ( ${IUSE_SERVERS} )
+ )
+ xephyr? ( kdrive )"
+
+#UPSTREAMED_PATCHES=(
+# "${WORKDIR}/patches/"
+#)
+
+PATCHES=(
+ "${UPSTREAMED_PATCHES[@]}"
+ "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
+ # needed for new eselect-opengl, bug #541232
+ "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
+)
+
+pkg_pretend() {
+ # older gcc is not supported
+ [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
+ die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
+}
+
+src_configure() {
+ # localstatedir is used for the log location; we need to override the default
+ # from ebuild.sh
+ # sysconfdir is used for the xorg.conf location; same applies
+ # NOTE: fop is used for doc generating; and I have no idea if Gentoo
+ # package it somewhere
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_enable dmx)
+ $(use_enable glamor)
+ $(use_enable kdrive)
+ $(use_enable kdrive kdrive-kbd)
+ $(use_enable kdrive kdrive-mouse)
+ $(use_enable kdrive kdrive-evdev)
+ $(use_enable suid install-setuid)
+ $(use_enable tslib)
+ $(use_enable unwind libunwind)
+ $(use_enable wayland xwayland)
+ $(use_enable !minimal record)
+ $(use_enable !minimal xfree86-utils)
+ $(use_enable !minimal dri)
+ $(use_enable !minimal dri2)
+ $(use_enable !minimal glx)
+ $(use_enable xephyr)
+ $(use_enable xnest)
+ $(use_enable xorg)
+ $(use_enable xvfb)
+ $(use_enable udev config-udev)
+ $(use_with doc doxygen)
+ $(use_with doc xmlto)
+ $(use_with systemd systemd-daemon)
+ $(use_enable systemd systemd-logind)
+ --enable-libdrm
+ --sysconfdir="${EPREFIX}"/etc/X11
+ --localstatedir="${EPREFIX}"/var
+ --with-fontrootdir="${EPREFIX}"/usr/share/fonts
+ --with-xkb-output="${EPREFIX}"/var/lib/xkb
+ --disable-config-hal
+ --disable-linux-acpi
+ --without-dtrace
+ --without-fop
+ --with-os-vendor=Gentoo
+ --with-sha1=libcrypto
+ )
+
+ xorg-2_src_configure
+}
+
+src_install() {
+ xorg-2_src_install
+
+ server_based_install
+
+ if ! use minimal && use xorg; then
+ # Install xorg.conf.example into docs
+ dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
+ fi
+
+ newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
+ newinitd "${FILESDIR}"/xdm.initd-11 xdm
+ newconfd "${FILESDIR}"/xdm.confd-4 xdm
+
+ # install the @x11-module-rebuild set for Portage
+ insinto /usr/share/portage/config/sets
+ newins "${FILESDIR}"/xorg-sets.conf xorg.conf
+}
+
+pkg_postinst() {
+ # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
+ eselect opengl set xorg-x11 --use-old
+}
+
+pkg_postrm() {
+ # Get rid of module dir to ensure opengl-update works properly
+ if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+ rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
+ fi
+}
+
+server_based_install() {
+ if ! use xorg; then
+ rm "${ED}"/usr/share/man/man1/Xserver.1x \
+ "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+ "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+ "${ED}"/usr/share/man/man1/Xserver.1x
+ fi
+}
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.0.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.0.ebuild
index 141404143932..d38eb2f470e1 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.0.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.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$
@@ -9,7 +9,7 @@ DESCRIPTION="Generic Linux input driver"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
IUSE=""
-RDEPEND=">=x11-base/xorg-server-1.12[udev]
+RDEPEND=">=x11-base/xorg-server-1.18[udev]
dev-libs/libevdev
sys-libs/mtdev"
DEPEND="${RDEPEND}
diff --git a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.1.ebuild b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.1.ebuild
index dcd1e1ebdb54..d38eb2f470e1 100644
--- a/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.1.ebuild
+++ b/x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generic Linux input driver"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
IUSE=""
-RDEPEND=">=x11-base/xorg-server-1.12[udev]
+RDEPEND=">=x11-base/xorg-server-1.18[udev]
dev-libs/libevdev
sys-libs/mtdev"
DEPEND="${RDEPEND}
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 32dbe23f7d1d..6ac1b185ad8b 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -2,12 +2,5 @@ DIST xf86-video-intel-2.19.0.tar.bz2 1463260 SHA256 32133d61b14ce3b45b83a60e4ed8
DIST xf86-video-intel-2.20.13.tar.bz2 1649369 SHA256 0151104b58ff3509ecd05ac4ee2c5d81a78506c97afbed511fed6b263060dce3 SHA512 4f70ba1e794d26f8cbbb52c4936cfc8cdf4f43a353d9f921bf519a02a0c7f1b1eec6b3aa706ee6fc333a89b152416b9526f5d951ddea23ed70400e975c59febe WHIRLPOOL 101dff2402c75d0a48243ce1e3ac11e529f2d26a8d81321ae9ec528b6d35a3ed7647c342a2cf60389a69d677c29798c84e3252932b64f905966ef5af695cffbf
DIST xf86-video-intel-2.21.15.tar.bz2 1977431 SHA256 7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc SHA512 ca9680716445d0e9ba1a5d87433455f7a5f558802b4d214d79496426dbfd3e598968f784b531de024df30fefcc114d6e40cc9c6da94604beb48cd4430bf9e491 WHIRLPOOL 352b114b1030d1fbe2d33f028e7c03be8b4a6a4b0e4cb4fd7c890dd4cc5594ebf1fd6477c9319c1e2ff5033fc3276fb9caa8d91d1d3ba6b0c2f1734b60d3efed
DIST xf86-video-intel-2.9.1.tar.bz2 789001 SHA256 95347c88854c2b41c07ab3bcdfadd1b8d27fb181a20520f185892877eb8d9d76 SHA512 62a7c1852b2d0b89be93536e7852caf398fc743e11a12c5071baed5e767b29c382ff5eb9d6c3ab453fc4d94aa16245b607ef33b94198bf7c7626746772fcc290 WHIRLPOOL 7e61c5d1396829aa354c9fdfbe5a21723171390d86b3307a2a331061e128a9866408993410090fe5d607609d245c55843633730bc4521e9cb0ec478c8d6ede1c
-DIST xf86-video-intel-2.99.903.tar.bz2 1965343 SHA256 a7582d80962f6052fb72b570cce53249dce6e1291d2d7df4f0384f73692eb32e SHA512 e8eff894cbeaf92368df94fd5bb65b871019444c5162569bb5011c8829457dffb0e631d9f0eaa71f2f21c87df94a64fe2864f60dc15b0db220f359c2a4fbb3cd WHIRLPOOL 3087665bb22aa921c106e0674f25a849d7dbb693dc93e0bd48966220a14265570d7e83947a20be8f4f8f8a40e779c64ad13982883b04cb42f16a96fda4b0f11c
-DIST xf86-video-intel-2.99.905.tar.bz2 2013611 SHA256 5ccd5325eb470765416b7d673fcd389a8331315f274e0e781038a0793b94ad79 SHA512 e309f185bcf73ec2a122402023b74f5997f6fe79805db6413746176aac3ec43592c83b07571353836949594b0c286ec9d2d3e18806c3ea5d33d9cda69c68f6f4 WHIRLPOOL b1fe9e670c2d58431c1c83d00329f1a2907e8076c3c5357db6cfb5403f0532e569c57d538694903169a1c3fe751d367db09a20614ba4d6a64fb1d0c706b6370c
-DIST xf86-video-intel-2.99.906.tar.bz2 2029492 SHA256 2d9343ce0257f82612ab6cb4a18ebfdcb2bc76a226d8442b2f7f210cc4f63cd6 SHA512 03100462cae897e745136475a4a85053406d8bde40f0dc09401b17bc50c65e929f50bb425076d9fce63e28cf25ad6f7bf01515e319b139ecca1c0908b19db0a1 WHIRLPOOL d66ee09c00b1ceb5774855a0f53556fce2d549b651f0385250ad28e1184499f485dd7d55ee323da55aad644ad1afac643e20f0486da8718b98f5bb4e12598fc0
-DIST xf86-video-intel-2.99.907.tar.bz2 2059916 SHA256 d0b02255f0ff4baa863f762bef49707ce0b4094a267a26e32e4270abe141117b SHA512 401a24248d3f8f6b4ba23ffee5c4a082145fda9e17d1499574fc7b3448dafff07a9872cf878cba04ccbe2951d0527ef93d8ce8bc925ff72c7396d51998c3cac7 WHIRLPOOL e1cf2b1afa0563527ce84e9ee3dca6cc9292c83ac59d18ce9ac5ae598a79a312ede4e64398bcecaf8c13fb512d1f6d9344f6a5b567bb1893d4cc64ae9a42d0de
-DIST xf86-video-intel-2.99.909.tar.bz2 2074714 SHA256 7541187161ee379f07591e1d2655f51e2d9772d98b34e8f21d7159d28ce70f55 SHA512 74417ebbac1f19da2c8cc24f42f3a8a1a721acdf9b1cbfef33c0608fb2c24b5adc08ddeaec077eb5349ee8c5412c29ee33aa1d6ce4ebc3754ab7fdf71589e833 WHIRLPOOL 7336db0b7bb9b03874db5b72be309db9c27ef1ab414e8455863917d09500bde44d82c36c49fd72cc2e49e0487edd526e2975e228a7afd42c02f7a006740ca917
-DIST xf86-video-intel-2.99.910.tar.bz2 2077330 SHA256 203d46064449da0e23a111418dfb189422ba96ea08707167c8dee463e2d745b1 SHA512 c694a63c362627491c1c621087f4ab7173ceaf8655e8814dd11627b6cbede7e92e79da2e019db3ec3a90a488a4ef451e97d6cd961bae54a493b56a072d2b1852 WHIRLPOOL 1cbafa9e7f5665b7078fce113f80fdbfc92df12766c6cf248b8d45c8058c6515af36d59c37d739beba84311cec6a49650140f864661e3933ed060ad5eed6522a
-DIST xf86-video-intel-2.99.914.tar.bz2 2241205 SHA256 78a22e5efd460b790c634caaf1afbb756046dd890482e204bb0d179baad27e46 SHA512 65292be6c9b09ed52af9aa835cff472e47e8090a595d82c1f953e0c3900c62b83d230f42d8028f0a4a6405935a4a375175875f0af6d6921be19513aa1a8518d9 WHIRLPOOL e4694a18f54617a6e4653b94f10ed41600ab99d31b52a98392c299cef096ac6f1a9708ead3e3978be00d95ee3c5de3d36fc05e86ac0613bbf621f84a680f9525
-DIST xf86-video-intel-2.99.916.tar.bz2 2241651 SHA256 409a819f4ac3e7c9432dd4acafe4621bbb3702adb34b1ea942b2e6d7c71eed01 SHA512 f44d6d9763587faa9723c47ca5c9c99e2595b2190168ac7cc8ea1fd9d9697ba5ba8ab3b2968913fa291a2fc908170bd1cf3de425312d96d68de458d03c503af4 WHIRLPOOL 0be7a4b74383b450b896dbc569d9d78d1e7ebf45a7d91f62680221a77b2ea3d8ece702c52585a4449b515d7882917ce24a254e30838c03ca5c516b293ab8dc57
DIST xf86-video-intel-2.99.917.tar.bz2 2259040 SHA256 00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9 SHA512 cbf4d46ad1ad5e5587c0f1f620ff534ef0645270517b60056b9f03e83d8216e2f456de46352a06c37c0c46963cc4ed20b71b815b20ec1bf680ff046e535f580f WHIRLPOOL b26f1b303a27825120e1036f15493119e8869ebae74a2663204fe1ee63cf9fc217e593c469d6c33151a73c9ea6e9df88d0e3a0bb74ece5109b51593785fd4d7d
+DIST xf86-video-intel-2.99.917_p20160122.tar.xz 931472 SHA256 7e1b9b9a183078c5c11d9962ad8782a0f8ba6d64dd8267a457563a91bc90a990 SHA512 e109826b6a08cbd8d9ae7918e0c3fa1f47a56715691552d293e50dbcd92efd3e1a49f3a0db44209fec1e2cce885cc930d520f24bcd5ecb7fb83e5b71a87b1d17 WHIRLPOOL 5eee92198c63dad7883b746cfd01025391fab6176f02222e61e784fc4be70903533583312c71058660043a0b6ec2624cdeaf30d723c52acd369358451fc8e1a4
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.903.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.903.ebuild
deleted file mode 100644
index ad1f82d99634..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.903.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="glamor +sna +udev uxa xvmc"
-
-REQUIRED_USE="|| ( glamor sna uxa )"
-
-RDEPEND="x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/pixman-0.27.1
- >=x11-libs/libdrm-2.4.29[video_cards_intel]
- glamor? (
- x11-libs/glamor
- )
- sna? (
- >=x11-base/xorg-server-1.10
- )
- udev? (
- virtual/udev
- )
- xvmc? (
- x11-libs/libXvMC
- >=x11-libs/libxcb-1.5
- x11-libs/xcb-util
- )
-"
-DEPEND="${RDEPEND}
- >=x11-proto/dri2proto-2.6
- x11-proto/resourceproto"
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable dri)
- $(use_enable glamor)
- $(use_enable sna)
- $(use_enable uxa)
- $(use_enable udev)
- $(use_enable xvmc)
- )
- xorg-2_src_configure
-}
-
-pkg_postinst() {
- if linux_config_exists \
- && ! linux_chkconfig_present DRM_I915_KMS; then
- echo
- ewarn "This driver requires KMS support in your kernel"
- ewarn " Device Drivers --->"
- ewarn " Graphics support --->"
- ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->"
- ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->"
- ewarn " i915 driver"
- ewarn " [*] Enable modesetting on intel by default"
- echo
- fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.905-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.905-r1.ebuild
deleted file mode 100644
index 69c515e9efd4..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.905-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="glamor +sna +udev uxa xvmc"
-
-REQUIRED_USE="
- || ( sna uxa )
- glamor? ( uxa )
-"
-
-RDEPEND="x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/pixman-0.27.1
- >=x11-libs/libdrm-2.4.29[video_cards_intel]
- glamor? (
- x11-libs/glamor
- )
- sna? (
- >=x11-base/xorg-server-1.10
- )
- udev? (
- virtual/udev
- )
- xvmc? (
- x11-libs/libXvMC
- >=x11-libs/libxcb-1.5
- x11-libs/xcb-util
- )
-"
-DEPEND="${RDEPEND}
- >=x11-proto/dri2proto-2.6
- x11-proto/resourceproto"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-randr.patch
-)
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable dri)
- $(use_enable glamor)
- $(use_enable sna)
- $(use_enable uxa)
- $(use_enable udev)
- $(use_enable xvmc)
- )
- xorg-2_src_configure
-}
-
-pkg_postinst() {
- if linux_config_exists \
- && ! linux_chkconfig_present DRM_I915_KMS; then
- echo
- ewarn "This driver requires KMS support in your kernel"
- ewarn " Device Drivers --->"
- ewarn " Graphics support --->"
- ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->"
- ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->"
- ewarn " i915 driver"
- ewarn " [*] Enable modesetting on intel by default"
- echo
- fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.906.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.906.ebuild
deleted file mode 100644
index a504dc87f643..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.906.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="glamor +sna +udev uxa xvmc"
-
-REQUIRED_USE="
- || ( sna uxa )
- glamor? ( uxa )
-"
-
-RDEPEND="x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/pixman-0.27.1
- >=x11-libs/libdrm-2.4.29[video_cards_intel]
- glamor? (
- x11-libs/glamor
- )
- sna? (
- >=x11-base/xorg-server-1.10
- )
- udev? (
- virtual/udev
- )
- xvmc? (
- x11-libs/libXvMC
- >=x11-libs/libxcb-1.5
- x11-libs/xcb-util
- )
-"
-DEPEND="${RDEPEND}
- >=x11-proto/dri2proto-2.6
- x11-proto/resourceproto"
-
-PATCHES=(
- "${FILESDIR}"/${P}-server-crash.patch
-)
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable dri)
- $(use_enable glamor)
- $(use_enable sna)
- $(use_enable uxa)
- $(use_enable udev)
- $(use_enable xvmc)
- )
- xorg-2_src_configure
-}
-
-pkg_postinst() {
- if linux_config_exists \
- && ! linux_chkconfig_present DRM_I915_KMS; then
- echo
- ewarn "This driver requires KMS support in your kernel"
- ewarn " Device Drivers --->"
- ewarn " Graphics support --->"
- ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->"
- ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->"
- ewarn " i915 driver"
- ewarn " [*] Enable modesetting on intel by default"
- echo
- fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.907-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.907-r1.ebuild
deleted file mode 100644
index 21a111621e9f..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.907-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="glamor +sna +udev uxa xvmc"
-
-REQUIRED_USE="
- || ( sna uxa )
- glamor? ( uxa )
-"
-
-RDEPEND="x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/pixman-0.27.1
- >=x11-libs/libdrm-2.4.29[video_cards_intel]
- glamor? (
- x11-libs/glamor
- )
- sna? (
- >=x11-base/xorg-server-1.10
- )
- udev? (
- virtual/udev
- )
- xvmc? (
- x11-libs/libXvMC
- >=x11-libs/libxcb-1.5
- x11-libs/xcb-util
- )
-"
-DEPEND="${RDEPEND}
- >=x11-proto/dri2proto-2.6
- x11-proto/resourceproto"
-
-PATCHES=(
- "${FILESDIR}"/${P}-invalidation.patch
-)
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable dri)
- $(use_enable glamor)
- $(use_enable sna)
- $(use_enable uxa)
- $(use_enable udev)
- $(use_enable xvmc)
- )
- xorg-2_src_configure
-}
-
-pkg_postinst() {
- if linux_config_exists \
- && ! linux_chkconfig_present DRM_I915_KMS; then
- echo
- ewarn "This driver requires KMS support in your kernel"
- ewarn " Device Drivers --->"
- ewarn " Graphics support --->"
- ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->"
- ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->"
- ewarn " i915 driver"
- ewarn " [*] Enable modesetting on intel by default"
- echo
- fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.909.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.909.ebuild
deleted file mode 100644
index 6b5314a0d23d..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.909.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="debug glamor +sna +udev uxa xvmc"
-
-REQUIRED_USE="
- || ( sna uxa )
- glamor? ( uxa )
-"
-
-RDEPEND="x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/pixman-0.27.1
- >=x11-libs/libdrm-2.4.29[video_cards_intel]
- glamor? (
- >=x11-libs/glamor-0.6.0
- )
- sna? (
- >=x11-base/xorg-server-1.10
- )
- udev? (
- virtual/udev
- )
- xvmc? (
- x11-libs/libXvMC
- >=x11-libs/libxcb-1.5
- x11-libs/xcb-util
- )
-"
-DEPEND="${RDEPEND}
- >=x11-proto/dri2proto-2.6
- x11-proto/resourceproto"
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable debug)
- $(use_enable dri)
- $(use_enable glamor)
- $(use_enable sna)
- $(use_enable uxa)
- $(use_enable udev)
- $(use_enable xvmc)
- )
- xorg-2_src_configure
-}
-
-pkg_postinst() {
- if linux_config_exists \
- && ! linux_chkconfig_present DRM_I915_KMS; then
- echo
- ewarn "This driver requires KMS support in your kernel"
- ewarn " Device Drivers --->"
- ewarn " Graphics support --->"
- ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->"
- ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->"
- ewarn " i915 driver"
- ewarn " [*] Enable modesetting on intel by default"
- echo
- fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.910.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.910.ebuild
deleted file mode 100644
index 6b5314a0d23d..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.910.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="debug glamor +sna +udev uxa xvmc"
-
-REQUIRED_USE="
- || ( sna uxa )
- glamor? ( uxa )
-"
-
-RDEPEND="x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/pixman-0.27.1
- >=x11-libs/libdrm-2.4.29[video_cards_intel]
- glamor? (
- >=x11-libs/glamor-0.6.0
- )
- sna? (
- >=x11-base/xorg-server-1.10
- )
- udev? (
- virtual/udev
- )
- xvmc? (
- x11-libs/libXvMC
- >=x11-libs/libxcb-1.5
- x11-libs/xcb-util
- )
-"
-DEPEND="${RDEPEND}
- >=x11-proto/dri2proto-2.6
- x11-proto/resourceproto"
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable debug)
- $(use_enable dri)
- $(use_enable glamor)
- $(use_enable sna)
- $(use_enable uxa)
- $(use_enable udev)
- $(use_enable xvmc)
- )
- xorg-2_src_configure
-}
-
-pkg_postinst() {
- if linux_config_exists \
- && ! linux_chkconfig_present DRM_I915_KMS; then
- echo
- ewarn "This driver requires KMS support in your kernel"
- ewarn " Device Drivers --->"
- ewarn " Graphics support --->"
- ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->"
- ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->"
- ewarn " i915 driver"
- ewarn " [*] Enable modesetting on intel by default"
- echo
- fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.914.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.914.ebuild
deleted file mode 100644
index f619eebc309b..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.914.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="debug glamor +sna +udev uxa xvmc"
-
-REQUIRED_USE="
- || ( sna uxa )
- glamor? ( uxa )
-"
-
-RDEPEND="x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/pixman-0.27.1
- >=x11-libs/libdrm-2.4.29[video_cards_intel]
- glamor? ( || (
- x11-base/xorg-server[glamor]
- >=x11-libs/glamor-0.6.0
- ) )
- sna? (
- >=x11-base/xorg-server-1.10
- )
- udev? (
- virtual/udev
- )
- xvmc? (
- x11-libs/libXvMC
- >=x11-libs/libxcb-1.5
- x11-libs/xcb-util
- )
-"
-DEPEND="${RDEPEND}
- >=x11-proto/dri2proto-2.6
- x11-proto/dri3proto
- x11-proto/presentproto
- x11-proto/resourceproto"
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable debug)
- $(use_enable dri)
- $(use_enable glamor)
- $(use_enable sna)
- $(use_enable uxa)
- $(use_enable udev)
- $(use_enable xvmc)
- --disable-dri3
- )
- xorg-2_src_configure
-}
-
-pkg_postinst() {
- if linux_config_exists \
- && ! linux_chkconfig_present DRM_I915_KMS; then
- echo
- ewarn "This driver requires KMS support in your kernel"
- ewarn " Device Drivers --->"
- ewarn " Graphics support --->"
- ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->"
- ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->"
- ewarn " i915 driver"
- ewarn " [*] Enable modesetting on intel by default"
- echo
- fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.916.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.916.ebuild
deleted file mode 100644
index f619eebc309b..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.916.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
-IUSE="debug glamor +sna +udev uxa xvmc"
-
-REQUIRED_USE="
- || ( sna uxa )
- glamor? ( uxa )
-"
-
-RDEPEND="x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/pixman-0.27.1
- >=x11-libs/libdrm-2.4.29[video_cards_intel]
- glamor? ( || (
- x11-base/xorg-server[glamor]
- >=x11-libs/glamor-0.6.0
- ) )
- sna? (
- >=x11-base/xorg-server-1.10
- )
- udev? (
- virtual/udev
- )
- xvmc? (
- x11-libs/libXvMC
- >=x11-libs/libxcb-1.5
- x11-libs/xcb-util
- )
-"
-DEPEND="${RDEPEND}
- >=x11-proto/dri2proto-2.6
- x11-proto/dri3proto
- x11-proto/presentproto
- x11-proto/resourceproto"
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable debug)
- $(use_enable dri)
- $(use_enable glamor)
- $(use_enable sna)
- $(use_enable uxa)
- $(use_enable udev)
- $(use_enable xvmc)
- --disable-dri3
- )
- xorg-2_src_configure
-}
-
-pkg_postinst() {
- if linux_config_exists \
- && ! linux_chkconfig_present DRM_I915_KMS; then
- echo
- ewarn "This driver requires KMS support in your kernel"
- ewarn " Device Drivers --->"
- ewarn " Graphics support --->"
- ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->"
- ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->"
- ewarn " i915 driver"
- ewarn " [*] Enable modesetting on intel by default"
- echo
- fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917.ebuild
deleted file mode 100644
index 4b5c53ea1391..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-XORG_DRI=dri
-inherit linux-info xorg-2
-
-DESCRIPTION="X.Org driver for Intel cards"
-
-KEYWORDS="amd64 x86 ~amd64-fbsd -x86-fbsd"
-IUSE="debug +sna +udev uxa xvmc"
-
-REQUIRED_USE="
- || ( sna uxa )
-"
-
-RDEPEND="x11-libs/libXext
- x11-libs/libXfixes
- >=x11-libs/pixman-0.27.1
- >=x11-libs/libdrm-2.4.29[video_cards_intel]
- sna? (
- >=x11-base/xorg-server-1.10
- )
- udev? (
- virtual/udev
- )
- xvmc? (
- x11-libs/libXvMC
- >=x11-libs/libxcb-1.5
- x11-libs/xcb-util
- )
-"
-DEPEND="${RDEPEND}
- >=x11-proto/dri2proto-2.6
- x11-proto/dri3proto
- x11-proto/presentproto
- x11-proto/resourceproto"
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable debug)
- $(use_enable dri)
- $(use_enable sna)
- $(use_enable uxa)
- $(use_enable udev)
- $(use_enable xvmc)
- --disable-dri3
- )
- xorg-2_src_configure
-}
-
-pkg_postinst() {
- if linux_config_exists \
- && ! linux_chkconfig_present DRM_I915_KMS; then
- echo
- ewarn "This driver requires KMS support in your kernel"
- ewarn " Device Drivers --->"
- ewarn " Graphics support --->"
- ewarn " Direct Rendering Manager (XFree86 4.1.0 and higher DRI support) --->"
- ewarn " <*> Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver) --->"
- ewarn " i915 driver"
- ewarn " [*] Enable modesetting on intel by default"
- echo
- fi
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160122.ebuild
index d3d741b6ceb2..c56fa94dbe4b 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917-r1.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917_p20160122.ebuild
@@ -1,22 +1,24 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
XORG_DRI=dri
-XORG_EAUTORECONF=yes
inherit linux-info xorg-2
DESCRIPTION="X.Org driver for Intel cards"
KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
IUSE="debug +sna +udev uxa xvmc"
+COMMIT_ID="b48d4a7917ab793526be47559becc64aacd347ae"
+SRC_URI="http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/${COMMIT_ID}.tar.xz -> ${P}.tar.xz"
+
+S=${WORKDIR}/${COMMIT_ID}
REQUIRED_USE="
|| ( sna uxa )
"
-
RDEPEND="x11-libs/libXext
x11-libs/libXfixes
>=x11-libs/pixman-0.27.1
@@ -39,10 +41,9 @@ DEPEND="${RDEPEND}
x11-proto/presentproto
x11-proto/resourceproto"
-PATCHES=(
- "${FILESDIR}"/${P}-sna-udev-fstat.patch
- "${FILESDIR}"/${P}-uxa-udev-fstat.patch
-)
+src_prepare() {
+ eautoreconf
+}
src_configure() {
XORG_CONFIGURE_OPTIONS=(
diff --git a/x11-drivers/xf86-video-nouveau/Manifest b/x11-drivers/xf86-video-nouveau/Manifest
index 9974468da326..4416b1cbf507 100644
--- a/x11-drivers/xf86-video-nouveau/Manifest
+++ b/x11-drivers/xf86-video-nouveau/Manifest
@@ -1,2 +1,2 @@
-DIST xf86-video-nouveau-1.0.10.tar.bz2 580544 SHA256 c1bab3160bae96d485fc93a048d19775398aa85b407bac53020675f7e995db9d SHA512 461301e5e05cdf21197abe7d7c009d491aa7d455403a3976d0ad0cba05a8d43010440e60061f5d3bcfe6cfe6bd6c4c7723ed73a889459950b795ea895459b32b WHIRLPOOL 1600767973034ab914b8978f134afbee6d33220c8a798328fad5815a84c25aa6a47192289ecf0d949272251f2574627728594b6633900a9f21b40fa5dfba245c
DIST xf86-video-nouveau-1.0.11.tar.bz2 582436 SHA256 f84fe2b2787f3ea9419eac3aa86462b929a551b3dbc4de550cc83b67f3216848 SHA512 4ceffc711798b98a5ee67d9df33d1a4f1d2b7d100605ea04b2e689debf745bc5a4f8907b602d1689ec6ed6400b2fc0ffe0eb0f7e7787bd2dd3cd5db1d14e90ee WHIRLPOOL fd201e7387cde4767c84c7be00cf3cff11fe542d079993369264b4fab090885050df51151aeef73153642666902437ad0876bc9544f6beb35ac5bfb6e19e9c97
+DIST xf86-video-nouveau-1.0.12.tar.bz2 599816 SHA256 0ea057ad7fc31caba2d4e46c7e418fe2b3c762b04fb8d382f53383397fd8391e SHA512 dd3be4b89d4b39f02b7cbf058be90e6777adc61a580c0987e737056ff85ed2685e7d6a7848b2c7ab8957810e057d7693c5dd2c425f88609670e02ea8368d77e9 WHIRLPOOL b2d4b7376a747ae1b44dde217a26cedaf4648c7b127e811a8230e39d73040b1ab8f1383f77cb69d9b576d21f8287a5ffa9ebc136c3ea6ada7c7acbb025a13170
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.10-r1.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.10-r1.ebuild
deleted file mode 100644
index 3e8e28285f04..000000000000
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.10-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
-XORG_DRI="always"
-inherit xorg-2
-
-if [[ ${PV} == 9999* ]]; then
- EGIT_REPO_URI="git://anongit.freedesktop.org/git/nouveau/${PN}"
- SRC_URI=""
-fi
-
-DESCRIPTION="Accelerated Open Source driver for nVidia cards"
-HOMEPAGE="http://nouveau.freedesktop.org/"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="udev"
-
-RDEPEND="udev? ( virtual/udev )
- >=x11-libs/libdrm-2.4.34[video_cards_nouveau]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- xorg-2_src_prepare
-
- # There is no configure knob for this, so hack it.
- use udev || export LIBUDEV_{CFLAGS,LIBS}=' '
- sed -i \
- -e "/LIBUDEV=/s:=.*:=$(usex udev):" \
- configure || die
-}
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.11.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.11.ebuild
index 310b82137edb..0d3ff1805c2f 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.11.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,7 +19,7 @@ KEYWORDS="amd64 ppc ppc64 x86"
IUSE="glamor"
RDEPEND=">=x11-libs/libdrm-2.4.34[video_cards_nouveau]
- x11-base/xorg-server[glamor(-)?]"
+ <x11-base/xorg-server-1.18.0[glamor(-)?]"
DEPEND="${RDEPEND}"
PATCHES=(
diff --git a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.10.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.12.ebuild
index c2aa5996479d..0ec2f469275e 100644
--- a/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.10.ebuild
+++ b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.12.ebuild
@@ -1,9 +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
XORG_DRI="always"
+XORG_EAUTORECONF=yes
inherit xorg-2
if [[ ${PV} == 9999* ]]; then
@@ -14,8 +15,9 @@ fi
DESCRIPTION="Accelerated Open Source driver for nVidia cards"
HOMEPAGE="http://nouveau.freedesktop.org/"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="glamor"
-RDEPEND=">=x11-libs/libdrm-2.4.34[video_cards_nouveau]"
+RDEPEND=">=x11-libs/libdrm-2.4.60[video_cards_nouveau]
+ >=x11-libs/libpciaccess-0.10"
DEPEND="${RDEPEND}"
diff --git a/x11-misc/qterm/qterm-0.5.12-r1.ebuild b/x11-misc/qterm/qterm-0.5.12-r1.ebuild
index 5c0a75f4c56c..734176a3d0ec 100644
--- a/x11-misc/qterm/qterm-0.5.12-r1.ebuild
+++ b/x11-misc/qterm/qterm-0.5.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qterm/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="libressl"
RDEPEND="
diff --git a/x11-plugins/vicious/vicious-2.1.3.ebuild b/x11-plugins/vicious/vicious-2.1.3.ebuild
index 6333f493e0a2..7b70ac70dc69 100644
--- a/x11-plugins/vicious/vicious-2.1.3.ebuild
+++ b/x11-plugins/vicious/vicious-2.1.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://git.sysphere.org/${PN}/snapshot/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="contrib"
DEPEND=""
diff --git a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
index 73c143066ebd..e74b9f26266c 100644
--- a/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
+++ b/x11-themes/qtcurve/qtcurve-1.8.18-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
else
SRC_URI="https://github.com/QtCurve/${PN}/archive/${PV/_/}.tar.gz -> ${P}.tar.gz
https://github.com/QtCurve/qtcurve/commit/020b70404f6202490d5ca131f0ec084355cb98e3.patch -> ${PN}-1.8.18-dont_use_c++11.patch"
- KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
fi
LICENSE="LGPL-2+"
diff --git a/x11-wm/awesome/awesome-3.5.6-r2.ebuild b/x11-wm/awesome/awesome-3.5.6-r2.ebuild
index 4b09e3c885e3..bd63b7740358 100644
--- a/x11-wm/awesome/awesome-3.5.6-r2.ebuild
+++ b/x11-wm/awesome/awesome-3.5.6-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://awesome.naquadah.org/download/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
IUSE="dbus doc elibc_FreeBSD gnome"
COMMON_DEPEND="