[gentoo-commits] repo/gentoo:master commit in: app-xemacs/build/, app-xemacs/forms/, app-xemacs/mule-base/, app-xemacs/auctex/, ...

[Ulrich Müller]

commit:     002df586457c235c538a3c45dc1c252925c92735
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  3 18:36:31 2017 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Apr  3 18:42:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=002df586

app-xemacs: Bump all ebuilds inheriting xemacs-packages.eclass to EAPI 6.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-xemacs/ada/ada-1.14.ebuild                                   | 7 ++++---
 app-xemacs/apel/apel-1.32.ebuild                                 | 7 ++++---
 app-xemacs/apel/apel-1.34.ebuild                                 | 7 ++++---
 app-xemacs/auctex/auctex-1.47.ebuild                             | 7 ++++---
 app-xemacs/auctex/auctex-1.51.ebuild                             | 7 ++++---
 app-xemacs/bbdb/bbdb-1.32.ebuild                                 | 7 ++++---
 app-xemacs/build/build-1.14.ebuild                               | 7 ++++---
 app-xemacs/build/build-1.15.ebuild                               | 7 ++++---
 app-xemacs/c-support/c-support-1.22.ebuild                       | 7 ++++---
 app-xemacs/calc/calc-1.26.ebuild                                 | 7 ++++---
 app-xemacs/calendar/calendar-1.32.ebuild                         | 7 ++++---
 app-xemacs/calendar/calendar-1.38.ebuild                         | 7 ++++---
 app-xemacs/cc-mode/cc-mode-1.45.ebuild                           | 7 ++++---
 app-xemacs/cedet-common/cedet-common-1.01.ebuild                 | 7 ++++---
 app-xemacs/clearcase/clearcase-1.10.ebuild                       | 7 ++++---
 app-xemacs/cogre/cogre-1.02.ebuild                               | 7 ++++---
 app-xemacs/cookie/cookie-1.15.ebuild                             | 7 ++++---
 app-xemacs/crisp/crisp-1.15.ebuild                               | 7 ++++---
 app-xemacs/debug/debug-1.18.ebuild                               | 7 ++++---
 app-xemacs/dictionary/dictionary-1.16.ebuild                     | 7 ++++---
 app-xemacs/dired/dired-1.17.ebuild                               | 7 ++++---
 app-xemacs/dired/dired-1.19.ebuild                               | 7 ++++---
 app-xemacs/dired/dired-1.20.ebuild                               | 7 ++++---
 app-xemacs/docbookide/docbookide-0.08.ebuild                     | 7 ++++---
 app-xemacs/easypg/easypg-1.02.ebuild                             | 7 ++++---
 app-xemacs/easypg/easypg-1.03-r1.ebuild                          | 7 ++++---
 app-xemacs/ecb/ecb-1.22.ebuild                                   | 7 ++++---
 app-xemacs/ecrypto/ecrypto-0.20.ebuild                           | 7 ++++---
 app-xemacs/ecrypto/ecrypto-0.21.ebuild                           | 7 ++++---
 app-xemacs/ede/ede-1.03-r1.ebuild                                | 7 ++++---
 app-xemacs/edebug/edebug-1.22.ebuild                             | 7 ++++---
 app-xemacs/edict/edict-1.16.ebuild                               | 7 ++++---
 app-xemacs/edict/edict-1.17.ebuild                               | 7 ++++---
 app-xemacs/ediff/ediff-1.68.ebuild                               | 7 ++++---
 app-xemacs/ediff/ediff-1.77.ebuild                               | 7 ++++---
 app-xemacs/ediff/ediff-1.81.ebuild                               | 7 ++++---
 app-xemacs/edit-utils/edit-utils-2.39.ebuild                     | 7 ++++---
 app-xemacs/edit-utils/edit-utils-2.43.ebuild                     | 7 ++++---
 app-xemacs/edit-utils/edit-utils-2.44.ebuild                     | 9 +++++----
 app-xemacs/edt/edt-1.13.ebuild                                   | 7 ++++---
 app-xemacs/edt/edt-1.14.ebuild                                   | 7 ++++---
 app-xemacs/efs/efs-1.33.ebuild                                   | 7 ++++---
 app-xemacs/efs/efs-1.34.ebuild                                   | 7 ++++---
 app-xemacs/egg-its/egg-its-1.27.ebuild                           | 7 ++++---
 app-xemacs/eieio/eieio-1.05.ebuild                               | 7 ++++---
 app-xemacs/eieio/eieio-1.07.ebuild                               | 7 ++++---
 app-xemacs/elib/elib-1.11.ebuild                                 | 7 ++++---
 app-xemacs/elib/elib-1.13.ebuild                                 | 7 ++++---
 app-xemacs/emerge/emerge-1.11.ebuild                             | 7 ++++---
 app-xemacs/erc/erc-0.21.ebuild                                   | 7 ++++---
 app-xemacs/erc/erc-0.23.ebuild                                   | 7 ++++---
 app-xemacs/escreen/escreen-1.01.ebuild                           | 7 ++++---
 app-xemacs/eshell/eshell-1.10.ebuild                             | 7 ++++---
 app-xemacs/eshell/eshell-1.18.ebuild                             | 7 ++++---
 app-xemacs/ess/ess-1.03.ebuild                                   | 7 ++++---
 app-xemacs/eudc/eudc-1.39.ebuild                                 | 7 ++++---
 app-xemacs/eudc/eudc-1.40.ebuild                                 | 7 ++++---
 app-xemacs/footnote/footnote-1.16.ebuild                         | 7 ++++---
 app-xemacs/forms/forms-1.15.ebuild                               | 7 ++++---
 app-xemacs/fortran-modes/fortran-modes-1.05.ebuild               | 7 ++++---
 app-xemacs/frame-icon/frame-icon-1.11.ebuild                     | 7 ++++---
 app-xemacs/fsf-compat/fsf-compat-1.15.ebuild                     | 7 ++++---
 app-xemacs/fsf-compat/fsf-compat-1.19.ebuild                     | 7 ++++---
 app-xemacs/games/games-1.20.ebuild                               | 7 ++++---
 app-xemacs/general-docs/general-docs-1.04.ebuild                 | 7 ++++---
 app-xemacs/general-docs/general-docs-1.06.ebuild                 | 7 ++++---
 app-xemacs/gnats/gnats-1.17.ebuild                               | 7 ++++---
 app-xemacs/gnus/gnus-1.99.ebuild                                 | 9 +++++----
 app-xemacs/guided-tour/guided-tour-0.52.ebuild                   | 7 ++++---
 app-xemacs/haskell-mode/haskell-mode-1.11.ebuild                 | 7 ++++---
 app-xemacs/hm-html-menus/hm-html-menus-1.23.ebuild               | 7 ++++---
 app-xemacs/hm-html-menus/hm-html-menus-1.24.ebuild               | 7 ++++---
 app-xemacs/hyperbole/hyperbole-1.16.ebuild                       | 7 ++++---
 app-xemacs/hyperbole/hyperbole-1.17.ebuild                       | 7 ++++---
 app-xemacs/ibuffer/ibuffer-1.09.ebuild                           | 7 ++++---
 app-xemacs/ibuffer/ibuffer-1.10.ebuild                           | 7 ++++---
 app-xemacs/idlwave/idlwave-1.32.ebuild                           | 7 ++++---
 app-xemacs/igrep/igrep-1.14.ebuild                               | 7 ++++---
 app-xemacs/igrep/igrep-1.16.ebuild                               | 7 ++++---
 app-xemacs/ilisp/ilisp-1.34.ebuild                               | 7 ++++---
 app-xemacs/ilisp/ilisp-1.36.ebuild                               | 7 ++++---
 app-xemacs/jde/jde-1.51.ebuild                                   | 7 ++++---
 app-xemacs/jde/jde-1.52.ebuild                                   | 7 ++++---
 app-xemacs/latin-euro-standards/latin-euro-standards-1.07.ebuild | 7 ++++---
 app-xemacs/latin-euro-standards/latin-euro-standards-1.09.ebuild | 7 ++++---
 app-xemacs/latin-unity/latin-unity-1.20.ebuild                   | 7 ++++---
 app-xemacs/leim/leim-1.24.ebuild                                 | 7 ++++---
 app-xemacs/leim/leim-1.31.ebuild                                 | 7 ++++---
 app-xemacs/locale/locale-1.24.ebuild                             | 7 ++++---
 app-xemacs/locale/locale-1.28.ebuild                             | 7 ++++---
 app-xemacs/lookup/lookup-1.15.ebuild                             | 7 ++++---
 app-xemacs/mail-lib/mail-lib-1.83.ebuild                         | 9 +++++----
 app-xemacs/mailcrypt/mailcrypt-2.14.ebuild                       | 7 ++++---
 app-xemacs/mew/mew-1.19.ebuild                                   | 7 ++++---
 app-xemacs/mh-e/mh-e-1.29.ebuild                                 | 7 ++++---
 app-xemacs/mh-e/mh-e-1.32.ebuild                                 | 7 ++++---
 app-xemacs/mine/mine-1.16.ebuild                                 | 7 ++++---
 app-xemacs/misc-games/misc-games-1.19.ebuild                     | 7 ++++---
 app-xemacs/misc-games/misc-games-1.22.ebuild                     | 7 ++++---
 app-xemacs/mmm-mode/mmm-mode-1.02.ebuild                         | 7 ++++---
 app-xemacs/mmm-mode/mmm-mode-1.05.ebuild                         | 7 ++++---
 app-xemacs/mule-base/mule-base-1.49-r1.ebuild                    | 7 ++++---
 app-xemacs/mule-base/mule-base-1.56.ebuild                       | 7 ++++---
 app-xemacs/mule-ucs/mule-ucs-1.14.ebuild                         | 7 ++++---
 app-xemacs/mule-ucs/mule-ucs-1.18.ebuild                         | 7 ++++---
 app-xemacs/net-utils/net-utils-1.52.ebuild                       | 7 ++++---
 app-xemacs/net-utils/net-utils-1.56.ebuild                       | 7 ++++---
 app-xemacs/ocaml/ocaml-0.06.ebuild                               | 7 ++++---
 app-xemacs/oo-browser/oo-browser-1.04.ebuild                     | 7 ++++---
 app-xemacs/oo-browser/oo-browser-1.05.ebuild                     | 7 ++++---
 app-xemacs/os-utils/os-utils-1.39.ebuild                         | 7 ++++---
 app-xemacs/os-utils/os-utils-1.41.ebuild                         | 7 ++++---
 app-xemacs/pc/pc-1.28.ebuild                                     | 7 ++++---
 app-xemacs/pcl-cvs/pcl-cvs-1.67.ebuild                           | 7 ++++---
 app-xemacs/pcl-cvs/pcl-cvs-1.70.ebuild                           | 7 ++++---
 app-xemacs/pcomplete/pcomplete-1.04.ebuild                       | 7 ++++---
 app-xemacs/pcomplete/pcomplete-1.06.ebuild                       | 7 ++++---
 app-xemacs/perl-modes/perl-modes-1.09.ebuild                     | 7 ++++---
 app-xemacs/perl-modes/perl-modes-1.14.ebuild                     | 7 ++++---
 app-xemacs/pgg/pgg-1.06.ebuild                                   | 7 ++++---
 app-xemacs/pgg/pgg-1.07.ebuild                                   | 7 ++++---
 app-xemacs/prog-modes/prog-modes-2.10.ebuild                     | 7 ++++---
 app-xemacs/prog-modes/prog-modes-2.20.ebuild                     | 7 ++++---
 app-xemacs/ps-print/ps-print-1.11.ebuild                         | 7 ++++---
 app-xemacs/ps-print/ps-print-1.12.ebuild                         | 7 ++++---
 app-xemacs/psgml-dtds/psgml-dtds-1.03.ebuild                     | 7 ++++---
 app-xemacs/psgml/psgml-1.44.ebuild                               | 7 ++++---
 app-xemacs/psgml/psgml-1.45.ebuild                               | 7 ++++---
 app-xemacs/python-modes/python-modes-1.08.ebuild                 | 7 ++++---
 app-xemacs/python-modes/python-modes-1.14.ebuild                 | 7 ++++---
 app-xemacs/re-builder/re-builder-1.05.ebuild                     | 7 ++++---
 app-xemacs/reftex/reftex-1.34.ebuild                             | 7 ++++---
 app-xemacs/riece/riece-1.23.ebuild                               | 7 ++++---
 app-xemacs/rmail/rmail-1.14.ebuild                               | 7 ++++---
 app-xemacs/ruby-modes/ruby-modes-1.02.ebuild                     | 7 ++++---
 app-xemacs/ruby-modes/ruby-modes-1.04.ebuild                     | 7 ++++---
 app-xemacs/sasl/sasl-1.16.ebuild                                 | 7 ++++---
 app-xemacs/scheme/scheme-1.15.ebuild                             | 7 ++++---
 app-xemacs/scheme/scheme-1.18.ebuild                             | 7 ++++---
 app-xemacs/semantic/semantic-1.20.ebuild                         | 7 ++++---
 app-xemacs/semantic/semantic-1.21.ebuild                         | 7 ++++---
 app-xemacs/sgml/sgml-1.11.ebuild                                 | 7 ++++---
 app-xemacs/sh-script/sh-script-1.22.ebuild                       | 7 ++++---
 app-xemacs/sh-script/sh-script-1.24.ebuild                       | 7 ++++---
 app-xemacs/sieve/sieve-1.18.ebuild                               | 7 ++++---
 app-xemacs/skk/skk-1.23.ebuild                                   | 7 ++++---
 app-xemacs/skk/skk-1.24.ebuild                                   | 7 ++++---
 app-xemacs/slider/slider-1.15.ebuild                             | 7 ++++---
 app-xemacs/slider/slider-1.16.ebuild                             | 7 ++++---
 app-xemacs/sml-mode/sml-mode-0.12.ebuild                         | 7 ++++---
 app-xemacs/sounds-au/sounds-au-1.12.ebuild                       | 7 ++++---
 app-xemacs/sounds-wav/sounds-wav-1.12.ebuild                     | 7 ++++---
 app-xemacs/speedbar/speedbar-1.28.ebuild                         | 7 ++++---
 app-xemacs/speedbar/speedbar-1.29.ebuild                         | 7 ++++---
 app-xemacs/strokes/strokes-1.10.ebuild                           | 7 ++++---
 app-xemacs/sun/sun-1.16.ebuild                                   | 7 ++++---
 app-xemacs/supercite/supercite-1.21.ebuild                       | 7 ++++---
 app-xemacs/texinfo/texinfo-1.30.ebuild                           | 7 ++++---
 app-xemacs/text-modes/text-modes-1.92.ebuild                     | 7 ++++---
 app-xemacs/text-modes/text-modes-1.98.ebuild                     | 7 ++++---
 app-xemacs/textools/textools-1.15.ebuild                         | 7 ++++---
 app-xemacs/time/time-1.14.ebuild                                 | 7 ++++---
 app-xemacs/tm/tm-1.38.ebuild                                     | 7 ++++---
 app-xemacs/tm/tm-1.39.ebuild                                     | 7 ++++---
 app-xemacs/tooltalk/tooltalk-1.15.ebuild                         | 7 ++++---
 app-xemacs/tpu/tpu-1.14.ebuild                                   | 7 ++++---
 app-xemacs/tramp/tramp-1.52.ebuild                               | 9 +++++----
 app-xemacs/vc-cc/vc-cc-1.22.ebuild                               | 7 ++++---
 app-xemacs/vc/vc-1.41.ebuild                                     | 7 ++++---
 app-xemacs/vc/vc-1.48.ebuild                                     | 7 ++++---
 app-xemacs/vhdl/vhdl-1.22.ebuild                                 | 7 ++++---
 app-xemacs/view-process/view-process-1.13.ebuild                 | 7 ++++---
 app-xemacs/viper/viper-1.55.ebuild                               | 7 ++++---
 app-xemacs/viper/viper-1.67.ebuild                               | 7 ++++---
 app-xemacs/vm/vm-7.22.ebuild                                     | 7 ++++---
 app-xemacs/vm/vm-8.08.ebuild                                     | 7 ++++---
 app-xemacs/w3/w3-1.33.ebuild                                     | 7 ++++---
 app-xemacs/w3/w3-1.35.ebuild                                     | 7 ++++---
 app-xemacs/x-symbol/x-symbol-1.10.ebuild                         | 7 ++++---
 app-xemacs/x-symbol/x-symbol-1.11.ebuild                         | 7 ++++---
 app-xemacs/xemacs-base/xemacs-base-2.08.ebuild                   | 7 ++++---
 app-xemacs/xemacs-base/xemacs-base-2.10-r1.ebuild                | 7 ++++---
 app-xemacs/xemacs-base/xemacs-base-2.27.ebuild                   | 7 ++++---
 app-xemacs/xemacs-devel/xemacs-devel-1.75.ebuild                 | 7 ++++---
 app-xemacs/xemacs-devel/xemacs-devel-1.80.ebuild                 | 7 ++++---
 app-xemacs/xemacs-eterm/xemacs-eterm-1.17.ebuild                 | 7 ++++---
 app-xemacs/xemacs-eterm/xemacs-eterm-1.18-r1.ebuild              | 7 ++++---
 app-xemacs/xemacs-ispell/xemacs-ispell-1.32.ebuild               | 7 ++++---
 app-xemacs/xetla/xetla-1.01.ebuild                               | 7 ++++---
 app-xemacs/xetla/xetla-1.02.ebuild                               | 7 ++++---
 app-xemacs/xlib/xlib-1.14.ebuild                                 | 7 ++++---
 app-xemacs/xslide/xslide-1.09.ebuild                             | 7 ++++---
 app-xemacs/xslt-process/xslt-process-1.12.ebuild                 | 7 ++++---
 app-xemacs/xwem/xwem-1.22.ebuild                                 | 7 ++++---
 app-xemacs/xwem/xwem-1.23.ebuild                                 | 7 ++++---
 app-xemacs/zenirc/zenirc-1.16.ebuild                             | 7 ++++---
 196 files changed, 788 insertions(+), 592 deletions(-)

diff --git a/app-xemacs/ada/ada-1.14.ebuild b/app-xemacs/ada/ada-1.14.ebuild
index cb6be3496d9..37841023153 100644
--- a/app-xemacs/ada/ada-1.14.ebuild
+++ b/app-xemacs/ada/ada-1.14.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Ada language support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/apel/apel-1.32.ebuild b/app-xemacs/apel/apel-1.32.ebuild
index 38c6c2b8f6e..41ed911f0bd 100644
--- a/app-xemacs/apel/apel-1.32.ebuild
+++ b/app-xemacs/apel/apel-1.32.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="A Portable Emacs Library.  Used by XEmacs MIME support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base

diff --git a/app-xemacs/apel/apel-1.34.ebuild b/app-xemacs/apel/apel-1.34.ebuild
index 5e9a5b0fcd7..f1e6cd90d48 100644
--- a/app-xemacs/apel/apel-1.34.ebuild
+++ b/app-xemacs/apel/apel-1.34.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="A Portable Emacs Library.  Used by XEmacs MIME support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base

diff --git a/app-xemacs/auctex/auctex-1.47.ebuild 
b/app-xemacs/auctex/auctex-1.47.ebuild
index f11e7bbf916..d8f86f78f00 100644
--- a/app-xemacs/auctex/auctex-1.47.ebuild
+++ b/app-xemacs/auctex/auctex-1.47.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Basic TeX/LaTeX support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/auctex/auctex-1.51.ebuild 
b/app-xemacs/auctex/auctex-1.51.ebuild
index 209c6c95b68..08fa1f09849 100644
--- a/app-xemacs/auctex/auctex-1.51.ebuild
+++ b/app-xemacs/auctex/auctex-1.51.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Basic TeX/LaTeX support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/texinfo

diff --git a/app-xemacs/bbdb/bbdb-1.32.ebuild b/app-xemacs/bbdb/bbdb-1.32.ebuild
index d11d966fe1e..4f59e37ef29 100644
--- a/app-xemacs/bbdb/bbdb-1.32.ebuild
+++ b/app-xemacs/bbdb/bbdb-1.32.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="The Big Brother Data Base"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/edit-utils
 app-xemacs/gnus

diff --git a/app-xemacs/build/build-1.14.ebuild 
b/app-xemacs/build/build-1.14.ebuild
index e954a959005..0c533d1aaa2 100644
--- a/app-xemacs/build/build-1.14.ebuild
+++ b/app-xemacs/build/build-1.14.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Build XEmacs from within (UNIX, Windows)"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/pcl-cvs

diff --git a/app-xemacs/build/build-1.15.ebuild 
b/app-xemacs/build/build-1.15.ebuild
index e954a959005..0c533d1aaa2 100644
--- a/app-xemacs/build/build-1.15.ebuild
+++ b/app-xemacs/build/build-1.15.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Build XEmacs from within (UNIX, Windows)"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/pcl-cvs

diff --git a/app-xemacs/c-support/c-support-1.22.ebuild 
b/app-xemacs/c-support/c-support-1.22.ebuild
index 7e79adb5263..aaaa319b817 100644
--- a/app-xemacs/c-support/c-support-1.22.ebuild
+++ b/app-xemacs/c-support/c-support-1.22.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Basic single-file add-ons for editing C code"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/cc-mode
 app-xemacs/xemacs-base

diff --git a/app-xemacs/calc/calc-1.26.ebuild b/app-xemacs/calc/calc-1.26.ebuild
index e535447080b..2f971de2ac8 100644
--- a/app-xemacs/calc/calc-1.26.ebuild
+++ b/app-xemacs/calc/calc-1.26.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Emacs calculator"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/calendar/calendar-1.32.ebuild 
b/app-xemacs/calendar/calendar-1.32.ebuild
index 19e8196e571..e33f1b4fd58 100644
--- a/app-xemacs/calendar/calendar-1.32.ebuild
+++ b/app-xemacs/calendar/calendar-1.32.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Calendar and diary support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/calendar/calendar-1.38.ebuild 
b/app-xemacs/calendar/calendar-1.38.ebuild
index 19e8196e571..e33f1b4fd58 100644
--- a/app-xemacs/calendar/calendar-1.38.ebuild
+++ b/app-xemacs/calendar/calendar-1.38.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Calendar and diary support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/cc-mode/cc-mode-1.45.ebuild 
b/app-xemacs/cc-mode/cc-mode-1.45.ebuild
index 4f7ab9cb2e4..2b09ea0323f 100644
--- a/app-xemacs/cc-mode/cc-mode-1.45.ebuild
+++ b/app-xemacs/cc-mode/cc-mode-1.45.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="C, C++ and Java language support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib

diff --git a/app-xemacs/cedet-common/cedet-common-1.01.ebuild 
b/app-xemacs/cedet-common/cedet-common-1.01.ebuild
index 60f574a55fd..723c87fd2ff 100644
--- a/app-xemacs/cedet-common/cedet-common-1.01.ebuild
+++ b/app-xemacs/cedet-common/cedet-common-1.01.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Common files for CEDET development environment"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/edebug
        app-xemacs/xemacs-base

diff --git a/app-xemacs/clearcase/clearcase-1.10.ebuild 
b/app-xemacs/clearcase/clearcase-1.10.ebuild
index 4bb2e004b98..36e00c1c6a1 100644
--- a/app-xemacs/clearcase/clearcase-1.10.ebuild
+++ b/app-xemacs/clearcase/clearcase-1.10.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="New Clearcase Version Control for XEmacs (UNIX, Windows)"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/dired
 app-xemacs/mail-lib

diff --git a/app-xemacs/cogre/cogre-1.02.ebuild 
b/app-xemacs/cogre/cogre-1.02.ebuild
index 866e0d306fb..05da8e3cc09 100644
--- a/app-xemacs/cogre/cogre-1.02.ebuild
+++ b/app-xemacs/cogre/cogre-1.02.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Graph editing mode"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="
 app-xemacs/xemacs-base

diff --git a/app-xemacs/cookie/cookie-1.15.ebuild 
b/app-xemacs/cookie/cookie-1.15.ebuild
index 977109a4bc1..fc2925e50a2 100644
--- a/app-xemacs/cookie/cookie-1.15.ebuild
+++ b/app-xemacs/cookie/cookie-1.15.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Spook and Yow (Zippy quotes)"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/crisp/crisp-1.15.ebuild 
b/app-xemacs/crisp/crisp-1.15.ebuild
index 2e08fa56dac..be983af0b9c 100644
--- a/app-xemacs/crisp/crisp-1.15.ebuild
+++ b/app-xemacs/crisp/crisp-1.15.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Crisp/Brief emulation"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 

diff --git a/app-xemacs/debug/debug-1.18.ebuild 
b/app-xemacs/debug/debug-1.18.ebuild
index acb09b34ed2..1deef8832a2 100644
--- a/app-xemacs/debug/debug-1.18.ebuild
+++ b/app-xemacs/debug/debug-1.18.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="GUD, gdb, dbx debugging support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/dictionary/dictionary-1.16.ebuild 
b/app-xemacs/dictionary/dictionary-1.16.ebuild
index 7f045828933..8f7f75eb27e 100644
--- a/app-xemacs/dictionary/dictionary-1.16.ebuild
+++ b/app-xemacs/dictionary/dictionary-1.16.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Interface to RFC2229 dictionary servers"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/dired/dired-1.17.ebuild 
b/app-xemacs/dired/dired-1.17.ebuild
index 0f491573180..a02902b8f23 100644
--- a/app-xemacs/dired/dired-1.17.ebuild
+++ b/app-xemacs/dired/dired-1.17.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Manage file systems"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/prog-modes

diff --git a/app-xemacs/dired/dired-1.19.ebuild 
b/app-xemacs/dired/dired-1.19.ebuild
index 14c1e249157..eff4c39aac6 100644
--- a/app-xemacs/dired/dired-1.19.ebuild
+++ b/app-xemacs/dired/dired-1.19.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Manage file systems"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/prog-modes

diff --git a/app-xemacs/dired/dired-1.20.ebuild 
b/app-xemacs/dired/dired-1.20.ebuild
index 0f491573180..a02902b8f23 100644
--- a/app-xemacs/dired/dired-1.20.ebuild
+++ b/app-xemacs/dired/dired-1.20.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Manage file systems"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/prog-modes

diff --git a/app-xemacs/docbookide/docbookide-0.08.ebuild 
b/app-xemacs/docbookide/docbookide-0.08.ebuild
index f69f3d56b13..037263a2c03 100644
--- a/app-xemacs/docbookide/docbookide-0.08.ebuild
+++ b/app-xemacs/docbookide/docbookide-0.08.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="DocBook editing support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-ispell

diff --git a/app-xemacs/easypg/easypg-1.02.ebuild 
b/app-xemacs/easypg/easypg-1.02.ebuild
index 072b96c18be..497ad8c018a 100644
--- a/app-xemacs/easypg/easypg-1.02.ebuild
+++ b/app-xemacs/easypg/easypg-1.02.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="GnuPG interface for Emacs"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 KEYWORDS="~amd64"
 

diff --git a/app-xemacs/easypg/easypg-1.03-r1.ebuild 
b/app-xemacs/easypg/easypg-1.03-r1.ebuild
index ac253900ec5..035c22ee794 100644
--- a/app-xemacs/easypg/easypg-1.03-r1.ebuild
+++ b/app-xemacs/easypg/easypg-1.03-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-PKG_CAT="standard"
+EAPI=6
+
+XEMACS_PKG_CAT="standard"
 
 inherit xemacs-packages
 
 SLOT="0"
-IUSE=""
 DESCRIPTION="GnuPG interface for Emacs"
 
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"

diff --git a/app-xemacs/ecb/ecb-1.22.ebuild b/app-xemacs/ecb/ecb-1.22.ebuild
index b85d91d5f96..d50fc03f88f 100644
--- a/app-xemacs/ecb/ecb-1.22.ebuild
+++ b/app-xemacs/ecb/ecb-1.22.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Emacs source code browser"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/semantic

diff --git a/app-xemacs/ecrypto/ecrypto-0.20.ebuild 
b/app-xemacs/ecrypto/ecrypto-0.20.ebuild
index f24cef0e136..862728af345 100644
--- a/app-xemacs/ecrypto/ecrypto-0.20.ebuild
+++ b/app-xemacs/ecrypto/ecrypto-0.20.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Crypto functionality in Emacs Lisp"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/ecrypto/ecrypto-0.21.ebuild 
b/app-xemacs/ecrypto/ecrypto-0.21.ebuild
index f24cef0e136..862728af345 100644
--- a/app-xemacs/ecrypto/ecrypto-0.21.ebuild
+++ b/app-xemacs/ecrypto/ecrypto-0.21.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Crypto functionality in Emacs Lisp"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/ede/ede-1.03-r1.ebuild 
b/app-xemacs/ede/ede-1.03-r1.ebuild
index 514721a96e8..5bf50d5ffbf 100644
--- a/app-xemacs/ede/ede-1.03-r1.ebuild
+++ b/app-xemacs/ede/ede-1.03-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-PKG_CAT="standard"
+EAPI=6
+
+XEMACS_PKG_CAT="standard"
 
 inherit xemacs-packages
 
 SLOT="0"
-IUSE=""
 DESCRIPTION="Emacs Development Environment"
 
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"

diff --git a/app-xemacs/edebug/edebug-1.22.ebuild 
b/app-xemacs/edebug/edebug-1.22.ebuild
index eb423edc2be..d17b63909ff 100644
--- a/app-xemacs/edebug/edebug-1.22.ebuild
+++ b/app-xemacs/edebug/edebug-1.22.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="An Emacs Lisp debugger"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-devel

diff --git a/app-xemacs/edict/edict-1.16.ebuild 
b/app-xemacs/edict/edict-1.16.ebuild
index 5e11aca7548..7df8cf41bcc 100644
--- a/app-xemacs/edict/edict-1.16.ebuild
+++ b/app-xemacs/edict/edict-1.16.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Lisp Interface to EDICT, Kanji Dictionary"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 app-xemacs/xemacs-base

diff --git a/app-xemacs/edict/edict-1.17.ebuild 
b/app-xemacs/edict/edict-1.17.ebuild
index f463c4ffc0f..7df8cf41bcc 100644
--- a/app-xemacs/edict/edict-1.17.ebuild
+++ b/app-xemacs/edict/edict-1.17.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Lisp Interface to EDICT, Kanji Dictionary"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 app-xemacs/xemacs-base

diff --git a/app-xemacs/ediff/ediff-1.68.ebuild 
b/app-xemacs/ediff/ediff-1.68.ebuild
index 3ae32e838bb..d5e4655f6b7 100644
--- a/app-xemacs/ediff/ediff-1.68.ebuild
+++ b/app-xemacs/ediff/ediff-1.68.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Interface over GNU patch"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/pcl-cvs
 app-xemacs/elib

diff --git a/app-xemacs/ediff/ediff-1.77.ebuild 
b/app-xemacs/ediff/ediff-1.77.ebuild
index 4b0d2061d21..c1c90e40757 100644
--- a/app-xemacs/ediff/ediff-1.77.ebuild
+++ b/app-xemacs/ediff/ediff-1.77.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Interface over GNU patch"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/pcl-cvs
 app-xemacs/elib

diff --git a/app-xemacs/ediff/ediff-1.81.ebuild 
b/app-xemacs/ediff/ediff-1.81.ebuild
index e8e4be89c48..6a23076790a 100644
--- a/app-xemacs/ediff/ediff-1.81.ebuild
+++ b/app-xemacs/ediff/ediff-1.81.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Interface over GNU patch"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/pcl-cvs
 app-xemacs/elib

diff --git a/app-xemacs/edit-utils/edit-utils-2.39.ebuild 
b/app-xemacs/edit-utils/edit-utils-2.39.ebuild
index 8e1f717b71b..3e52e3b9215 100644
--- a/app-xemacs/edit-utils/edit-utils-2.39.ebuild
+++ b/app-xemacs/edit-utils/edit-utils-2.39.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Miscellaneous editor extensions, you probably need this"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-devel

diff --git a/app-xemacs/edit-utils/edit-utils-2.43.ebuild 
b/app-xemacs/edit-utils/edit-utils-2.43.ebuild
index 8e1f717b71b..3e52e3b9215 100644
--- a/app-xemacs/edit-utils/edit-utils-2.43.ebuild
+++ b/app-xemacs/edit-utils/edit-utils-2.43.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Miscellaneous editor extensions, you probably need this"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-devel

diff --git a/app-xemacs/edit-utils/edit-utils-2.44.ebuild 
b/app-xemacs/edit-utils/edit-utils-2.44.ebuild
index 7e549afdc60..66d1a24c46d 100644
--- a/app-xemacs/edit-utils/edit-utils-2.44.ebuild
+++ b/app-xemacs/edit-utils/edit-utils-2.44.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Miscellaneous editor extensions, you probably need this"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
-EXPERIMENTAL="true"
+XEMACS_EXPERIMENTAL="true"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-devel

diff --git a/app-xemacs/edt/edt-1.13.ebuild b/app-xemacs/edt/edt-1.13.ebuild
index 773c4fe8dbb..5402891763b 100644
--- a/app-xemacs/edt/edt-1.13.ebuild
+++ b/app-xemacs/edt/edt-1.13.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="DEC EDIT/EDT emulation"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/edt/edt-1.14.ebuild b/app-xemacs/edt/edt-1.14.ebuild
index 773c4fe8dbb..5402891763b 100644
--- a/app-xemacs/edt/edt-1.14.ebuild
+++ b/app-xemacs/edt/edt-1.14.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="DEC EDIT/EDT emulation"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/efs/efs-1.33.ebuild b/app-xemacs/efs/efs-1.33.ebuild
index 39d437377df..8581d129394 100644
--- a/app-xemacs/efs/efs-1.33.ebuild
+++ b/app-xemacs/efs/efs-1.33.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Treat files on remote systems the same as local files"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/dired

diff --git a/app-xemacs/efs/efs-1.34.ebuild b/app-xemacs/efs/efs-1.34.ebuild
index 39d437377df..8581d129394 100644
--- a/app-xemacs/efs/efs-1.34.ebuild
+++ b/app-xemacs/efs/efs-1.34.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Treat files on remote systems the same as local files"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/dired

diff --git a/app-xemacs/egg-its/egg-its-1.27.ebuild 
b/app-xemacs/egg-its/egg-its-1.27.ebuild
index 2d7624ca58f..8009921bd1f 100644
--- a/app-xemacs/egg-its/egg-its-1.27.ebuild
+++ b/app-xemacs/egg-its/egg-its-1.27.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Wnn (4.2 and 6) support.  SJ3 support"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/leim
 app-xemacs/mule-base

diff --git a/app-xemacs/eieio/eieio-1.05.ebuild 
b/app-xemacs/eieio/eieio-1.05.ebuild
index 321f877434d..ceb5a0eb769 100644
--- a/app-xemacs/eieio/eieio-1.05.ebuild
+++ b/app-xemacs/eieio/eieio-1.05.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Enhanced Implementation of Emacs Interpreted Objects"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/speedbar
 app-xemacs/xemacs-base

diff --git a/app-xemacs/eieio/eieio-1.07.ebuild 
b/app-xemacs/eieio/eieio-1.07.ebuild
index 1d93120df4e..234ebe0bc04 100644
--- a/app-xemacs/eieio/eieio-1.07.ebuild
+++ b/app-xemacs/eieio/eieio-1.07.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Enhanced Implementation of Emacs Interpreted Objects"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug

diff --git a/app-xemacs/elib/elib-1.11.ebuild b/app-xemacs/elib/elib-1.11.ebuild
index d3ffaddbf0c..cdd4a251e62 100644
--- a/app-xemacs/elib/elib-1.11.ebuild
+++ b/app-xemacs/elib/elib-1.11.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Portable Emacs Lisp utilities library"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"

diff --git a/app-xemacs/elib/elib-1.13.ebuild b/app-xemacs/elib/elib-1.13.ebuild
index 5a4d269b135..d808110e8c5 100644
--- a/app-xemacs/elib/elib-1.13.ebuild
+++ b/app-xemacs/elib/elib-1.13.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Portable Emacs Lisp utilities library"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/emerge/emerge-1.11.ebuild 
b/app-xemacs/emerge/emerge-1.11.ebuild
index 016d35d633b..e9e116fa84c 100644
--- a/app-xemacs/emerge/emerge-1.11.ebuild
+++ b/app-xemacs/emerge/emerge-1.11.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Another interface over GNU patch"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 

diff --git a/app-xemacs/erc/erc-0.21.ebuild b/app-xemacs/erc/erc-0.21.ebuild
index d94bb502602..89ce786a278 100644
--- a/app-xemacs/erc/erc-0.21.ebuild
+++ b/app-xemacs/erc/erc-0.21.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="ERC - The Emacs IRC Client"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base"
 

diff --git a/app-xemacs/erc/erc-0.23.ebuild b/app-xemacs/erc/erc-0.23.ebuild
index 161e73d05fc..a8dbe1642c0 100644
--- a/app-xemacs/erc/erc-0.23.ebuild
+++ b/app-xemacs/erc/erc-0.23.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="ERC - The Emacs IRC Client"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 

diff --git a/app-xemacs/escreen/escreen-1.01.ebuild 
b/app-xemacs/escreen/escreen-1.01.ebuild
index b8868a4cea3..38aa9861344 100644
--- a/app-xemacs/escreen/escreen-1.01.ebuild
+++ b/app-xemacs/escreen/escreen-1.01.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Multiple editing sessions withing a single frame (like screen).."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/eshell/eshell-1.10.ebuild 
b/app-xemacs/eshell/eshell-1.10.ebuild
index 8722abea13e..9e52ba32fd8 100644
--- a/app-xemacs/eshell/eshell-1.10.ebuild
+++ b/app-xemacs/eshell/eshell-1.10.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Command shell implemented entirely in Emacs Lisp"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-eterm

diff --git a/app-xemacs/eshell/eshell-1.18.ebuild 
b/app-xemacs/eshell/eshell-1.18.ebuild
index e48f5149a6b..9e52ba32fd8 100644
--- a/app-xemacs/eshell/eshell-1.18.ebuild
+++ b/app-xemacs/eshell/eshell-1.18.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Command shell implemented entirely in Emacs Lisp"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-eterm

diff --git a/app-xemacs/ess/ess-1.03.ebuild b/app-xemacs/ess/ess-1.03.ebuild
index 3dbb4c6f31b..c5ec6860088 100644
--- a/app-xemacs/ess/ess-1.03.ebuild
+++ b/app-xemacs/ess/ess-1.03.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="ESS: Emacs Speaks Statistics"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 DEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib

diff --git a/app-xemacs/eudc/eudc-1.39.ebuild b/app-xemacs/eudc/eudc-1.39.ebuild
index 940ee0d6bda..c6b0dcad667 100644
--- a/app-xemacs/eudc/eudc-1.39.ebuild
+++ b/app-xemacs/eudc/eudc-1.39.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Emacs Unified Directory Client (LDAP, PH)"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base

diff --git a/app-xemacs/eudc/eudc-1.40.ebuild b/app-xemacs/eudc/eudc-1.40.ebuild
index 4dd5f1b3346..28e8c902059 100644
--- a/app-xemacs/eudc/eudc-1.40.ebuild
+++ b/app-xemacs/eudc/eudc-1.40.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Emacs Unified Directory Client (LDAP, PH)"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base

diff --git a/app-xemacs/footnote/footnote-1.16.ebuild 
b/app-xemacs/footnote/footnote-1.16.ebuild
index 06f45b6b057..524fe1f5398 100644
--- a/app-xemacs/footnote/footnote-1.16.ebuild
+++ b/app-xemacs/footnote/footnote-1.16.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Footnoting in mail message editing modes"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base

diff --git a/app-xemacs/forms/forms-1.15.ebuild 
b/app-xemacs/forms/forms-1.15.ebuild
index cb416e7c7e3..2e93a1c0448 100644
--- a/app-xemacs/forms/forms-1.15.ebuild
+++ b/app-xemacs/forms/forms-1.15.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Forms editing support (obsolete, use Widget instead)"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 

diff --git a/app-xemacs/fortran-modes/fortran-modes-1.05.ebuild 
b/app-xemacs/fortran-modes/fortran-modes-1.05.ebuild
index 9241a432890..dcdfaa75f99 100644
--- a/app-xemacs/fortran-modes/fortran-modes-1.05.ebuild
+++ b/app-xemacs/fortran-modes/fortran-modes-1.05.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Fortran support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/frame-icon/frame-icon-1.11.ebuild 
b/app-xemacs/frame-icon/frame-icon-1.11.ebuild
index 552ca4336a6..1cf1561b703 100644
--- a/app-xemacs/frame-icon/frame-icon-1.11.ebuild
+++ b/app-xemacs/frame-icon/frame-icon-1.11.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Set up mode-specific icons for each frame under XEmacs"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 

diff --git a/app-xemacs/fsf-compat/fsf-compat-1.15.ebuild 
b/app-xemacs/fsf-compat/fsf-compat-1.15.ebuild
index 562a658f214..ae5d7b45d2d 100644
--- a/app-xemacs/fsf-compat/fsf-compat-1.15.ebuild
+++ b/app-xemacs/fsf-compat/fsf-compat-1.15.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="FSF Emacs compatibility files"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base"
 

diff --git a/app-xemacs/fsf-compat/fsf-compat-1.19.ebuild 
b/app-xemacs/fsf-compat/fsf-compat-1.19.ebuild
index de90fa0f891..55a8058091d 100644
--- a/app-xemacs/fsf-compat/fsf-compat-1.19.ebuild
+++ b/app-xemacs/fsf-compat/fsf-compat-1.19.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="FSF Emacs compatibility files"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-fbsd"
 

diff --git a/app-xemacs/games/games-1.20.ebuild 
b/app-xemacs/games/games-1.20.ebuild
index 6107aac33bd..fad29c3903b 100644
--- a/app-xemacs/games/games-1.20.ebuild
+++ b/app-xemacs/games/games-1.20.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Tetris, Sokoban, and Snake"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/general-docs/general-docs-1.04.ebuild 
b/app-xemacs/general-docs/general-docs-1.04.ebuild
index 2071c43b062..c8558a82aaa 100644
--- a/app-xemacs/general-docs/general-docs-1.04.ebuild
+++ b/app-xemacs/general-docs/general-docs-1.04.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="General XEmacs documentation"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"

diff --git a/app-xemacs/general-docs/general-docs-1.06.ebuild 
b/app-xemacs/general-docs/general-docs-1.06.ebuild
index 2071c43b062..c8558a82aaa 100644
--- a/app-xemacs/general-docs/general-docs-1.06.ebuild
+++ b/app-xemacs/general-docs/general-docs-1.06.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="General XEmacs documentation"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"

diff --git a/app-xemacs/gnats/gnats-1.17.ebuild 
b/app-xemacs/gnats/gnats-1.17.ebuild
index 264d7b8e348..b6255576c4b 100644
--- a/app-xemacs/gnats/gnats-1.17.ebuild
+++ b/app-xemacs/gnats/gnats-1.17.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="XEmacs bug reports"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base

diff --git a/app-xemacs/gnus/gnus-1.99.ebuild b/app-xemacs/gnus/gnus-1.99.ebuild
index c75d299282f..713d7a5b7f9 100644
--- a/app-xemacs/gnus/gnus-1.99.ebuild
+++ b/app-xemacs/gnus/gnus-1.99.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="The Gnus Newsreader and Mailreader"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL="true"
 
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base

diff --git a/app-xemacs/guided-tour/guided-tour-0.52.ebuild 
b/app-xemacs/guided-tour/guided-tour-0.52.ebuild
index 0310b5dc235..c1bacaeb4fb 100644
--- a/app-xemacs/guided-tour/guided-tour-0.52.ebuild
+++ b/app-xemacs/guided-tour/guided-tour-0.52.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Phil Sung's Guided Tour of Emacs"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 KEYWORDS="~amd64"
 

diff --git a/app-xemacs/haskell-mode/haskell-mode-1.11.ebuild 
b/app-xemacs/haskell-mode/haskell-mode-1.11.ebuild
index ba13b347327..26aba7c30f1 100644
--- a/app-xemacs/haskell-mode/haskell-mode-1.11.ebuild
+++ b/app-xemacs/haskell-mode/haskell-mode-1.11.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Haskell editing support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/dired
 app-xemacs/mail-lib

diff --git a/app-xemacs/hm-html-menus/hm-html-menus-1.23.ebuild 
b/app-xemacs/hm-html-menus/hm-html-menus-1.23.ebuild
index 0d3d1ec90f5..56777cf73d2 100644
--- a/app-xemacs/hm-html-menus/hm-html-menus-1.23.ebuild
+++ b/app-xemacs/hm-html-menus/hm-html-menus-1.23.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="HTML editing"
 SRC_URI="http://ftp.xemacs.org/packages/hm--html-menus-${PV}-pkg.tar.gz";
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base

diff --git a/app-xemacs/hm-html-menus/hm-html-menus-1.24.ebuild 
b/app-xemacs/hm-html-menus/hm-html-menus-1.24.ebuild
index 0d3d1ec90f5..56777cf73d2 100644
--- a/app-xemacs/hm-html-menus/hm-html-menus-1.24.ebuild
+++ b/app-xemacs/hm-html-menus/hm-html-menus-1.24.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="HTML editing"
 SRC_URI="http://ftp.xemacs.org/packages/hm--html-menus-${PV}-pkg.tar.gz";
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base

diff --git a/app-xemacs/hyperbole/hyperbole-1.16.ebuild 
b/app-xemacs/hyperbole/hyperbole-1.16.ebuild
index 65007a37503..687de34b8dc 100644
--- a/app-xemacs/hyperbole/hyperbole-1.16.ebuild
+++ b/app-xemacs/hyperbole/hyperbole-1.16.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Hyperbole: The Everyday Info Manager"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib

diff --git a/app-xemacs/hyperbole/hyperbole-1.17.ebuild 
b/app-xemacs/hyperbole/hyperbole-1.17.ebuild
index 17dffc10cf7..b9be70c62ad 100644
--- a/app-xemacs/hyperbole/hyperbole-1.17.ebuild
+++ b/app-xemacs/hyperbole/hyperbole-1.17.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Hyperbole: The Everyday Info Manager"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib

diff --git a/app-xemacs/ibuffer/ibuffer-1.09.ebuild 
b/app-xemacs/ibuffer/ibuffer-1.09.ebuild
index 48fdb64d85d..2d2dd22e823 100644
--- a/app-xemacs/ibuffer/ibuffer-1.09.ebuild
+++ b/app-xemacs/ibuffer/ibuffer-1.09.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Advanced replacement for buffer-menu"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/ibuffer/ibuffer-1.10.ebuild 
b/app-xemacs/ibuffer/ibuffer-1.10.ebuild
index 593e0692339..2d2dd22e823 100644
--- a/app-xemacs/ibuffer/ibuffer-1.10.ebuild
+++ b/app-xemacs/ibuffer/ibuffer-1.10.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Advanced replacement for buffer-menu"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/idlwave/idlwave-1.32.ebuild 
b/app-xemacs/idlwave/idlwave-1.32.ebuild
index 695a7f3185a..d8aaff829bf 100644
--- a/app-xemacs/idlwave/idlwave-1.32.ebuild
+++ b/app-xemacs/idlwave/idlwave-1.32.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Editing and Shell mode for the Interactive Data Language"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base

diff --git a/app-xemacs/igrep/igrep-1.14.ebuild 
b/app-xemacs/igrep/igrep-1.14.ebuild
index 28ee82ad419..13d8f82a361 100644
--- a/app-xemacs/igrep/igrep-1.14.ebuild
+++ b/app-xemacs/igrep/igrep-1.14.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Enhanced front-end for Grep"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base

diff --git a/app-xemacs/igrep/igrep-1.16.ebuild 
b/app-xemacs/igrep/igrep-1.16.ebuild
index 28ee82ad419..13d8f82a361 100644
--- a/app-xemacs/igrep/igrep-1.16.ebuild
+++ b/app-xemacs/igrep/igrep-1.16.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Enhanced front-end for Grep"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base

diff --git a/app-xemacs/ilisp/ilisp-1.34.ebuild 
b/app-xemacs/ilisp/ilisp-1.34.ebuild
index fd5d89bae64..322725fa53f 100644
--- a/app-xemacs/ilisp/ilisp-1.34.ebuild
+++ b/app-xemacs/ilisp/ilisp-1.34.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Front-end for Inferior Lisp"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib

diff --git a/app-xemacs/ilisp/ilisp-1.36.ebuild 
b/app-xemacs/ilisp/ilisp-1.36.ebuild
index fd5d89bae64..322725fa53f 100644
--- a/app-xemacs/ilisp/ilisp-1.36.ebuild
+++ b/app-xemacs/ilisp/ilisp-1.36.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Front-end for Inferior Lisp"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib

diff --git a/app-xemacs/jde/jde-1.51.ebuild b/app-xemacs/jde/jde-1.51.ebuild
index 817fe1f81f1..ff20dc506db 100644
--- a/app-xemacs/jde/jde-1.51.ebuild
+++ b/app-xemacs/jde/jde-1.51.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Integrated Development Environment for Java"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/cc-mode
 app-xemacs/semantic

diff --git a/app-xemacs/jde/jde-1.52.ebuild b/app-xemacs/jde/jde-1.52.ebuild
index 372b90393f8..9be95c9814c 100644
--- a/app-xemacs/jde/jde-1.52.ebuild
+++ b/app-xemacs/jde/jde-1.52.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Integrated Development Environment for Java"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/cc-mode
 app-xemacs/semantic

diff --git a/app-xemacs/latin-euro-standards/latin-euro-standards-1.07.ebuild 
b/app-xemacs/latin-euro-standards/latin-euro-standards-1.07.ebuild
index ce73491f4a4..87c19f6742c 100644
--- a/app-xemacs/latin-euro-standards/latin-euro-standards-1.07.ebuild
+++ b/app-xemacs/latin-euro-standards/latin-euro-standards-1.07.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Support for the Latin{7,8,9,10} character sets & coding 
systems"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 "

diff --git a/app-xemacs/latin-euro-standards/latin-euro-standards-1.09.ebuild 
b/app-xemacs/latin-euro-standards/latin-euro-standards-1.09.ebuild
index ce73491f4a4..87c19f6742c 100644
--- a/app-xemacs/latin-euro-standards/latin-euro-standards-1.09.ebuild
+++ b/app-xemacs/latin-euro-standards/latin-euro-standards-1.09.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Support for the Latin{7,8,9,10} character sets & coding 
systems"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 "

diff --git a/app-xemacs/latin-unity/latin-unity-1.20.ebuild 
b/app-xemacs/latin-unity/latin-unity-1.20.ebuild
index a7fabd7c483..cf308c9eec6 100644
--- a/app-xemacs/latin-unity/latin-unity-1.20.ebuild
+++ b/app-xemacs/latin-unity/latin-unity-1.20.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: find single ISO 8859 character set to encode a buffer"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 app-xemacs/latin-euro-standards

diff --git a/app-xemacs/leim/leim-1.24.ebuild b/app-xemacs/leim/leim-1.24.ebuild
index 22492e9a571..85bf3650314 100644
--- a/app-xemacs/leim/leim-1.24.ebuild
+++ b/app-xemacs/leim/leim-1.24.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Quail.  All non-English and non-Japanese language support"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 app-xemacs/fsf-compat

diff --git a/app-xemacs/leim/leim-1.31.ebuild b/app-xemacs/leim/leim-1.31.ebuild
index 0ce32e09639..6423bcbb704 100644
--- a/app-xemacs/leim/leim-1.31.ebuild
+++ b/app-xemacs/leim/leim-1.31.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Quail.  All non-English and non-Japanese language support"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 app-xemacs/fsf-compat

diff --git a/app-xemacs/locale/locale-1.24.ebuild 
b/app-xemacs/locale/locale-1.24.ebuild
index ac4365af468..c3d747f0ca1 100644
--- a/app-xemacs/locale/locale-1.24.ebuild
+++ b/app-xemacs/locale/locale-1.24.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Localized menubars and localized splash screens"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 "

diff --git a/app-xemacs/locale/locale-1.28.ebuild 
b/app-xemacs/locale/locale-1.28.ebuild
index ac4365af468..c3d747f0ca1 100644
--- a/app-xemacs/locale/locale-1.28.ebuild
+++ b/app-xemacs/locale/locale-1.28.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Localized menubars and localized splash screens"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 "

diff --git a/app-xemacs/lookup/lookup-1.15.ebuild 
b/app-xemacs/lookup/lookup-1.15.ebuild
index be16771e9b1..786117936c3 100644
--- a/app-xemacs/lookup/lookup-1.15.ebuild
+++ b/app-xemacs/lookup/lookup-1.15.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Dictionary support"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 app-xemacs/cookie

diff --git a/app-xemacs/mail-lib/mail-lib-1.83.ebuild 
b/app-xemacs/mail-lib/mail-lib-1.83.ebuild
index 792293b82e9..05dfd13753a 100644
--- a/app-xemacs/mail-lib/mail-lib-1.83.ebuild
+++ b/app-xemacs/mail-lib/mail-lib-1.83.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Fundamental lisp files for providing email support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL="true"
 
 RDEPEND="app-xemacs/xemacs-eterm
 app-xemacs/xemacs-base

diff --git a/app-xemacs/mailcrypt/mailcrypt-2.14.ebuild 
b/app-xemacs/mailcrypt/mailcrypt-2.14.ebuild
index fc0606c2e42..13fee8df3bc 100644
--- a/app-xemacs/mailcrypt/mailcrypt-2.14.ebuild
+++ b/app-xemacs/mailcrypt/mailcrypt-2.14.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Support for messaging encryption with PGP"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/fsf-compat

diff --git a/app-xemacs/mew/mew-1.19.ebuild b/app-xemacs/mew/mew-1.19.ebuild
index 40e1f7c8e9f..145d59dcbf2 100644
--- a/app-xemacs/mew/mew-1.19.ebuild
+++ b/app-xemacs/mew/mew-1.19.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Messaging in an Emacs World"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/w3
 app-xemacs/efs

diff --git a/app-xemacs/mh-e/mh-e-1.29.ebuild b/app-xemacs/mh-e/mh-e-1.29.ebuild
index 8aaca2b8540..e7e8bc67a14 100644
--- a/app-xemacs/mh-e/mh-e-1.29.ebuild
+++ b/app-xemacs/mh-e/mh-e-1.29.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Front end support for MH"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/gnus
 app-xemacs/mail-lib

diff --git a/app-xemacs/mh-e/mh-e-1.32.ebuild b/app-xemacs/mh-e/mh-e-1.32.ebuild
index c31e06e8c67..e1fe888c582 100644
--- a/app-xemacs/mh-e/mh-e-1.32.ebuild
+++ b/app-xemacs/mh-e/mh-e-1.32.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Front end support for MH"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/gnus
 app-xemacs/mail-lib

diff --git a/app-xemacs/mine/mine-1.16.ebuild b/app-xemacs/mine/mine-1.16.ebuild
index 78a8862e36e..3a52de9bbef 100644
--- a/app-xemacs/mine/mine-1.16.ebuild
+++ b/app-xemacs/mine/mine-1.16.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Minehunt Game"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/misc-games/misc-games-1.19.ebuild 
b/app-xemacs/misc-games/misc-games-1.19.ebuild
index b856b823499..6a50cc16ab9 100644
--- a/app-xemacs/misc-games/misc-games-1.19.ebuild
+++ b/app-xemacs/misc-games/misc-games-1.19.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Other amusements and diversions"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/misc-games/misc-games-1.22.ebuild 
b/app-xemacs/misc-games/misc-games-1.22.ebuild
index b856b823499..6a50cc16ab9 100644
--- a/app-xemacs/misc-games/misc-games-1.22.ebuild
+++ b/app-xemacs/misc-games/misc-games-1.22.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Other amusements and diversions"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/mmm-mode/mmm-mode-1.02.ebuild 
b/app-xemacs/mmm-mode/mmm-mode-1.02.ebuild
index 85dd2e7a5e2..038c2904161 100644
--- a/app-xemacs/mmm-mode/mmm-mode-1.02.ebuild
+++ b/app-xemacs/mmm-mode/mmm-mode-1.02.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Multiple major modes in a single buffer"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat

diff --git a/app-xemacs/mmm-mode/mmm-mode-1.05.ebuild 
b/app-xemacs/mmm-mode/mmm-mode-1.05.ebuild
index 604c03b04b4..038c2904161 100644
--- a/app-xemacs/mmm-mode/mmm-mode-1.05.ebuild
+++ b/app-xemacs/mmm-mode/mmm-mode-1.05.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Multiple major modes in a single buffer"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat

diff --git a/app-xemacs/mule-base/mule-base-1.49-r1.ebuild 
b/app-xemacs/mule-base/mule-base-1.49-r1.ebuild
index 032f7b7c924..d2a5c813740 100644
--- a/app-xemacs/mule-base/mule-base-1.49-r1.ebuild
+++ b/app-xemacs/mule-base/mule-base-1.49-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Basic Mule support, required for building with Mule"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base

diff --git a/app-xemacs/mule-base/mule-base-1.56.ebuild 
b/app-xemacs/mule-base/mule-base-1.56.ebuild
index 343ed550c4b..a9a65cefa6a 100644
--- a/app-xemacs/mule-base/mule-base-1.56.ebuild
+++ b/app-xemacs/mule-base/mule-base-1.56.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Basic Mule support, required for building with Mule"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/fsf-compat
 app-xemacs/xemacs-base

diff --git a/app-xemacs/mule-ucs/mule-ucs-1.14.ebuild 
b/app-xemacs/mule-ucs/mule-ucs-1.14.ebuild
index 73d520796a2..c06b018ee2b 100644
--- a/app-xemacs/mule-ucs/mule-ucs-1.14.ebuild
+++ b/app-xemacs/mule-ucs/mule-ucs-1.14.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Extended coding systems (including Unicode) for XEmacs"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 app-xemacs/latin-euro-standards

diff --git a/app-xemacs/mule-ucs/mule-ucs-1.18.ebuild 
b/app-xemacs/mule-ucs/mule-ucs-1.18.ebuild
index 73d520796a2..c06b018ee2b 100644
--- a/app-xemacs/mule-ucs/mule-ucs-1.18.ebuild
+++ b/app-xemacs/mule-ucs/mule-ucs-1.18.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Extended coding systems (including Unicode) for XEmacs"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/mule-base
 app-xemacs/latin-euro-standards

diff --git a/app-xemacs/net-utils/net-utils-1.52.ebuild 
b/app-xemacs/net-utils/net-utils-1.52.ebuild
index 9f8473e63b0..943b24f7a88 100644
--- a/app-xemacs/net-utils/net-utils-1.52.ebuild
+++ b/app-xemacs/net-utils/net-utils-1.52.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Miscellaneous Networking Utilities"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/gnus

diff --git a/app-xemacs/net-utils/net-utils-1.56.ebuild 
b/app-xemacs/net-utils/net-utils-1.56.ebuild
index 9f8473e63b0..943b24f7a88 100644
--- a/app-xemacs/net-utils/net-utils-1.56.ebuild
+++ b/app-xemacs/net-utils/net-utils-1.56.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Miscellaneous Networking Utilities"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/gnus

diff --git a/app-xemacs/ocaml/ocaml-0.06.ebuild 
b/app-xemacs/ocaml/ocaml-0.06.ebuild
index 78e4e31f4f9..10ef040202d 100644
--- a/app-xemacs/ocaml/ocaml-0.06.ebuild
+++ b/app-xemacs/ocaml/ocaml-0.06.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Objective Caml editing support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat

diff --git a/app-xemacs/oo-browser/oo-browser-1.04.ebuild 
b/app-xemacs/oo-browser/oo-browser-1.04.ebuild
index d508d41a7f4..ff49d4fe289 100644
--- a/app-xemacs/oo-browser/oo-browser-1.04.ebuild
+++ b/app-xemacs/oo-browser/oo-browser-1.04.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="The Multi-Language Object-Oriented Code Browser"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/hyperbole

diff --git a/app-xemacs/oo-browser/oo-browser-1.05.ebuild 
b/app-xemacs/oo-browser/oo-browser-1.05.ebuild
index 43400bd3e4f..5615f5ad32e 100644
--- a/app-xemacs/oo-browser/oo-browser-1.05.ebuild
+++ b/app-xemacs/oo-browser/oo-browser-1.05.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="The Multi-Language Object-Oriented Code Browser"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/hyperbole

diff --git a/app-xemacs/os-utils/os-utils-1.39.ebuild 
b/app-xemacs/os-utils/os-utils-1.39.ebuild
index 7984b1750ef..76e701cfed2 100644
--- a/app-xemacs/os-utils/os-utils-1.39.ebuild
+++ b/app-xemacs/os-utils/os-utils-1.39.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Miscellaneous O/S utilities"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/os-utils/os-utils-1.41.ebuild 
b/app-xemacs/os-utils/os-utils-1.41.ebuild
index 7984b1750ef..76e701cfed2 100644
--- a/app-xemacs/os-utils/os-utils-1.41.ebuild
+++ b/app-xemacs/os-utils/os-utils-1.41.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Miscellaneous O/S utilities"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/pc/pc-1.28.ebuild b/app-xemacs/pc/pc-1.28.ebuild
index eb033840957..1c50eafb376 100644
--- a/app-xemacs/pc/pc-1.28.ebuild
+++ b/app-xemacs/pc/pc-1.28.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="PC style interface emulation"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/pcl-cvs/pcl-cvs-1.67.ebuild 
b/app-xemacs/pcl-cvs/pcl-cvs-1.67.ebuild
index 9e422af3c06..8eb6ae45104 100644
--- a/app-xemacs/pcl-cvs/pcl-cvs-1.67.ebuild
+++ b/app-xemacs/pcl-cvs/pcl-cvs-1.67.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="CVS frontend"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/elib

diff --git a/app-xemacs/pcl-cvs/pcl-cvs-1.70.ebuild 
b/app-xemacs/pcl-cvs/pcl-cvs-1.70.ebuild
index 44ce58bcba7..5cd112f3d99 100644
--- a/app-xemacs/pcl-cvs/pcl-cvs-1.70.ebuild
+++ b/app-xemacs/pcl-cvs/pcl-cvs-1.70.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="CVS frontend"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/elib

diff --git a/app-xemacs/pcomplete/pcomplete-1.04.ebuild 
b/app-xemacs/pcomplete/pcomplete-1.04.ebuild
index a9e1b919a21..e224894017f 100644
--- a/app-xemacs/pcomplete/pcomplete-1.04.ebuild
+++ b/app-xemacs/pcomplete/pcomplete-1.04.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Provides programmatic completion"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/sh-script
 app-xemacs/xemacs-base

diff --git a/app-xemacs/pcomplete/pcomplete-1.06.ebuild 
b/app-xemacs/pcomplete/pcomplete-1.06.ebuild
index a9e1b919a21..e224894017f 100644
--- a/app-xemacs/pcomplete/pcomplete-1.06.ebuild
+++ b/app-xemacs/pcomplete/pcomplete-1.06.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Provides programmatic completion"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/sh-script
 app-xemacs/xemacs-base

diff --git a/app-xemacs/perl-modes/perl-modes-1.09.ebuild 
b/app-xemacs/perl-modes/perl-modes-1.09.ebuild
index d0995c09447..78a6bc03d52 100644
--- a/app-xemacs/perl-modes/perl-modes-1.09.ebuild
+++ b/app-xemacs/perl-modes/perl-modes-1.09.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Perl support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-ispell

diff --git a/app-xemacs/perl-modes/perl-modes-1.14.ebuild 
b/app-xemacs/perl-modes/perl-modes-1.14.ebuild
index d0995c09447..78a6bc03d52 100644
--- a/app-xemacs/perl-modes/perl-modes-1.14.ebuild
+++ b/app-xemacs/perl-modes/perl-modes-1.14.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Perl support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-ispell

diff --git a/app-xemacs/pgg/pgg-1.06.ebuild b/app-xemacs/pgg/pgg-1.06.ebuild
index f17d99627e4..04a14a18e12 100644
--- a/app-xemacs/pgg/pgg-1.06.ebuild
+++ b/app-xemacs/pgg/pgg-1.06.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Emacs interface to various PGP implementations"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat

diff --git a/app-xemacs/pgg/pgg-1.07.ebuild b/app-xemacs/pgg/pgg-1.07.ebuild
index f17d99627e4..04a14a18e12 100644
--- a/app-xemacs/pgg/pgg-1.07.ebuild
+++ b/app-xemacs/pgg/pgg-1.07.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Emacs interface to various PGP implementations"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/fsf-compat

diff --git a/app-xemacs/prog-modes/prog-modes-2.10.ebuild 
b/app-xemacs/prog-modes/prog-modes-2.10.ebuild
index 4a1fa61529e..025b202fc35 100644
--- a/app-xemacs/prog-modes/prog-modes-2.10.ebuild
+++ b/app-xemacs/prog-modes/prog-modes-2.10.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Support for various programming languages"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-devel

diff --git a/app-xemacs/prog-modes/prog-modes-2.20.ebuild 
b/app-xemacs/prog-modes/prog-modes-2.20.ebuild
index f427e609378..ddb9e085023 100644
--- a/app-xemacs/prog-modes/prog-modes-2.20.ebuild
+++ b/app-xemacs/prog-modes/prog-modes-2.20.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Support for various programming languages"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-devel

diff --git a/app-xemacs/ps-print/ps-print-1.11.ebuild 
b/app-xemacs/ps-print/ps-print-1.11.ebuild
index e0f21b29458..87a034183a3 100644
--- a/app-xemacs/ps-print/ps-print-1.11.ebuild
+++ b/app-xemacs/ps-print/ps-print-1.11.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Printing functions and utilities"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/text-modes
 "

diff --git a/app-xemacs/ps-print/ps-print-1.12.ebuild 
b/app-xemacs/ps-print/ps-print-1.12.ebuild
index 72235672545..7ffeea9eb96 100644
--- a/app-xemacs/ps-print/ps-print-1.12.ebuild
+++ b/app-xemacs/ps-print/ps-print-1.12.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Printing functions and utilities"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/text-modes
 app-xemacs/xemacs-base

diff --git a/app-xemacs/psgml-dtds/psgml-dtds-1.03.ebuild 
b/app-xemacs/psgml-dtds/psgml-dtds-1.03.ebuild
index a8116e570c4..28f322bdc0c 100644
--- a/app-xemacs/psgml-dtds/psgml-dtds-1.03.ebuild
+++ b/app-xemacs/psgml-dtds/psgml-dtds-1.03.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Deprecated collection of DTDs for psgml"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/psgml

diff --git a/app-xemacs/psgml/psgml-1.44.ebuild 
b/app-xemacs/psgml/psgml-1.44.ebuild
index d10eb18652e..c24433ea319 100644
--- a/app-xemacs/psgml/psgml-1.44.ebuild
+++ b/app-xemacs/psgml/psgml-1.44.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Validated HTML/SGML editing"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edit-utils

diff --git a/app-xemacs/psgml/psgml-1.45.ebuild 
b/app-xemacs/psgml/psgml-1.45.ebuild
index d10eb18652e..c24433ea319 100644
--- a/app-xemacs/psgml/psgml-1.45.ebuild
+++ b/app-xemacs/psgml/psgml-1.45.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Validated HTML/SGML editing"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edit-utils

diff --git a/app-xemacs/python-modes/python-modes-1.08.ebuild 
b/app-xemacs/python-modes/python-modes-1.08.ebuild
index 14861f440c5..0b29eeefe0f 100644
--- a/app-xemacs/python-modes/python-modes-1.08.ebuild
+++ b/app-xemacs/python-modes/python-modes-1.08.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Python support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib

diff --git a/app-xemacs/python-modes/python-modes-1.14.ebuild 
b/app-xemacs/python-modes/python-modes-1.14.ebuild
index f610c573b80..bea65b48972 100644
--- a/app-xemacs/python-modes/python-modes-1.14.ebuild
+++ b/app-xemacs/python-modes/python-modes-1.14.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Python support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib

diff --git a/app-xemacs/re-builder/re-builder-1.05.ebuild 
b/app-xemacs/re-builder/re-builder-1.05.ebuild
index 28ccd02125a..5b0485312cf 100644
--- a/app-xemacs/re-builder/re-builder-1.05.ebuild
+++ b/app-xemacs/re-builder/re-builder-1.05.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Interactive development tool for regular expressions"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"

diff --git a/app-xemacs/reftex/reftex-1.34.ebuild 
b/app-xemacs/reftex/reftex-1.34.ebuild
index 92c1f5c8ed9..a0162a84228 100644
--- a/app-xemacs/reftex/reftex-1.34.ebuild
+++ b/app-xemacs/reftex/reftex-1.34.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Emacs support for LaTeX cross-references, citations.."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/riece/riece-1.23.ebuild 
b/app-xemacs/riece/riece-1.23.ebuild
index 535c9364a1b..08c5e9bdebc 100644
--- a/app-xemacs/riece/riece-1.23.ebuild
+++ b/app-xemacs/riece/riece-1.23.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="IRC client for Emacs"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib

diff --git a/app-xemacs/rmail/rmail-1.14.ebuild 
b/app-xemacs/rmail/rmail-1.14.ebuild
index 588dfefeec6..e50d725dbe1 100644
--- a/app-xemacs/rmail/rmail-1.14.ebuild
+++ b/app-xemacs/rmail/rmail-1.14.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="An obsolete Emacs mailer"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/tm
 app-xemacs/apel

diff --git a/app-xemacs/ruby-modes/ruby-modes-1.02.ebuild 
b/app-xemacs/ruby-modes/ruby-modes-1.02.ebuild
index 20618d908c4..4ec74b5df26 100644
--- a/app-xemacs/ruby-modes/ruby-modes-1.02.ebuild
+++ b/app-xemacs/ruby-modes/ruby-modes-1.02.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Ruby support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/debug

diff --git a/app-xemacs/ruby-modes/ruby-modes-1.04.ebuild 
b/app-xemacs/ruby-modes/ruby-modes-1.04.ebuild
index 5ceb7c23495..df833c1cae6 100644
--- a/app-xemacs/ruby-modes/ruby-modes-1.04.ebuild
+++ b/app-xemacs/ruby-modes/ruby-modes-1.04.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Ruby support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/debug

diff --git a/app-xemacs/sasl/sasl-1.16.ebuild b/app-xemacs/sasl/sasl-1.16.ebuild
index af4b873837f..bce12e72b5d 100644
--- a/app-xemacs/sasl/sasl-1.16.ebuild
+++ b/app-xemacs/sasl/sasl-1.16.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Simple Authentication and Security Layer (SASL) library"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/ecrypto
 "

diff --git a/app-xemacs/scheme/scheme-1.15.ebuild 
b/app-xemacs/scheme/scheme-1.15.ebuild
index 7883321cf77..41c710f1d71 100644
--- a/app-xemacs/scheme/scheme-1.15.ebuild
+++ b/app-xemacs/scheme/scheme-1.15.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Front-end support for Inferior Scheme"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/scheme/scheme-1.18.ebuild 
b/app-xemacs/scheme/scheme-1.18.ebuild
index 7883321cf77..41c710f1d71 100644
--- a/app-xemacs/scheme/scheme-1.18.ebuild
+++ b/app-xemacs/scheme/scheme-1.18.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Front-end support for Inferior Scheme"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/semantic/semantic-1.20.ebuild 
b/app-xemacs/semantic/semantic-1.20.ebuild
index 34083cf8568..01fa5effc37 100644
--- a/app-xemacs/semantic/semantic-1.20.ebuild
+++ b/app-xemacs/semantic/semantic-1.20.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Semantic bovinator (Yacc/Lex for XEmacs). Includes Senator"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/eieio
 app-xemacs/xemacs-base

diff --git a/app-xemacs/semantic/semantic-1.21.ebuild 
b/app-xemacs/semantic/semantic-1.21.ebuild
index dc678c7f6f6..c4aa7f69913 100644
--- a/app-xemacs/semantic/semantic-1.21.ebuild
+++ b/app-xemacs/semantic/semantic-1.21.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Semantic bovinator (Yacc/Lex for XEmacs). Includes Senator"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/ede
 app-xemacs/cedet-common

diff --git a/app-xemacs/sgml/sgml-1.11.ebuild b/app-xemacs/sgml/sgml-1.11.ebuild
index 0ff29cc462b..5c76c027790 100644
--- a/app-xemacs/sgml/sgml-1.11.ebuild
+++ b/app-xemacs/sgml/sgml-1.11.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="SGML/Linuxdoc-SGML editing"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/sh-script/sh-script-1.22.ebuild 
b/app-xemacs/sh-script/sh-script-1.22.ebuild
index 4bb7221b562..affaf81527a 100644
--- a/app-xemacs/sh-script/sh-script-1.22.ebuild
+++ b/app-xemacs/sh-script/sh-script-1.22.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Support for editing shell scripts"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/sh-script/sh-script-1.24.ebuild 
b/app-xemacs/sh-script/sh-script-1.24.ebuild
index 4bb7221b562..affaf81527a 100644
--- a/app-xemacs/sh-script/sh-script-1.24.ebuild
+++ b/app-xemacs/sh-script/sh-script-1.24.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Support for editing shell scripts"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/sieve/sieve-1.18.ebuild 
b/app-xemacs/sieve/sieve-1.18.ebuild
index 10552aab2e0..57b325e43bf 100644
--- a/app-xemacs/sieve/sieve-1.18.ebuild
+++ b/app-xemacs/sieve/sieve-1.18.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Manage Sieve email filtering scripts"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib

diff --git a/app-xemacs/skk/skk-1.23.ebuild b/app-xemacs/skk/skk-1.23.ebuild
index 7a3075d54ca..3d56eaf2f8d 100644
--- a/app-xemacs/skk/skk-1.23.ebuild
+++ b/app-xemacs/skk/skk-1.23.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Japanese Language Input Method"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 DEPEND="app-xemacs/viper
 app-xemacs/mule-base

diff --git a/app-xemacs/skk/skk-1.24.ebuild b/app-xemacs/skk/skk-1.24.ebuild
index a477aa9867e..df952626475 100644
--- a/app-xemacs/skk/skk-1.24.ebuild
+++ b/app-xemacs/skk/skk-1.24.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="MULE: Japanese Language Input Method"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
 
 RDEPEND="app-xemacs/viper
 app-xemacs/mule-base

diff --git a/app-xemacs/slider/slider-1.15.ebuild 
b/app-xemacs/slider/slider-1.15.ebuild
index 2375687f323..3c70d3b3d7b 100644
--- a/app-xemacs/slider/slider-1.15.ebuild
+++ b/app-xemacs/slider/slider-1.15.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="User interface tool"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 

diff --git a/app-xemacs/slider/slider-1.16.ebuild 
b/app-xemacs/slider/slider-1.16.ebuild
index 2375687f323..3c70d3b3d7b 100644
--- a/app-xemacs/slider/slider-1.16.ebuild
+++ b/app-xemacs/slider/slider-1.16.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="User interface tool"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 

diff --git a/app-xemacs/sml-mode/sml-mode-0.12.ebuild 
b/app-xemacs/sml-mode/sml-mode-0.12.ebuild
index 7e198d8c6fc..0c97f710fc7 100644
--- a/app-xemacs/sml-mode/sml-mode-0.12.ebuild
+++ b/app-xemacs/sml-mode/sml-mode-0.12.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="SML editing support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug

diff --git a/app-xemacs/sounds-au/sounds-au-1.12.ebuild 
b/app-xemacs/sounds-au/sounds-au-1.12.ebuild
index 7582d91b1e7..8d67d5e62b3 100644
--- a/app-xemacs/sounds-au/sounds-au-1.12.ebuild
+++ b/app-xemacs/sounds-au/sounds-au-1.12.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="XEmacs Sun sound files"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"

diff --git a/app-xemacs/sounds-wav/sounds-wav-1.12.ebuild 
b/app-xemacs/sounds-wav/sounds-wav-1.12.ebuild
index b8cb88ab70b..00bbcf27d89 100644
--- a/app-xemacs/sounds-wav/sounds-wav-1.12.ebuild
+++ b/app-xemacs/sounds-wav/sounds-wav-1.12.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="XEmacs Microsoft sound files"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 

diff --git a/app-xemacs/speedbar/speedbar-1.28.ebuild 
b/app-xemacs/speedbar/speedbar-1.28.ebuild
index 113dce9aba7..df1df8a9180 100644
--- a/app-xemacs/speedbar/speedbar-1.28.ebuild
+++ b/app-xemacs/speedbar/speedbar-1.28.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Provides a separate frame with convenient references"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug

diff --git a/app-xemacs/speedbar/speedbar-1.29.ebuild 
b/app-xemacs/speedbar/speedbar-1.29.ebuild
index e95e52b9b3d..688867907ed 100644
--- a/app-xemacs/speedbar/speedbar-1.29.ebuild
+++ b/app-xemacs/speedbar/speedbar-1.29.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Provides a separate frame with convenient references"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edebug

diff --git a/app-xemacs/strokes/strokes-1.10.ebuild 
b/app-xemacs/strokes/strokes-1.10.ebuild
index 4390c888a9d..5febb774824 100644
--- a/app-xemacs/strokes/strokes-1.10.ebuild
+++ b/app-xemacs/strokes/strokes-1.10.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Mouse enhancement utility"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/text-modes
 app-xemacs/edit-utils

diff --git a/app-xemacs/sun/sun-1.16.ebuild b/app-xemacs/sun/sun-1.16.ebuild
index 9db8bc270b7..2d3a4fe5275 100644
--- a/app-xemacs/sun/sun-1.16.ebuild
+++ b/app-xemacs/sun/sun-1.16.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Support for Sparcworks.."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 MY_PN="Sun"
 SRC_URI="http://ftp.xemacs.org/packages/${MY_PN}-${PV}-pkg.tar.gz";

diff --git a/app-xemacs/supercite/supercite-1.21.ebuild 
b/app-xemacs/supercite/supercite-1.21.ebuild
index 2e6e31b0990..69800fad24f 100644
--- a/app-xemacs/supercite/supercite-1.21.ebuild
+++ b/app-xemacs/supercite/supercite-1.21.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="An Emacs citation tool for News & Mail messages"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base

diff --git a/app-xemacs/texinfo/texinfo-1.30.ebuild 
b/app-xemacs/texinfo/texinfo-1.30.ebuild
index 4ffbe08ef94..9ea018a3c05 100644
--- a/app-xemacs/texinfo/texinfo-1.30.ebuild
+++ b/app-xemacs/texinfo/texinfo-1.30.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="XEmacs TeXinfo support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/text-modes
 app-xemacs/xemacs-base

diff --git a/app-xemacs/text-modes/text-modes-1.92.ebuild 
b/app-xemacs/text-modes/text-modes-1.92.ebuild
index 001f454205f..1af096fe0b7 100644
--- a/app-xemacs/text-modes/text-modes-1.92.ebuild
+++ b/app-xemacs/text-modes/text-modes-1.92.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Miscellaneous support for editing text files"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-ispell
 app-xemacs/fsf-compat

diff --git a/app-xemacs/text-modes/text-modes-1.98.ebuild 
b/app-xemacs/text-modes/text-modes-1.98.ebuild
index 001f454205f..1af096fe0b7 100644
--- a/app-xemacs/text-modes/text-modes-1.98.ebuild
+++ b/app-xemacs/text-modes/text-modes-1.98.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Miscellaneous support for editing text files"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-ispell
 app-xemacs/fsf-compat

diff --git a/app-xemacs/textools/textools-1.15.ebuild 
b/app-xemacs/textools/textools-1.15.ebuild
index 6baf0a42ce6..f4a7926992a 100644
--- a/app-xemacs/textools/textools-1.15.ebuild
+++ b/app-xemacs/textools/textools-1.15.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Miscellaneous TeX support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/time/time-1.14.ebuild b/app-xemacs/time/time-1.14.ebuild
index 9040fdcca90..cfe2f811849 100644
--- a/app-xemacs/time/time-1.14.ebuild
+++ b/app-xemacs/time/time-1.14.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Display time & date on the modeline"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/tm/tm-1.38.ebuild b/app-xemacs/tm/tm-1.38.ebuild
index 9def52b0fd6..94d9692def4 100644
--- a/app-xemacs/tm/tm-1.38.ebuild
+++ b/app-xemacs/tm/tm-1.38.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Emacs MIME support. Not needed for gnus >= 5.8.0"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/gnus
 app-xemacs/mh-e

diff --git a/app-xemacs/tm/tm-1.39.ebuild b/app-xemacs/tm/tm-1.39.ebuild
index c5660d22c18..94d9692def4 100644
--- a/app-xemacs/tm/tm-1.39.ebuild
+++ b/app-xemacs/tm/tm-1.39.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Emacs MIME support. Not needed for gnus >= 5.8.0"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/gnus
 app-xemacs/mh-e

diff --git a/app-xemacs/tooltalk/tooltalk-1.15.ebuild 
b/app-xemacs/tooltalk/tooltalk-1.15.ebuild
index f57b9c4557b..24aff9c12b6 100644
--- a/app-xemacs/tooltalk/tooltalk-1.15.ebuild
+++ b/app-xemacs/tooltalk/tooltalk-1.15.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Support for building with Tooltalk"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 

diff --git a/app-xemacs/tpu/tpu-1.14.ebuild b/app-xemacs/tpu/tpu-1.14.ebuild
index c069a14f410..5ac7a8a4913 100644
--- a/app-xemacs/tpu/tpu-1.14.ebuild
+++ b/app-xemacs/tpu/tpu-1.14.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="DEC EDIT/TPU support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"

diff --git a/app-xemacs/tramp/tramp-1.52.ebuild 
b/app-xemacs/tramp/tramp-1.52.ebuild
index 42889d5cbff..f085ea53c85 100644
--- a/app-xemacs/tramp/tramp-1.52.ebuild
+++ b/app-xemacs/tramp/tramp-1.52.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Remote shell-based file editing"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL="true"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/vc

diff --git a/app-xemacs/vc-cc/vc-cc-1.22.ebuild 
b/app-xemacs/vc-cc/vc-cc-1.22.ebuild
index 3720c9f3d25..3be0a62a259 100644
--- a/app-xemacs/vc-cc/vc-cc-1.22.ebuild
+++ b/app-xemacs/vc-cc/vc-cc-1.22.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Version Control for ClearCase (UnFree) systems"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base

diff --git a/app-xemacs/vc/vc-1.41.ebuild b/app-xemacs/vc/vc-1.41.ebuild
index 69da6c67fff..8046841ef1c 100644
--- a/app-xemacs/vc/vc-1.41.ebuild
+++ b/app-xemacs/vc/vc-1.41.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Version Control for Free systems"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base

diff --git a/app-xemacs/vc/vc-1.48.ebuild b/app-xemacs/vc/vc-1.48.ebuild
index 9267a3bec57..1c9327ab94d 100644
--- a/app-xemacs/vc/vc-1.48.ebuild
+++ b/app-xemacs/vc/vc-1.48.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Version Control for Free systems"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/dired
 app-xemacs/xemacs-base

diff --git a/app-xemacs/vhdl/vhdl-1.22.ebuild b/app-xemacs/vhdl/vhdl-1.22.ebuild
index 31cca42f40e..8b8c37f70d2 100644
--- a/app-xemacs/vhdl/vhdl-1.22.ebuild
+++ b/app-xemacs/vhdl/vhdl-1.22.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Support for VHDL"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/edit-utils

diff --git a/app-xemacs/view-process/view-process-1.13.ebuild 
b/app-xemacs/view-process/view-process-1.13.ebuild
index 3f7dd190b1e..1053e35ea79 100644
--- a/app-xemacs/view-process/view-process-1.13.ebuild
+++ b/app-xemacs/view-process/view-process-1.13.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="A Unix process browsing tool"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/viper/viper-1.55.ebuild 
b/app-xemacs/viper/viper-1.55.ebuild
index ccaf7ebf1bb..95ab1c02cfb 100644
--- a/app-xemacs/viper/viper-1.55.ebuild
+++ b/app-xemacs/viper/viper-1.55.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="VI emulation support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/viper/viper-1.67.ebuild 
b/app-xemacs/viper/viper-1.67.ebuild
index ccaf7ebf1bb..95ab1c02cfb 100644
--- a/app-xemacs/viper/viper-1.67.ebuild
+++ b/app-xemacs/viper/viper-1.67.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="VI emulation support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/vm/vm-7.22.ebuild b/app-xemacs/vm/vm-7.22.ebuild
index 5170e15770d..c2df562566c 100644
--- a/app-xemacs/vm/vm-7.22.ebuild
+++ b/app-xemacs/vm/vm-7.22.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="An Emacs mailer"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base

diff --git a/app-xemacs/vm/vm-8.08.ebuild b/app-xemacs/vm/vm-8.08.ebuild
index 0f5eddb5715..f79efbf4358 100644
--- a/app-xemacs/vm/vm-8.08.ebuild
+++ b/app-xemacs/vm/vm-8.08.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="An Emacs mailer"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/mail-lib

diff --git a/app-xemacs/w3/w3-1.33.ebuild b/app-xemacs/w3/w3-1.33.ebuild
index 2904f61a4ae..9ff14df5acc 100644
--- a/app-xemacs/w3/w3-1.33.ebuild
+++ b/app-xemacs/w3/w3-1.33.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="A Web browser"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base

diff --git a/app-xemacs/w3/w3-1.35.ebuild b/app-xemacs/w3/w3-1.35.ebuild
index 2904f61a4ae..9ff14df5acc 100644
--- a/app-xemacs/w3/w3-1.35.ebuild
+++ b/app-xemacs/w3/w3-1.35.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="A Web browser"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/mail-lib
 app-xemacs/xemacs-base

diff --git a/app-xemacs/x-symbol/x-symbol-1.10.ebuild 
b/app-xemacs/x-symbol/x-symbol-1.10.ebuild
index eb224d27600..d70c9183c25 100644
--- a/app-xemacs/x-symbol/x-symbol-1.10.ebuild
+++ b/app-xemacs/x-symbol/x-symbol-1.10.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Semi WYSIWYG for LaTeX, HTML, etc, using additional fonts"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/auctex

diff --git a/app-xemacs/x-symbol/x-symbol-1.11.ebuild 
b/app-xemacs/x-symbol/x-symbol-1.11.ebuild
index eb224d27600..d70c9183c25 100644
--- a/app-xemacs/x-symbol/x-symbol-1.11.ebuild
+++ b/app-xemacs/x-symbol/x-symbol-1.11.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Semi WYSIWYG for LaTeX, HTML, etc, using additional fonts"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/auctex

diff --git a/app-xemacs/xemacs-base/xemacs-base-2.08.ebuild 
b/app-xemacs/xemacs-base/xemacs-base-2.08.ebuild
index 5dafd05ce4b..01aabdec66f 100644
--- a/app-xemacs/xemacs-base/xemacs-base-2.08.ebuild
+++ b/app-xemacs/xemacs-base/xemacs-base-2.08.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Fundamental XEmacs support, you almost certainly need this"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 

diff --git a/app-xemacs/xemacs-base/xemacs-base-2.10-r1.ebuild 
b/app-xemacs/xemacs-base/xemacs-base-2.10-r1.ebuild
index caa8fd4efcf..e935c2806aa 100644
--- a/app-xemacs/xemacs-base/xemacs-base-2.10-r1.ebuild
+++ b/app-xemacs/xemacs-base/xemacs-base-2.10-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Fundamental XEmacs support, you almost certainly need this"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86"
 

diff --git a/app-xemacs/xemacs-base/xemacs-base-2.27.ebuild 
b/app-xemacs/xemacs-base/xemacs-base-2.27.ebuild
index 6dca002357d..9240f076f3b 100644
--- a/app-xemacs/xemacs-base/xemacs-base-2.27.ebuild
+++ b/app-xemacs/xemacs-base/xemacs-base-2.27.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Fundamental XEmacs support, you almost certainly need this"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~amd64-fbsd"
 

diff --git a/app-xemacs/xemacs-devel/xemacs-devel-1.75.ebuild 
b/app-xemacs/xemacs-devel/xemacs-devel-1.75.ebuild
index b6d39d7a635..0d475874681 100644
--- a/app-xemacs/xemacs-devel/xemacs-devel-1.75.ebuild
+++ b/app-xemacs/xemacs-devel/xemacs-devel-1.75.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Emacs Lisp developer support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-ispell

diff --git a/app-xemacs/xemacs-devel/xemacs-devel-1.80.ebuild 
b/app-xemacs/xemacs-devel/xemacs-devel-1.80.ebuild
index b6d39d7a635..0d475874681 100644
--- a/app-xemacs/xemacs-devel/xemacs-devel-1.80.ebuild
+++ b/app-xemacs/xemacs-devel/xemacs-devel-1.80.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Emacs Lisp developer support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xemacs-ispell

diff --git a/app-xemacs/xemacs-eterm/xemacs-eterm-1.17.ebuild 
b/app-xemacs/xemacs-eterm/xemacs-eterm-1.17.ebuild
index ee038bf80dd..c34b5aaedcf 100644
--- a/app-xemacs/xemacs-eterm/xemacs-eterm-1.17.ebuild
+++ b/app-xemacs/xemacs-eterm/xemacs-eterm-1.17.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Terminal emulation"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 MY_PN=${PN/xemacs-/}
 SRC_URI="http://ftp.xemacs.org/packages/${MY_PN}-${PV}-pkg.tar.gz";

diff --git a/app-xemacs/xemacs-eterm/xemacs-eterm-1.18-r1.ebuild 
b/app-xemacs/xemacs-eterm/xemacs-eterm-1.18-r1.ebuild
index a2452f17653..d3242c3e524 100644
--- a/app-xemacs/xemacs-eterm/xemacs-eterm-1.18-r1.ebuild
+++ b/app-xemacs/xemacs-eterm/xemacs-eterm-1.18-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 MY_PN=${PN/xemacs-/}
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 inherit xemacs-packages
 
 SLOT="0"
-IUSE=""
 DESCRIPTION="Terminal emulation"
 
 SRC_URI="http://ftp.xemacs.org/packages/${MY_PN}-${PV}-pkg.tar.gz";

diff --git a/app-xemacs/xemacs-ispell/xemacs-ispell-1.32.ebuild 
b/app-xemacs/xemacs-ispell/xemacs-ispell-1.32.ebuild
index 3f84cdaf150..8c3a5ddecad 100644
--- a/app-xemacs/xemacs-ispell/xemacs-ispell-1.32.ebuild
+++ b/app-xemacs/xemacs-ispell/xemacs-ispell-1.32.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Spell-checking with GNU ispell"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 MY_PN=${PN/xemacs-/}
 

diff --git a/app-xemacs/xetla/xetla-1.01.ebuild 
b/app-xemacs/xetla/xetla-1.01.ebuild
index fc021db572c..b4401b59783 100644
--- a/app-xemacs/xetla/xetla-1.01.ebuild
+++ b/app-xemacs/xetla/xetla-1.01.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION=" Arch (tla) interface for XEmacs"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 DEPEND=""
 RDEPEND="app-xemacs/ediff

diff --git a/app-xemacs/xetla/xetla-1.02.ebuild 
b/app-xemacs/xetla/xetla-1.02.ebuild
index b00e7f59649..96f3e4dc606 100644
--- a/app-xemacs/xetla/xetla-1.02.ebuild
+++ b/app-xemacs/xetla/xetla-1.02.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION=" Arch (tla) interface for XEmacs"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/ediff
 app-xemacs/xemacs-base

diff --git a/app-xemacs/xlib/xlib-1.14.ebuild b/app-xemacs/xlib/xlib-1.14.ebuild
index 0c57978b8c2..dab669c74d2 100644
--- a/app-xemacs/xlib/xlib-1.14.ebuild
+++ b/app-xemacs/xlib/xlib-1.14.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="Emacs interface to X server"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 "

diff --git a/app-xemacs/xslide/xslide-1.09.ebuild 
b/app-xemacs/xslide/xslide-1.09.ebuild
index 10cd619e50b..b883c9482ab 100644
--- a/app-xemacs/xslide/xslide-1.09.ebuild
+++ b/app-xemacs/xslide/xslide-1.09.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="XSL editing support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-ispell
 app-xemacs/mail-lib

diff --git a/app-xemacs/xslt-process/xslt-process-1.12.ebuild 
b/app-xemacs/xslt-process/xslt-process-1.12.ebuild
index c5e1dffafc3..a953d464d0b 100644
--- a/app-xemacs/xslt-process/xslt-process-1.12.ebuild
+++ b/app-xemacs/xslt-process/xslt-process-1.12.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="XSLT processing support"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/jde
 app-xemacs/cc-mode

diff --git a/app-xemacs/xwem/xwem-1.22.ebuild b/app-xemacs/xwem/xwem-1.22.ebuild
index f44e5c385eb..c9c1af4b1a4 100644
--- a/app-xemacs/xwem/xwem-1.22.ebuild
+++ b/app-xemacs/xwem/xwem-1.22.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="X Emacs Window Manager"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xlib

diff --git a/app-xemacs/xwem/xwem-1.23.ebuild b/app-xemacs/xwem/xwem-1.23.ebuild
index f44e5c385eb..c9c1af4b1a4 100644
--- a/app-xemacs/xwem/xwem-1.23.ebuild
+++ b/app-xemacs/xwem/xwem-1.23.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="X Emacs Window Manager"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND="app-xemacs/xemacs-base
 app-xemacs/xlib

diff --git a/app-xemacs/zenirc/zenirc-1.16.ebuild 
b/app-xemacs/zenirc/zenirc-1.16.ebuild
index 457fdd8e534..7400914433d 100644
--- a/app-xemacs/zenirc/zenirc-1.16.ebuild
+++ b/app-xemacs/zenirc/zenirc-1.16.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 SLOT="0"
-IUSE=""
 DESCRIPTION="ZENIRC IRC Client"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
 
 RDEPEND=""
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"