summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2017-04-03 20:59:47 +0200
committerUlrich Müller <ulm@gentoo.org>2017-04-03 20:59:47 +0200
commitb254aeed74b27a448dca1e7574ae95b05a8e593b (patch)
tree0cd6ae2b2171f0e7e42ae7d9e928871e156e01dd
parentxemacs-packages.eclass: Remove. (diff)
downloademacs-b254aeed74b27a448dca1e7574ae95b05a8e593b.tar.gz
emacs-b254aeed74b27a448dca1e7574ae95b05a8e593b.tar.bz2
emacs-b254aeed74b27a448dca1e7574ae95b05a8e593b.zip
app-xemacs: Bump all ebuilds inheriting xemacs-packages.eclass to EAPI 6.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
-rw-r--r--app-xemacs/ada/ada-1.16.ebuild9
-rw-r--r--app-xemacs/apel/apel-1.36.ebuild9
-rw-r--r--app-xemacs/auctex/auctex-1.56.ebuild9
-rw-r--r--app-xemacs/bbdb/bbdb-1.34.ebuild9
-rw-r--r--app-xemacs/build/build-1.18.ebuild9
-rw-r--r--app-xemacs/c-support/c-support-1.24.ebuild9
-rw-r--r--app-xemacs/calc/calc-1.28.ebuild9
-rw-r--r--app-xemacs/calendar/calendar-1.40.ebuild9
-rw-r--r--app-xemacs/calendar/calendar-1.41.ebuild9
-rw-r--r--app-xemacs/cc-mode/cc-mode-1.99.ebuild9
-rw-r--r--app-xemacs/cedet-common/cedet-common-1.03.ebuild9
-rw-r--r--app-xemacs/clearcase/clearcase-1.12.ebuild9
-rw-r--r--app-xemacs/cogre/cogre-1.04.ebuild9
-rw-r--r--app-xemacs/cookie/cookie-1.17.ebuild9
-rw-r--r--app-xemacs/crisp/crisp-1.17.ebuild9
-rw-r--r--app-xemacs/debug/debug-1.20.ebuild9
-rw-r--r--app-xemacs/dictionary/dictionary-1.18.ebuild9
-rw-r--r--app-xemacs/dired/dired-1.22.ebuild9
-rw-r--r--app-xemacs/docbookide/docbookide-0.10.ebuild9
-rw-r--r--app-xemacs/easypg/easypg-1.05.ebuild9
-rw-r--r--app-xemacs/ecb/ecb-1.25.ebuild9
-rw-r--r--app-xemacs/ecrypto/ecrypto-0.23.ebuild9
-rw-r--r--app-xemacs/ede/ede-1.06.ebuild9
-rw-r--r--app-xemacs/edebug/edebug-1.24.ebuild9
-rw-r--r--app-xemacs/edict/edict-1.19.ebuild9
-rw-r--r--app-xemacs/ediff/ediff-1.82.ebuild9
-rw-r--r--app-xemacs/ediff/ediff-1.84.ebuild9
-rw-r--r--app-xemacs/edit-utils/edit-utils-2.57.ebuild9
-rw-r--r--app-xemacs/edt/edt-1.16.ebuild9
-rw-r--r--app-xemacs/efs/efs-1.35.ebuild9
-rw-r--r--app-xemacs/efs/efs-1.37.ebuild9
-rw-r--r--app-xemacs/egg-its/egg-its-1.29.ebuild9
-rw-r--r--app-xemacs/eieio/eieio-1.09.ebuild9
-rw-r--r--app-xemacs/elib/elib-1.15.ebuild9
-rw-r--r--app-xemacs/emerge/emerge-1.13.ebuild9
-rw-r--r--app-xemacs/erc/erc-0.24.ebuild9
-rw-r--r--app-xemacs/erc/erc-0.26.ebuild9
-rw-r--r--app-xemacs/escreen/escreen-1.03.ebuild9
-rw-r--r--app-xemacs/eshell/eshell-1.20.ebuild9
-rw-r--r--app-xemacs/ess/ess-1.18.ebuild9
-rw-r--r--app-xemacs/eudc/eudc-1.41.ebuild9
-rw-r--r--app-xemacs/eudc/eudc-1.43.ebuild9
-rw-r--r--app-xemacs/footnote/footnote-1.18.ebuild9
-rw-r--r--app-xemacs/forms/forms-1.17.ebuild9
-rw-r--r--app-xemacs/fortran-modes/fortran-modes-1.07.ebuild9
-rw-r--r--app-xemacs/frame-icon/frame-icon-1.13.ebuild9
-rw-r--r--app-xemacs/fsf-compat/fsf-compat-1.24.ebuild9
-rw-r--r--app-xemacs/games/games-1.21.ebuild9
-rw-r--r--app-xemacs/games/games-1.23.ebuild9
-rw-r--r--app-xemacs/general-docs/general-docs-1.10.ebuild9
-rw-r--r--app-xemacs/gnats/gnats-1.19.ebuild9
-rw-r--r--app-xemacs/gnus/gnus-2.03.ebuild9
-rw-r--r--app-xemacs/guided-tour/guided-tour-0.54.ebuild9
-rw-r--r--app-xemacs/haskell-mode/haskell-mode-1.12.ebuild9
-rw-r--r--app-xemacs/haskell-mode/haskell-mode-1.14.ebuild9
-rw-r--r--app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild9
-rw-r--r--app-xemacs/hyperbole/hyperbole-1.20.ebuild9
-rw-r--r--app-xemacs/hyperbole/hyperbole-1.22.ebuild9
-rw-r--r--app-xemacs/ibuffer/ibuffer-1.12.ebuild9
-rw-r--r--app-xemacs/idlwave/idlwave-1.34.ebuild9
-rw-r--r--app-xemacs/igrep/igrep-1.18.ebuild9
-rw-r--r--app-xemacs/ilisp/ilisp-1.38.ebuild9
-rw-r--r--app-xemacs/jde/jde-1.54.ebuild9
-rw-r--r--app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild9
-rw-r--r--app-xemacs/latin-unity/latin-unity-1.22.ebuild9
-rw-r--r--app-xemacs/latin-unity/latin-unity-1.23.ebuild9
-rw-r--r--app-xemacs/leim/leim-1.36.ebuild9
-rw-r--r--app-xemacs/leim/leim-1.37.ebuild9
-rw-r--r--app-xemacs/leim/leim-1.38.ebuild9
-rw-r--r--app-xemacs/locale/locale-1.30.ebuild9
-rw-r--r--app-xemacs/lookup/lookup-1.17.ebuild9
-rw-r--r--app-xemacs/mail-lib/mail-lib-1.83.ebuild9
-rw-r--r--app-xemacs/mailcrypt/mailcrypt-2.16.ebuild9
-rw-r--r--app-xemacs/mew/mew-1.22.ebuild9
-rw-r--r--app-xemacs/mh-e/mh-e-1.33.ebuild9
-rw-r--r--app-xemacs/mh-e/mh-e-1.35.ebuild9
-rw-r--r--app-xemacs/mine/mine-1.18.ebuild9
-rw-r--r--app-xemacs/misc-games/misc-games-1.23.ebuild9
-rw-r--r--app-xemacs/misc-games/misc-games-1.25.ebuild9
-rw-r--r--app-xemacs/mmm-mode/mmm-mode-1.06.ebuild9
-rw-r--r--app-xemacs/mmm-mode/mmm-mode-1.08.ebuild9
-rw-r--r--app-xemacs/mule-base/mule-base-1.59.ebuild9
-rw-r--r--app-xemacs/mule-base/mule-base-1.60.ebuild9
-rw-r--r--app-xemacs/mule-ucs/mule-ucs-1.20.ebuild9
-rw-r--r--app-xemacs/mule-ucs/mule-ucs-1.21.ebuild9
-rw-r--r--app-xemacs/net-utils/net-utils-1.60.ebuild9
-rw-r--r--app-xemacs/net-utils/net-utils-1.61.ebuild9
-rw-r--r--app-xemacs/ocaml/ocaml-0.10.ebuild9
-rw-r--r--app-xemacs/oo-browser/oo-browser-1.07.ebuild9
-rw-r--r--app-xemacs/os-utils/os-utils-1.42.ebuild9
-rw-r--r--app-xemacs/os-utils/os-utils-1.44.ebuild9
-rw-r--r--app-xemacs/pc/pc-1.30.ebuild9
-rw-r--r--app-xemacs/pcl-cvs/pcl-cvs-1.71.ebuild9
-rw-r--r--app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild9
-rw-r--r--app-xemacs/pcomplete/pcomplete-1.08.ebuild9
-rw-r--r--app-xemacs/perl-modes/perl-modes-1.16.ebuild9
-rw-r--r--app-xemacs/pgg/pgg-1.08.ebuild9
-rw-r--r--app-xemacs/pgg/pgg-1.10.ebuild9
-rw-r--r--app-xemacs/prog-modes/prog-modes-2.32.ebuild9
-rw-r--r--app-xemacs/ps-print/ps-print-1.14.ebuild9
-rw-r--r--app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild9
-rw-r--r--app-xemacs/psgml/psgml-1.49.ebuild9
-rw-r--r--app-xemacs/python-modes/python-modes-1.16.ebuild9
-rw-r--r--app-xemacs/re-builder/re-builder-1.07.ebuild9
-rw-r--r--app-xemacs/reftex/reftex-1.36.ebuild9
-rw-r--r--app-xemacs/riece/riece-1.26.ebuild9
-rw-r--r--app-xemacs/rmail/rmail-1.16.ebuild9
-rw-r--r--app-xemacs/ruby-modes/ruby-modes-1.05.ebuild9
-rw-r--r--app-xemacs/ruby-modes/ruby-modes-1.07.ebuild9
-rw-r--r--app-xemacs/sasl/sasl-1.18.ebuild9
-rw-r--r--app-xemacs/scheme/scheme-1.19.ebuild9
-rw-r--r--app-xemacs/scheme/scheme-1.22.ebuild9
-rw-r--r--app-xemacs/semantic/semantic-1.23.ebuild9
-rw-r--r--app-xemacs/sgml/sgml-1.13.ebuild9
-rw-r--r--app-xemacs/sh-script/sh-script-1.26.ebuild9
-rw-r--r--app-xemacs/sieve/sieve-1.20.ebuild9
-rw-r--r--app-xemacs/skk/skk-1.27.ebuild9
-rw-r--r--app-xemacs/slider/slider-1.18.ebuild9
-rw-r--r--app-xemacs/sml-mode/sml-mode-0.14.ebuild9
-rw-r--r--app-xemacs/sounds-au/sounds-au-1.14.ebuild9
-rw-r--r--app-xemacs/sounds-wav/sounds-wav-1.14.ebuild9
-rw-r--r--app-xemacs/speedbar/speedbar-1.30.ebuild9
-rw-r--r--app-xemacs/speedbar/speedbar-1.32.ebuild9
-rw-r--r--app-xemacs/strokes/strokes-1.12.ebuild9
-rw-r--r--app-xemacs/sun/sun-1.17.ebuild9
-rw-r--r--app-xemacs/sun/sun-1.19.ebuild9
-rw-r--r--app-xemacs/supercite/supercite-1.23.ebuild9
-rw-r--r--app-xemacs/texinfo/texinfo-1.32.ebuild9
-rw-r--r--app-xemacs/text-modes/text-modes-2.01.ebuild9
-rw-r--r--app-xemacs/text-modes/text-modes-2.05.ebuild9
-rw-r--r--app-xemacs/textools/textools-1.17.ebuild9
-rw-r--r--app-xemacs/time/time-1.16.ebuild9
-rw-r--r--app-xemacs/tm/tm-1.42.ebuild9
-rw-r--r--app-xemacs/tooltalk/tooltalk-1.17.ebuild9
-rw-r--r--app-xemacs/tpu/tpu-1.16.ebuild9
-rw-r--r--app-xemacs/tramp/tramp-1.57.ebuild9
-rw-r--r--app-xemacs/vc-cc/vc-cc-1.24.ebuild9
-rw-r--r--app-xemacs/vc/vc-1.50.ebuild9
-rw-r--r--app-xemacs/vhdl/vhdl-1.24.ebuild9
-rw-r--r--app-xemacs/view-process/view-process-1.15.ebuild9
-rw-r--r--app-xemacs/viper/viper-1.69.ebuild9
-rw-r--r--app-xemacs/vm/vm-8.11.ebuild9
-rw-r--r--app-xemacs/w3/w3-1.38.ebuild9
-rw-r--r--app-xemacs/w3/w3-1.41.ebuild9
-rw-r--r--app-xemacs/x-symbol/x-symbol-1.13.ebuild9
-rw-r--r--app-xemacs/x-symbol/x-symbol-1.16.ebuild9
-rw-r--r--app-xemacs/xemacs-base/xemacs-base-2.45.ebuild9
-rw-r--r--app-xemacs/xemacs-devel/xemacs-devel-1.82.ebuild9
-rw-r--r--app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild9
-rw-r--r--app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild9
-rw-r--r--app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild9
-rw-r--r--app-xemacs/xetla/xetla-1.04.ebuild9
-rw-r--r--app-xemacs/xlib/xlib-1.16.ebuild9
-rw-r--r--app-xemacs/xslide/xslide-1.11.ebuild9
-rw-r--r--app-xemacs/xslt-process/xslt-process-1.14.ebuild9
-rw-r--r--app-xemacs/xwem/xwem-1.25.ebuild9
-rw-r--r--app-xemacs/zenirc/zenirc-1.18.ebuild9
157 files changed, 628 insertions, 785 deletions
diff --git a/app-xemacs/ada/ada-1.16.ebuild b/app-xemacs/ada/ada-1.16.ebuild
index a3030aa..23369b9 100644
--- a/app-xemacs/ada/ada-1.16.ebuild
+++ b/app-xemacs/ada/ada-1.16.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Ada language support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/apel/apel-1.36.ebuild b/app-xemacs/apel/apel-1.36.ebuild
index f8d0b73..102962c 100644
--- a/app-xemacs/apel/apel-1.36.ebuild
+++ b/app-xemacs/apel/apel-1.36.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="A Portable Emacs Library. Used by XEmacs MIME support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/fsf-compat
app-xemacs/xemacs-base
diff --git a/app-xemacs/auctex/auctex-1.56.ebuild b/app-xemacs/auctex/auctex-1.56.ebuild
index d4f4b44..3080afb 100644
--- a/app-xemacs/auctex/auctex-1.56.ebuild
+++ b/app-xemacs/auctex/auctex-1.56.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Basic TeX/LaTeX support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/texinfo
diff --git a/app-xemacs/bbdb/bbdb-1.34.ebuild b/app-xemacs/bbdb/bbdb-1.34.ebuild
index 2d4ec16..f49a6af 100644
--- a/app-xemacs/bbdb/bbdb-1.34.ebuild
+++ b/app-xemacs/bbdb/bbdb-1.34.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="The Big Brother Data Base"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/edit-utils
app-xemacs/gnus
diff --git a/app-xemacs/build/build-1.18.ebuild b/app-xemacs/build/build-1.18.ebuild
index 708e61c..5ea2a09 100644
--- a/app-xemacs/build/build-1.18.ebuild
+++ b/app-xemacs/build/build-1.18.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Build XEmacs from within (UNIX, Windows)."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/pcl-cvs
diff --git a/app-xemacs/c-support/c-support-1.24.ebuild b/app-xemacs/c-support/c-support-1.24.ebuild
index 35e5f5a..336a6af 100644
--- a/app-xemacs/c-support/c-support-1.24.ebuild
+++ b/app-xemacs/c-support/c-support-1.24.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Basic single-file add-ons for editing C code."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/cc-mode
app-xemacs/xemacs-base
diff --git a/app-xemacs/calc/calc-1.28.ebuild b/app-xemacs/calc/calc-1.28.ebuild
index 4dff7cf..92ed8fe 100644
--- a/app-xemacs/calc/calc-1.28.ebuild
+++ b/app-xemacs/calc/calc-1.28.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Emacs calculator"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/calendar/calendar-1.40.ebuild b/app-xemacs/calendar/calendar-1.40.ebuild
index 71d9337..98efda4 100644
--- a/app-xemacs/calendar/calendar-1.40.ebuild
+++ b/app-xemacs/calendar/calendar-1.40.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Calendar and diary support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/fsf-compat
diff --git a/app-xemacs/calendar/calendar-1.41.ebuild b/app-xemacs/calendar/calendar-1.41.ebuild
index 71d9337..98efda4 100644
--- a/app-xemacs/calendar/calendar-1.41.ebuild
+++ b/app-xemacs/calendar/calendar-1.41.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Calendar and diary support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/fsf-compat
diff --git a/app-xemacs/cc-mode/cc-mode-1.99.ebuild b/app-xemacs/cc-mode/cc-mode-1.99.ebuild
index 4339133..817a181 100644
--- a/app-xemacs/cc-mode/cc-mode-1.99.ebuild
+++ b/app-xemacs/cc-mode/cc-mode-1.99.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="C, C++ and Java language support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/mail-lib
diff --git a/app-xemacs/cedet-common/cedet-common-1.03.ebuild b/app-xemacs/cedet-common/cedet-common-1.03.ebuild
index c2fb803..9fa51be 100644
--- a/app-xemacs/cedet-common/cedet-common-1.03.ebuild
+++ b/app-xemacs/cedet-common/cedet-common-1.03.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Common files for CEDET development environment."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/edebug
diff --git a/app-xemacs/clearcase/clearcase-1.12.ebuild b/app-xemacs/clearcase/clearcase-1.12.ebuild
index 7fc13c0..02e22e4 100644
--- a/app-xemacs/clearcase/clearcase-1.12.ebuild
+++ b/app-xemacs/clearcase/clearcase-1.12.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="New Clearcase Version Control for XEmacs (UNIX, Windows)."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/dired
app-xemacs/mail-lib
diff --git a/app-xemacs/cogre/cogre-1.04.ebuild b/app-xemacs/cogre/cogre-1.04.ebuild
index 14fddd8..06903ef 100644
--- a/app-xemacs/cogre/cogre-1.04.ebuild
+++ b/app-xemacs/cogre/cogre-1.04.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Graph editing mode."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/edebug
diff --git a/app-xemacs/cookie/cookie-1.17.ebuild b/app-xemacs/cookie/cookie-1.17.ebuild
index b07cbf8..5ca1da5 100644
--- a/app-xemacs/cookie/cookie-1.17.ebuild
+++ b/app-xemacs/cookie/cookie-1.17.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Spook and Yow (Zippy quotes)."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/crisp/crisp-1.17.ebuild b/app-xemacs/crisp/crisp-1.17.ebuild
index 4904e7b..d58961b 100644
--- a/app-xemacs/crisp/crisp-1.17.ebuild
+++ b/app-xemacs/crisp/crisp-1.17.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Crisp/Brief emulation."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-xemacs/debug/debug-1.20.ebuild b/app-xemacs/debug/debug-1.20.ebuild
index 3cedd32..380c3d6 100644
--- a/app-xemacs/debug/debug-1.20.ebuild
+++ b/app-xemacs/debug/debug-1.20.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="GUD, gdb, dbx debugging support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/dictionary/dictionary-1.18.ebuild b/app-xemacs/dictionary/dictionary-1.18.ebuild
index 1e7869b..7faad35 100644
--- a/app-xemacs/dictionary/dictionary-1.18.ebuild
+++ b/app-xemacs/dictionary/dictionary-1.18.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Interface to RFC2229 dictionary servers."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/dired/dired-1.22.ebuild b/app-xemacs/dired/dired-1.22.ebuild
index 8a57808..3d58101 100644
--- a/app-xemacs/dired/dired-1.22.ebuild
+++ b/app-xemacs/dired/dired-1.22.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Manage file systems."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/prog-modes
diff --git a/app-xemacs/docbookide/docbookide-0.10.ebuild b/app-xemacs/docbookide/docbookide-0.10.ebuild
index b5c20ca..3969fa8 100644
--- a/app-xemacs/docbookide/docbookide-0.10.ebuild
+++ b/app-xemacs/docbookide/docbookide-0.10.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="DocBook editing support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/xemacs-ispell
diff --git a/app-xemacs/easypg/easypg-1.05.ebuild b/app-xemacs/easypg/easypg-1.05.ebuild
index aec0bd3..b0a365b 100644
--- a/app-xemacs/easypg/easypg-1.05.ebuild
+++ b/app-xemacs/easypg/easypg-1.05.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="GnuPG interface for Emacs."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/dired
diff --git a/app-xemacs/ecb/ecb-1.25.ebuild b/app-xemacs/ecb/ecb-1.25.ebuild
index 8d2679d..02ad717 100644
--- a/app-xemacs/ecb/ecb-1.25.ebuild
+++ b/app-xemacs/ecb/ecb-1.25.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Emacs source code browser."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/semantic
diff --git a/app-xemacs/ecrypto/ecrypto-0.23.ebuild b/app-xemacs/ecrypto/ecrypto-0.23.ebuild
index 0198e2e..0c0851c 100644
--- a/app-xemacs/ecrypto/ecrypto-0.23.ebuild
+++ b/app-xemacs/ecrypto/ecrypto-0.23.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Crypto functionality in Emacs Lisp."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/ede/ede-1.06.ebuild b/app-xemacs/ede/ede-1.06.ebuild
index 76473ec..0e840a1 100644
--- a/app-xemacs/ede/ede-1.06.ebuild
+++ b/app-xemacs/ede/ede-1.06.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Emacs Development Environment."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-xemacs/edebug/edebug-1.24.ebuild b/app-xemacs/edebug/edebug-1.24.ebuild
index ec0125b..4c864a2 100644
--- a/app-xemacs/edebug/edebug-1.24.ebuild
+++ b/app-xemacs/edebug/edebug-1.24.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="An Emacs Lisp debugger."
-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/edict/edict-1.19.ebuild b/app-xemacs/edict/edict-1.19.ebuild
index eb139ef..772505c 100644
--- a/app-xemacs/edict/edict-1.19.ebuild
+++ b/app-xemacs/edict/edict-1.19.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="MULE: Lisp Interface to EDICT, Kanji Dictionary"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/mule-base
app-xemacs/xemacs-base
diff --git a/app-xemacs/ediff/ediff-1.82.ebuild b/app-xemacs/ediff/ediff-1.82.ebuild
index 47d8606..c9f6d06 100644
--- a/app-xemacs/ediff/ediff-1.82.ebuild
+++ b/app-xemacs/ediff/ediff-1.82.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Interface over GNU patch."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/pcl-cvs
app-xemacs/elib
diff --git a/app-xemacs/ediff/ediff-1.84.ebuild b/app-xemacs/ediff/ediff-1.84.ebuild
index 1e4d097..c9f6d06 100644
--- a/app-xemacs/ediff/ediff-1.84.ebuild
+++ b/app-xemacs/ediff/ediff-1.84.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Interface over GNU patch."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/pcl-cvs
app-xemacs/elib
diff --git a/app-xemacs/edit-utils/edit-utils-2.57.ebuild b/app-xemacs/edit-utils/edit-utils-2.57.ebuild
index f2096d9..0fa83a8 100644
--- a/app-xemacs/edit-utils/edit-utils-2.57.ebuild
+++ b/app-xemacs/edit-utils/edit-utils-2.57.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+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.16.ebuild b/app-xemacs/edt/edt-1.16.ebuild
index 909f1f6..e98c253 100644
--- a/app-xemacs/edt/edt-1.16.ebuild
+++ b/app-xemacs/edt/edt-1.16.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="DEC EDIT/EDT emulation."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/efs/efs-1.35.ebuild b/app-xemacs/efs/efs-1.35.ebuild
index 8b9d961..5fb8a70 100644
--- a/app-xemacs/efs/efs-1.35.ebuild
+++ b/app-xemacs/efs/efs-1.35.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Treat files on remote systems the same as local files."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/dired
diff --git a/app-xemacs/efs/efs-1.37.ebuild b/app-xemacs/efs/efs-1.37.ebuild
index d96bab6..5fb8a70 100644
--- a/app-xemacs/efs/efs-1.37.ebuild
+++ b/app-xemacs/efs/efs-1.37.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Treat files on remote systems the same as local files."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/dired
diff --git a/app-xemacs/egg-its/egg-its-1.29.ebuild b/app-xemacs/egg-its/egg-its-1.29.ebuild
index 130e2a8..c994b03 100644
--- a/app-xemacs/egg-its/egg-its-1.29.ebuild
+++ b/app-xemacs/egg-its/egg-its-1.29.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="MULE: Wnn (4.2 and 6) support. SJ3 support."
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/leim
app-xemacs/mule-base
diff --git a/app-xemacs/eieio/eieio-1.09.ebuild b/app-xemacs/eieio/eieio-1.09.ebuild
index 491734c..d89e9ae 100644
--- a/app-xemacs/eieio/eieio-1.09.ebuild
+++ b/app-xemacs/eieio/eieio-1.09.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Enhanced Implementation of Emacs Interpreted Objects"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/edebug
diff --git a/app-xemacs/elib/elib-1.15.ebuild b/app-xemacs/elib/elib-1.15.ebuild
index 49dfd92..71771c1 100644
--- a/app-xemacs/elib/elib-1.15.ebuild
+++ b/app-xemacs/elib/elib-1.15.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Portable Emacs Lisp utilities library."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/emerge/emerge-1.13.ebuild b/app-xemacs/emerge/emerge-1.13.ebuild
index e0bb89f..395ea77 100644
--- a/app-xemacs/emerge/emerge-1.13.ebuild
+++ b/app-xemacs/emerge/emerge-1.13.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Another interface over GNU patch."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-xemacs/erc/erc-0.24.ebuild b/app-xemacs/erc/erc-0.24.ebuild
index 1ac845c..f7fef91 100644
--- a/app-xemacs/erc/erc-0.24.ebuild
+++ b/app-xemacs/erc/erc-0.24.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="ERC - The Emacs IRC Client."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/edit-utils
app-xemacs/fsf-compat
diff --git a/app-xemacs/erc/erc-0.26.ebuild b/app-xemacs/erc/erc-0.26.ebuild
index 252582c..f7fef91 100644
--- a/app-xemacs/erc/erc-0.26.ebuild
+++ b/app-xemacs/erc/erc-0.26.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="ERC - The Emacs IRC Client."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/edit-utils
app-xemacs/fsf-compat
diff --git a/app-xemacs/escreen/escreen-1.03.ebuild b/app-xemacs/escreen/escreen-1.03.ebuild
index 6be553d..f830e52 100644
--- a/app-xemacs/escreen/escreen-1.03.ebuild
+++ b/app-xemacs/escreen/escreen-1.03.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Multiple editing sessions withing a single frame (like screen).."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/eshell/eshell-1.20.ebuild b/app-xemacs/eshell/eshell-1.20.ebuild
index 48fdb49..da6d884 100644
--- a/app-xemacs/eshell/eshell-1.20.ebuild
+++ b/app-xemacs/eshell/eshell-1.20.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Command shell implemented entirely in Emacs Lisp"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/xemacs-eterm
diff --git a/app-xemacs/ess/ess-1.18.ebuild b/app-xemacs/ess/ess-1.18.ebuild
index 82452af..ad0d9b6 100644
--- a/app-xemacs/ess/ess-1.18.ebuild
+++ b/app-xemacs/ess/ess-1.18.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="ESS: Emacs Speaks Statistics."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/mail-lib
diff --git a/app-xemacs/eudc/eudc-1.41.ebuild b/app-xemacs/eudc/eudc-1.41.ebuild
index 898be54..ba49704 100644
--- a/app-xemacs/eudc/eudc-1.41.ebuild
+++ b/app-xemacs/eudc/eudc-1.41.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Emacs Unified Directory Client (LDAP, PH)."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/fsf-compat
app-xemacs/xemacs-base
diff --git a/app-xemacs/eudc/eudc-1.43.ebuild b/app-xemacs/eudc/eudc-1.43.ebuild
index 58c7c7c..ba49704 100644
--- a/app-xemacs/eudc/eudc-1.43.ebuild
+++ b/app-xemacs/eudc/eudc-1.43.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Emacs Unified Directory Client (LDAP, PH)."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/fsf-compat
app-xemacs/xemacs-base
diff --git a/app-xemacs/footnote/footnote-1.18.ebuild b/app-xemacs/footnote/footnote-1.18.ebuild
index 92d5926..28cf3ed 100644
--- a/app-xemacs/footnote/footnote-1.18.ebuild
+++ b/app-xemacs/footnote/footnote-1.18.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Footnoting in mail message editing modes."
-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/forms/forms-1.17.ebuild b/app-xemacs/forms/forms-1.17.ebuild
index 92e7558..5f5b3e6 100644
--- a/app-xemacs/forms/forms-1.17.ebuild
+++ b/app-xemacs/forms/forms-1.17.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Forms editing support (obsolete, use Widget instead)."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild b/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild
index dabb655..9c5a16d 100644
--- a/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild
+++ b/app-xemacs/fortran-modes/fortran-modes-1.07.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Fortran support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/frame-icon/frame-icon-1.13.ebuild b/app-xemacs/frame-icon/frame-icon-1.13.ebuild
index 6e7873e..fda4941 100644
--- a/app-xemacs/frame-icon/frame-icon-1.13.ebuild
+++ b/app-xemacs/frame-icon/frame-icon-1.13.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Set up mode-specific icons for each frame under XEmacs"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild b/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild
index 59f9c02..32ae760 100644
--- a/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild
+++ b/app-xemacs/fsf-compat/fsf-compat-1.24.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="FSF Emacs compatibility files."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
diff --git a/app-xemacs/games/games-1.21.ebuild b/app-xemacs/games/games-1.21.ebuild
index 6f02d99..441a71d 100644
--- a/app-xemacs/games/games-1.21.ebuild
+++ b/app-xemacs/games/games-1.21.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Tetris, Sokoban, and Snake."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/games/games-1.23.ebuild b/app-xemacs/games/games-1.23.ebuild
index e524e9c..441a71d 100644
--- a/app-xemacs/games/games-1.23.ebuild
+++ b/app-xemacs/games/games-1.23.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Tetris, Sokoban, and Snake."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/general-docs/general-docs-1.10.ebuild b/app-xemacs/general-docs/general-docs-1.10.ebuild
index aded3d9..589507b 100644
--- a/app-xemacs/general-docs/general-docs-1.10.ebuild
+++ b/app-xemacs/general-docs/general-docs-1.10.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="General XEmacs documentation."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND=""
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-xemacs/gnats/gnats-1.19.ebuild b/app-xemacs/gnats/gnats-1.19.ebuild
index 742872d..be742de 100644
--- a/app-xemacs/gnats/gnats-1.19.ebuild
+++ b/app-xemacs/gnats/gnats-1.19.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="XEmacs bug reports."
-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/gnus/gnus-2.03.ebuild b/app-xemacs/gnus/gnus-2.03.ebuild
index 54f9c83..32c46ee 100644
--- a/app-xemacs/gnus/gnus-2.03.ebuild
+++ b/app-xemacs/gnus/gnus-2.03.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+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.54.ebuild b/app-xemacs/guided-tour/guided-tour-0.54.ebuild
index 27b155d..1459ecf 100644
--- a/app-xemacs/guided-tour/guided-tour-0.54.ebuild
+++ b/app-xemacs/guided-tour/guided-tour-0.54.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Phil Sung's Guided Tour of Emacs."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
KEYWORDS="~amd64 ~x86"
diff --git a/app-xemacs/haskell-mode/haskell-mode-1.12.ebuild b/app-xemacs/haskell-mode/haskell-mode-1.12.ebuild
index acd78e3..d0c090d 100644
--- a/app-xemacs/haskell-mode/haskell-mode-1.12.ebuild
+++ b/app-xemacs/haskell-mode/haskell-mode-1.12.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Haskell editing support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/dired
app-xemacs/mail-lib
diff --git a/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild b/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild
index 60ed10e..d0c090d 100644
--- a/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild
+++ b/app-xemacs/haskell-mode/haskell-mode-1.14.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Haskell editing support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/dired
app-xemacs/mail-lib
diff --git a/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild b/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild
index c71f667..a1036da 100644
--- a/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild
+++ b/app-xemacs/hm-html-menus/hm-html-menus-1.26.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="HTML editing."
SRC_URI="http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/hm--html-menus-${PV}-pkg.tar.gz"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-#EXPERIMENTAL=true
+#XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/dired
app-xemacs/xemacs-base
diff --git a/app-xemacs/hyperbole/hyperbole-1.20.ebuild b/app-xemacs/hyperbole/hyperbole-1.20.ebuild
index 09399c6..1961328 100644
--- a/app-xemacs/hyperbole/hyperbole-1.20.ebuild
+++ b/app-xemacs/hyperbole/hyperbole-1.20.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Hyperbole: The Everyday Info Manager."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/mail-lib
diff --git a/app-xemacs/hyperbole/hyperbole-1.22.ebuild b/app-xemacs/hyperbole/hyperbole-1.22.ebuild
index 00b20e6..8108bcd 100644
--- a/app-xemacs/hyperbole/hyperbole-1.22.ebuild
+++ b/app-xemacs/hyperbole/hyperbole-1.22.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Hyperbole: The Everyday Info Manager."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
LICENSE="GPL-3+"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/mail-lib
diff --git a/app-xemacs/ibuffer/ibuffer-1.12.ebuild b/app-xemacs/ibuffer/ibuffer-1.12.ebuild
index 154f9f1..e22a78b 100644
--- a/app-xemacs/ibuffer/ibuffer-1.12.ebuild
+++ b/app-xemacs/ibuffer/ibuffer-1.12.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Advanced replacement for buffer-menu"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/idlwave/idlwave-1.34.ebuild b/app-xemacs/idlwave/idlwave-1.34.ebuild
index cff5d32..81ba046 100644
--- a/app-xemacs/idlwave/idlwave-1.34.ebuild
+++ b/app-xemacs/idlwave/idlwave-1.34.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Editing and Shell mode for the Interactive Data Language"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/fsf-compat
app-xemacs/xemacs-base
diff --git a/app-xemacs/igrep/igrep-1.18.ebuild b/app-xemacs/igrep/igrep-1.18.ebuild
index 502dc11..d6de362 100644
--- a/app-xemacs/igrep/igrep-1.18.ebuild
+++ b/app-xemacs/igrep/igrep-1.18.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Enhanced front-end for Grep."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/dired
app-xemacs/xemacs-base
diff --git a/app-xemacs/ilisp/ilisp-1.38.ebuild b/app-xemacs/ilisp/ilisp-1.38.ebuild
index c735469..0f93607 100644
--- a/app-xemacs/ilisp/ilisp-1.38.ebuild
+++ b/app-xemacs/ilisp/ilisp-1.38.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Front-end for Inferior Lisp."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/mail-lib
diff --git a/app-xemacs/jde/jde-1.54.ebuild b/app-xemacs/jde/jde-1.54.ebuild
index d1014e4..df2a91c 100644
--- a/app-xemacs/jde/jde-1.54.ebuild
+++ b/app-xemacs/jde/jde-1.54.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Integrated Development Environment for Java."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/cc-mode
app-xemacs/semantic
diff --git a/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild b/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild
index 9bdfdd0..1b1d2cb 100644
--- a/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild
+++ b/app-xemacs/latin-euro-standards/latin-euro-standards-1.11.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+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"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/mule-base
"
diff --git a/app-xemacs/latin-unity/latin-unity-1.22.ebuild b/app-xemacs/latin-unity/latin-unity-1.22.ebuild
index b3694f3..851c00f 100644
--- a/app-xemacs/latin-unity/latin-unity-1.22.ebuild
+++ b/app-xemacs/latin-unity/latin-unity-1.22.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="MULE: find single ISO 8859 character set to encode a buffer."
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/mule-base
app-xemacs/latin-euro-standards
diff --git a/app-xemacs/latin-unity/latin-unity-1.23.ebuild b/app-xemacs/latin-unity/latin-unity-1.23.ebuild
index b3694f3..851c00f 100644
--- a/app-xemacs/latin-unity/latin-unity-1.23.ebuild
+++ b/app-xemacs/latin-unity/latin-unity-1.23.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="MULE: find single ISO 8859 character set to encode a buffer."
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/mule-base
app-xemacs/latin-euro-standards
diff --git a/app-xemacs/leim/leim-1.36.ebuild b/app-xemacs/leim/leim-1.36.ebuild
index c5c9bb1..e777173 100644
--- a/app-xemacs/leim/leim-1.36.ebuild
+++ b/app-xemacs/leim/leim-1.36.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="MULE: Quail. All non-English and non-Japanese language support."
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/mule-base
app-xemacs/fsf-compat
diff --git a/app-xemacs/leim/leim-1.37.ebuild b/app-xemacs/leim/leim-1.37.ebuild
index c5c9bb1..e777173 100644
--- a/app-xemacs/leim/leim-1.37.ebuild
+++ b/app-xemacs/leim/leim-1.37.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="MULE: Quail. All non-English and non-Japanese language support."
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/mule-base
app-xemacs/fsf-compat
diff --git a/app-xemacs/leim/leim-1.38.ebuild b/app-xemacs/leim/leim-1.38.ebuild
index c5c9bb1..e777173 100644
--- a/app-xemacs/leim/leim-1.38.ebuild
+++ b/app-xemacs/leim/leim-1.38.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="MULE: Quail. All non-English and non-Japanese language support."
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/mule-base
app-xemacs/fsf-compat
diff --git a/app-xemacs/locale/locale-1.30.ebuild b/app-xemacs/locale/locale-1.30.ebuild
index 35c1112..4b93d7d 100644
--- a/app-xemacs/locale/locale-1.30.ebuild
+++ b/app-xemacs/locale/locale-1.30.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="MULE: Localized menubars and localized splash screens."
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/mule-base
"
diff --git a/app-xemacs/lookup/lookup-1.17.ebuild b/app-xemacs/lookup/lookup-1.17.ebuild
index 295901b..4571def 100644
--- a/app-xemacs/lookup/lookup-1.17.ebuild
+++ b/app-xemacs/lookup/lookup-1.17.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="MULE: Dictionary support"
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
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 c822152..bc72573 100644
--- a/app-xemacs/mail-lib/mail-lib-1.83.ebuild
+++ b/app-xemacs/mail-lib/mail-lib-1.83.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+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.16.ebuild b/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild
index 5ed872d..963590a 100644
--- a/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild
+++ b/app-xemacs/mailcrypt/mailcrypt-2.16.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Support for messaging encryption with PGP."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/mail-lib
app-xemacs/fsf-compat
diff --git a/app-xemacs/mew/mew-1.22.ebuild b/app-xemacs/mew/mew-1.22.ebuild
index 7051f3d..654ac05 100644
--- a/app-xemacs/mew/mew-1.22.ebuild
+++ b/app-xemacs/mew/mew-1.22.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Messaging in an Emacs World."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/w3
app-xemacs/efs
diff --git a/app-xemacs/mh-e/mh-e-1.33.ebuild b/app-xemacs/mh-e/mh-e-1.33.ebuild
index ebcc0c8..2dc8be1 100644
--- a/app-xemacs/mh-e/mh-e-1.33.ebuild
+++ b/app-xemacs/mh-e/mh-e-1.33.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Front end support for MH."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/gnus
app-xemacs/mail-lib
diff --git a/app-xemacs/mh-e/mh-e-1.35.ebuild b/app-xemacs/mh-e/mh-e-1.35.ebuild
index 33d54bf..2dc8be1 100644
--- a/app-xemacs/mh-e/mh-e-1.35.ebuild
+++ b/app-xemacs/mh-e/mh-e-1.35.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Front end support for MH."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/gnus
app-xemacs/mail-lib
diff --git a/app-xemacs/mine/mine-1.18.ebuild b/app-xemacs/mine/mine-1.18.ebuild
index ce1d277..e3259a1 100644
--- a/app-xemacs/mine/mine-1.18.ebuild
+++ b/app-xemacs/mine/mine-1.18.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Minehunt Game."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/misc-games/misc-games-1.23.ebuild b/app-xemacs/misc-games/misc-games-1.23.ebuild
index f8a4528..3f0a42d 100644
--- a/app-xemacs/misc-games/misc-games-1.23.ebuild
+++ b/app-xemacs/misc-games/misc-games-1.23.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Other amusements and diversions."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/misc-games/misc-games-1.25.ebuild b/app-xemacs/misc-games/misc-games-1.25.ebuild
index 81594da..3f0a42d 100644
--- a/app-xemacs/misc-games/misc-games-1.25.ebuild
+++ b/app-xemacs/misc-games/misc-games-1.25.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Other amusements and diversions."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/mmm-mode/mmm-mode-1.06.ebuild b/app-xemacs/mmm-mode/mmm-mode-1.06.ebuild
index 571950e..ca5d767 100644
--- a/app-xemacs/mmm-mode/mmm-mode-1.06.ebuild
+++ b/app-xemacs/mmm-mode/mmm-mode-1.06.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Multiple major modes in a single buffer"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/fsf-compat
diff --git a/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild b/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild
index 705c7a2..ca5d767 100644
--- a/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild
+++ b/app-xemacs/mmm-mode/mmm-mode-1.08.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Multiple major modes in a single buffer"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/fsf-compat
diff --git a/app-xemacs/mule-base/mule-base-1.59.ebuild b/app-xemacs/mule-base/mule-base-1.59.ebuild
index 9352aa5..33e2d7c 100644
--- a/app-xemacs/mule-base/mule-base-1.59.ebuild
+++ b/app-xemacs/mule-base/mule-base-1.59.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="MULE: Basic Mule support, required for building with Mule."
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/fsf-compat
app-xemacs/xemacs-base
diff --git a/app-xemacs/mule-base/mule-base-1.60.ebuild b/app-xemacs/mule-base/mule-base-1.60.ebuild
index 9352aa5..33e2d7c 100644
--- a/app-xemacs/mule-base/mule-base-1.60.ebuild
+++ b/app-xemacs/mule-base/mule-base-1.60.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="MULE: Basic Mule support, required for building with Mule."
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/fsf-compat
app-xemacs/xemacs-base
diff --git a/app-xemacs/mule-ucs/mule-ucs-1.20.ebuild b/app-xemacs/mule-ucs/mule-ucs-1.20.ebuild
index 23ff8db..4a4097c 100644
--- a/app-xemacs/mule-ucs/mule-ucs-1.20.ebuild
+++ b/app-xemacs/mule-ucs/mule-ucs-1.20.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="MULE: Extended coding systems (including Unicode) for XEmacs."
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/mule-base
app-xemacs/latin-euro-standards
diff --git a/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild b/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild
index 23ff8db..4a4097c 100644
--- a/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild
+++ b/app-xemacs/mule-ucs/mule-ucs-1.21.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="MULE: Extended coding systems (including Unicode) for XEmacs."
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/mule-base
app-xemacs/latin-euro-standards
diff --git a/app-xemacs/net-utils/net-utils-1.60.ebuild b/app-xemacs/net-utils/net-utils-1.60.ebuild
index c65af8a..3d0c358 100644
--- a/app-xemacs/net-utils/net-utils-1.60.ebuild
+++ b/app-xemacs/net-utils/net-utils-1.60.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Miscellaneous Networking Utilities."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/mail-lib
app-xemacs/gnus
diff --git a/app-xemacs/net-utils/net-utils-1.61.ebuild b/app-xemacs/net-utils/net-utils-1.61.ebuild
index c65af8a..3d0c358 100644
--- a/app-xemacs/net-utils/net-utils-1.61.ebuild
+++ b/app-xemacs/net-utils/net-utils-1.61.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Miscellaneous Networking Utilities."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/mail-lib
app-xemacs/gnus
diff --git a/app-xemacs/ocaml/ocaml-0.10.ebuild b/app-xemacs/ocaml/ocaml-0.10.ebuild
index 5b73e2d..871f340 100644
--- a/app-xemacs/ocaml/ocaml-0.10.ebuild
+++ b/app-xemacs/ocaml/ocaml-0.10.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Objective Caml editing support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/fsf-compat
diff --git a/app-xemacs/oo-browser/oo-browser-1.07.ebuild b/app-xemacs/oo-browser/oo-browser-1.07.ebuild
index a277bd0..c0186e8 100644
--- a/app-xemacs/oo-browser/oo-browser-1.07.ebuild
+++ b/app-xemacs/oo-browser/oo-browser-1.07.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="The Multi-Language Object-Oriented Code Browser."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/hyperbole
diff --git a/app-xemacs/os-utils/os-utils-1.42.ebuild b/app-xemacs/os-utils/os-utils-1.42.ebuild
index baebc55..946332f 100644
--- a/app-xemacs/os-utils/os-utils-1.42.ebuild
+++ b/app-xemacs/os-utils/os-utils-1.42.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Miscellaneous O/S utilities."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/os-utils/os-utils-1.44.ebuild b/app-xemacs/os-utils/os-utils-1.44.ebuild
index db7bc73..946332f 100644
--- a/app-xemacs/os-utils/os-utils-1.44.ebuild
+++ b/app-xemacs/os-utils/os-utils-1.44.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Miscellaneous O/S utilities."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/pc/pc-1.30.ebuild b/app-xemacs/pc/pc-1.30.ebuild
index f9590b5..3989ed7 100644
--- a/app-xemacs/pc/pc-1.30.ebuild
+++ b/app-xemacs/pc/pc-1.30.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="PC style interface emulation."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/pcl-cvs/pcl-cvs-1.71.ebuild b/app-xemacs/pcl-cvs/pcl-cvs-1.71.ebuild
index cdf65e8..d5464e9 100644
--- a/app-xemacs/pcl-cvs/pcl-cvs-1.71.ebuild
+++ b/app-xemacs/pcl-cvs/pcl-cvs-1.71.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="CVS frontend."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/elib
diff --git a/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild b/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild
index 0587511..d5464e9 100644
--- a/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild
+++ b/app-xemacs/pcl-cvs/pcl-cvs-1.73.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="CVS frontend."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/elib
diff --git a/app-xemacs/pcomplete/pcomplete-1.08.ebuild b/app-xemacs/pcomplete/pcomplete-1.08.ebuild
index 9956644..465da91 100644
--- a/app-xemacs/pcomplete/pcomplete-1.08.ebuild
+++ b/app-xemacs/pcomplete/pcomplete-1.08.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Provides programmatic completion."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/sh-script
app-xemacs/xemacs-base
diff --git a/app-xemacs/perl-modes/perl-modes-1.16.ebuild b/app-xemacs/perl-modes/perl-modes-1.16.ebuild
index 3706b17..ff4df47 100644
--- a/app-xemacs/perl-modes/perl-modes-1.16.ebuild
+++ b/app-xemacs/perl-modes/perl-modes-1.16.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Perl support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/xemacs-ispell
diff --git a/app-xemacs/pgg/pgg-1.08.ebuild b/app-xemacs/pgg/pgg-1.08.ebuild
index f364509..5381916 100644
--- a/app-xemacs/pgg/pgg-1.08.ebuild
+++ b/app-xemacs/pgg/pgg-1.08.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Emacs interface to various PGP implementations."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/fsf-compat
diff --git a/app-xemacs/pgg/pgg-1.10.ebuild b/app-xemacs/pgg/pgg-1.10.ebuild
index 127c168..5381916 100644
--- a/app-xemacs/pgg/pgg-1.10.ebuild
+++ b/app-xemacs/pgg/pgg-1.10.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Emacs interface to various PGP implementations."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/fsf-compat
diff --git a/app-xemacs/prog-modes/prog-modes-2.32.ebuild b/app-xemacs/prog-modes/prog-modes-2.32.ebuild
index 36d6c96..4f5756a 100644
--- a/app-xemacs/prog-modes/prog-modes-2.32.ebuild
+++ b/app-xemacs/prog-modes/prog-modes-2.32.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Support for various programming languages."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/mail-lib
app-xemacs/xemacs-devel
diff --git a/app-xemacs/ps-print/ps-print-1.14.ebuild b/app-xemacs/ps-print/ps-print-1.14.ebuild
index 3d67b56..7a2655a 100644
--- a/app-xemacs/ps-print/ps-print-1.14.ebuild
+++ b/app-xemacs/ps-print/ps-print-1.14.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Printing functions and utilities"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/text-modes
app-xemacs/xemacs-base
diff --git a/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild b/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild
index d1ee605..c2b97e0 100644
--- a/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild
+++ b/app-xemacs/psgml-dtds/psgml-dtds-1.05.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Deprecated collection of DTDs for psgml."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/psgml
diff --git a/app-xemacs/psgml/psgml-1.49.ebuild b/app-xemacs/psgml/psgml-1.49.ebuild
index 82d9358..7160045 100644
--- a/app-xemacs/psgml/psgml-1.49.ebuild
+++ b/app-xemacs/psgml/psgml-1.49.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Validated HTML/SGML editing."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/edit-utils
diff --git a/app-xemacs/python-modes/python-modes-1.16.ebuild b/app-xemacs/python-modes/python-modes-1.16.ebuild
index d8eeab9..faff2e0 100644
--- a/app-xemacs/python-modes/python-modes-1.16.ebuild
+++ b/app-xemacs/python-modes/python-modes-1.16.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Python support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/mail-lib
diff --git a/app-xemacs/re-builder/re-builder-1.07.ebuild b/app-xemacs/re-builder/re-builder-1.07.ebuild
index 11453b5..6eda64a 100644
--- a/app-xemacs/re-builder/re-builder-1.07.ebuild
+++ b/app-xemacs/re-builder/re-builder-1.07.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Interactive development tool for regular expressions."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND=""
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-xemacs/reftex/reftex-1.36.ebuild b/app-xemacs/reftex/reftex-1.36.ebuild
index deac1f4..3a4aa52 100644
--- a/app-xemacs/reftex/reftex-1.36.ebuild
+++ b/app-xemacs/reftex/reftex-1.36.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Emacs support for LaTeX cross-references, citations.."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/riece/riece-1.26.ebuild b/app-xemacs/riece/riece-1.26.ebuild
index 8643bc8..1198959 100644
--- a/app-xemacs/riece/riece-1.26.ebuild
+++ b/app-xemacs/riece/riece-1.26.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="IRC client for Emacs."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/mail-lib
diff --git a/app-xemacs/rmail/rmail-1.16.ebuild b/app-xemacs/rmail/rmail-1.16.ebuild
index 0570222..46aa596 100644
--- a/app-xemacs/rmail/rmail-1.16.ebuild
+++ b/app-xemacs/rmail/rmail-1.16.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="An obsolete Emacs mailer."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/tm
app-xemacs/apel
app-xemacs/mail-lib
diff --git a/app-xemacs/ruby-modes/ruby-modes-1.05.ebuild b/app-xemacs/ruby-modes/ruby-modes-1.05.ebuild
index 347d021..9b2ad98 100644
--- a/app-xemacs/ruby-modes/ruby-modes-1.05.ebuild
+++ b/app-xemacs/ruby-modes/ruby-modes-1.05.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Ruby support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/debug
diff --git a/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild b/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild
index a32a2f8..9b2ad98 100644
--- a/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild
+++ b/app-xemacs/ruby-modes/ruby-modes-1.07.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Ruby support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/debug
diff --git a/app-xemacs/sasl/sasl-1.18.ebuild b/app-xemacs/sasl/sasl-1.18.ebuild
index c319b7a..a687280 100644
--- a/app-xemacs/sasl/sasl-1.18.ebuild
+++ b/app-xemacs/sasl/sasl-1.18.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Simple Authentication and Security Layer (SASL) library."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/ecrypto
"
diff --git a/app-xemacs/scheme/scheme-1.19.ebuild b/app-xemacs/scheme/scheme-1.19.ebuild
index 40005a3..1bf0037 100644
--- a/app-xemacs/scheme/scheme-1.19.ebuild
+++ b/app-xemacs/scheme/scheme-1.19.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Front-end support for Inferior Scheme."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/scheme/scheme-1.22.ebuild b/app-xemacs/scheme/scheme-1.22.ebuild
index 9de35a0..1bf0037 100644
--- a/app-xemacs/scheme/scheme-1.22.ebuild
+++ b/app-xemacs/scheme/scheme-1.22.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Front-end support for Inferior Scheme."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/semantic/semantic-1.23.ebuild b/app-xemacs/semantic/semantic-1.23.ebuild
index c5d1fe5..d63e6f3 100644
--- a/app-xemacs/semantic/semantic-1.23.ebuild
+++ b/app-xemacs/semantic/semantic-1.23.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Semantic bovinator (Yacc/Lex for XEmacs). Includes Senator."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/ede
app-xemacs/cedet-common
diff --git a/app-xemacs/sgml/sgml-1.13.ebuild b/app-xemacs/sgml/sgml-1.13.ebuild
index 1a56438..99d7548 100644
--- a/app-xemacs/sgml/sgml-1.13.ebuild
+++ b/app-xemacs/sgml/sgml-1.13.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="SGML/Linuxdoc-SGML editing."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/sh-script/sh-script-1.26.ebuild b/app-xemacs/sh-script/sh-script-1.26.ebuild
index 03d6ea5..2d3e15b 100644
--- a/app-xemacs/sh-script/sh-script-1.26.ebuild
+++ b/app-xemacs/sh-script/sh-script-1.26.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Support for editing shell scripts."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/sieve/sieve-1.20.ebuild b/app-xemacs/sieve/sieve-1.20.ebuild
index 660a8e5..0fd0b95 100644
--- a/app-xemacs/sieve/sieve-1.20.ebuild
+++ b/app-xemacs/sieve/sieve-1.20.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Manage Sieve email filtering scripts."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/mail-lib
diff --git a/app-xemacs/skk/skk-1.27.ebuild b/app-xemacs/skk/skk-1.27.ebuild
index 306ec7f..197a2e8 100644
--- a/app-xemacs/skk/skk-1.27.ebuild
+++ b/app-xemacs/skk/skk-1.27.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="MULE: Japanese Language Input Method."
-PKG_CAT="mule"
+XEMACS_PKG_CAT="mule"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/viper
app-xemacs/mule-base
diff --git a/app-xemacs/slider/slider-1.18.ebuild b/app-xemacs/slider/slider-1.18.ebuild
index bb0bcab..36e920c 100644
--- a/app-xemacs/slider/slider-1.18.ebuild
+++ b/app-xemacs/slider/slider-1.18.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="User interface tool."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-xemacs/sml-mode/sml-mode-0.14.ebuild b/app-xemacs/sml-mode/sml-mode-0.14.ebuild
index 70aecdb..5f59cc2 100644
--- a/app-xemacs/sml-mode/sml-mode-0.14.ebuild
+++ b/app-xemacs/sml-mode/sml-mode-0.14.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="SML editing support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/edebug
diff --git a/app-xemacs/sounds-au/sounds-au-1.14.ebuild b/app-xemacs/sounds-au/sounds-au-1.14.ebuild
index 7bb7db4..0a9fc3c 100644
--- a/app-xemacs/sounds-au/sounds-au-1.14.ebuild
+++ b/app-xemacs/sounds-au/sounds-au-1.14.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="XEmacs Sun sound files."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND=""
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild b/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild
index 94b017c..2191410 100644
--- a/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild
+++ b/app-xemacs/sounds-wav/sounds-wav-1.14.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="XEmacs Microsoft sound files."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-xemacs/speedbar/speedbar-1.30.ebuild b/app-xemacs/speedbar/speedbar-1.30.ebuild
index 4736a3c..92bac81 100644
--- a/app-xemacs/speedbar/speedbar-1.30.ebuild
+++ b/app-xemacs/speedbar/speedbar-1.30.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Provides a separate frame with convenient references."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/edebug
diff --git a/app-xemacs/speedbar/speedbar-1.32.ebuild b/app-xemacs/speedbar/speedbar-1.32.ebuild
index 662b4fd..92bac81 100644
--- a/app-xemacs/speedbar/speedbar-1.32.ebuild
+++ b/app-xemacs/speedbar/speedbar-1.32.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Provides a separate frame with convenient references."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/edebug
diff --git a/app-xemacs/strokes/strokes-1.12.ebuild b/app-xemacs/strokes/strokes-1.12.ebuild
index f617bba..45c8d4d 100644
--- a/app-xemacs/strokes/strokes-1.12.ebuild
+++ b/app-xemacs/strokes/strokes-1.12.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Mouse enhancement utility."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/text-modes
app-xemacs/edit-utils
diff --git a/app-xemacs/sun/sun-1.17.ebuild b/app-xemacs/sun/sun-1.17.ebuild
index 0831815..a16aa39 100644
--- a/app-xemacs/sun/sun-1.17.ebuild
+++ b/app-xemacs/sun/sun-1.17.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Support for Sparcworks.."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
MY_PN="Sun"
# SRC_URI="http://ftp.xemacs.org/packages/${MY_PN}-${PV}-pkg.tar.gz"
diff --git a/app-xemacs/sun/sun-1.19.ebuild b/app-xemacs/sun/sun-1.19.ebuild
index 88f97ef..a16aa39 100644
--- a/app-xemacs/sun/sun-1.19.ebuild
+++ b/app-xemacs/sun/sun-1.19.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Support for Sparcworks.."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
MY_PN="Sun"
# SRC_URI="http://ftp.xemacs.org/packages/${MY_PN}-${PV}-pkg.tar.gz"
diff --git a/app-xemacs/supercite/supercite-1.23.ebuild b/app-xemacs/supercite/supercite-1.23.ebuild
index a3a20cb..1b2c1bf 100644
--- a/app-xemacs/supercite/supercite-1.23.ebuild
+++ b/app-xemacs/supercite/supercite-1.23.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="An Emacs citation tool for News & Mail messages."
-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/texinfo/texinfo-1.32.ebuild b/app-xemacs/texinfo/texinfo-1.32.ebuild
index 50f536e..45eddfb 100644
--- a/app-xemacs/texinfo/texinfo-1.32.ebuild
+++ b/app-xemacs/texinfo/texinfo-1.32.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="XEmacs TeXinfo support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/text-modes
app-xemacs/xemacs-base
diff --git a/app-xemacs/text-modes/text-modes-2.01.ebuild b/app-xemacs/text-modes/text-modes-2.01.ebuild
index ec5ebb6..eb3fbb6 100644
--- a/app-xemacs/text-modes/text-modes-2.01.ebuild
+++ b/app-xemacs/text-modes/text-modes-2.01.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Miscellaneous support for editing text files."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-ispell
app-xemacs/fsf-compat
diff --git a/app-xemacs/text-modes/text-modes-2.05.ebuild b/app-xemacs/text-modes/text-modes-2.05.ebuild
index af8bfe0..eb3fbb6 100644
--- a/app-xemacs/text-modes/text-modes-2.05.ebuild
+++ b/app-xemacs/text-modes/text-modes-2.05.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Miscellaneous support for editing text files."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-ispell
app-xemacs/fsf-compat
diff --git a/app-xemacs/textools/textools-1.17.ebuild b/app-xemacs/textools/textools-1.17.ebuild
index e139d76..5c38a86 100644
--- a/app-xemacs/textools/textools-1.17.ebuild
+++ b/app-xemacs/textools/textools-1.17.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Miscellaneous TeX support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/time/time-1.16.ebuild b/app-xemacs/time/time-1.16.ebuild
index 9f9ee64..4c02215 100644
--- a/app-xemacs/time/time-1.16.ebuild
+++ b/app-xemacs/time/time-1.16.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Display time & date on the modeline."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/tm/tm-1.42.ebuild b/app-xemacs/tm/tm-1.42.ebuild
index 98a43ad..1da0977 100644
--- a/app-xemacs/tm/tm-1.42.ebuild
+++ b/app-xemacs/tm/tm-1.42.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Emacs MIME support. Not needed for gnus >= 5.8.0"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/gnus
app-xemacs/mh-e
diff --git a/app-xemacs/tooltalk/tooltalk-1.17.ebuild b/app-xemacs/tooltalk/tooltalk-1.17.ebuild
index 8fef9b8..4e5b926 100644
--- a/app-xemacs/tooltalk/tooltalk-1.17.ebuild
+++ b/app-xemacs/tooltalk/tooltalk-1.17.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Support for building with Tooltalk."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-xemacs/tpu/tpu-1.16.ebuild b/app-xemacs/tpu/tpu-1.16.ebuild
index 1c60c78..68b323c 100644
--- a/app-xemacs/tpu/tpu-1.16.ebuild
+++ b/app-xemacs/tpu/tpu-1.16.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="DEC EDIT/TPU support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND=""
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-xemacs/tramp/tramp-1.57.ebuild b/app-xemacs/tramp/tramp-1.57.ebuild
index 31269c0..f6bce6f 100644
--- a/app-xemacs/tramp/tramp-1.57.ebuild
+++ b/app-xemacs/tramp/tramp-1.57.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+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.24.ebuild b/app-xemacs/vc-cc/vc-cc-1.24.ebuild
index 81ef199..ff17c7b 100644
--- a/app-xemacs/vc-cc/vc-cc-1.24.ebuild
+++ b/app-xemacs/vc-cc/vc-cc-1.24.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Version Control for ClearCase (UnFree) systems."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/dired
app-xemacs/xemacs-base
diff --git a/app-xemacs/vc/vc-1.50.ebuild b/app-xemacs/vc/vc-1.50.ebuild
index 355169c..04db51d 100644
--- a/app-xemacs/vc/vc-1.50.ebuild
+++ b/app-xemacs/vc/vc-1.50.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Version Control for Free systems."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/dired
app-xemacs/xemacs-base
diff --git a/app-xemacs/vhdl/vhdl-1.24.ebuild b/app-xemacs/vhdl/vhdl-1.24.ebuild
index bbfdd9d..62c7dd3 100644
--- a/app-xemacs/vhdl/vhdl-1.24.ebuild
+++ b/app-xemacs/vhdl/vhdl-1.24.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Support for VHDL."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/edit-utils
diff --git a/app-xemacs/view-process/view-process-1.15.ebuild b/app-xemacs/view-process/view-process-1.15.ebuild
index 51d67d6..8f41be5 100644
--- a/app-xemacs/view-process/view-process-1.15.ebuild
+++ b/app-xemacs/view-process/view-process-1.15.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="A Unix process browsing tool."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/viper/viper-1.69.ebuild b/app-xemacs/viper/viper-1.69.ebuild
index 83b4501..d81a3c1 100644
--- a/app-xemacs/viper/viper-1.69.ebuild
+++ b/app-xemacs/viper/viper-1.69.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="VI emulation support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/vm/vm-8.11.ebuild b/app-xemacs/vm/vm-8.11.ebuild
index 5f8f238..390672e 100644
--- a/app-xemacs/vm/vm-8.11.ebuild
+++ b/app-xemacs/vm/vm-8.11.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="An Emacs mailer."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/mail-lib
diff --git a/app-xemacs/w3/w3-1.38.ebuild b/app-xemacs/w3/w3-1.38.ebuild
index 9050931..f0b3292 100644
--- a/app-xemacs/w3/w3-1.38.ebuild
+++ b/app-xemacs/w3/w3-1.38.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="A Web browser."
-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/w3/w3-1.41.ebuild b/app-xemacs/w3/w3-1.41.ebuild
index ab2e0da..f0b3292 100644
--- a/app-xemacs/w3/w3-1.41.ebuild
+++ b/app-xemacs/w3/w3-1.41.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="A Web browser."
-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/x-symbol/x-symbol-1.13.ebuild b/app-xemacs/x-symbol/x-symbol-1.13.ebuild
index a1ec42d..e5576b2 100644
--- a/app-xemacs/x-symbol/x-symbol-1.13.ebuild
+++ b/app-xemacs/x-symbol/x-symbol-1.13.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Semi WYSIWYG for LaTeX, HTML, etc, using additional fonts."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/auctex
diff --git a/app-xemacs/x-symbol/x-symbol-1.16.ebuild b/app-xemacs/x-symbol/x-symbol-1.16.ebuild
index 8d4a920..e5576b2 100644
--- a/app-xemacs/x-symbol/x-symbol-1.16.ebuild
+++ b/app-xemacs/x-symbol/x-symbol-1.16.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Semi WYSIWYG for LaTeX, HTML, etc, using additional fonts."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/auctex
diff --git a/app-xemacs/xemacs-base/xemacs-base-2.45.ebuild b/app-xemacs/xemacs-base/xemacs-base-2.45.ebuild
index e454660..46661c3 100644
--- a/app-xemacs/xemacs-base/xemacs-base-2.45.ebuild
+++ b/app-xemacs/xemacs-base/xemacs-base-2.45.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Fundamental XEmacs support, you almost certainly need this."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
diff --git a/app-xemacs/xemacs-devel/xemacs-devel-1.82.ebuild b/app-xemacs/xemacs-devel/xemacs-devel-1.82.ebuild
index cbfb156..370b83d 100644
--- a/app-xemacs/xemacs-devel/xemacs-devel-1.82.ebuild
+++ b/app-xemacs/xemacs-devel/xemacs-devel-1.82.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Emacs Lisp developer support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/xemacs-ispell
diff --git a/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild b/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild
index 0925432..370b83d 100644
--- a/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild
+++ b/app-xemacs/xemacs-devel/xemacs-devel-1.84.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Emacs Lisp developer support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/xemacs-ispell
diff --git a/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild b/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild
index 9126ac6..d27aef2 100644
--- a/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild
+++ b/app-xemacs/xemacs-eterm/xemacs-eterm-1.20.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
MY_PN=${PN/xemacs-/}
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
SLOT="0"
-IUSE=""
DESCRIPTION="Terminal emulation."
-# EXPERIMENTAL=true
+#XEMACS_EXPERIMENTAL=true
SRC_URI="http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/${MY_PN}-${PV}-pkg.tar.gz"
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
diff --git a/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild b/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild
index 9dc84af..13fe28e 100644
--- a/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild
+++ b/app-xemacs/xemacs-ispell/xemacs-ispell-1.37.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Spell-checking with GNU ispell."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-# EXPERIMENTAL=true
+#XEMACS_EXPERIMENTAL=true
MY_PN=${PN/xemacs-/}
diff --git a/app-xemacs/xetla/xetla-1.04.ebuild b/app-xemacs/xetla/xetla-1.04.ebuild
index b9b08fb..e876ad9 100644
--- a/app-xemacs/xetla/xetla-1.04.ebuild
+++ b/app-xemacs/xetla/xetla-1.04.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION=" Arch (tla) interface for XEmacs"
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/ediff
app-xemacs/xemacs-base
diff --git a/app-xemacs/xlib/xlib-1.16.ebuild b/app-xemacs/xlib/xlib-1.16.ebuild
index 54010e4..770996b 100644
--- a/app-xemacs/xlib/xlib-1.16.ebuild
+++ b/app-xemacs/xlib/xlib-1.16.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="Emacs interface to X server."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
"
diff --git a/app-xemacs/xslide/xslide-1.11.ebuild b/app-xemacs/xslide/xslide-1.11.ebuild
index b9171ad..d5af4ac 100644
--- a/app-xemacs/xslide/xslide-1.11.ebuild
+++ b/app-xemacs/xslide/xslide-1.11.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="XSL editing support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-ispell
app-xemacs/mail-lib
diff --git a/app-xemacs/xslt-process/xslt-process-1.14.ebuild b/app-xemacs/xslt-process/xslt-process-1.14.ebuild
index 067ecb5..3f18463 100644
--- a/app-xemacs/xslt-process/xslt-process-1.14.ebuild
+++ b/app-xemacs/xslt-process/xslt-process-1.14.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="XSLT processing support."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/jde
app-xemacs/cc-mode
diff --git a/app-xemacs/xwem/xwem-1.25.ebuild b/app-xemacs/xwem/xwem-1.25.ebuild
index 4bb66bc..849c92d 100644
--- a/app-xemacs/xwem/xwem-1.25.ebuild
+++ b/app-xemacs/xwem/xwem-1.25.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="X Emacs Window Manager."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND="app-xemacs/xemacs-base
app-xemacs/xlib
diff --git a/app-xemacs/zenirc/zenirc-1.18.ebuild b/app-xemacs/zenirc/zenirc-1.18.ebuild
index 652e521..55f8ed4 100644
--- a/app-xemacs/zenirc/zenirc-1.18.ebuild
+++ b/app-xemacs/zenirc/zenirc-1.18.ebuild
@@ -1,14 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
SLOT="0"
-IUSE=""
DESCRIPTION="ZENIRC IRC Client."
-PKG_CAT="standard"
+XEMACS_PKG_CAT="standard"
-EXPERIMENTAL=true
+XEMACS_EXPERIMENTAL=true
RDEPEND=""
KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"