summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Clement <monsieurp@gentoo.org>2016-01-24 22:11:50 +0000
committerPatrice Clement <monsieurp@gentoo.org>2016-01-24 22:14:40 +0000
commit9967127c68f2fb589b4117c5346857b19a4c961d (patch)
tree9efcaa41c90a302bf6224cb512b1122b48ee51fb
parentMerge remote-tracking branch 'github/pr/714'. (diff)
parentdev-java/piccolo2d-3.0: New release (diff)
downloadgentoo-9967127c68f2fb589b4117c5346857b19a4c961d.tar.gz
gentoo-9967127c68f2fb589b4117c5346857b19a4c961d.tar.bz2
gentoo-9967127c68f2fb589b4117c5346857b19a4c961d.zip
Merge remote-tracking branch 'github/pr/717'. Fixes bug 572486.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
-rw-r--r--app-admin/consul-template/Manifest1
-rw-r--r--app-admin/consul-template/consul-template-0.12.2.ebuild20
-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-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/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/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-eselect/eselect-ctags/metadata.xml5
-rw-r--r--app-eselect/eselect-emacs/metadata.xml5
-rw-r--r--app-misc/tmux-mem-cpu-load/tmux-mem-cpu-load-2.2.1-r1.ebuild2
-rw-r--r--app-text/dvipng/metadata.xml18
-rw-r--r--app-xemacs/ebuild-mode/metadata.xml6
-rw-r--r--dev-java/icedtea-bin/Manifest10
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-7.2.6.3.ebuild185
-rw-r--r--dev-java/icedtea-bin/metadata.xml1
-rw-r--r--dev-java/piccolo2d/piccolo2d-3.0.ebuild52
-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/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-perl/Any-Moose/Any-Moose-0.260.0.ebuild2
-rw-r--r--dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.12.0.ebuild2
-rw-r--r--dev-perl/Cwd-Guard/Cwd-Guard-0.40.0.ebuild2
-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/File-Find-Rule-Perl/File-Find-Rule-Perl-1.130.0.ebuild2
-rw-r--r--dev-perl/Finance-Quote/Finance-Quote-1.370.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/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/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/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-python/botocore/Manifest1
-rw-r--r--dev-python/botocore/botocore-1.3.22.ebuild54
-rw-r--r--dev-python/livereload/Manifest1
-rw-r--r--dev-python/livereload/livereload-2.4.1.ebuild39
-rw-r--r--dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild2
-rw-r--r--dev-python/reno/reno-1.2.0.ebuild2
-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-video/ffmpeg/ffmpeg-9999.ebuild3
-rw-r--r--net-libs/courier-authlib/courier-authlib-0.66.4.ebuild2
-rw-r--r--net-misc/chrony/chrony-2.2.1.ebuild2
-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--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--sys-apps/pkgcore/pkgcore-9999.ebuild3
-rw-r--r--sys-auth/keystone/keystone-8.0.1.ebuild2
-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-kernel/gentoo-sources/Manifest24
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-3.10.92.ebuild30
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-3.10.93.ebuild30
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-3.10.94.ebuild30
-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.ebuild29
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-3.14.56.ebuild29
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-4.4.0.ebuild31
-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--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--x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild (renamed from x11-base/xorg-drivers/xorg-drivers-1.18.ebuild)2
-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.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-wm/awesome/awesome-3.5.6-r2.ebuild2
328 files changed, 1802 insertions, 1650 deletions
diff --git a/app-admin/consul-template/Manifest b/app-admin/consul-template/Manifest
index 323df50ab4a..a598b3f0a5b 100644
--- a/app-admin/consul-template/Manifest
+++ b/app-admin/consul-template/Manifest
@@ -19,6 +19,7 @@ DIST go-radix-0bab926c3433cfd6490c6d3c504a7b471362390c.tar.gz 5446 SHA256 f4e628
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
diff --git a/app-admin/consul-template/consul-template-0.12.2.ebuild b/app-admin/consul-template/consul-template-0.12.2.ebuild
index 139f640da6e..ab46d48dd0d 100644
--- a/app-admin/consul-template/consul-template-0.12.2.ebuild
+++ b/app-admin/consul-template/consul-template-0.12.2.ebuild
@@ -20,6 +20,8 @@ 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
@@ -28,6 +30,7 @@ SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.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
@@ -42,7 +45,6 @@ SRC_URI="https://${EGO_PN%/*}/archive/v${PV}.tar.gz -> ${P}.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/hashicorp/vault/archive/145041757cee09193b0d132b816f72bc1e846107.tar.gz -> vault-145041757cee09193b0d132b816f72bc1e846107.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
@@ -59,6 +61,10 @@ pkg_setup() {
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}
@@ -67,17 +73,20 @@ get_archive_go_package() {
fi
done
uri=${uri#https://}
- echo ${uri%/archive/*}
+ uri=${uri%/archive/*}
+ echo "${uri##*/}-* ${uri}"
}
unpack_go_packages() {
- local go_package x
+ 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 ${go_package##*/}-* src/${go_package} || die
+ mv ${pattern} src/${go_package} || die
done
}
@@ -92,9 +101,6 @@ src_prepare() {
-e 's:-ldflags.*:\\:' \
-i scripts/build.sh || die
- sed -e 's:gopkg.in/yaml.v2:github.com/go-yaml/yaml:' \
- -i template_functions.go || die
-
# Create a writable GOROOT in order to avoid sandbox violations.
export GOROOT="${WORKDIR}/goroot"
cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
diff --git a/app-admin/emacs-updater/metadata.xml b/app-admin/emacs-updater/metadata.xml
index bc306fe5822..9daa11a4ea2 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 6f833116f93..f06070f4bee 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 00000000000..feef5d4335f
--- /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 c875e4f7db3..95dad05169b 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-doc/casting-spels-emacs/metadata.xml b/app-doc/casting-spels-emacs/metadata.xml
index b81c3b2a076..39488bbc3dc 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 b47e13bb88a..fe3660e451d 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 ddec4ff80d9..52ffbf8545d 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 88ecff51f01..c5e623f1989 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 88ecff51f01..c5e623f1989 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 f0b7b2b3c64..1bb638a7aa0 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 21a5d93d303..28debfc5137 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 f2371402a16..d9eb40b9481 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/jasspa-microemacs/metadata.xml b/app-editors/jasspa-microemacs/metadata.xml
index 4f5375ba458..35a586253db 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 36be58a2be0..47f4effcefc 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 5c7a37a88b6..2821cca37db 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 59d457bd8e9..b7b8243b936 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 41e5f9b7b11..a86fa59f0b1 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 00000000000..197182edb71
--- /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 c0162f066ce..6ba8754897f 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 62e65fab292..86800a9b522 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/zile/metadata.xml b/app-editors/zile/metadata.xml
index 077afb68594..8a7000bae25 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 e6ac0b24adb..2e0acac81fb 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 a055ee9b776..7d01ef42903 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 1574e79ead4..5abd82fad5c 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 f36206c9357..5376b5c3875 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 8ad6abfbb6e..46c40b7e866 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 bc306fe5822..9daa11a4ea2 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 a71dd9eb2fa..551404c7fd2 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 bc306fe5822..9daa11a4ea2 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 485301c7a4a..56ca2ca5439 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 152470076db..9cc274f6b23 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 0587eac4d91..6a0b3ee13e4 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 a65893303f9..d4c63ed4521 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 b71e9e1351c..e4b5613ae14 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 883209f9d13..f4e37eb671b 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 bc306fe5822..9daa11a4ea2 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 bd25ab175ab..3a7d30c6a66 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 d1df4e744e0..03bb20e536e 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 5c42e1ba76b..d634a41cebd 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 23f59bff4a6..13c0f1e7ba3 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 955ea9e4689..bfd3609ad42 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 dfbc8002225..6e35c7ee62a 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 91bd7f73751..b620c664ec4 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 bc306fe5822..9daa11a4ea2 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 b7412c27c41..47f27bbc943 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 dc4cb40bfcb..e7e16aa2502 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 b70add88d4a..03f15560737 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 df397ea3014..7fb92b25f5a 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 0eb0d94a3b4..a32234bc7a6 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 2178ad6af50..2c86c967630 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 a9e1348325d..6d4554a0c05 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 bc306fe5822..9daa11a4ea2 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 b6aad8082c1..77c5ff22b4a 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 bc306fe5822..7a5743cd65e 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 40e4a67ca08..5e18c480d78 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 bc306fe5822..9daa11a4ea2 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 4b4a912af00..4e1cc89c5d9 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 bcc2d5e5f17..0f7852c582d 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 105523fef1a..cf4f2e881ac 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 dce59205114..0df1cf6f4da 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 bc306fe5822..9daa11a4ea2 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 2efe4fd9d4b..d79a82a8a93 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 03ffb61f731..8951337df52 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 fd8b7e6425e..51376d5af1c 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 99a40a1ed9d..a2114ce5c30 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 bff8c8626d3..4316be3a5d7 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 bc306fe5822..9daa11a4ea2 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 b2c96c69ba4..400f45cc2bf 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 bc306fe5822..9daa11a4ea2 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 4182a42c03c..9daa11a4ea2 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 d66f0dd32b1..1c29e297870 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 f86749b31da..d999aca2da6 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 536405d4b31..d263fd9cd27 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 bc306fe5822..9daa11a4ea2 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 f662d74d64b..c4a025804ec 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 c94cb834097..00a2be873be 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 1dc47cec2e8..a4aa5f2412a 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 730939bd552..b28b15c5cbe 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 b2c87461ee6..dff6ceb4b94 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 875419a23c9..e096066bd2e 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 bc306fe5822..9daa11a4ea2 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 72d70ada470..ba9dba3feeb 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 92d4e62095d..20226552912 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 cca32e07cd8..a2b3921954b 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 bc306fe5822..9daa11a4ea2 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 b9582600984..90c8a318e33 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 d6d654a5d70..e1b80dff9e3 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 dea4fc9df66..e8f3b49b5d7 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 ebcd4a8456a..a4c0fe525ef 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 bc306fe5822..9daa11a4ea2 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 c6470844bc5..e1f3c3570ad 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 bc306fe5822..9daa11a4ea2 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 7afdcc0fc87..a1dd52c28c8 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 bc306fe5822..9daa11a4ea2 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 d4be75b5e35..22031cb5d67 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 bc306fe5822..9daa11a4ea2 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 fd0567d9ae8..88f968e5fe5 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 bc306fe5822..9daa11a4ea2 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 92d4e62095d..20226552912 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 df4301f0f4a..006dd03698a 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 3a7d30f6e61..3c1551c445c 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 135da40f247..d70dd6cbd1a 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 bc306fe5822..9daa11a4ea2 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 7751814d02a..4e09ad0e30f 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 d0e321d9a75..b0f74dbff2b 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 bc306fe5822..9daa11a4ea2 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 a178e33b29d..9078b5ed03d 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 d0e321d9a75..b0f74dbff2b 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 d3eb2339e1f..987ffbd1b68 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 191bd8718bc..841e9895518 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 0e07ff7b6d4..71c6993f4c3 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 bc306fe5822..9daa11a4ea2 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 f7f0dd4460a..c874778b42f 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 27000b3f07e..323c4d2bc02 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 bc306fe5822..9daa11a4ea2 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 62aa791f244..6178f5c36c6 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 4182a42c03c..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 7d4e87f6679..87c00028986 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 4f7be8f8a82..25d3fe951b7 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 4c84d631ad4..81c665a3f06 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 bc306fe5822..9daa11a4ea2 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 dc70d2e97d2..e8fef63a5b4 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 97e784644cc..68505ec6808 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 f4406812d32..187bc899595 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 bc306fe5822..9daa11a4ea2 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 9cc80b349a6..fbb92e6910c 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 bc306fe5822..9daa11a4ea2 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 417d155c0e4..39589e3df8b 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 bc306fe5822..9daa11a4ea2 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 76fede0181f..f3cbec8ebc2 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 b1bfa491b81..8901c22a753 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 bc306fe5822..9daa11a4ea2 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 51ab1920de6..43a0838f703 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 a3dc6093203..e4bdcb750b3 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 86027b0987d..51de88f313b 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 bc306fe5822..9daa11a4ea2 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 1839c43c667..9edf7895555 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 bc306fe5822..9daa11a4ea2 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 907cce48a95..1cf8ad40d03 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 e6afb9ae720..a4059ed3801 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 ccebeb74e56..0672c881559 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 62541310d2d..fc40138f3df 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 0899764535c..53adc5aad66 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 3da2601fe3c..4e34b67ba89 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 dbcd421d2b1..49088e772b0 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 b0fb5c47692..427c9f4ff22 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 4b82c017958..615a647ffe1 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 affa9b85b29..bed0dff059f 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 3fab274a410..3e2504b4bb2 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 4be47a3f1ad..23b119c5563 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 ce96f79d40d..ff0a5a3fc26 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 526fe57e893..1ab9e7415d5 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 bc306fe5822..9daa11a4ea2 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 fb51ee8b64e..600ffcb21c8 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 abe61475903..f5b58ef0c90 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 dfc7f88ca6d..884f5ed8cd3 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 be75e8ba45a..d32e0a543a3 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 ca038952bd6..51d2849fce1 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 df397ea3014..7fb92b25f5a 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 47a77903d55..801c33d8cf9 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 f4514376b4e..4de747e5684 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-eselect/eselect-ctags/metadata.xml b/app-eselect/eselect-ctags/metadata.xml
index bc306fe5822..385932e856a 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 bc306fe5822..385932e856a 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/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 54fa609b846..4859b34f0ff 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-text/dvipng/metadata.xml b/app-text/dvipng/metadata.xml
index f1c2746b9c1..dda18346778 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 29888891660..00e0c73ebee 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-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index f2628378450..1b1cb207bb9 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,26 +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-7.2.6.3.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.3.ebuild
deleted file mode 100644
index cd849a1992b..00000000000
--- 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/metadata.xml b/dev-java/icedtea-bin/metadata.xml
index 0c161d9e63f..c1fbf8dce06 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/piccolo2d/piccolo2d-3.0.ebuild b/dev-java/piccolo2d/piccolo2d-3.0.ebuild
new file mode 100644
index 00000000000..0697b8ee434
--- /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/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index 5fbcad51f68..e4867f51667 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 163d995bba4..e1c4b04366c 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 750b8f14d59..42abf751bad 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 00000000000..27799df5d8c
--- /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/librep/Manifest b/dev-libs/librep/Manifest
index fcafb6f6bcc..c0e0082535d 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 6f7b2f1228c..03cec6f710b 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 00000000000..d5d6c92772f
--- /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-perl/Any-Moose/Any-Moose-0.260.0.ebuild b/dev-perl/Any-Moose/Any-Moose-0.260.0.ebuild
index 069f59947b2..c7229ad8a28 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/CPAN-Meta-Check/CPAN-Meta-Check-0.12.0.ebuild b/dev-perl/CPAN-Meta-Check/CPAN-Meta-Check-0.12.0.ebuild
index dd760a3f692..8cf26e50cc3 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/Cwd-Guard/Cwd-Guard-0.40.0.ebuild b/dev-perl/Cwd-Guard/Cwd-Guard-0.40.0.ebuild
index d7d8727c626..a1b4827da9b 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/Devel-CheckCompiler/Devel-CheckCompiler-0.50.0.ebuild b/dev-perl/Devel-CheckCompiler/Devel-CheckCompiler-0.50.0.ebuild
index 3a44abe0397..e13bcceff1d 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 76bc294e9c4..213d23e6839 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 24ee416fce9..684a62da6ac 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/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 3abbda38c72..ae298a35c90 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/Finance-Quote/Finance-Quote-1.370.0.ebuild b/dev-perl/Finance-Quote/Finance-Quote-1.370.0.ebuild
index 3b5c6837a19..4afc2302b61 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/Module-Build-XSUtil/Module-Build-XSUtil-0.140.0.ebuild b/dev-perl/Module-Build-XSUtil/Module-Build-XSUtil-0.140.0.ebuild
index 7ef4269a09f..3edd459f645 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 3bc98134130..7c7fb38ccc6 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 59dc72d1d43..8dccb8d8c24 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 b9a23bfcc3d..84d7978d63e 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 b7f6141b926..01f9ed632dd 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 d273fb9d52d..06c5d238e23 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 fc340a96b10..d966493536d 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/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 e052bb4ca25..455884174a0 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 6ce8255a539..18a77bd8885 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/Test-CheckDeps/Test-CheckDeps-0.10.0.ebuild b/dev-perl/Test-CheckDeps/Test-CheckDeps-0.10.0.ebuild
index 445341d4dc9..c2f64265e00 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 ce03c482f3e..c12a6cd75a8 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/namespace-autoclean/namespace-autoclean-0.280.0.ebuild b/dev-perl/namespace-autoclean/namespace-autoclean-0.280.0.ebuild
index 1820d0cf7a9..9d5c769eb64 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 0719d939f13..43793a8ee9b 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 3a84883dcb2..a556408979e 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-python/botocore/Manifest b/dev-python/botocore/Manifest
index 84716cf15ae..7d848a4e04d 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 00000000000..44e0a6ae37a
--- /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/livereload/Manifest b/dev-python/livereload/Manifest
index 5efc59e56cb..24275ae46ea 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 00000000000..b812bba2f0d
--- /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/pyopenssl/pyopenssl-0.15.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild
index 317aab5da2c..108f080436e 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/reno/reno-1.2.0.ebuild b/dev-python/reno/reno-1.2.0.ebuild
index 2c22364c7bf..a55842086b9 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/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 00000000000..cbffdee0d54
--- /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 3983d9c820b..766795c8c15 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 00000000000..2d57f637a09
--- /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-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 193e3775801..ef9db8d940b 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
@@ -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/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild b/net-libs/courier-authlib/courier-authlib-0.66.4.ebuild
index e9076dbbdfb..8feed88b834 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-misc/chrony/chrony-2.2.1.ebuild b/net-misc/chrony/chrony-2.2.1.ebuild
index 57ce62bbd51..7920c32bd9c 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-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 26937a042c2..b678e6d6be4 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 1c40edc7cd7..a9814b3167a 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 dd06efec02a..bd4936259dc 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 00000000000..d04d69f2086
--- /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 ee9df503d38..7c8e6b82394 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 770b3459e99..66b8f6fc72a 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/profiles/prefix/darwin/macos/10.10/x64/make.defaults b/profiles/prefix/darwin/macos/10.10/x64/make.defaults
index d91e8091f9a..02090104360 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 1c0df4a5c34..c372b5cae74 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 bc129813548..b9464e7a2a0 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 918b7eb9970..2e9a6dee39d 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 881ead4e2bb..ff7d41e9b6e 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 fc7ab94d55c..1c265fd79b9 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 e2de7310674..701853b9bfd 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 23a4c84da2b..de733d2806a 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 ef3a3932cb0..7cd2a2caba2 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 69a5d6a640c..34a480e2f1a 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 2097d6872ee..a0835e2ad87 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 013e22939e1..f606f1fbdc5 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 c3dd43c7132..23d3fd2b894 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 b10fb531d25..e8831181e70 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 95b47fbd2d6..092253cac5a 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 aff95e51d92..8b994140ed3 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 4e6b922ab1b..3a38bd918d5 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/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 0cf49627109..a0bfcfd7695 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 1c62ec745ba..673cc49cf94 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/zram-init/zram-init-3.6.ebuild b/sys-block/zram-init/zram-init-3.6.ebuild
index ab1468e62fa..665d820ce34 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 bf4eb5d8fab..226a65584f8 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 60a223df540..6b243ca5516 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 9d49c42bd7c..9d353a2c3a0 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-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 887300c227c..3e4c9e1a7a9 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -3,30 +3,9 @@ DIST deblob-check-4.0 670921 SHA256 042b511913187672d9a0512765e662ba5d4283812ebe
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.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.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
@@ -59,9 +38,6 @@ DIST genpatches-4.3-5.extras.tar.xz 16284 SHA256 79a6d10fba5a62519d4818cb1606547
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-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.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.92.ebuild
deleted file mode 100644
index 28b1e89d4a9..00000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.92.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="97"
-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.10.93.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.93.ebuild
deleted file mode 100644
index 56d5e69b120..00000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.93.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="98"
-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.10.94.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.10.94.ebuild
deleted file mode 100644
index dc54d6bbcad..00000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-3.10.94.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"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="99"
-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.49.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.49.ebuild
deleted file mode 100644
index cd170b0d27e..00000000000
--- 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 484f1ce90ff..00000000000
--- 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.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-3.12.52.ebuild
deleted file mode 100644
index 60c24feba7f..00000000000
--- 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 10ae47f390a..00000000000
--- 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-4.4.0.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.0.ebuild
deleted file mode 100644
index 89354dac4d1..00000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="1"
-K_DEBLOB_AVAILABLE="0"
-K_KDBUS_AVAILABLE="0"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
-IUSE="experimental"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_postinst() {
- kernel-2_pkg_postinst
- einfo "For more info on this patchset, and how to report problems, see:"
- einfo "${HOMEPAGE}"
-}
-
-pkg_postrm() {
- kernel-2_pkg_postrm
-}
diff --git a/sys-power/cpudyn/cpudyn-1.0.1-r1.ebuild b/sys-power/cpudyn/cpudyn-1.0.1-r1.ebuild
new file mode 100644
index 00000000000..c3dd5eec3f6
--- /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 fcfb55294d3..f6aca0b7a9f 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/virtual/editor/metadata.xml b/virtual/editor/metadata.xml
index 472bbacc8c4..d3514926a04 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 00000000000..2ab126fd721
--- /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 73c1d413908..55de6b72df7 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 00000000000..2d9cf3ea472
--- /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 79271225d7d..ae9a4efc446 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 fb425f9a6a3..ec624604c24 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 1ecbd779ed7..0e544eca237 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/x11-base/xorg-drivers/xorg-drivers-1.18.ebuild b/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild
index 42bb8090fbf..2eeca6902c0 100644
--- a/x11-base/xorg-drivers/xorg-drivers-1.18.ebuild
+++ b/x11-base/xorg-drivers/xorg-drivers-1.18-r1.ebuild
@@ -165,4 +165,6 @@ PDEPEND="
!<=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-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 32dbe23f7d1..6ac1b185ad8 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 ad1f82d9963..00000000000
--- 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 69c515e9efd..00000000000
--- 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 a504dc87f64..00000000000
--- 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 21a111621e9..00000000000
--- 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 6b5314a0d23..00000000000
--- 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 6b5314a0d23..00000000000
--- 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 f619eebc309..00000000000
--- 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 f619eebc309..00000000000
--- 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 4b5c53ea139..00000000000
--- 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 d3d741b6ceb..c56fa94dbe4 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 9974468da32..4416b1cbf50 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 3e8e28285f0..00000000000
--- 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.10.ebuild b/x11-drivers/xf86-video-nouveau/xf86-video-nouveau-1.0.12.ebuild
index c2aa5996479..0ec2f469275 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 5c0a75f4c56..734176a3d0e 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-wm/awesome/awesome-3.5.6-r2.ebuild b/x11-wm/awesome/awesome-3.5.6-r2.ebuild
index 4b09e3c885e..bd63b774035 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="