gentoo resync : 14.07.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-07-14 21:03:06 +0100
commit: 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree: 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-xemacs
parent: 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)
666 files changed, 5313 insertions, 2215 deletions
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index 15acaf83613d..78ff2d6e87b2 100644
--- a/app-xemacs/Manifest.gz
+++ b/app-xemacs/Manifest.gz
diff --git a/app-xemacs/ada-1.14 b/app-xemacs/ada-1.14
deleted file mode 100644
index 0b5caadbdef0..000000000000
--- a/app-xemacs/ada-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Ada language support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ada-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=1ecce664dbd6049e646bfa8fab7660d4
diff --git a/app-xemacs/ada/Manifest b/app-xemacs/ada/Manifest
new file mode 100644
index 000000000000..4e1ca9745db5
--- /dev/null
+++ b/app-xemacs/ada/Manifest
@@ -0,0 +1,3 @@
+DIST ada-1.14-pkg.tar.gz 55836 BLAKE2B d61de679848b2cda840ee24fc930495b3b16c664a63d8e5d960cc891c3b327417657b143b18052f33b530aa82971154737c66d71876ca872e7ec0973fdff0834 SHA512 9925cd30f9d67b72086114b1cc723ab131541f694eda77a6094a7d5b5d20b340ef9e285930e793b61c87bd8f732acc37a80ffe3fe0836ee01beca36b303bb1e3
+EBUILD ada-1.14.ebuild 289 BLAKE2B ae9f8bc7c3eda10bb98c873e005ed15718e9c6c58ef337021928ddb135b18a4932c384cf4a30029ded2f798c417f73bb59418a22b2820ce2fec3116e37c789a5 SHA512 b0ad5a01215f3b04111441bb5f68341b53444dca3db55c9d90abc96669c318744f5a9d3c7c73482d5658effa36b37255cb2bac2e3d4b65eeaa74478683ac0f6a
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ada/ada-1.14.ebuild b/app-xemacs/ada/ada-1.14.ebuild
new file mode 100644
index 000000000000..378410231536
--- /dev/null
+++ b/app-xemacs/ada/ada-1.14.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Ada language support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ada/metadata.xml b/app-xemacs/ada/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/ada/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/apel-1.32 b/app-xemacs/apel-1.32
deleted file mode 100644
index 9ba42dc1b74a..000000000000
--- a/app-xemacs/apel-1.32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A Portable Emacs Library. Used by XEmacs MIME support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/apel-1.32-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=0e29246bb3d7689b36a12f713758b57c
diff --git a/app-xemacs/apel-1.34 b/app-xemacs/apel-1.34
deleted file mode 100644
index 300f38379198..000000000000
--- a/app-xemacs/apel-1.34
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A Portable Emacs Library. Used by XEmacs MIME support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/apel-1.34-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=b0e4dac0ebb735ffbfbd6b204d65f621
diff --git a/app-xemacs/apel/Manifest b/app-xemacs/apel/Manifest
new file mode 100644
index 000000000000..8088410f5957
--- /dev/null
+++ b/app-xemacs/apel/Manifest
@@ -0,0 +1,5 @@
+DIST apel-1.32-pkg.tar.gz 121589 BLAKE2B 177a29672eec4ee8b47235eebed5bce25c90431461e23f378c6dd3d3303abc6e2b9667dd845b80e27421d1007ee2e377395fd2b64b72fe4d1298ea689edd96d3 SHA512 5f0c18fcd05ef28766a0e5fe265cfbb5fd637fb393c10eee47475898617dfc54563e3e021a8b9cd54baca7b0a29168aeb451382c89c3ef0a3fe96f0682ba1d8b
+DIST apel-1.34-pkg.tar.gz 124989 BLAKE2B c8504878f8c0df2e41bfd81db76136f280f22309e339bdb119260acc6aed568b240db1b82bf506bf26034543df1134ff50874a233d0e959c34ba2df126c6e0e9 SHA512 29c42c0908499d4e78f1ba7197d2d0da57f1bea179dd870422b3ea8475c50a91cb5d0470b6b02d241b2af46b2ee4e05f7b3d836bb7315dbb58bf75751048da30
+EBUILD apel-1.32.ebuild 350 BLAKE2B f3399ca9a30c0c1beffd6f006df029e9eac4b0022c41bc3bab808d2ecce6b209bb5edab13b1f4a5658be0f22cb527e4652f6355fdf7f3963a4c1e5d67881b0a7 SHA512 14efacecac1dc5e4d3a80f8cf95cc4bbe852fa77109c04766ed21c3228c08140865183c580d3354dad6b4cfa73bac831edbf4bfefae19aff508ec9fd0de0e2d2
+EBUILD apel-1.34.ebuild 369 BLAKE2B dfc2c9583af55508ab5a9eb6b795a908f244fe5fce1418fc68ae7891100f0e1d372327523eeff2a3d16887a50a003180a0fbc91fe450ab20c1db98be60c95323 SHA512 7e779f36da5fae86d9539a9b0d3f0cacb4c137485ffd2449a5aa1125a6974ce5f41a1914b0b95a06eb134150eb4f0da8c5df927804e3a643096da25f9d9896fe
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/apel/apel-1.32.ebuild b/app-xemacs/apel/apel-1.32.ebuild
new file mode 100644
index 000000000000..41ed911f0bdc
--- /dev/null
+++ b/app-xemacs/apel/apel-1.32.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="A Portable Emacs Library.  Used by XEmacs MIME support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/apel/apel-1.34.ebuild b/app-xemacs/apel/apel-1.34.ebuild
new file mode 100644
index 000000000000..fff342e11803
--- /dev/null
+++ b/app-xemacs/apel/apel-1.34.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="A Portable Emacs Library.  Used by XEmacs MIME support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd"
+
+inherit xemacs-packages
diff --git a/app-xemacs/apel/metadata.xml b/app-xemacs/apel/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/apel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/auctex-1.47 b/app-xemacs/auctex-1.47
deleted file mode 100644
index 206da97716ec..000000000000
--- a/app-xemacs/auctex-1.47
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Basic TeX/LaTeX support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/auctex-1.47-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=74481ab99882486d30d54542d6beacd7
diff --git a/app-xemacs/auctex-1.51 b/app-xemacs/auctex-1.51
deleted file mode 100644
index 2d2c8e35cbd6..000000000000
--- a/app-xemacs/auctex-1.51
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Basic TeX/LaTeX support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/texinfo app-xemacs/fsf-compat app-xemacs/mail-lib app-xemacs/edit-utils app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/auctex-1.51-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=ed2199bfb5a5a3728604881b782a247f
diff --git a/app-xemacs/auctex/Manifest b/app-xemacs/auctex/Manifest
new file mode 100644
index 000000000000..2f29daa2b021
--- /dev/null
+++ b/app-xemacs/auctex/Manifest
@@ -0,0 +1,5 @@
+DIST auctex-1.47-pkg.tar.gz 710901 BLAKE2B 438296d1b4fb038b3c2956cfe4f54432680c76298f81610094a0be2c9cf0efa181f7cdc6d7fa1766b66f9851aa73636da018eb282b7c24de70a11bf246a74956 SHA512 a5c06277decb8ce5f515ec09103702bff95eeba48b7d9df9ca6f8fbaab33bd9964d6296de5d5baae0f02e07fb434b48831ff9bc86f061f38eedb1b6c708f4e56
+DIST auctex-1.51-pkg.tar.gz 1002835 BLAKE2B 8f71cb30bb78108d59e5ba76dbf0763c781167d112e1c59b2869a16e033061f5414709e31642a39ca0180333a3dfb50c304436a61d73653ff8b9a7812812cdf4 SHA512 f6a3edcf2992c03e6e39ecfdf534589341a5331df712a534c39b70976eaf6f353271987282d1217fc8bae2daf7104273f5eb0134f95a5bdf2d2e0fab31a5675f
+EBUILD auctex-1.47.ebuild 292 BLAKE2B 2e29d4192244b8e9acf8a2aaf2f6feba800f8bb3dadf451c4512f4c1cabbe3ed2088f1952222694ce34082757291189abce25d3d48c6bf01273285a2e61d7bba SHA512 bde4d8faed0b97e2c0268bb7f2447d00f9cd7993b7233fd466f8bcb88ca4d44fb3629e2fce2e61497ace48eaf55549aa4c4b9f35ed508954acc8c5a9c1f54222
+EBUILD auctex-1.51.ebuild 375 BLAKE2B 8aca3df5b55f813d6391d49c346f61eec994d3c06857ae9f757abc6859aa6601765303521175a205a7a8f2901c272e6e16a4182c392976c967a9b2a9ba8c5c0b SHA512 ba3330224ecab23f9322ea446613040e1b50c2d1059233558a2f250e0b5ebd20ea45dbfaaf5412271a35cba9bdd4e53d88b5d65a577220b616aa50d3b4dfa849
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/auctex/auctex-1.47.ebuild b/app-xemacs/auctex/auctex-1.47.ebuild
new file mode 100644
index 000000000000..d8f86f78f005
--- /dev/null
+++ b/app-xemacs/auctex/auctex-1.47.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Basic TeX/LaTeX support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/auctex/auctex-1.51.ebuild b/app-xemacs/auctex/auctex-1.51.ebuild
new file mode 100644
index 000000000000..08fa1f09849d
--- /dev/null
+++ b/app-xemacs/auctex/auctex-1.51.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Basic TeX/LaTeX support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/texinfo
+app-xemacs/fsf-compat
+app-xemacs/mail-lib
+app-xemacs/edit-utils
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/auctex/metadata.xml b/app-xemacs/auctex/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/auctex/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/bbdb-1.32 b/app-xemacs/bbdb-1.32
deleted file mode 100644
index c41b22807b59..000000000000
--- a/app-xemacs/bbdb-1.32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=The Big Brother Data Base
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/edit-utils app-xemacs/gnus app-xemacs/mh-e app-xemacs/rmail app-xemacs/supercite app-xemacs/vm app-xemacs/tm app-xemacs/apel app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/w3 app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/os-utils app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/bbdb-1.32-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=ec49af7af943d26ba96439934e6cd97c
diff --git a/app-xemacs/bbdb/Manifest b/app-xemacs/bbdb/Manifest
new file mode 100644
index 000000000000..dd370709cd20
--- /dev/null
+++ b/app-xemacs/bbdb/Manifest
@@ -0,0 +1,3 @@
+DIST bbdb-1.32-pkg.tar.gz 380002 BLAKE2B d4ba20cdcbb63cbe3aae65cf7c7dc69ef1dea7c888a841a697a77ca63bf6af58caab38efcda5993e6b029e8536cbe47312670498c0f0496dc2422138d8c8d6eb SHA512 238ab158f3a3606bfb753aa02aa6556170df61bfa523cada8570feb97d43cdee481264c2faef30eb2a9c6e345dc1e3f5fbdbe1e44272a2a57115733cc4e2e28c
+EBUILD bbdb-1.32.ebuild 591 BLAKE2B 27024b60588a9967300e660fa43b6bf5ebd5b880201a22efc2e778c7e02394f19cf6500bf06ef8126071856e02c84967e86ad9c22ec12e9849e716c0b6d22e0b SHA512 b303cc3a8b3ba132400a01651497e9d40685cefc503642ef22a86cf4856791e7a1256ef9d53b7842483549ec7f766115b4acab841d9e79010e48145e2eee494b
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/bbdb/bbdb-1.32.ebuild b/app-xemacs/bbdb/bbdb-1.32.ebuild
new file mode 100644
index 000000000000..4f59e37ef296
--- /dev/null
+++ b/app-xemacs/bbdb/bbdb-1.32.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="The Big Brother Data Base"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/edit-utils
+app-xemacs/gnus
+app-xemacs/mh-e
+app-xemacs/rmail
+app-xemacs/supercite
+app-xemacs/vm
+app-xemacs/tm
+app-xemacs/apel
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/w3
+app-xemacs/fsf-compat
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+app-xemacs/net-utils
+app-xemacs/os-utils
+app-xemacs/ecrypto
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/bbdb/metadata.xml b/app-xemacs/bbdb/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/bbdb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/build-1.14 b/app-xemacs/build-1.14
deleted file mode 100644
index df42df2be2cd..000000000000
--- a/app-xemacs/build-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Build XEmacs from within (UNIX, Windows)
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/pcl-cvs app-xemacs/dired app-xemacs/w3 app-xemacs/prog-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/build-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c731ad6653f7c2218698633ee3c8227d
diff --git a/app-xemacs/build-1.15 b/app-xemacs/build-1.15
deleted file mode 100644
index 2913b72aa7e0..000000000000
--- a/app-xemacs/build-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Build XEmacs from within (UNIX, Windows)
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/pcl-cvs app-xemacs/dired app-xemacs/w3 app-xemacs/prog-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/build-1.15-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c731ad6653f7c2218698633ee3c8227d
diff --git a/app-xemacs/build/Manifest b/app-xemacs/build/Manifest
new file mode 100644
index 000000000000..5b9235acd945
--- /dev/null
+++ b/app-xemacs/build/Manifest
@@ -0,0 +1,5 @@
+DIST build-1.14-pkg.tar.gz 49484 BLAKE2B 1d0072b9d7737a8d74a12ef0ce45909f212aeb58a4343522da0036f65be11955766756428fd7f6302c449cbb8936bfad70e69fc3b90ec90884de79b248753633 SHA512 bdda0904d8790df0adcaace0df038714f8175dea682af567daac8b0436436dd6e20d2f49f84deae5090f6d5013165de61b8ca50d81d5fea837b9f6013f9ba050
+DIST build-1.15-pkg.tar.gz 49849 BLAKE2B a41e3441a9e1734bfd5caf1b999644fe0ff36c5e9bcb12d03b551bbcee308c14a5378f45966ca5b460a52950e22b4e06c20b215e2b5ccd1d2caef3b8f1f36812 SHA512 bf72d2509250fbd93a512ce445a5a17f01ea47965a729dc3e9a4745093b3057158482674393fa10fd76574f1cad0a998d0ceb5cd37d959cee70a3d8f098e5640
+EBUILD build-1.14.ebuild 381 BLAKE2B 9cbc4568a8504108d2f378d7cc978d51c233de603c3e51bbc64fd673f8340555621f68ccab80b6bf7822d11f77ac6fcbf1bcac097b7f9e78c9f5f186e19278d1 SHA512 5e1e85a9f50ff96f7b189028be475d4614eb4a946878ff41f67b6d88d047ce532238b0d68f4f97219d2a4579cff9b8e0bdfcd20afd9b0096c8f73f202e585aa8
+EBUILD build-1.15.ebuild 381 BLAKE2B 9cbc4568a8504108d2f378d7cc978d51c233de603c3e51bbc64fd673f8340555621f68ccab80b6bf7822d11f77ac6fcbf1bcac097b7f9e78c9f5f186e19278d1 SHA512 5e1e85a9f50ff96f7b189028be475d4614eb4a946878ff41f67b6d88d047ce532238b0d68f4f97219d2a4579cff9b8e0bdfcd20afd9b0096c8f73f202e585aa8
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/build/build-1.14.ebuild b/app-xemacs/build/build-1.14.ebuild
new file mode 100644
index 000000000000..0c533d1aaa2a
--- /dev/null
+++ b/app-xemacs/build/build-1.14.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Build XEmacs from within (UNIX, Windows)"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/pcl-cvs
+app-xemacs/dired
+app-xemacs/w3
+app-xemacs/prog-modes
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/build/build-1.15.ebuild b/app-xemacs/build/build-1.15.ebuild
new file mode 100644
index 000000000000..0c533d1aaa2a
--- /dev/null
+++ b/app-xemacs/build/build-1.15.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Build XEmacs from within (UNIX, Windows)"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/pcl-cvs
+app-xemacs/dired
+app-xemacs/w3
+app-xemacs/prog-modes
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/build/metadata.xml b/app-xemacs/build/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/build/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/c-support-1.22 b/app-xemacs/c-support-1.22
deleted file mode 100644
index c72c17a15a7a..000000000000
--- a/app-xemacs/c-support-1.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Basic single-file add-ons for editing C code
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/cc-mode app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/c-support-1.22-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=fffafdee4dd9c2581ff91c35c9385e9c
diff --git a/app-xemacs/c-support/Manifest b/app-xemacs/c-support/Manifest
new file mode 100644
index 000000000000..d498d3060cc2
--- /dev/null
+++ b/app-xemacs/c-support/Manifest
@@ -0,0 +1,3 @@
+DIST c-support-1.22-pkg.tar.gz 78027 BLAKE2B 6431841a5bde016211016723b633b6aa1c7c10e62f0a846d52b4b77053226392e4ed4170384144235ca48f5dde5d47312c34085069ef682bb0b199f7d926c289 SHA512 38ca69f114541a9886ac547701d3d2bae90707307e73ca9ef2b2867500c0ea1b16f9a1fe3bc69b039dafe9cfabafadab46c11d156873c3105c77026655ae00a4
+EBUILD c-support-1.22.ebuild 332 BLAKE2B f56f4a9911061bd91b8810eed68d2783443f320fa1073afd880b1386ee5dee1c1bae7401313369225253702f75977811b20afadbde73fd1f353fea8580c55d33 SHA512 98947148b5001de432f5449493beabc08af814d76097b7313e6d88cfa5762872afba17f4b3bb80437344b2e3dfad46bae6267e0befae072f9cdd04cc55a9c38b
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/c-support/c-support-1.22.ebuild b/app-xemacs/c-support/c-support-1.22.ebuild
new file mode 100644
index 000000000000..aaaa319b817b
--- /dev/null
+++ b/app-xemacs/c-support/c-support-1.22.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Basic single-file add-ons for editing C code"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/cc-mode
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/c-support/metadata.xml b/app-xemacs/c-support/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/c-support/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/calc-1.26 b/app-xemacs/calc-1.26
deleted file mode 100644
index cbe7278e7fee..000000000000
--- a/app-xemacs/calc-1.26
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs calculator
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/calc-1.26-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=8c0b09df6ca18d5cbb7f7930d86a9b20
diff --git a/app-xemacs/calc/Manifest b/app-xemacs/calc/Manifest
new file mode 100644
index 000000000000..78370d2f4967
--- /dev/null
+++ b/app-xemacs/calc/Manifest
@@ -0,0 +1,3 @@
+DIST calc-1.26-pkg.tar.gz 1600637 BLAKE2B 5ded27390d06e9e5ade53e6b33ad9583233ebae64f2600e9cb3c8717bac7e372bad4e45c2fad45f15090bfaa7e661f98a84414e297765dae0578a58f06b49394 SHA512 f727675754980f448d9607fd45b561642104888042fae35f64e20130e0ee7c9dae8cb24b07d871281e3e995b97addf268e6d2db390d900f4826c85c89c30845b
+EBUILD calc-1.26.ebuild 285 BLAKE2B 5a6e6082e435507994fa305ea86f0ac5a670c871f35b8f8138b577e774e4ec269eaea1b3e79d4532804cdfa47ab47cc37440a9909a6ba64400d540559a9f1f1a SHA512 205ceae6b656f1a4278cb3ce52c6f56c888d772768965813bcf24e6b774aae717b57e6dbdac4d50a02bedda361be9ec82a34581b3c17be7c74318bad3bb8eb06
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/calc/calc-1.26.ebuild b/app-xemacs/calc/calc-1.26.ebuild
new file mode 100644
index 000000000000..2f971de2ac8a
--- /dev/null
+++ b/app-xemacs/calc/calc-1.26.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Emacs calculator"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/calc/metadata.xml b/app-xemacs/calc/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/calc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/calendar-1.32 b/app-xemacs/calendar-1.32
deleted file mode 100644
index 1ab5dd47509b..000000000000
--- a/app-xemacs/calendar-1.32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Calendar and diary support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/calendar-1.32-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=ae64564efb1a0d8abb93f76232646b71
diff --git a/app-xemacs/calendar-1.38 b/app-xemacs/calendar-1.38
deleted file mode 100644
index 7cebd808a02c..000000000000
--- a/app-xemacs/calendar-1.38
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Calendar and diary support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/calendar-1.38-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=ae64564efb1a0d8abb93f76232646b71
diff --git a/app-xemacs/calendar/Manifest b/app-xemacs/calendar/Manifest
new file mode 100644
index 000000000000..735f3a0e118a
--- /dev/null
+++ b/app-xemacs/calendar/Manifest
@@ -0,0 +1,5 @@
+DIST calendar-1.32-pkg.tar.gz 410752 BLAKE2B 698ffcef148c6c84fbea7328da45d73bdf49601a94e3776b00ea7bae58223ef6ff1706ee8bf0e090e6aca16bcc6ed5c2037af2f9bb694ba03a840b20913afc19 SHA512 ca9a2dd135d012e094044f066939dafad0ef5f73f738b538c0f7aefc08c2e9efa0e1bcd3a3630681cfb90ec3b3319fd9b8594675ca2747627924d53d3fbe8ec1
+DIST calendar-1.38-pkg.tar.gz 411386 BLAKE2B be833c4f81a9d2e79e06768836fe1e58601c9b483f9febe127bd2c2bfe77259a3cd50630920e2df38de14234c1eece9c498b71073d967a06bf27258d91c9010c SHA512 d5158147df3fffcba550f4bdb34aba916b9071734c2e08b3bebb4c1969ac06b15b79337b4d2f50a53e057ff097fc63162849d5dc0983da4363e4e484357c571f
+EBUILD calendar-1.32.ebuild 295 BLAKE2B 7b3ad75b0119b31f8531a1dbd36166253231fcea2352ad1802e75381bda52f263f11a3fbbd36a63cf557cc6629438a65211ffb5674e12b509e733dddb915f2cb SHA512 c57e15c7bfd9d85693440be694a0eea8a243643884ac3a222c44a0c0680fe772e11c3e010889032685e4d757da4c4ca02150788e3b667abf2aea66ca16717680
+EBUILD calendar-1.38.ebuild 295 BLAKE2B 7b3ad75b0119b31f8531a1dbd36166253231fcea2352ad1802e75381bda52f263f11a3fbbd36a63cf557cc6629438a65211ffb5674e12b509e733dddb915f2cb SHA512 c57e15c7bfd9d85693440be694a0eea8a243643884ac3a222c44a0c0680fe772e11c3e010889032685e4d757da4c4ca02150788e3b667abf2aea66ca16717680
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/calendar/calendar-1.32.ebuild b/app-xemacs/calendar/calendar-1.32.ebuild
new file mode 100644
index 000000000000..e33f1b4fd58d
--- /dev/null
+++ b/app-xemacs/calendar/calendar-1.32.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Calendar and diary support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/calendar/calendar-1.38.ebuild b/app-xemacs/calendar/calendar-1.38.ebuild
new file mode 100644
index 000000000000..e33f1b4fd58d
--- /dev/null
+++ b/app-xemacs/calendar/calendar-1.38.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Calendar and diary support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/calendar/metadata.xml b/app-xemacs/calendar/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/calendar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/cc-mode-1.45 b/app-xemacs/cc-mode-1.45
deleted file mode 100644
index fc66fe04042d..000000000000
--- a/app-xemacs/cc-mode-1.45
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=C, C++ and Java language support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/cc-mode-1.45-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=f81a2ec0a8474dc35e8166e139b5f86c
diff --git a/app-xemacs/cc-mode/Manifest b/app-xemacs/cc-mode/Manifest
new file mode 100644
index 000000000000..da4d84725026
--- /dev/null
+++ b/app-xemacs/cc-mode/Manifest
@@ -0,0 +1,3 @@
+DIST cc-mode-1.45-pkg.tar.gz 524116 BLAKE2B ba250dd9f9fd97c7659768f23c215a31e1b0b9fc7e60824328048bf3624a88577586e3cb06bd9e12a667b30a6dd68d097d6c448a571498b6d88dc73afae65268 SHA512 1b584685e2d6878d29e07e0618ac1e3a8306be8e5f8e39f9ccecc9458d155967844a0544f87d9f25518d52f322dfc7433e5578f84e46423f14ffa8f901537d3c
+EBUILD cc-mode-1.45.ebuild 321 BLAKE2B 272310ee0f6cefc78870047275d0754875ce86a7b7acd1e59d6f5b42015e8b053107f08c4292337b5e98f38ec69915f3d30bd864f1fe507489259a002fff1c45 SHA512 6258db422c3eeb8fb1b0ed1a8f389fa7a78f25f70339ac3e074f77770a7b34bcb573fc800f6911439bd05910fcec55161568956a6c7f7251b2a9f73f4ff28888
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/cc-mode/cc-mode-1.45.ebuild b/app-xemacs/cc-mode/cc-mode-1.45.ebuild
new file mode 100644
index 000000000000..2b09ea0323f7
--- /dev/null
+++ b/app-xemacs/cc-mode/cc-mode-1.45.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="C, C++ and Java language support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/mail-lib
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/cc-mode/metadata.xml b/app-xemacs/cc-mode/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/cc-mode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/cedet-common-1.01 b/app-xemacs/cedet-common-1.01
deleted file mode 100644
index 1e82d32d236a..000000000000
--- a/app-xemacs/cedet-common-1.01
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Common files for CEDET development environment
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/edebug app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/cedet-common-1.01-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=88d7ec265988a1896a85950ab4cf2447
diff --git a/app-xemacs/cedet-common/Manifest b/app-xemacs/cedet-common/Manifest
new file mode 100644
index 000000000000..38b49e64c437
--- /dev/null
+++ b/app-xemacs/cedet-common/Manifest
@@ -0,0 +1,3 @@
+DIST cedet-common-1.01-pkg.tar.gz 73671 BLAKE2B ced597935ef483ee6d92a1245d255200a767b0663b7c90d0adefadecf5b42bc4734597cefcb35268ef6eda5bc1887ea7a9110fc894e72b6fcefd7ea8d1ddb2a7 SHA512 53ee8486ff02ff5dccfd9974b3f7bfc710befee95ad3db1bcfe5e67c5dcf740440f060770a080264f0b0f09013867ee7d66a83d7b3919c7e598ef3207340d9d8
+EBUILD cedet-common-1.01.ebuild 334 BLAKE2B 9421490190b86b51504c88456ec14a0c28d9e914ed81bd8637d606a963a42118cb01369b69533b64a5aecc9eb96bcbad9e4ea3e6ee888a31d369255608eec787 SHA512 9dcb4c490deaba76e2cf4277b5293d2a433bf2419d287c6d8d6ead0b2f1d75447c8e00c9a5ac77ed438c2f46f2aaa89e50b75fe42a262f2da12a9cba5e6b8012
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/cedet-common/cedet-common-1.01.ebuild b/app-xemacs/cedet-common/cedet-common-1.01.ebuild
new file mode 100644
index 000000000000..723c87fd2ff0
--- /dev/null
+++ b/app-xemacs/cedet-common/cedet-common-1.01.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Common files for CEDET development environment"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/edebug
+	app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/cedet-common/metadata.xml b/app-xemacs/cedet-common/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/cedet-common/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/clearcase-1.10 b/app-xemacs/clearcase-1.10
deleted file mode 100644
index 7b80caa43e3b..000000000000
--- a/app-xemacs/clearcase-1.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=New Clearcase Version Control for XEmacs (UNIX, Windows)
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/sh-script app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/clearcase-1.10-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=68a35c996653e8f6d96980b494ecb50c
diff --git a/app-xemacs/clearcase/Manifest b/app-xemacs/clearcase/Manifest
new file mode 100644
index 000000000000..636a21b5870f
--- /dev/null
+++ b/app-xemacs/clearcase/Manifest
@@ -0,0 +1,3 @@
+DIST clearcase-1.10-pkg.tar.gz 105865 BLAKE2B 42738b8614b4feae38fb45d4839219a523052bb330a78ca7f4c271b0163c89934c4e18b7329d970270880ae197a6ba1aec6e5713aebe073007cf079635ebfdd7 SHA512 a2e909efcc372e40f05af9a588eb8e6222c64947ca61460e137f516c43294120727527e98af72bbd9c4c3782d62cc9ff8fe06743d4dc498e0c12721f229d9a1a
+EBUILD clearcase-1.10.ebuild 383 BLAKE2B 1b165afb612e0667fac81e8cdad379001cdc947090f2b00d9ef5119eec21e8d3f6ba258d26e4a06fa86a0613fbc7a9db3ffa6d5058b0c697179178b6752716e3 SHA512 9f0e776e38f66968d5d8a76a58b90f334dd781e696c769c55c84b35fad23768e90243a848245425f1743b7eee620cd0451116b3146f6d0fe7bf3c4c710afef87
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/clearcase/clearcase-1.10.ebuild b/app-xemacs/clearcase/clearcase-1.10.ebuild
new file mode 100644
index 000000000000..36e00c1c6a1d
--- /dev/null
+++ b/app-xemacs/clearcase/clearcase-1.10.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="New Clearcase Version Control for XEmacs (UNIX, Windows)"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/dired
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/sh-script
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/clearcase/metadata.xml b/app-xemacs/clearcase/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/clearcase/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/cogre-1.02 b/app-xemacs/cogre-1.02
deleted file mode 100644
index d1822660a989..000000000000
--- a/app-xemacs/cogre-1.02
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Graph editing mode
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/edebug app-xemacs/cedet-common app-xemacs/eieio app-xemacs/semantic app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/cogre-1.02-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c933e8d4b608b51801362bdaf3a76ccb
diff --git a/app-xemacs/cogre/Manifest b/app-xemacs/cogre/Manifest
new file mode 100644
index 000000000000..c4a99c11ddb6
--- /dev/null
+++ b/app-xemacs/cogre/Manifest
@@ -0,0 +1,3 @@
+DIST cogre-1.02-pkg.tar.gz 47588 BLAKE2B 6ce7f40e5aafa2aeaedbb5f17b4624decd0c87ec4fb38f186e0419c5496109d0b6fc267d6f484eb84fdd22f5f59c70451241e92c7bf7dc26c956e3ae6a95e7b7 SHA512 a3256df974d92440cb63b612e30807088450854cb157e1ba01e0362c36262fcdef11d5f1240796091ee2a6869f4dec06e9ab55dabd55ada5d2c7e7410e0e537c
+EBUILD cogre-1.02.ebuild 391 BLAKE2B 2a4bec232569d440b4296f9cac9bb489252338c304372a4491e62f0cda85b23b67d5c2571a55457ad339dec3bd66f0ed144df0a198c531e90525c12f7664af30 SHA512 afe60bf332bf39afbfc06d93466b20c78977ee9159d9125fcbec543a0c6fea4a4b6cea5648b487c5e4c83b78cc50bbe5c82256ef44f66a7543199f1f4ea68207
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/cogre/cogre-1.02.ebuild b/app-xemacs/cogre/cogre-1.02.ebuild
new file mode 100644
index 000000000000..05da8e3cc09e
--- /dev/null
+++ b/app-xemacs/cogre/cogre-1.02.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Graph editing mode"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="
+app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+app-xemacs/edebug
+app-xemacs/cedet-common
+app-xemacs/eieio
+app-xemacs/semantic
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/cogre/metadata.xml b/app-xemacs/cogre/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/cogre/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/cookie-1.15 b/app-xemacs/cookie-1.15
deleted file mode 100644
index 7fb8203c92f5..000000000000
--- a/app-xemacs/cookie-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Spook and Yow (Zippy quotes)
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/cookie-1.15-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=2ab0b10016acfcf9edd3b73f7ce1c3df
diff --git a/app-xemacs/cookie/Manifest b/app-xemacs/cookie/Manifest
new file mode 100644
index 000000000000..ff8e20b87eb4
--- /dev/null
+++ b/app-xemacs/cookie/Manifest
@@ -0,0 +1,3 @@
+DIST cookie-1.15-pkg.tar.gz 35035 BLAKE2B 4cd1408781337b8f124a5106a0a1c5d0f47860c3300f5451a031ec0403e6434a13973d93906e6585318b757fbd670aa7dd7a239445f6882f2574f92e48bff66b SHA512 0fdbc6f1db7f0fceaa35aaf8ab148875f4b391a3a2accab41c02267ad385fff4e54538e5335b2acca3e2d2550a9b2b00e78ae1e0b1bb997617ab439db9c89ece
+EBUILD cookie-1.15.ebuild 297 BLAKE2B 873f4dc5ecbd0f43121a8628d21412c3947081f5808c2be386ffcd601b26881f5d0bd6cb8e42adb6d78c6bf42dbae48b455debcfedbbf339bf1cc938cec4ddd6 SHA512 1db90f0fe72a5730e0a0bbe9d65c5608580a181776cea9721bce4d342b056c84f8df34106f4d1f69bc7d8916ec1dd278ef0f4cb03b0ce6f46b06eb7a0f78dc8c
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/cookie/cookie-1.15.ebuild b/app-xemacs/cookie/cookie-1.15.ebuild
new file mode 100644
index 000000000000..fc2925e50a29
--- /dev/null
+++ b/app-xemacs/cookie/cookie-1.15.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Spook and Yow (Zippy quotes)"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/cookie/metadata.xml b/app-xemacs/cookie/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/cookie/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/crisp-1.15 b/app-xemacs/crisp-1.15
deleted file mode 100644
index 9dfc5b6e93c6..000000000000
--- a/app-xemacs/crisp-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Crisp/Brief emulation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/crisp-1.15-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=1045794f164eac0d5eb6fd861039cece
diff --git a/app-xemacs/crisp/Manifest b/app-xemacs/crisp/Manifest
new file mode 100644
index 000000000000..4e3276e98162
--- /dev/null
+++ b/app-xemacs/crisp/Manifest
@@ -0,0 +1,3 @@
+DIST crisp-1.15-pkg.tar.gz 10436 BLAKE2B df57ef3f1eb7cc235f21bf40c8770cecf3ea139833cb1f27b3c25649721734fe88eb9af88a7da2e19cc98d869816087c52464e13dc254d6c1693e05089ed8083 SHA512 815d86bfc854e78c35fc8468f4e9aa3de05f9b029f4ec9e344880d398ae4b5a2bf8cc3391b0f6b8030090fcb4966dbc3871518410c99cd265c751b40c0e2b42f
+EBUILD crisp-1.15.ebuild 256 BLAKE2B faeb0c7773bfd4b7116335608f3a4d4f896ca377bbb1948e83adabf4385d875e4eb1e1fd916ab5ce64e2b35159272a3a4afec369ab3005a094250b8915a0c4b1 SHA512 13ab4764960d884e7e5643d4866573a26c4eb6e0b70e1ee2dea178f5be3610181572fc64b854e1c30d8d76b68d8a8f9b53da5f8f4768a5d6d037f85d635f876f
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/crisp/crisp-1.15.ebuild b/app-xemacs/crisp/crisp-1.15.ebuild
new file mode 100644
index 000000000000..be983af0b9ce
--- /dev/null
+++ b/app-xemacs/crisp/crisp-1.15.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Crisp/Brief emulation"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/crisp/metadata.xml b/app-xemacs/crisp/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/crisp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/debug-1.18 b/app-xemacs/debug-1.18
deleted file mode 100644
index 71b8eee8a95b..000000000000
--- a/app-xemacs/debug-1.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=GUD, gdb, dbx debugging support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/debug-1.18-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=0e6ac7f2475175bcbb639b19e59bb4bf
diff --git a/app-xemacs/debug/Manifest b/app-xemacs/debug/Manifest
new file mode 100644
index 000000000000..63ca9f33ee85
--- /dev/null
+++ b/app-xemacs/debug/Manifest
@@ -0,0 +1,3 @@
+DIST debug-1.18-pkg.tar.gz 107997 BLAKE2B 06873ef6d3886c8b5e9659084bb3a50db955e27ab5104d0f29271ebcfa2e5c298c1bee59f46dac0d4d10f8c0dd89c4b0c99e23bef2c449da697d22641d15bb6f SHA512 0bbd5496636bf6b850d44f953865ca7c23bb5f5040be0d8f6ec385a590ffaa6d5e325b24aac7f07b0b6c8ba0abf3fc3b7214f06a09d20eabc6bdf940237106a1
+EBUILD debug-1.18.ebuild 324 BLAKE2B 0510a2ad345b7ef9fa8cb575ce5c9b8ec7004bb3f434bebde260cafd696c02dfdcc0bf112b088338f53e1f90ea75f488a8cfc28eae882f5bec6bec44e37cb41d SHA512 68846bd7418cf47cc8367f6bc6f2176aebd8cf8ef387f28cb4d9201f48916bf5d853c69693bd7b1536cc713af92fe656b7670e4ac2af1173abe77788b00dcad1
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/debug/debug-1.18.ebuild b/app-xemacs/debug/debug-1.18.ebuild
new file mode 100644
index 000000000000..66aed95545f7
--- /dev/null
+++ b/app-xemacs/debug/debug-1.18.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="GUD, gdb, dbx debugging support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd"
+
+inherit xemacs-packages
diff --git a/app-xemacs/debug/metadata.xml b/app-xemacs/debug/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/debug/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/dictionary-1.16 b/app-xemacs/dictionary-1.16
deleted file mode 100644
index 16420b8e4d34..000000000000
--- a/app-xemacs/dictionary-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Interface to RFC2229 dictionary servers
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/dictionary-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=63f0cd988196c2aa997b1c6b37ce9736
diff --git a/app-xemacs/dictionary/Manifest b/app-xemacs/dictionary/Manifest
new file mode 100644
index 000000000000..a5bc16e974ac
--- /dev/null
+++ b/app-xemacs/dictionary/Manifest
@@ -0,0 +1,3 @@
+DIST dictionary-1.16-pkg.tar.gz 40085 BLAKE2B 413d5b82704eed5f96b99ffaedecdb149e8e562fa7e1a559cb396076d1ddae758fb634e00326f3f8682f7a1199905e3be7b0f271903f52faa532dbf31b8367fe SHA512 8dc0c0809d713f9eda280b110dbffa6f237c50ebb2e6c93f571efb3d22c1875ee5359fa91bc3faa58b3b0f431e75b84527262defb8aff5174a400be61f1a80dd
+EBUILD dictionary-1.16.ebuild 308 BLAKE2B 5552a050c03fd5b7d6ca8abda40d138604017a2da9147191003aaff3b30ac2e646615d53974388eefb854601575f53a79331f2e1c9d6bcddef1c9ccc3fa7d18d SHA512 08d737064247aa16149c95a719d75ccdbb249255cd57a464e3305e2ed1acb8dd31ae280d80264b7f16ec07a4783283885c7e201af558f61f08e26a17d72e39a0
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/dictionary/dictionary-1.16.ebuild b/app-xemacs/dictionary/dictionary-1.16.ebuild
new file mode 100644
index 000000000000..8f7f75eb27ee
--- /dev/null
+++ b/app-xemacs/dictionary/dictionary-1.16.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Interface to RFC2229 dictionary servers"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/dictionary/metadata.xml b/app-xemacs/dictionary/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/dictionary/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/dired-1.17 b/app-xemacs/dired-1.17
deleted file mode 100644
index 7ce53d0c0f65..000000000000
--- a/app-xemacs/dired-1.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Manage file systems
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/prog-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/dired-1.17-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=ecaa9e6bc202aeea50cc217ddf075772
diff --git a/app-xemacs/dired-1.19 b/app-xemacs/dired-1.19
deleted file mode 100644
index 6c86f1f939f9..000000000000
--- a/app-xemacs/dired-1.19
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Manage file systems
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/prog-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/dired-1.19-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=fe5bcb9275c1ae6123c424931b75d4b2
diff --git a/app-xemacs/dired-1.20 b/app-xemacs/dired-1.20
deleted file mode 100644
index 26cad81a0ff6..000000000000
--- a/app-xemacs/dired-1.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Manage file systems
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/prog-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/dired-1.20-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=ecaa9e6bc202aeea50cc217ddf075772
diff --git a/app-xemacs/dired/Manifest b/app-xemacs/dired/Manifest
new file mode 100644
index 000000000000..1ea7278f7e20
--- /dev/null
+++ b/app-xemacs/dired/Manifest
@@ -0,0 +1,7 @@
+DIST dired-1.17-pkg.tar.gz 201027 BLAKE2B f5662499f2c374fe8fe8bbcf7b859e3d923576078b126012d5d2b9b8c4581df607df0e3a9b9244afe333652ce0c92051e939d029c74d168b7052fa11e7e9cbb8 SHA512 337e32734df33520d3bfb492f04c82430ca473da5d8f69ced98f7562260e40d1ff85739e905c05412d8ad8b0e175927e90304fb2c79b8670899173d8c0cc0472
+DIST dired-1.19-pkg.tar.gz 203355 BLAKE2B 9825024621fc488d8ba603bf430b5ab9457afecdf288b95bcafab5e04bbf0524b49d642371e82aa1cee9d551c70867ed93a721e6568598f0797a8e2d4ac800c3 SHA512 522d63a018f640cc1120dfe4bce8215649b745f8c692e0dd875f41b92ffb54cf22968983befb7a3e3dcede562c947aa92336c247522bd520b8fb5e53909f5d51
+DIST dired-1.20-pkg.tar.gz 203778 BLAKE2B 90fdcdfc6cc33e58745bf65eb226c52617cccc73a246bcc4e7bb5525cb625b40ca0cbfd2bef1a97e1b7176c21efa11a0c157103bed7a35417ba06af034b3db94 SHA512 889b922cc187689c67c3b6f98264780b4653fe2707730cfa9c32cf5e3d93a5c80c4599daabbe1273f25f32dfc4f487288cdcbc09b8d0ac8b58dc09efb18f689d
+EBUILD dired-1.17.ebuild 310 BLAKE2B 810c6bc627cbd3b2c412a49181e5b1d7645133b83e166830f96a9456d67cfffae4ebfecdf01e7fd87546d70d489d65546e3cd7c9b4bfb0c1f73eb9ed318e9679 SHA512 a53e403a8c7c9eddd7f47e8695d366080e24fca28b7bd7fe7287d6f15c3d5511d345837cf386f5dd5d6f65dbbf2b5a6291d377996a4af6f32fd4baf867bc4d29
+EBUILD dired-1.19.ebuild 316 BLAKE2B 92244d2f28d006695cab4528a4b683baf80832aa6bdee43a3328702302f36ca4b9afc91edd79243faabae57a54089116410abf23662ea40511e7f1fff68a3061 SHA512 44a64f869617cb770abd7a9dc6bb1b6edd878abb896932282ab2234f78a51b7ab10aff5e9f43984bd47d75ba38b632fcaf2101b8eb85165c616a7f2ba396eab7
+EBUILD dired-1.20.ebuild 310 BLAKE2B 810c6bc627cbd3b2c412a49181e5b1d7645133b83e166830f96a9456d67cfffae4ebfecdf01e7fd87546d70d489d65546e3cd7c9b4bfb0c1f73eb9ed318e9679 SHA512 a53e403a8c7c9eddd7f47e8695d366080e24fca28b7bd7fe7287d6f15c3d5511d345837cf386f5dd5d6f65dbbf2b5a6291d377996a4af6f32fd4baf867bc4d29
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/dired/dired-1.17.ebuild b/app-xemacs/dired/dired-1.17.ebuild
new file mode 100644
index 000000000000..a02902b8f230
--- /dev/null
+++ b/app-xemacs/dired/dired-1.17.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Manage file systems"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/prog-modes
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/dired/dired-1.19.ebuild b/app-xemacs/dired/dired-1.19.ebuild
new file mode 100644
index 000000000000..eff4c39aac6f
--- /dev/null
+++ b/app-xemacs/dired/dired-1.19.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Manage file systems"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/prog-modes
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/dired/dired-1.20.ebuild b/app-xemacs/dired/dired-1.20.ebuild
new file mode 100644
index 000000000000..a02902b8f230
--- /dev/null
+++ b/app-xemacs/dired/dired-1.20.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Manage file systems"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/prog-modes
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/dired/metadata.xml b/app-xemacs/dired/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/dired/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/docbookide-0.08 b/app-xemacs/docbookide-0.08
deleted file mode 100644
index 7e8bfbabd91f..000000000000
--- a/app-xemacs/docbookide-0.08
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=DocBook editing support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-ispell app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/docbookide-0.08-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=fa7ac3b652ecb420799f1674b331942d
diff --git a/app-xemacs/docbookide/Manifest b/app-xemacs/docbookide/Manifest
new file mode 100644
index 000000000000..010d70ebdafb
--- /dev/null
+++ b/app-xemacs/docbookide/Manifest
@@ -0,0 +1,3 @@
+DIST docbookide-0.08-pkg.tar.gz 32061 BLAKE2B 051331b77ed2d68feaadd163134b7c39e1c57e87b3ff925ba2c2c353d470f94f575c4977ee18e84acf9e84de5440ebf32a31f507d99b110dbc1bf271069d1164 SHA512 a5de9193285bf185ab808c9aef3f483f81493a0f30327a923ed898700a5a7dcc489e4b6f9fc7767cadae481b62faa5f18e956955575543a037aba1a4059a42b0
+EBUILD docbookide-0.08.ebuild 337 BLAKE2B b8e9e3f4d2b49a5cae2bd38d6b7449ccdfcd6fb8efae5117961f513f507c9ac409414637aa1e6efda9dc0f9c5b0e8108bb52aaa4394b937fcd3ea2f07425bbd3 SHA512 ab270110ac5c740f24fec0657a54f6ef1002370a444d436fb7185396dfdea7ae7e929e3c6e57f606c21e98cf6d00b368ef63187a5f0dc0ef406179e05ea5445c
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/docbookide/docbookide-0.08.ebuild b/app-xemacs/docbookide/docbookide-0.08.ebuild
new file mode 100644
index 000000000000..037263a2c030
--- /dev/null
+++ b/app-xemacs/docbookide/docbookide-0.08.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="DocBook editing support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-ispell
+app-xemacs/mail-lib
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/docbookide/metadata.xml b/app-xemacs/docbookide/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/docbookide/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/easypg-1.02 b/app-xemacs/easypg-1.02
deleted file mode 100644
index 662599acdc55..000000000000
--- a/app-xemacs/easypg-1.02
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=GnuPG interface for Emacs
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/dired app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/easypg-1.02-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=097fc92ca00c632a6ba7dd3e154c4928
diff --git a/app-xemacs/easypg-1.03-r1 b/app-xemacs/easypg-1.03-r1
deleted file mode 100644
index 4e2fd4644ac5..000000000000
--- a/app-xemacs/easypg-1.03-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=GnuPG interface for Emacs
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/dired app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/easypg-1.03-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=2049fb713d338bb076a5424ed60c3a96
diff --git a/app-xemacs/easypg/Manifest b/app-xemacs/easypg/Manifest
new file mode 100644
index 000000000000..05cc4f20bd08
--- /dev/null
+++ b/app-xemacs/easypg/Manifest
@@ -0,0 +1,5 @@
+DIST easypg-1.02-pkg.tar.gz 73462 BLAKE2B 050b064cf3b7618defbaf893babb5406f6715cb292aed99d9f54ae4e31a26f89a032a90aff0ffa313c7dd12d07e894ebc302fd311e5e5f3e7c49630285ff5fdf SHA512 ec73fbdec50a01788ca586212d4b71e2c744e3283117515a71f73c3bda82b26d86ef9be52c4f78efeb574635e0b84a87b763f09bb1ced956699d1d97fb294aee
+DIST easypg-1.03-pkg.tar.gz 78192 BLAKE2B 5369dbf4f5da0c25c9a2e451dd775a0dc4e6bb5fe077e35b98f655cd23174ec5fc3bcf5df397ad0e9fc5b5728b919da666e91397f0cf13c3a0d9788c580275af SHA512 62541d38a09bcd60232cd18c54ded710515a88c2aa7940d823f120fef1c5316afca746723fb7ac564fad7407365daa736d96afc9d228d74b5d9ff19c4121b506
+EBUILD easypg-1.02.ebuild 308 BLAKE2B 37bc16f8b21c0c835269baccb6cf9b705111a27b5fd06c8b3133e34ca0351fee642df8001f619fd9370d1377afec87d86fdd50a4d91f7d4ab32bfbf6e5a32047 SHA512 a3cb0980b83c149a7abb9953e6c79cb815ba0d24e1a6e30183f30f7ed9a0d710e0a60daed9ce682acb3995c0f7cbdf6492abccc6c074dc624d259ccd2e41979d
+EBUILD easypg-1.03-r1.ebuild 333 BLAKE2B 7d63e60278a4231fe3d99c1f4c1181db5ca87311f7e23ff42c7337f49afa020a3832ab469c591a33d9a58572be74efce7b91d27d48b4d911b737fd73f36378d8 SHA512 86cb1e51e54120d923f1bf0c079cb07662b633e6bf8e492eb2f16f626bf63c7bf6b41bcfdb297c8aeaf142d7e01c41e7de857f6f4001c0a16d0819bc8f5acaf8
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/easypg/easypg-1.02.ebuild b/app-xemacs/easypg/easypg-1.02.ebuild
new file mode 100644
index 000000000000..497ad8c018aa
--- /dev/null
+++ b/app-xemacs/easypg/easypg-1.02.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="GnuPG interface for Emacs"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="~amd64"
+
+RDEPEND="app-xemacs/xemacs-base
+	app-xemacs/dired
+	app-xemacs/mail-lib"
+
+inherit xemacs-packages
diff --git a/app-xemacs/easypg/easypg-1.03-r1.ebuild b/app-xemacs/easypg/easypg-1.03-r1.ebuild
new file mode 100644
index 000000000000..035c22ee7943
--- /dev/null
+++ b/app-xemacs/easypg/easypg-1.03-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+XEMACS_PKG_CAT="standard"
+
+inherit xemacs-packages
+
+SLOT="0"
+DESCRIPTION="GnuPG interface for Emacs"
+
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/dired
+app-xemacs/mail-lib
+"
diff --git a/app-xemacs/easypg/metadata.xml b/app-xemacs/easypg/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/easypg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/ebuild-mode-1.42 b/app-xemacs/ebuild-mode-1.42
deleted file mode 100644
index 7da07605032d..000000000000
--- a/app-xemacs/ebuild-mode-1.42
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script app-editors/xemacs
-DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=amd64 hppa x86
-LICENSE=GPL-2+
-RDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.42.tar.xz
-_eclasses_=xemacs-elisp	ec6a89e5b3d4b998d328d445d1c7ec06	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=302b5d06bec37b75721e79d08056541b
diff --git a/app-xemacs/ebuild-mode-1.43 b/app-xemacs/ebuild-mode-1.43
deleted file mode 100644
index 1139a51ce4e4..000000000000
--- a/app-xemacs/ebuild-mode-1.43
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script app-editors/xemacs
-DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-2+
-RDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.43.tar.xz
-_eclasses_=xemacs-elisp	ec6a89e5b3d4b998d328d445d1c7ec06	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=8b44f2158af8de57d85b06cb8b4cf8b3
diff --git a/app-xemacs/ebuild-mode-1.44 b/app-xemacs/ebuild-mode-1.44
deleted file mode 100644
index 9d2e6b17a434..000000000000
--- a/app-xemacs/ebuild-mode-1.44
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script app-editors/xemacs
-DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-2+
-RDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.44.tar.xz
-_eclasses_=xemacs-elisp	ec6a89e5b3d4b998d328d445d1c7ec06	xemacs-elisp-common	5ad47e1940fe7ffbdeeb002a3912bf79
-_md5_=88eb99e8ef5020a6e684fe940b9658bc
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
new file mode 100644
index 000000000000..fe5b1ab59bd9
--- /dev/null
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -0,0 +1,7 @@
+DIST ebuild-mode-1.42.tar.xz 34936 BLAKE2B dd94d17dc57e2d32b329ab62ec6eec8ada6a4aeddadb8d978736f5dcb4d613759fd860043cab92d12db11614f8b7fa71fc5537576a2af3f5e6c9d56fc2fdcc05 SHA512 119f954eaf009bd0c9f0a75810b94a54d65ed91c6ffef20dd164c7a5ef095410dd0f3642426817f5efa6623d4f3e120ed3b27076222b02a90e75a83bb80b8703
+DIST ebuild-mode-1.43.tar.xz 34688 BLAKE2B 577900e2fa7ccb2362ec7f9046affb58e92bdfde44f2ea48274ba61d65f35fa6a1852bda6d9c64bd3f63aba99df244b4cb3378de079259508b149cdacf7caf28 SHA512 91f9a06de6feeeadb27d765a6ca6f2fa17e01938a6c953efe3586646f1bf48da87fe269ee9b07b2e16199d3ba4a76f42b8be9143218b808fac2971fc6f64f36d
+DIST ebuild-mode-1.44.tar.xz 34468 BLAKE2B 05c420979c2e4e145ab6230e9218d2ace8250abcc07e819610e9ac1fbb86147a641b88e69328ff624f9787b87cef56f9fe02a1205a02d01a0157b0293656647e SHA512 4d9b01939af089794255faf747264f948b8b2df47936e364ccfa23da493a33f56fbce1277526089e60b716e38e248b12fac39eca0d59d4974e2e70236ffbcd44
+EBUILD ebuild-mode-1.42.ebuild 700 BLAKE2B c7232955da39b7675addbf75055b2fa6c7ff98e209a574816f1fc6d6af3e49d4b4975e781d39eec1c64f46c57a326eab35183458498c5958a2505c350334b9c4 SHA512 279fe95a7672377e24e592db0bcc6678984cdb310da298b60168bd63a1881ff1730a51ed5e43d35a2c32a0ebef3401764622e6b81750f13adde24b7942aef354
+EBUILD ebuild-mode-1.43.ebuild 703 BLAKE2B 4fb8321a4f2708171c344e79fc313c45ddf1cf258d3bbdcff51b725537419560b2c02a203b73315b4fa80c47ebe468af93fbfef557e1e09347cc676b67db1298 SHA512 f93821aa3a2d511cbf90400ae2f9688f03ac712b08f22a7aef5dbfac475c5f1d11d63b8fd48b767086d826fd4baba20591dc597d7cc5e05d2a3feb12583651b8
+EBUILD ebuild-mode-1.44.ebuild 703 BLAKE2B fb6d6f16fc57632d1b1ac6c90d9619acafa4833a2ecf202b61bb51dfdfb76424d8091ce4e92e6e3db0c791a0cd1c17f37f88e75d8068e6be932a432055375d32 SHA512 1dc192d4dcc7abba0598eeeea4fdef47a517fdc56c81ebdad6a0563d70504f790bb808b26d856782ffe71c51d6d4785b1f4b01b00362dc5e26329c619099e7c4
+MISC metadata.xml 417 BLAKE2B d442b7726c175c95922475904d9dbb6260ecf53140bf041121fed80c3183142bdf7bcc88f7f87eeeab0dd91a81eacf507e2c4ea8cc8f86dbf6b60c52fcec868d SHA512 459969f9a78209b1058fb5fed220192bddd532c9dabc8e5d340c040bef0e454f08fe3896b33bcddaa011fd4639351f6f6a33ba6669895e99e001810324c101ad
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.42.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.42.ebuild
new file mode 100644
index 000000000000..56fd191b5054
--- /dev/null
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.42.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xemacs-elisp
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 hppa x86"
+
+RDEPEND=">=app-editors/xemacs-21.4.20-r5
+	app-xemacs/sh-script"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
+		-f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die
+	xemacs-elisp-make-autoload-file \
+		ebuild-mode.el gentoo-newsitem-mode.el || die
+}
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.43.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.43.ebuild
new file mode 100644
index 000000000000..1288c724a3a0
--- /dev/null
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.43.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xemacs-elisp
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+RDEPEND=">=app-editors/xemacs-21.4.20-r5
+	app-xemacs/sh-script"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
+		-f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die
+	xemacs-elisp-make-autoload-file \
+		ebuild-mode.el gentoo-newsitem-mode.el || die
+}
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.44.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.44.ebuild
new file mode 100644
index 000000000000..b0e82e52e220
--- /dev/null
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.44.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xemacs-elisp
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+RDEPEND=">=app-editors/xemacs-21.4.20-r5
+	app-xemacs/sh-script"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
+		-f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die
+	xemacs-elisp-make-autoload-file \
+		ebuild-mode.el gentoo-newsitem-mode.el || die
+}
diff --git a/app-xemacs/ebuild-mode/metadata.xml b/app-xemacs/ebuild-mode/metadata.xml
new file mode 100644
index 000000000000..bf4f894f5fe3
--- /dev/null
+++ b/app-xemacs/ebuild-mode/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>emacs@gentoo.org</email>
+      <name>Gentoo Emacs project</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/app-xemacs/ecb-1.22 b/app-xemacs/ecb-1.22
deleted file mode 100644
index 86c44c638db5..000000000000
--- a/app-xemacs/ecb-1.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs source code browser
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/semantic app-xemacs/eieio app-xemacs/fsf-compat app-xemacs/edit-utils app-xemacs/jde app-xemacs/mail-lib app-xemacs/eshell app-xemacs/ediff app-xemacs/xemacs-devel app-xemacs/speedbar app-xemacs/c-support app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ecb-1.22-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=943d8b626fee156bd95a4090c5717153
diff --git a/app-xemacs/ecb/Manifest b/app-xemacs/ecb/Manifest
new file mode 100644
index 000000000000..28ef20a5a542
--- /dev/null
+++ b/app-xemacs/ecb/Manifest
@@ -0,0 +1,3 @@
+DIST ecb-1.22-pkg.tar.gz 887270 BLAKE2B 3185c440a06e90f0bfdf2314a8689eb992f568109a98aedf95f65438fee40e2d665cf5b30a175bc6f0cb02591b80439db072fae452a707e93537c2a0b630e650 SHA512 13c1254cd39f346b9165ea9b0eb3195372da54a5d6afce83a86b2c6b2e7673b0d614526f14330a2483a6eed45ce04b8d72ad119e02db2d3aaeff0fd9fd234b41
+EBUILD ecb-1.22.ebuild 510 BLAKE2B c3a0acfa9a498f9fdc9273fc6af2335bd1b4fa5fa89a465cf4079d31ead20bcfd8c35853caae3b36db850aeca3084458d5275505287a30cac69716a1b007c922 SHA512 9fd65cd1eeda1e0679ab33ad540cfef18a728b1289642dc9311484942a363ad4cb9c700be0d13a9892aa9becd8368a706da9fa1df50175b43906a96abde36aeb
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ecb/ecb-1.22.ebuild b/app-xemacs/ecb/ecb-1.22.ebuild
new file mode 100644
index 000000000000..d50fc03f88f4
--- /dev/null
+++ b/app-xemacs/ecb/ecb-1.22.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Emacs source code browser"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/semantic
+app-xemacs/eieio
+app-xemacs/fsf-compat
+app-xemacs/edit-utils
+app-xemacs/jde
+app-xemacs/mail-lib
+app-xemacs/eshell
+app-xemacs/ediff
+app-xemacs/xemacs-devel
+app-xemacs/speedbar
+app-xemacs/c-support
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ecb/metadata.xml b/app-xemacs/ecb/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/ecb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/ecrypto-0.20 b/app-xemacs/ecrypto-0.20
deleted file mode 100644
index a85212672ab9..000000000000
--- a/app-xemacs/ecrypto-0.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Crypto functionality in Emacs Lisp
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ecrypto-0.20-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=03c8227e8ad6bb966401206ab9613b8b
diff --git a/app-xemacs/ecrypto-0.21 b/app-xemacs/ecrypto-0.21
deleted file mode 100644
index 6bcfedd06ec7..000000000000
--- a/app-xemacs/ecrypto-0.21
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Crypto functionality in Emacs Lisp
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ecrypto-0.21-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=03c8227e8ad6bb966401206ab9613b8b
diff --git a/app-xemacs/ecrypto/Manifest b/app-xemacs/ecrypto/Manifest
new file mode 100644
index 000000000000..9170568b5a8a
--- /dev/null
+++ b/app-xemacs/ecrypto/Manifest
@@ -0,0 +1,5 @@
+DIST ecrypto-0.20-pkg.tar.gz 76257 BLAKE2B f9ae37e7addb3670a162ac36750def814121da60864372ab1f75ceacd7133e7071d94962b41a103a27edd081d0f093859eb2db6f6a84f3dcb9517e12af37fe1e SHA512 bacf0b8e5ee3c11aed744a9e7a3b33a7e4d10aa698b43b95226cc476db0daaa821b1d8e9fd64a487efc8a8c69b932c3112020815ca8abfaa7e5b08785d8b3e9b
+DIST ecrypto-0.21-pkg.tar.gz 76396 BLAKE2B b5f730a90370968ab5596a5b0ec8ee72ec93eb71f14df30161be19a9d0b2b8ca82195df462c80120aca3dc6189a1a2158b724eae7ac21c47c88332db79c4f9bb SHA512 b5d74079d940753a809ac294f466ee93244f5c96a79d9af26a45d005ed9b2b4ccb2459baeb63430b8e3dab44db31ea845ec8c64c8d57482e382955b793510e67
+EBUILD ecrypto-0.20.ebuild 303 BLAKE2B 1bb6a31fc02fd4b846009e4df9c00c3d2d7a9436dbbada3ec210dbada7de27510ce3c38138d488943c241f09771e8caeed6f1a4976c6b29d1f7be689ab07da42 SHA512 4d7ca5139b9dddb25f809c2ca54fca91f65574b2e9e722a8544bf2d5ee916c62ea54e9fd9340d39f6e3ce73a02cd281690dfa402693ee48e50f51383aa82cf50
+EBUILD ecrypto-0.21.ebuild 303 BLAKE2B 1bb6a31fc02fd4b846009e4df9c00c3d2d7a9436dbbada3ec210dbada7de27510ce3c38138d488943c241f09771e8caeed6f1a4976c6b29d1f7be689ab07da42 SHA512 4d7ca5139b9dddb25f809c2ca54fca91f65574b2e9e722a8544bf2d5ee916c62ea54e9fd9340d39f6e3ce73a02cd281690dfa402693ee48e50f51383aa82cf50
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ecrypto/ecrypto-0.20.ebuild b/app-xemacs/ecrypto/ecrypto-0.20.ebuild
new file mode 100644
index 000000000000..862728af345e
--- /dev/null
+++ b/app-xemacs/ecrypto/ecrypto-0.20.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Crypto functionality in Emacs Lisp"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ecrypto/ecrypto-0.21.ebuild b/app-xemacs/ecrypto/ecrypto-0.21.ebuild
new file mode 100644
index 000000000000..862728af345e
--- /dev/null
+++ b/app-xemacs/ecrypto/ecrypto-0.21.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Crypto functionality in Emacs Lisp"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ecrypto/metadata.xml b/app-xemacs/ecrypto/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/ecrypto/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/ede-1.03-r1 b/app-xemacs/ede-1.03-r1
deleted file mode 100644
index 2cfa01149144..000000000000
--- a/app-xemacs/ede-1.03-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs Development Environment
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ede-1.03-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c61e484482f270421344946fb26de93c
diff --git a/app-xemacs/ede/Manifest b/app-xemacs/ede/Manifest
new file mode 100644
index 000000000000..2adf653a9188
--- /dev/null
+++ b/app-xemacs/ede/Manifest
@@ -0,0 +1,3 @@
+DIST ede-1.03-pkg.tar.gz 124600 BLAKE2B bcd1bdc260b401c2eac620e176d54707ea8ec014205d9d04e9f207629b4c22e311db1215450c2e9f66e6f7ebbd742c1bfe51bd1ccf0412fcfcb37cad7b865035 SHA512 9ac35acf8df8fd6b649720602772404a808556b105dc438bbc495af3ce3323afd0c3ebd05cec4ee5b12199342d836fcc6873146cf06525e12de8277248968de2
+EBUILD ede-1.03-r1.ebuild 265 BLAKE2B cf67717e68b750aa98140631e314272db29e45fb68cfde0dcf6538cedd46861c44de5f2f7359cb1fac3a78fc96063d43d0d5169868b5056db087c412d2fec3a0 SHA512 bd219459daab5dc639f9f0684d38d60e243f6262bdca1002ad6b77cf60bd93e2d3966a48ac5f011346913ae7d47ecdc2be58251bf6157909afbb0d902515df00
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ede/ede-1.03-r1.ebuild b/app-xemacs/ede/ede-1.03-r1.ebuild
new file mode 100644
index 000000000000..5bf50d5ffbf4
--- /dev/null
+++ b/app-xemacs/ede/ede-1.03-r1.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+XEMACS_PKG_CAT="standard"
+
+inherit xemacs-packages
+
+SLOT="0"
+DESCRIPTION="Emacs Development Environment"
+
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
diff --git a/app-xemacs/ede/metadata.xml b/app-xemacs/ede/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/ede/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/edebug-1.22 b/app-xemacs/edebug-1.22
deleted file mode 100644
index 716002cde0a2..000000000000
--- a/app-xemacs/edebug-1.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=An Emacs Lisp debugger
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-devel app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edebug-1.22-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=53b622ce8cc82670cf151ecdbeed3451
diff --git a/app-xemacs/edebug/Manifest b/app-xemacs/edebug/Manifest
new file mode 100644
index 000000000000..c2de1c2e6a00
--- /dev/null
+++ b/app-xemacs/edebug/Manifest
@@ -0,0 +1,3 @@
+DIST edebug-1.22-pkg.tar.gz 115557 BLAKE2B ce828bf916a02d15a699cbf0e1da97b3f2492595685bcd40c038dfdb3de2bc93cb1ef62a1ba280642384363a8c7fc7a23aa35073036d7e13aaa43597015a94e3 SHA512 5f4d86d770d68ab2199cb781da4f3b67dbda979396349212d851890bd257a85195fc5a8e0fa4ab337335887b3c2ff27e46002758926828093b6dce25f8796ada
+EBUILD edebug-1.22.ebuild 315 BLAKE2B a0be97e8648ef463df346b2a4c0c256d07f58c766e326f7005e76b427fd2fd225f3a7b1ae912186ef0c7b0aca9752f600da9bafe04d844790a29b17e0d0d1d18 SHA512 634585da96e8e8e248aa3da87dcb0e27118bec28631e358e1bcd59b579a77b27517abf4c01a94f9f5a4de8e8d3bd0430243e100dcd9778f9e8bac9a135a13253
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/edebug/edebug-1.22.ebuild b/app-xemacs/edebug/edebug-1.22.ebuild
new file mode 100644
index 000000000000..d17b63909ffc
--- /dev/null
+++ b/app-xemacs/edebug/edebug-1.22.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="An Emacs Lisp debugger"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/edebug/metadata.xml b/app-xemacs/edebug/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/edebug/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/edict-1.16 b/app-xemacs/edict-1.16
deleted file mode 100644
index 9bdd949a4d21..000000000000
--- a/app-xemacs/edict-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Lisp Interface to EDICT, Kanji Dictionary
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edict-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=aaa2edf9be348d5afbe20fd63fc36bc6
diff --git a/app-xemacs/edict-1.17 b/app-xemacs/edict-1.17
deleted file mode 100644
index 7db11b0c7cae..000000000000
--- a/app-xemacs/edict-1.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Lisp Interface to EDICT, Kanji Dictionary
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edict-1.17-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=aaa2edf9be348d5afbe20fd63fc36bc6
diff --git a/app-xemacs/edict/Manifest b/app-xemacs/edict/Manifest
new file mode 100644
index 000000000000..fb70f09075b0
--- /dev/null
+++ b/app-xemacs/edict/Manifest
@@ -0,0 +1,5 @@
+DIST edict-1.16-pkg.tar.gz 96111 BLAKE2B 60d0a990e8c2938205cdca4159f0d77360bb864b7ee66ac11b8f5714aa7cab1c2baf23fbcd891a2e0151be221efd9e46754e6ce651b2b4db2172a8835d7bbc46 SHA512 702d8d454310aaeb0804a96ed5f90c34eb2eeb72c598504404e257640a6cc153e5603cd7d8d1233b152e828fa44ec6919c7e0f9a9870a303b837db6dd5e0632c
+DIST edict-1.17-pkg.tar.gz 96241 BLAKE2B 7f353921e15a4334d5ba62048ed755b35e492536e43009c07d52acbb6a81ae92bc2190e3e8c033e1b9ad7cb685b2c673097ebe17c1eceab3d74fff4c9d82b44f SHA512 df70e1c128fd5d70ce9b5a927e25d3787b6f7e9bf7683c2da98e7a428d8bedbf2da9f1b26f7db41e94857cb30eed43e01eb9073b85a70650cabeea706599449c
+EBUILD edict-1.16.ebuild 333 BLAKE2B 301fa1a83f3971b1cb8f33fce17ea6af0460e3f8f8a187646f558ad1c57d09e6ea5fa849bbe40862bb2e46b243b58c9bb75c4a7dd79e3455c17874055b7ce8ae SHA512 6e9b305a54d92abb478cd03a35540a3f4e61131cd1158b65e35cdcdb3d91ee80482fc71f218fcb84bab798b30a6bf45b65f1dbe927c80c872795a1b8e5933a2a
+EBUILD edict-1.17.ebuild 333 BLAKE2B 301fa1a83f3971b1cb8f33fce17ea6af0460e3f8f8a187646f558ad1c57d09e6ea5fa849bbe40862bb2e46b243b58c9bb75c4a7dd79e3455c17874055b7ce8ae SHA512 6e9b305a54d92abb478cd03a35540a3f4e61131cd1158b65e35cdcdb3d91ee80482fc71f218fcb84bab798b30a6bf45b65f1dbe927c80c872795a1b8e5933a2a
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/edict/edict-1.16.ebuild b/app-xemacs/edict/edict-1.16.ebuild
new file mode 100644
index 000000000000..7df8cf41bcca
--- /dev/null
+++ b/app-xemacs/edict/edict-1.16.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Lisp Interface to EDICT, Kanji Dictionary"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/mule-base
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/edict/edict-1.17.ebuild b/app-xemacs/edict/edict-1.17.ebuild
new file mode 100644
index 000000000000..7df8cf41bcca
--- /dev/null
+++ b/app-xemacs/edict/edict-1.17.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Lisp Interface to EDICT, Kanji Dictionary"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/mule-base
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/edict/metadata.xml b/app-xemacs/edict/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/edict/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/ediff-1.68 b/app-xemacs/ediff-1.68
deleted file mode 100644
index 36e11abe084c..000000000000
--- a/app-xemacs/ediff-1.68
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Interface over GNU patch
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/pcl-cvs app-xemacs/elib app-xemacs/dired app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/prog-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ediff-1.68-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=b8534cefbec27cc8117c16ee29e6fd7f
diff --git a/app-xemacs/ediff-1.77 b/app-xemacs/ediff-1.77
deleted file mode 100644
index 30e595569f00..000000000000
--- a/app-xemacs/ediff-1.77
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Interface over GNU patch
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/pcl-cvs app-xemacs/elib app-xemacs/dired app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/prog-modes app-xemacs/gnus app-xemacs/tramp app-xemacs/vc app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ediff-1.77-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=f8fe3c962548a9eb1500a69789d57d86
diff --git a/app-xemacs/ediff-1.81 b/app-xemacs/ediff-1.81
deleted file mode 100644
index ccc97b73ee98..000000000000
--- a/app-xemacs/ediff-1.81
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Interface over GNU patch
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/pcl-cvs app-xemacs/elib app-xemacs/dired app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/prog-modes app-xemacs/gnus app-xemacs/tramp app-xemacs/vc app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ediff-1.81-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=a0b1d488695f576e10e230b3ac800e30
diff --git a/app-xemacs/ediff/Manifest b/app-xemacs/ediff/Manifest
new file mode 100644
index 000000000000..e18d082ec939
--- /dev/null
+++ b/app-xemacs/ediff/Manifest
@@ -0,0 +1,7 @@
+DIST ediff-1.68-pkg.tar.gz 317183 BLAKE2B 56610f91e61cf4cfba0c7ad444d06a929ddfb6fc65e41bc8dce57ba354e1e6d5b99c5cea0121d11c32d4f277b7f8303026522b0423669d2e77126905b8d61a0b SHA512 adf3fc6fb0692022d4f44e9b966d076574dc12025b3f90bfb7f7bab6f3735d39c993757619d09a19479afdb73554cf484aae457f1184a8bf5bf831923c4ac6bb
+DIST ediff-1.77-pkg.tar.gz 317283 BLAKE2B 1f0fb3206ef6b05cc56ae9512ba7a3f9368952b898e6e324e7b73f748c91de3ec7ed0d7c34dd4961ba9c2d86b988e75065d0578f0777bba602e7693983829e20 SHA512 5f1ba2019dfa762382639516eabcfd81da14dcbb35df77c82f24ae3250d003fb4c596d529c6897b7502ee227a67be85da8d01d4d3109d9f28ef6558f0ebc78d2
+DIST ediff-1.81-pkg.tar.gz 321669 BLAKE2B b4d28035fc6ed786053c04f759524f538e1e61c18df6db1d9e844e8f5718c228cd4c3e8d62f0ba3ef112b6e7bd85c02727a4404fb067fca0135784b963323e20 SHA512 1535f39a6af02e488f756303223cb116687c28d635f761f8456a439c576bf6691119d29e5fa2c7fca2e2a578faa4d09bac34145a8ca92116aca14e7ea93d694f
+EBUILD ediff-1.68.ebuild 385 BLAKE2B a998fe0983e857e0f1fbd201256f9e63de9598e6e395ea3b92d1562fa1203f7f0e0502bef66a3e87c83dc23278c3faeb719af38ba486d38a775f615d4ce5e1b8 SHA512 597a0fa865c3b9839a312f1d2f4408acb9a5a4934fc22705a66f0d80a4a0e4c7bbd9661f997e09e7a9ede77aad96879efd2fc17092bd657c6470752148b5cf0e
+EBUILD ediff-1.77.ebuild 438 BLAKE2B 3c83c1884e1f6aa76fdb6dc5560fef1f9f0edd923981ab5e5fbe2be61388da3f7334b204adaf6e7a7f8f77ee67d1ac546fd89543cc86f9b20711eeff317b36f4 SHA512 51fbeca99179ded5f0ddb65d892a123e1f484d7198d75025e0d287aa8f3049737e05bd2a5286ad87631db771baa5151ccf38879f4c8174b36fd4cab0bc836b1f
+EBUILD ediff-1.81.ebuild 432 BLAKE2B 6ad5637e1cc80d5582b24abe17ee0618942aebdcc130970bf476b781c2420c78e9928ac2f1494ded56bf46b60b3a6ea56017b3d9f39cf9c5013e02119489d4bb SHA512 8c809b38b935fe38076c8aabe089b4a712705a1538f7519662dd0a159f862f9df10e57b143da39beddc00a4b8058dadb4760a23e571d2bfc674a1c6f04af1648
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ediff/ediff-1.68.ebuild b/app-xemacs/ediff/ediff-1.68.ebuild
new file mode 100644
index 000000000000..d5e4655f6b78
--- /dev/null
+++ b/app-xemacs/ediff/ediff-1.68.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Interface over GNU patch"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/pcl-cvs
+app-xemacs/elib
+app-xemacs/dired
+app-xemacs/xemacs-base
+app-xemacs/edebug
+app-xemacs/prog-modes
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ediff/ediff-1.77.ebuild b/app-xemacs/ediff/ediff-1.77.ebuild
new file mode 100644
index 000000000000..c1c90e40757e
--- /dev/null
+++ b/app-xemacs/ediff/ediff-1.77.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Interface over GNU patch"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/pcl-cvs
+app-xemacs/elib
+app-xemacs/dired
+app-xemacs/xemacs-base
+app-xemacs/edebug
+app-xemacs/prog-modes
+app-xemacs/gnus
+app-xemacs/tramp
+app-xemacs/vc
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ediff/ediff-1.81.ebuild b/app-xemacs/ediff/ediff-1.81.ebuild
new file mode 100644
index 000000000000..6a23076790a4
--- /dev/null
+++ b/app-xemacs/ediff/ediff-1.81.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Interface over GNU patch"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/pcl-cvs
+app-xemacs/elib
+app-xemacs/dired
+app-xemacs/xemacs-base
+app-xemacs/edebug
+app-xemacs/prog-modes
+app-xemacs/gnus
+app-xemacs/tramp
+app-xemacs/vc
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ediff/metadata.xml b/app-xemacs/ediff/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/ediff/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/edit-utils-2.39 b/app-xemacs/edit-utils-2.39
deleted file mode 100644
index 19ebb744a6e9..000000000000
--- a/app-xemacs/edit-utils-2.39
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Miscellaneous editor extensions, you probably need this
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/fsf-compat app-xemacs/dired app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edit-utils-2.39-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=669d623ff79a942529a0d02abf4e3c12
diff --git a/app-xemacs/edit-utils-2.43 b/app-xemacs/edit-utils-2.43
deleted file mode 100644
index 65d98a2c7fed..000000000000
--- a/app-xemacs/edit-utils-2.43
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Miscellaneous editor extensions, you probably need this
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/fsf-compat app-xemacs/dired app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edit-utils-2.43-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=669d623ff79a942529a0d02abf4e3c12
diff --git a/app-xemacs/edit-utils-2.44 b/app-xemacs/edit-utils-2.44
deleted file mode 100644
index d5df7311a36c..000000000000
--- a/app-xemacs/edit-utils-2.44
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Miscellaneous editor extensions, you probably need this
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/fsf-compat app-xemacs/dired app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/edit-utils-2.44-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=a978aafd16eb3170ef66621fe70e4d9e
diff --git a/app-xemacs/edit-utils/Manifest b/app-xemacs/edit-utils/Manifest
new file mode 100644
index 000000000000..eae81bcc436f
--- /dev/null
+++ b/app-xemacs/edit-utils/Manifest
@@ -0,0 +1,7 @@
+DIST edit-utils-2.39-pkg.tar.gz 962340 BLAKE2B 58fd356da23467c29976f39642d5aeac0898418deb60edc909b79d76e0e196bdf3757a672a12bebfd258014c495a8c43cc177dc00b5da5877905fe991814c41e SHA512 dcd6634ec0eb9cb71336ac445fa063a3fabf34d5bfe47f417c00b111a82c42f10679ab6512e1bfcb80596cacb532fa14cb3f5675fb36a5e6258696bb7491fb51
+DIST edit-utils-2.43-pkg.tar.gz 958798 BLAKE2B 276bc16f5e7dbf29fcc78ed05da80976262dd48b1a088e8070192dd414240389da08a737dc6fb8c8459552d9c5ae491e248196ba8e7bf30d49cd7c74d0070cae SHA512 e42e416002f0f0c580f241ce4753c3868494025b4bfd087f5654e3c238a4b5c99d56f01db6b0fa47d1142085d5b4183625248266d76381387030a89e47a9e68f
+DIST edit-utils-2.44-pkg.tar.gz 958866 BLAKE2B 826d508304a2b08b76b7f358e7629184ef5d441d5a728e4943158b6e5c37cd128a5353f4b760a1a460f7f6487b51f10882462859388618587a984b298dc92b98 SHA512 fcb37c24304756e83cd273497cedf671e62ddce78f7bc460052cd3725948e35d87ce9d3108938483cd2ab8fb2d663ffb1df033b47b6e4b7e73f3a71d6d0ae886
+EBUILD edit-utils-2.39.ebuild 407 BLAKE2B aedfec505d2c7e91591c2a83a9b0f1b997ffb3dee4336b5b9d21f22f003c14ec2e0ea537bf49353518b27daa7313739730ee8484b4c1a865ee2efe0283a5a792 SHA512 4f9a5e69aadf5b843a2aac32ac472d716d7b6a1d009e5a07deec5a25330950798dafe9a5e53baadb4655f7cd0fabed1b581059d9607798daf96e9778a29fc541
+EBUILD edit-utils-2.43.ebuild 407 BLAKE2B aedfec505d2c7e91591c2a83a9b0f1b997ffb3dee4336b5b9d21f22f003c14ec2e0ea537bf49353518b27daa7313739730ee8484b4c1a865ee2efe0283a5a792 SHA512 4f9a5e69aadf5b843a2aac32ac472d716d7b6a1d009e5a07deec5a25330950798dafe9a5e53baadb4655f7cd0fabed1b581059d9607798daf96e9778a29fc541
+EBUILD edit-utils-2.44.ebuild 441 BLAKE2B 80e3e76d4377de7a1fcc9feb131c8c1b747c8821dad6f3677b031df875251ccc19429e77ab4cc897f9c7c0ca47f8369f80483d26893509ae5c0f71f9e8364e7f SHA512 b0e5deb82a3725758175ef0348229d59a9e647a6efd40dbf689baa842aedb9f3521cd6ca18b013ceade9f709e65abf826abe9c7e322b8ca7aad40a10c79a5b1a
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/edit-utils/edit-utils-2.39.ebuild b/app-xemacs/edit-utils/edit-utils-2.39.ebuild
new file mode 100644
index 000000000000..3e52e3b9215f
--- /dev/null
+++ b/app-xemacs/edit-utils/edit-utils-2.39.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Miscellaneous editor extensions, you probably need this"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+app-xemacs/fsf-compat
+app-xemacs/dired
+app-xemacs/mail-lib
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/edit-utils/edit-utils-2.43.ebuild b/app-xemacs/edit-utils/edit-utils-2.43.ebuild
new file mode 100644
index 000000000000..3e52e3b9215f
--- /dev/null
+++ b/app-xemacs/edit-utils/edit-utils-2.43.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Miscellaneous editor extensions, you probably need this"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+app-xemacs/fsf-compat
+app-xemacs/dired
+app-xemacs/mail-lib
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/edit-utils/edit-utils-2.44.ebuild b/app-xemacs/edit-utils/edit-utils-2.44.ebuild
new file mode 100644
index 000000000000..66d1a24c46d9
--- /dev/null
+++ b/app-xemacs/edit-utils/edit-utils-2.44.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Miscellaneous editor extensions, you probably need this"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+app-xemacs/fsf-compat
+app-xemacs/dired
+app-xemacs/mail-lib
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/edit-utils/metadata.xml b/app-xemacs/edit-utils/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/edit-utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/edt-1.13 b/app-xemacs/edt-1.13
deleted file mode 100644
index 04b7d935f117..000000000000
--- a/app-xemacs/edt-1.13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=DEC EDIT/EDT emulation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edt-1.13-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=f691c612f41d458f3cd4b8237a623a9c
diff --git a/app-xemacs/edt-1.14 b/app-xemacs/edt-1.14
deleted file mode 100644
index 82a5e23dbe93..000000000000
--- a/app-xemacs/edt-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=DEC EDIT/EDT emulation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/edt-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=f691c612f41d458f3cd4b8237a623a9c
diff --git a/app-xemacs/edt/Manifest b/app-xemacs/edt/Manifest
new file mode 100644
index 000000000000..05c36944f28b
--- /dev/null
+++ b/app-xemacs/edt/Manifest
@@ -0,0 +1,5 @@
+DIST edt-1.13-pkg.tar.gz 62754 BLAKE2B f327f44febb3fcca7a79771126ff85716464ce23739b2caf49a95047f2244da706576f80e5ea58125f0c7cd4723262b6d759c77c66581d3393f56f1950465544 SHA512 8371dd96b6996d1257c769be4fcc77ae386d187bfb51ccd03c57e09b12a2b193c575f15b8fce29380a59f795adaf02a3528fa80f3b24536c349fc10ab54f808a
+DIST edt-1.14-pkg.tar.gz 62824 BLAKE2B 9ab1cc9e55364b901ee51d16b97ea8a72a935e10d2aec5ef4f1757954a5f3e0c36132686225bb64e47227e2c83171632b004621f14b1508a9bfc07c8ad4cfc04 SHA512 8179652766eeffdd12b673e453f4dbe0117bc8f2ad743943c5f613dd217c80d3433b7cbe3a2d8b55604eaff489416edc5afd3e5bafafcec8782dd471688555c2
+EBUILD edt-1.13.ebuild 291 BLAKE2B ab72441b0d2df38f5d9f0e01746eb1763b45467a2abb31b79940d51897423ba8fcc14917464dc6df765b56722446dd15d8b040288490ddb56f13ba480b951072 SHA512 cc3e85fa76a2a37c1d49c042cf364cfbfa32a642693e4e2f41c40ede0e9656cfbb08785a4d2d68b31fa1e9cae93cb491b1dff2d4c3e8a7f8a1f7be53828922d4
+EBUILD edt-1.14.ebuild 291 BLAKE2B ab72441b0d2df38f5d9f0e01746eb1763b45467a2abb31b79940d51897423ba8fcc14917464dc6df765b56722446dd15d8b040288490ddb56f13ba480b951072 SHA512 cc3e85fa76a2a37c1d49c042cf364cfbfa32a642693e4e2f41c40ede0e9656cfbb08785a4d2d68b31fa1e9cae93cb491b1dff2d4c3e8a7f8a1f7be53828922d4
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/edt/edt-1.13.ebuild b/app-xemacs/edt/edt-1.13.ebuild
new file mode 100644
index 000000000000..5402891763b8
--- /dev/null
+++ b/app-xemacs/edt/edt-1.13.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="DEC EDIT/EDT emulation"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/edt/edt-1.14.ebuild b/app-xemacs/edt/edt-1.14.ebuild
new file mode 100644
index 000000000000..5402891763b8
--- /dev/null
+++ b/app-xemacs/edt/edt-1.14.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="DEC EDIT/EDT emulation"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/edt/metadata.xml b/app-xemacs/edt/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/edt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/efs-1.33 b/app-xemacs/efs-1.33
deleted file mode 100644
index 97045c862e31..000000000000
--- a/app-xemacs/efs-1.33
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Treat files on remote systems the same as local files
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/dired app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/efs-1.33-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=6ffadfde6a47147b0ead29b09293e24f
diff --git a/app-xemacs/efs-1.34 b/app-xemacs/efs-1.34
deleted file mode 100644
index 67313127895d..000000000000
--- a/app-xemacs/efs-1.34
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Treat files on remote systems the same as local files
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/dired app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/efs-1.34-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=6ffadfde6a47147b0ead29b09293e24f
diff --git a/app-xemacs/efs/Manifest b/app-xemacs/efs/Manifest
new file mode 100644
index 000000000000..ad21d4467218
--- /dev/null
+++ b/app-xemacs/efs/Manifest
@@ -0,0 +1,5 @@
+DIST efs-1.33-pkg.tar.gz 375842 BLAKE2B 61e7751d5571a57ed0781773a6f26d476cc63a86a82ff9f381f4221e82c6731287c138e66326cb7881fab5656e04be1cb5de4f2a0fe09cb71cc82526c390efb0 SHA512 d588b8885ec659a78b4b64dadf10e75d08766e1cdfbd03dda9fc822081552dd8f27ed77dbff6be28a8f52fcb6f6747d27b7dea5ed3c7defd704639d49d7d4ae1
+DIST efs-1.34-pkg.tar.gz 376920 BLAKE2B c441fb03cebb97f845d3767001312a99d505c3fb7af4ae7d1902a67ba27633f18952136fdcfda442608034bc843a0a1754d3db829da967aa816a484f21a2f67e SHA512 44550090f4b122d995c10fa4e82972adeb4261bb27a431f7ac40a61773252fff1024a0f6a480cc7f35705aaa90781aed8473b96b5468d0ed18d2f5b3f59cb9fd
+EBUILD efs-1.33.ebuild 339 BLAKE2B 72c5fa6594de3a7d8e9c4fa08b6cc990a44ad800b30701c712664747e8ea7682be7a56758e867cf9208d00d396b704272e1c85fec88e7bf3bc8b788a035524e9 SHA512 ee1fc143c69873f6a42f212ef5175f3f7deed704d335bba06e47a623663bf77e790e4f75628b8f0d98d954f70f0c11a750e2b4f416719210423260a93c52c3d5
+EBUILD efs-1.34.ebuild 339 BLAKE2B 72c5fa6594de3a7d8e9c4fa08b6cc990a44ad800b30701c712664747e8ea7682be7a56758e867cf9208d00d396b704272e1c85fec88e7bf3bc8b788a035524e9 SHA512 ee1fc143c69873f6a42f212ef5175f3f7deed704d335bba06e47a623663bf77e790e4f75628b8f0d98d954f70f0c11a750e2b4f416719210423260a93c52c3d5
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/efs/efs-1.33.ebuild b/app-xemacs/efs/efs-1.33.ebuild
new file mode 100644
index 000000000000..8581d1293944
--- /dev/null
+++ b/app-xemacs/efs/efs-1.33.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Treat files on remote systems the same as local files"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/dired
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/efs/efs-1.34.ebuild b/app-xemacs/efs/efs-1.34.ebuild
new file mode 100644
index 000000000000..8581d1293944
--- /dev/null
+++ b/app-xemacs/efs/efs-1.34.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Treat files on remote systems the same as local files"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/dired
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/efs/metadata.xml b/app-xemacs/efs/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/efs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/egg-its-1.27 b/app-xemacs/egg-its-1.27
deleted file mode 100644
index 36d54e626254..000000000000
--- a/app-xemacs/egg-its-1.27
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Wnn (4.2 and 6) support. SJ3 support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/leim app-xemacs/mule-base app-xemacs/fsf-compat app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/egg-its-1.27-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=e0fee1274a4f24d4c1762852821ab5b9
diff --git a/app-xemacs/egg-its/Manifest b/app-xemacs/egg-its/Manifest
new file mode 100644
index 000000000000..ec06ad2d6d3a
--- /dev/null
+++ b/app-xemacs/egg-its/Manifest
@@ -0,0 +1,3 @@
+DIST egg-its-1.27-pkg.tar.gz 261339 BLAKE2B 8e0fb9cf66d373ccdee6d54c0eb0d996d5ebc03a5d85e1ae8c43b66ae53b7a9ee97a90526b70d52232397ef2982baefc3d4bb327bdebe60aa79bb77ffe4a785a SHA512 f5a2a9412175cc4a825de907f566df0228a1838b082a20f9f11164fb76b7f87db2f4f4e337a8d58f7e0479ffb498c32ac0a7413a70f047a10ecc631edebd4ded
+EBUILD egg-its-1.27.ebuild 367 BLAKE2B 81b1e1de789b402d9544ac847d41e2113093d0d99eef4eb3bd518cc433175fca8624032c0c4de64ca900161e6634a305fc79a6a427d7cc0847864d2ccc654412 SHA512 d91736ff1edda687e5e810b80b54157e7dcc2bdb4d2259a921acbe0e0c22cc349882012bfa43abbcae830fdbca4039560bc73317959d17c046d03cf7e23ff983
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/egg-its/egg-its-1.27.ebuild b/app-xemacs/egg-its/egg-its-1.27.ebuild
new file mode 100644
index 000000000000..8009921bd1fc
--- /dev/null
+++ b/app-xemacs/egg-its/egg-its-1.27.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Wnn (4.2 and 6) support.  SJ3 support"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/leim
+app-xemacs/mule-base
+app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/egg-its/metadata.xml b/app-xemacs/egg-its/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/egg-its/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/eieio-1.05 b/app-xemacs/eieio-1.05
deleted file mode 100644
index 54a5d6b15e01..000000000000
--- a/app-xemacs/eieio-1.05
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Enhanced Implementation of Emacs Interpreted Objects
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/speedbar app-xemacs/xemacs-base app-xemacs/edebug app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eieio-1.05-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=8b538e5a5d0a40cbe4e92b9d6865fd62
diff --git a/app-xemacs/eieio-1.07 b/app-xemacs/eieio-1.07
deleted file mode 100644
index bf5acfa36d73..000000000000
--- a/app-xemacs/eieio-1.07
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Enhanced Implementation of Emacs Interpreted Objects
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/cedet-common app-xemacs/speedbar app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eieio-1.07-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=03b3d724d4f5cef7a7c12e05ddc11c42
diff --git a/app-xemacs/eieio/Manifest b/app-xemacs/eieio/Manifest
new file mode 100644
index 000000000000..aae47e00480e
--- /dev/null
+++ b/app-xemacs/eieio/Manifest
@@ -0,0 +1,5 @@
+DIST eieio-1.05-pkg.tar.gz 165803 BLAKE2B 92425dbaf275be435acc9d51f1ab5fad0a771d8205b11881229a244372059f71a8fa5c2d485c9cdc5208a21a4b54acd03f41e39847c4901bde81bb42b30bb2a5 SHA512 7caa2cff977f850e4b59b00a2c34252bb235d901e4605092181aebac7690eb996b2bce7bb9262a9ec4c6aa691e89046cb723b8f0cd643f5b9b6cb5af51385497
+DIST eieio-1.07-pkg.tar.gz 177923 BLAKE2B efc84c48fac4bd76ca4c843a4bff97dc10f21f45be9067c54c871a64314c9012b80e8d5e292f8844e1b7c3ed86a3f8044dfa547109c09891a3aeb11d515b7b0d SHA512 e4c76aa617bf80ca3fa7de249535ba63b22c3c8d787361dfce9381f4cb31500cb8f40e564c70928ee99492a0b71a67a13dd90e9626335b18b2a49877a124a551
+EBUILD eieio-1.05.ebuild 359 BLAKE2B f729edffdcc0e421a9e41163f7b50d45ac4403ddd8422764a798d2adfdc4f190d517d455d53d0896cc1a638b196424d5f7dd388b4585ea3d944a550104d26c2f SHA512 82eca548ab6da03bd4c878d1838be7f743304d2e4f7a0753c8349ed0d62c6d789dda3e5ee04fdc55add8a8d5d5780357e9531d3ed1075ccc1147695b8f572897
+EBUILD eieio-1.07.ebuild 383 BLAKE2B b1ca1c4c03e64069624236871a2a92ab66a7d5dda5cb8da8db95f41c9f67b24e5fd812bf42631f4eab156f307a94a219883ca1a5ca6d625ed6b72a44dc19f069 SHA512 aeb650bc7784ca50eee5aa336e8a7c756823444734e6b835171752d2118054afcac403ee06d3520bc0eea9fbb6c154d2158b3db74438b0686a0369ab42c56484
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/eieio/eieio-1.05.ebuild b/app-xemacs/eieio/eieio-1.05.ebuild
new file mode 100644
index 000000000000..ceb5a0eb7696
--- /dev/null
+++ b/app-xemacs/eieio/eieio-1.05.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Enhanced Implementation of Emacs Interpreted Objects"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/speedbar
+app-xemacs/xemacs-base
+app-xemacs/edebug
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/eieio/eieio-1.07.ebuild b/app-xemacs/eieio/eieio-1.07.ebuild
new file mode 100644
index 000000000000..234ebe0bc047
--- /dev/null
+++ b/app-xemacs/eieio/eieio-1.07.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Enhanced Implementation of Emacs Interpreted Objects"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/edebug
+app-xemacs/cedet-common
+app-xemacs/speedbar
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/eieio/metadata.xml b/app-xemacs/eieio/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/eieio/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/elib-1.11 b/app-xemacs/elib-1.11
deleted file mode 100644
index 950f2d6a0173..000000000000
--- a/app-xemacs/elib-1.11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Portable Emacs Lisp utilities library
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/elib-1.11-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=dc13b7af394b677aa6911482e7af7edd
diff --git a/app-xemacs/elib-1.13 b/app-xemacs/elib-1.13
deleted file mode 100644
index b423de11c971..000000000000
--- a/app-xemacs/elib-1.13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Portable Emacs Lisp utilities library
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/elib-1.13-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=13fe317763089009cb48a323b47e9e30
diff --git a/app-xemacs/elib/Manifest b/app-xemacs/elib/Manifest
new file mode 100644
index 000000000000..0a339e9c3cc2
--- /dev/null
+++ b/app-xemacs/elib/Manifest
@@ -0,0 +1,5 @@
+DIST elib-1.11-pkg.tar.gz 73387 BLAKE2B 423476172a1a1ffe2731ca67fc24bec37a52de5387afc22c044aa90c40dbc0c2d4d858f57ccf2237274b7b3cc7b7b366bb44cd52c9c6f0d1264d1ad051a10be8 SHA512 0ed1b6bd47b13c69b5990e6e1ca8e203440e28527f860a70e22fe0da94811909bcddcf184cfc9a8016a2fe590cea5e3ceec270bfb33ff655b542a3c8c0ea8638
+DIST elib-1.13-pkg.tar.gz 80235 BLAKE2B b81ca5b529a808ee5a9c7f514cf53dfa1c5d5ad4531b3aef10706ba746b4ee4a3216460e006842f733bba073d1048d2d26c88643c1d3f9f5744924e66f84a9c4 SHA512 edffc77f9db1300693701df56fea7fa6e0fe3c4d11949bd8766faea21ccad79cb52b60f5c25e84350fa7f3cfc45820035b06f82890ea760dcb90e93a065feec9
+EBUILD elib-1.11.ebuild 283 BLAKE2B a205ba055bbf7f1ad6dfc1823c1d741544be4c7ff625baba798f2fea584c8c85c12955aad5a52c95718ea196909662eea4092f523ec6341b9e87675e15393ea4 SHA512 d96460e055259058fd0a23bd4b376bb4893c72481816b94d7dc5f9fe0af93c5831ac0515e9ab4d2051e1de78ffa0419126f1d47f986566993db909491750d442
+EBUILD elib-1.13.ebuild 306 BLAKE2B 373ce3a3e0f5e3ec81fb8284846bcf76426e80d3d845dbb4bce43bccb1d825062f343a8c5c6937704a45171e34b9feada73c4ed4cfeab99b17aeebe4f41a99b8 SHA512 b50fce9a1fb7f93bd421f4ab471c75e7bc6d28ed2589832de7289a8a026ac8e52e198df61a9e71db0f7517a08823934e57a12008f4571e84a57a15bcab2cd68b
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/elib/elib-1.11.ebuild b/app-xemacs/elib/elib-1.11.ebuild
new file mode 100644
index 000000000000..cdd4a251e62d
--- /dev/null
+++ b/app-xemacs/elib/elib-1.11.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Portable Emacs Lisp utilities library"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND=""
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/elib/elib-1.13.ebuild b/app-xemacs/elib/elib-1.13.ebuild
new file mode 100644
index 000000000000..d808110e8c58
--- /dev/null
+++ b/app-xemacs/elib/elib-1.13.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Portable Emacs Lisp utilities library"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/elib/metadata.xml b/app-xemacs/elib/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/elib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/emerge-1.11 b/app-xemacs/emerge-1.11
deleted file mode 100644
index eda3eaae7804..000000000000
--- a/app-xemacs/emerge-1.11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Another interface over GNU patch
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/emerge-1.11-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=b5b629aa5ea48684e776fdcfda865e5d
diff --git a/app-xemacs/emerge/Manifest b/app-xemacs/emerge/Manifest
new file mode 100644
index 000000000000..ebe8a7c36693
--- /dev/null
+++ b/app-xemacs/emerge/Manifest
@@ -0,0 +1,3 @@
+DIST emerge-1.11-pkg.tar.gz 61367 BLAKE2B 4b97e5118c34d89f7387e29c7e19337a0adc89c1588d35f338f910ea8d5f3003e358613850acf3124911e88aee31f387a7853ad51cf9a0f90d5b13608c81fcaa SHA512 c72569dc28b5db4c1e6b5b35107dcb4e1772de7a7b42898895c538f0ec127e28104b0ea0612d01138c1ff715285f06b9cd642609272ed40360f9b97e5e8dc784
+EBUILD emerge-1.11.ebuild 267 BLAKE2B ba7597ef6e34d05c73157cf08dc17180e3983a65299474a736b64ea661d247a570243aa801484b65b5a1dff4dbeffe95890cc99a6e7eb447aed9b0342bc3cb58 SHA512 0dd6c2772e8523e1b192d7c978921636d2590160744a3297375402230aca5964983272558e140914b72769c6f903d1804dc9f0397eccf1d30208913f9a12a701
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/emerge/emerge-1.11.ebuild b/app-xemacs/emerge/emerge-1.11.ebuild
new file mode 100644
index 000000000000..e9e116fa84cc
--- /dev/null
+++ b/app-xemacs/emerge/emerge-1.11.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Another interface over GNU patch"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/emerge/metadata.xml b/app-xemacs/emerge/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/emerge/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/erc-0.21 b/app-xemacs/erc-0.21
deleted file mode 100644
index 849c04ca609f..000000000000
--- a/app-xemacs/erc-0.21
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-xemacs/xemacs-base
-DESCRIPTION=ERC - The Emacs IRC Client
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/erc-0.21-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=3ff2e220981df64fc9a406a80ebee83d
diff --git a/app-xemacs/erc-0.23 b/app-xemacs/erc-0.23
deleted file mode 100644
index a64788cbf6ed..000000000000
--- a/app-xemacs/erc-0.23
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=ERC - The Emacs IRC Client
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/edit-utils app-xemacs/fsf-compat app-xemacs/gnus app-xemacs/pcomplete app-xemacs/xemacs-base app-xemacs/text-modes app-xemacs/xemacs-ispell app-xemacs/viper app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/erc-0.23-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=a1b8f78c714e6a76e29916d44d9cb9b0
diff --git a/app-xemacs/erc/Manifest b/app-xemacs/erc/Manifest
new file mode 100644
index 000000000000..b952c70271fe
--- /dev/null
+++ b/app-xemacs/erc/Manifest
@@ -0,0 +1,5 @@
+DIST erc-0.21-pkg.tar.gz 516214 BLAKE2B f9f7811e9f73d895186e4c3bf6774db6304aba11af829886ccb4a7a4553a43e055baaf6ff830e757d75436cbbbdf1e1d341441d71cab4b75ca253481910390fe SHA512 5743fe1840a1e42700aa3fe41292b29a31f93e7ba7956ec80eda6df0c4d4300da268ccc692fe48b24dc59a60234e7d5a5d774dd8e9db8b6bcd91ddd4b11562e2
+DIST erc-0.23-pkg.tar.gz 517288 BLAKE2B ce5a5f41b70b25d8e4a123d3a7a8d32815f3059da2e5353dace6ef185d8df2d2539c88155136a60ef7bd934a79db87b772267836cdce1ee2d691a9f1a4917f8f SHA512 54df94abb666d76f65faf668e8f85d20f5411c70031e709387706fe7d77b9403dd9e8d4fc2c634cbe58f5de896bb2780e2fae2706758774e295e3bc2704e7dc0
+EBUILD erc-0.21.ebuild 294 BLAKE2B f30a951ef4c633ba500c110bd98dadb6867541f824327c0f1e0bcd508862e1968fa49a2f6e5cdc504b89848225fd98179e6820d1e5e15513e308eaa116d16901 SHA512 34b4588e22b92c8084b7599be8cde4a922bc5d6fa9fffc4dd4b80c199df5725b91febf843f06785a234175740fdd94295c02634424c9b63f5105552fc74b635f
+EBUILD erc-0.23.ebuild 441 BLAKE2B 924b1fc3eb823cde51b49e123803bf21fc6de40a7f996ea8717eeb426df8f2de4353761f7a7548b720217fe6f840cc62785941c77ff56fa17dd4afd36cde97f4 SHA512 4f59427469e9838c343733050b90f4fc0f9798e24b2900dc5f9b0bd958a9b8254825dd9e8136ac41deed1daa2454c4f16b9310902cdd3ab6873771663835a343
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/erc/erc-0.21.ebuild b/app-xemacs/erc/erc-0.21.ebuild
new file mode 100644
index 000000000000..89ce786a2787
--- /dev/null
+++ b/app-xemacs/erc/erc-0.21.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="ERC - The Emacs IRC Client"
+XEMACS_PKG_CAT="standard"
+
+DEPEND="app-xemacs/xemacs-base"
+
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/erc/erc-0.23.ebuild b/app-xemacs/erc/erc-0.23.ebuild
new file mode 100644
index 000000000000..a8dbe1642c0f
--- /dev/null
+++ b/app-xemacs/erc/erc-0.23.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="ERC - The Emacs IRC Client"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
+
+RDEPEND="app-xemacs/edit-utils
+app-xemacs/fsf-compat
+app-xemacs/gnus
+app-xemacs/pcomplete
+app-xemacs/xemacs-base
+app-xemacs/text-modes
+app-xemacs/xemacs-ispell
+app-xemacs/viper
+"
diff --git a/app-xemacs/erc/metadata.xml b/app-xemacs/erc/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/erc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/escreen-1.01 b/app-xemacs/escreen-1.01
deleted file mode 100644
index 12ea7d15d31d..000000000000
--- a/app-xemacs/escreen-1.01
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Multiple editing sessions withing a single frame (like screen)..
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/escreen-1.01-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=dda5c7b55807e73117770f7ad122918b
diff --git a/app-xemacs/escreen/Manifest b/app-xemacs/escreen/Manifest
new file mode 100644
index 000000000000..cce76002f61c
--- /dev/null
+++ b/app-xemacs/escreen/Manifest
@@ -0,0 +1,3 @@
+DIST escreen-1.01-pkg.tar.gz 14639 BLAKE2B 4686dfecc40c7f90b4351de0b3ab20b5c5fcbc77760de7d5e0e115ddfbf792b5f7238df5272b33c3f98e7fd5ef4ecc8b79b08723217a4dad7e0c65bc0f4e8eed SHA512 3fb4d47ed6ae6173a530ea31b7ae759a34e2257e85e3f512c841234f7eba9780cd160e4ed600dd5f1871a022d4b2b28dd3dcdff788f679a07c05745914a04a89
+EBUILD escreen-1.01.ebuild 333 BLAKE2B 64ca5c9e2edf1c377694c819687d19e7f40b96580b7df4a06a980592343988e1ac005bc03474f9e0937de8873fa22152dcc42a5f7b9f881201af6f7d3b246a6a SHA512 92d3ef0a0c22ff6bcd90af185acc7679fbfc5d9fc0ad9d5d75b29261d6686cbe2bd939f534c4366fb6d7a53e3f01c07c17abb9a4888b5731d4053ad3fc1647f9
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/escreen/escreen-1.01.ebuild b/app-xemacs/escreen/escreen-1.01.ebuild
new file mode 100644
index 000000000000..38aa98613441
--- /dev/null
+++ b/app-xemacs/escreen/escreen-1.01.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Multiple editing sessions withing a single frame (like screen).."
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/escreen/metadata.xml b/app-xemacs/escreen/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/escreen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/eshell-1.10 b/app-xemacs/eshell-1.10
deleted file mode 100644
index c36933bcf2f0..000000000000
--- a/app-xemacs/eshell-1.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Command shell implemented entirely in Emacs Lisp
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-eterm app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eshell-1.10-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c7bf0c0924da186f17f43887fcdef749
diff --git a/app-xemacs/eshell-1.18 b/app-xemacs/eshell-1.18
deleted file mode 100644
index 82d1cd03832d..000000000000
--- a/app-xemacs/eshell-1.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Command shell implemented entirely in Emacs Lisp
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-eterm app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eshell-1.18-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c7bf0c0924da186f17f43887fcdef749
diff --git a/app-xemacs/eshell/Manifest b/app-xemacs/eshell/Manifest
new file mode 100644
index 000000000000..8ac497925fc5
--- /dev/null
+++ b/app-xemacs/eshell/Manifest
@@ -0,0 +1,5 @@
+DIST eshell-1.10-pkg.tar.gz 232616 BLAKE2B 42c057c6afc401f480c8531be0b6dd2f1a1d1230063ca9649c23f751c6d988d2eb1918a3158840ada50d1b59f02319f7e06d1e021bd0b502be77dfe13036ea64 SHA512 97b4d81b024513b4dacbdbd3d04150a3dcc10aa9c2a8ed0e7157ada3aa404de6c44f8cce60c59f1c75c0e9e31f0f7b6de86b402b2c6527111162e2ee54e51dc9
+DIST eshell-1.18-pkg.tar.gz 238988 BLAKE2B d595f9c36ca5cd50ac46efabc813575b6f8415f47ac1d44632151bf8a39233c7166a0d9fdc2eb2cf00565b4e4f9ed9b4828ffb385ef4941745529260d31850e3 SHA512 3cb3f66c2714ffc5e2875bdbc3fd02dd60032db338ef9ef9c0904ec89945075ae95a5e02ce402299dbbc98b6e53d7304dbe50fc3cb3eb0dd2aacaef5535f2792
+EBUILD eshell-1.10.ebuild 341 BLAKE2B 7f27a6f3a5ea11d21b9c760e50440395d866d90f20dbb7238fee97c948bd31579c77b09d2fa94d448d00a674b83fc511ebe1a12e6428ec374dcb83690bb783e9 SHA512 e560058fa946c52bb0bb913df5c379e505803de138e580dcec9a4608ed928e150623aac687d9648a8fa503ec61fe0c5121da21a5ad27f3cf10165d94313bf699
+EBUILD eshell-1.18.ebuild 341 BLAKE2B 7f27a6f3a5ea11d21b9c760e50440395d866d90f20dbb7238fee97c948bd31579c77b09d2fa94d448d00a674b83fc511ebe1a12e6428ec374dcb83690bb783e9 SHA512 e560058fa946c52bb0bb913df5c379e505803de138e580dcec9a4608ed928e150623aac687d9648a8fa503ec61fe0c5121da21a5ad27f3cf10165d94313bf699
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/eshell/eshell-1.10.ebuild b/app-xemacs/eshell/eshell-1.10.ebuild
new file mode 100644
index 000000000000..9e52ba32fd84
--- /dev/null
+++ b/app-xemacs/eshell/eshell-1.10.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Command shell implemented entirely in Emacs Lisp"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-eterm
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/eshell/eshell-1.18.ebuild b/app-xemacs/eshell/eshell-1.18.ebuild
new file mode 100644
index 000000000000..9e52ba32fd84
--- /dev/null
+++ b/app-xemacs/eshell/eshell-1.18.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Command shell implemented entirely in Emacs Lisp"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-eterm
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/eshell/metadata.xml b/app-xemacs/eshell/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/eshell/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/ess-1.03 b/app-xemacs/ess-1.03
deleted file mode 100644
index 82febca95a4c..000000000000
--- a/app-xemacs/ess-1.03
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/fsf-compat app-xemacs/edit-utils app-xemacs/speedbar app-xemacs/sh-script app-xemacs/xemacs-eterm
-DESCRIPTION=ESS: Emacs Speaks Statistics
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ess-1.03-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=286da246c819d19431997610bea84ef1
diff --git a/app-xemacs/ess/Manifest b/app-xemacs/ess/Manifest
new file mode 100644
index 000000000000..b58920cc527d
--- /dev/null
+++ b/app-xemacs/ess/Manifest
@@ -0,0 +1,3 @@
+DIST ess-1.03-pkg.tar.gz 470257 BLAKE2B 154fb229284cc35bb2f6573918ccce0dd22dda6db6651f444bfe80d0165e75b6921f88a5bd7230b91e5a7ac0126c744189a9c338abc32c92391e8b7331c9777e SHA512 e9de030fd3b97e2840b023b2426ce4c9ffb1dfbf1a0d4f3178beb3299c16b20f612ca1ed20bf994c3844e0e57cdde7ded32b2cc58fb5a1946ddde02d18daec56
+EBUILD ess-1.03.ebuild 425 BLAKE2B e7d50e7c614b9361e09ab4c5260a09cf363229b023f3502a5e0a4bace5115c8c720635f683a0f4ded63428608988d18f941718b91b6994cc7907087840c21e8c SHA512 c6400e8884ed79bcf4b4228119c760bd5d894e960bc9add27c9c15646f004b0119138f52ced78feeda2dc3e5f561b48187773148286be665e9c364c5281f5311
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ess/ess-1.03.ebuild b/app-xemacs/ess/ess-1.03.ebuild
new file mode 100644
index 000000000000..c5ec6860088d
--- /dev/null
+++ b/app-xemacs/ess/ess-1.03.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="ESS: Emacs Speaks Statistics"
+XEMACS_PKG_CAT="standard"
+
+DEPEND="app-xemacs/xemacs-base
+app-xemacs/mail-lib
+app-xemacs/fsf-compat
+app-xemacs/edit-utils
+app-xemacs/speedbar
+app-xemacs/sh-script
+app-xemacs/xemacs-eterm
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ess/metadata.xml b/app-xemacs/ess/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/ess/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/eudc-1.39 b/app-xemacs/eudc-1.39
deleted file mode 100644
index 8f5de20c721f..000000000000
--- a/app-xemacs/eudc-1.39
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs Unified Directory Client (LDAP, PH)
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/bbdb app-xemacs/mail-lib app-xemacs/gnus app-xemacs/rmail app-xemacs/tm app-xemacs/apel app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eudc-1.39-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=986a9cf00edcd99b88fa7847693953cc
diff --git a/app-xemacs/eudc-1.40 b/app-xemacs/eudc-1.40
deleted file mode 100644
index c5020d945529..000000000000
--- a/app-xemacs/eudc-1.40
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs Unified Directory Client (LDAP, PH)
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/bbdb app-xemacs/mail-lib app-xemacs/gnus app-xemacs/rmail app-xemacs/tm app-xemacs/apel app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/eudc-1.40-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=3d18802a15140d9bd3f75ecfbcbcef83
diff --git a/app-xemacs/eudc/Manifest b/app-xemacs/eudc/Manifest
new file mode 100644
index 000000000000..ebff61381ba5
--- /dev/null
+++ b/app-xemacs/eudc/Manifest
@@ -0,0 +1,5 @@
+DIST eudc-1.39-pkg.tar.gz 79488 BLAKE2B 62789aeedcc6f1efa1cb453161cee6d3134295d84bff591c606b5a871cf355a2f377d557a99bb4e818916b5a611c18d838bc375e539fe0219f07d111125914df SHA512 c2442e701dad665fc0651aee3d9f0affd72006abcceb6da46eea67f0cdaf75a285f330615de54a5097ce39786537612b1dd053268fda01c0c18a00bb44c0fdda
+DIST eudc-1.40-pkg.tar.gz 79675 BLAKE2B e3bac796fb0b7d496d6a3066795c5e89372b22a4af693a91cc3dbe6b6e68b3b9327841a18fb42b03bc6435b8831785872dad95516f2b494bc003be4ac85745ef SHA512 ecd14560771652450e6f4acbf468efad9215681e6c85e8f5b3c999a222f8e90299f7e63c4951a122f5d04a08ec247c95bc5da910df47f66b5f88656acf2ad827
+EBUILD eudc-1.39.ebuild 497 BLAKE2B 150cf7ceef45c7ccd78135e1a74e7d4ebc0688a68a56a23d70e2a2a2d212c13ea974af8fabdd2422bbf6db8a4d012e1cf597b2e14c1aa7c18e2bd8ff609b76c0 SHA512 43551a8ce3825c90b283b33c16f122586a535a586593032433d5f48de29fef99ef4f88cd75607e6eb6bde8e6bb90f3ee3f7fc331c2b1e9a2a0e623db168125b5
+EBUILD eudc-1.40.ebuild 516 BLAKE2B 3e8c871295d0e3551df0bf557228f857550d769d9e3be6ccdeee7cab01dc8285d553e2d4a7a7323f319dd41e5d25bd9ebb584f7ef74faa4da2028eb66409369e SHA512 6961c39d98abed22ec1a266098f27ed5d3119e1d37d8d8c8a1c307938965a566efa549e46ae579a3b09bc015aad02a5ba98635e50fe468cfd5ba2d8b9ffbe66d
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/eudc/eudc-1.39.ebuild b/app-xemacs/eudc/eudc-1.39.ebuild
new file mode 100644
index 000000000000..c6b0dcad667b
--- /dev/null
+++ b/app-xemacs/eudc/eudc-1.39.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Emacs Unified Directory Client (LDAP, PH)"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+app-xemacs/bbdb
+app-xemacs/mail-lib
+app-xemacs/gnus
+app-xemacs/rmail
+app-xemacs/tm
+app-xemacs/apel
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+app-xemacs/net-utils
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/eudc/eudc-1.40.ebuild b/app-xemacs/eudc/eudc-1.40.ebuild
new file mode 100644
index 000000000000..28e8c902059d
--- /dev/null
+++ b/app-xemacs/eudc/eudc-1.40.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Emacs Unified Directory Client (LDAP, PH)"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+app-xemacs/bbdb
+app-xemacs/mail-lib
+app-xemacs/gnus
+app-xemacs/rmail
+app-xemacs/tm
+app-xemacs/apel
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+app-xemacs/net-utils
+app-xemacs/ecrypto
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/eudc/metadata.xml b/app-xemacs/eudc/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/eudc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/footnote-1.16 b/app-xemacs/footnote-1.16
deleted file mode 100644
index 928b64535f2c..000000000000
--- a/app-xemacs/footnote-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Footnoting in mail message editing modes
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/footnote-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=8fa5fa076b5561ffbf6dd14590fdf207
diff --git a/app-xemacs/footnote/Manifest b/app-xemacs/footnote/Manifest
new file mode 100644
index 000000000000..eecc3c5bc58c
--- /dev/null
+++ b/app-xemacs/footnote/Manifest
@@ -0,0 +1,3 @@
+DIST footnote-1.16-pkg.tar.gz 22152 BLAKE2B 4ff8d3df1d76fcf23ec5191516bfeb7be4dbdf11a428d387a5c4a722b8c9b7cf34680548a8e7be2fa39b8dc83f623c96328c974ea4f3d940879b57ae03fde259 SHA512 4eba15270fd4529c3a8b5e8f488cd9dc294dab2f4b968490e8bbfc09e81bc4abd4f9c95b38a295a8f5899f4df55b7dab18e8979130cd8b24a533fbc609f0bf92
+EBUILD footnote-1.16.ebuild 329 BLAKE2B 9daee3d0d1ca6c262183c9da21aadc479ddcdd8709503a4715dda3647ef982b95afe4eaaf37768a87cbe7171f2e4c757ac5235760418132fb941e64c80219396 SHA512 fd0fd82f2658b716f42eefca9d3ab9b4ce67c7280704d3dc5915a731c031b9d2133454b5bb974b626918c2141aa06218e09d7494549ecaa0f7969bdc023dc760
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/footnote/footnote-1.16.ebuild b/app-xemacs/footnote/footnote-1.16.ebuild
new file mode 100644
index 000000000000..524fe1f53988
--- /dev/null
+++ b/app-xemacs/footnote/footnote-1.16.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Footnoting in mail message editing modes"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/footnote/metadata.xml b/app-xemacs/footnote/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/footnote/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/forms-1.15 b/app-xemacs/forms-1.15
deleted file mode 100644
index a804385a42dc..000000000000
--- a/app-xemacs/forms-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Forms editing support (obsolete, use Widget instead)
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/forms-1.15-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=f90f1697211a80008bc93567227cd6d2
diff --git a/app-xemacs/forms/Manifest b/app-xemacs/forms/Manifest
new file mode 100644
index 000000000000..38efbcf9325c
--- /dev/null
+++ b/app-xemacs/forms/Manifest
@@ -0,0 +1,3 @@
+DIST forms-1.15-pkg.tar.gz 48747 BLAKE2B a7695c1d07fc33cf6ccf7f0a3e7bd1039da1f662d589fea02716c9dcccf1441c7acc6bfdf344f6f0dd55965d45fd55633af3f369d57cb18bab3c62f3f95417c8 SHA512 eec09fe907c6b2ec94132ccc508d70903b27fb74cd02ae58a60d2196b80ea62111b0849db0c220e205d9e58394e588913b42dcf350d83cbe17cd9fbdd8ac6a62
+EBUILD forms-1.15.ebuild 287 BLAKE2B c028df35aff20fa2b4bbd1819bde15713aee1f89d290ebc17a46f368bc8844b3d8f0a0a3102efb3cf940290db342cfb3ba7720ab0719c8640c857728c76882c3 SHA512 2db088448bc5d2ad894543b4d46dfa3261b5a403f0ff13ddfa0fb2b3a2cec527ce05882daa35e4ed3bf3813f091b10440d04c978719aef83559764e234001918
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/forms/forms-1.15.ebuild b/app-xemacs/forms/forms-1.15.ebuild
new file mode 100644
index 000000000000..2e93a1c0448d
--- /dev/null
+++ b/app-xemacs/forms/forms-1.15.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Forms editing support (obsolete, use Widget instead)"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/forms/metadata.xml b/app-xemacs/forms/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/forms/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/fortran-modes-1.05 b/app-xemacs/fortran-modes-1.05
deleted file mode 100644
index a37704cc2f78..000000000000
--- a/app-xemacs/fortran-modes-1.05
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Fortran support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/fortran-modes-1.05-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=dd222d4ad435a40654f63e383ffd667c
diff --git a/app-xemacs/fortran-modes/Manifest b/app-xemacs/fortran-modes/Manifest
new file mode 100644
index 000000000000..5e134942ce61
--- /dev/null
+++ b/app-xemacs/fortran-modes/Manifest
@@ -0,0 +1,3 @@
+DIST fortran-modes-1.05-pkg.tar.gz 70602 BLAKE2B da1e620e74b497290bf655fcbf9d45b5510193388557e33abc769d874ef2d75786cb91ea9964f0019a40b19de968690f396523144f49c7bd79be783111830d8c SHA512 c3eac57a6d84605fde545951d423855cca8a40dd02dc24d0e005e165ab4e52f2f76f7347ddf33e4e85d25717689b85c578ce1e2b3b738df8a080b56057747b27
+EBUILD fortran-modes-1.05.ebuild 284 BLAKE2B 83041f886a60ad6a9081ed68860f79d512e48f4e907899815cf144c5107ecf2761a5f8c39e2220c1132ace9bcfac55ba04aa9f32875bf5176e89689d74fcb99e SHA512 26b1f0c7e0f6bbe5af0b4541b6a7d3df343eb886f6715802dc3f48c268de614f05a91d7db33d983a11dab80682261452c5a9571554f468ad9a4c964daa57f357
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/fortran-modes/fortran-modes-1.05.ebuild b/app-xemacs/fortran-modes/fortran-modes-1.05.ebuild
new file mode 100644
index 000000000000..dcdfaa75f99b
--- /dev/null
+++ b/app-xemacs/fortran-modes/fortran-modes-1.05.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Fortran support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/fortran-modes/metadata.xml b/app-xemacs/fortran-modes/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/fortran-modes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/frame-icon-1.11 b/app-xemacs/frame-icon-1.11
deleted file mode 100644
index 247672dab883..000000000000
--- a/app-xemacs/frame-icon-1.11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Set up mode-specific icons for each frame under XEmacs
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/frame-icon-1.11-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=9909b2f880b945e47f00b6a4a425ada0
diff --git a/app-xemacs/frame-icon/Manifest b/app-xemacs/frame-icon/Manifest
new file mode 100644
index 000000000000..3b7ed61e4c3f
--- /dev/null
+++ b/app-xemacs/frame-icon/Manifest
@@ -0,0 +1,3 @@
+DIST frame-icon-1.11-pkg.tar.gz 33800 BLAKE2B 93c404c9dfc894634e1b463d54eb53812de102e20f0d622dec9dcd5b37006bc92f5f4c1a2d47c5e1e1bc2344a49819bb6839a5c3d41df68546d6027abf6f5f8f SHA512 30e4de2e4bdac71483d39f3893b4ccd5d1ec37bc8b522a621af35f569e00c69bf02312c1039a52bfae759da2eaa748d26356a2b7db8c6b4dc8ce2ceb494d7d82
+EBUILD frame-icon-1.11.ebuild 289 BLAKE2B c013e5b9b897cacf48e0959b4df9baefd4d3a1b4618f7fe7cb819966a8d6ece07c05be2d9119e55ca8a3497735247a055dfe765121a8438676091378eb59b925 SHA512 f20f4b8028d1bcd20358894440fab60020d4df29e2b83796c87180c2a56d2462cc21214026aca21272cfffa3a2fb1f58d88198929fdd9a58e30779d0fba47878
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/frame-icon/frame-icon-1.11.ebuild b/app-xemacs/frame-icon/frame-icon-1.11.ebuild
new file mode 100644
index 000000000000..1cf1561b7031
--- /dev/null
+++ b/app-xemacs/frame-icon/frame-icon-1.11.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Set up mode-specific icons for each frame under XEmacs"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/frame-icon/metadata.xml b/app-xemacs/frame-icon/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/frame-icon/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/fsf-compat-1.15 b/app-xemacs/fsf-compat-1.15
deleted file mode 100644
index 3f7e4971c30c..000000000000
--- a/app-xemacs/fsf-compat-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=FSF Emacs compatibility files
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/fsf-compat-1.15-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=362042b43b6e8f698270d9905afbcfdd
diff --git a/app-xemacs/fsf-compat-1.19 b/app-xemacs/fsf-compat-1.19
deleted file mode 100644
index 0dd7df3b4da7..000000000000
--- a/app-xemacs/fsf-compat-1.19
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=FSF Emacs compatibility files
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/fsf-compat-1.19-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=727a24e2b2619cf8dcff876085b08e1f
diff --git a/app-xemacs/fsf-compat/Manifest b/app-xemacs/fsf-compat/Manifest
new file mode 100644
index 000000000000..dbc07f5e0c07
--- /dev/null
+++ b/app-xemacs/fsf-compat/Manifest
@@ -0,0 +1,5 @@
+DIST fsf-compat-1.15-pkg.tar.gz 18912 BLAKE2B c44bea3e0aba7dbd13d747a6faf6e5824df5cae83a2fb341d4fe81590cd0575c163f6f3a7a919ec71a7b3d2860436342df87fb93db89375099b1e08c7ceeeea5 SHA512 87e208b0f30d58953c9d49b7988b0dcd886870e29083ec9bfd47eef347e83b2c275e446593f200c8b76075b70c9691286f6c1e6639b82eb9f1599df33c5042a6
+DIST fsf-compat-1.19-pkg.tar.gz 20477 BLAKE2B d231757c8498693b1f08d164f1b93a89352e081cb52e3c46dc79007d5e5b0076d59950e7269b62eaa1efdf990aac21f56a355e42dd52b59008e5c182b4179912 SHA512 e1c64af5aee787691b527ee90a7ca6112ec0556b5939fc916c32fd4f990a60c8af70fda3b5c9e557888596ae5294b7ca8ddc4ae0df741299ec5d17a99a2479db
+EBUILD fsf-compat-1.15.ebuild 303 BLAKE2B a07a401564e467a1f06d33f03a9f928ba148dbb919945a4bb34e90f7ad897fdd5ddee3fc3210478c65851a4bf10a6688ff4441b8f9c4f9b0c48db15a442cf83d SHA512 5595cee32937d00e83c396cac4490bc29edc9c92c4ff8da0dbd2e6197f547cd29b79a15cd7f748255898a7c8d141f70c36f014861d9c8ee1def032ec13f4d678
+EBUILD fsf-compat-1.19.ebuild 323 BLAKE2B ee930e5f0ee164c76dc73615f6abb37aa99e0dc80d583c7ef430f22bb7b1031daa11c2948047652809433b99d8f6cbc526539085fd2563b30ed47738671fd1fa SHA512 842d13d504dd7ed2a5bfd70d92c171ab371b3e0cf50c5010b94208876aea2e52a2f8b7044d982de613764daea68ebeffa93173b84e0d567df1784e715e4d0ded
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/fsf-compat/fsf-compat-1.15.ebuild b/app-xemacs/fsf-compat/fsf-compat-1.15.ebuild
new file mode 100644
index 000000000000..ae5d7b45d2d0
--- /dev/null
+++ b/app-xemacs/fsf-compat/fsf-compat-1.15.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="FSF Emacs compatibility files"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base"
+
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/fsf-compat/fsf-compat-1.19.ebuild b/app-xemacs/fsf-compat/fsf-compat-1.19.ebuild
new file mode 100644
index 000000000000..744c91512380
--- /dev/null
+++ b/app-xemacs/fsf-compat/fsf-compat-1.19.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="FSF Emacs compatibility files"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="alpha amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd"
+
+inherit xemacs-packages
+
+RDEPEND="app-xemacs/xemacs-base
+"
diff --git a/app-xemacs/fsf-compat/metadata.xml b/app-xemacs/fsf-compat/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/fsf-compat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/games-1.20 b/app-xemacs/games-1.20
deleted file mode 100644
index 34aa29bf0ed6..000000000000
--- a/app-xemacs/games-1.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Tetris, Sokoban, and Snake
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/games-1.20-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c7100e5b73444297b13d973ff79d2605
diff --git a/app-xemacs/games/Manifest b/app-xemacs/games/Manifest
new file mode 100644
index 000000000000..f5c1f346deb6
--- /dev/null
+++ b/app-xemacs/games/Manifest
@@ -0,0 +1,3 @@
+DIST games-1.20-pkg.tar.gz 84330 BLAKE2B c2f7fbd059de6e9da0670ed77fc86d8ada289f9841885038ed81bcf7db2825cf2006fc12f12dd308287a4bcea4d06ee98bb60ec0a0d4d4867356f1e48c446544 SHA512 dbee4a0da7a7ef1ddffcec72caa1af09aaa449c3d1f662c217bbd53ce0a7651c0ba3b31a3af750cba79454455c5325c5a9d81bcbae80610f356656b998b2f649
+EBUILD games-1.20.ebuild 295 BLAKE2B 59842188c0f5ee629d8582f2fd14224fac8b3861e59465670775d91dd56f856dad7225ac2b72750193ffe01726b331866d9df5b72cca3524a76883f198c5d2ea SHA512 db45b744179f294aed00fec0a6905e3cef91301254d10d60106a9f6a3b94e66d82acffdbfca9838ed8c2b91f5222959a2f955496bbbd8d80bc4e709390801b89
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/games/games-1.20.ebuild b/app-xemacs/games/games-1.20.ebuild
new file mode 100644
index 000000000000..fad29c3903b7
--- /dev/null
+++ b/app-xemacs/games/games-1.20.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Tetris, Sokoban, and Snake"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/games/metadata.xml b/app-xemacs/games/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/games/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/general-docs-1.04 b/app-xemacs/general-docs-1.04
deleted file mode 100644
index 6376c0d0d1b9..000000000000
--- a/app-xemacs/general-docs-1.04
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=General XEmacs documentation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/general-docs-1.04-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=dcf51c86b436151b2f948bbbc52f0764
diff --git a/app-xemacs/general-docs-1.06 b/app-xemacs/general-docs-1.06
deleted file mode 100644
index cec8afab030b..000000000000
--- a/app-xemacs/general-docs-1.06
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=General XEmacs documentation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/general-docs-1.06-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=dcf51c86b436151b2f948bbbc52f0764
diff --git a/app-xemacs/general-docs/Manifest b/app-xemacs/general-docs/Manifest
new file mode 100644
index 000000000000..da3947eff692
--- /dev/null
+++ b/app-xemacs/general-docs/Manifest
@@ -0,0 +1,5 @@
+DIST general-docs-1.04-pkg.tar.gz 43374 BLAKE2B 535370c9dd135ac36603812db099624a167bc234203fb4b87f5a8b0e9a535d9e0bb9f6a9adad00fd62d4caf904f551ad61e50f3b16d9ccff9ab795b9e88d5a78 SHA512 a5df76303cffcac6e334decca3b11900e927e1ee70be73bbbd217e67ab0594c8f9829f7a0f582c254e616df491aee9a4e89c5a8ad6ef54ab3157abf367ecf647
+DIST general-docs-1.06-pkg.tar.gz 146305 BLAKE2B 5341120385d4c6c9d631f604e8ad71a8213c5033184a1b8ed14a14c066024a16bda397db9c656dc0d01483e42bfc9ff7754a47afce654014677187479dc4b828 SHA512 ff4847f881dd2f431e3a861015212798b23716087bd15ec117b7edb8f182bf5bddb31d370e9e69aa21847fd062164f05d2b4eba93326d6ffb784134b9152ddf8
+EBUILD general-docs-1.04.ebuild 274 BLAKE2B fbd4894c2845c46ed8defacad92d94666c4bb4b3ea5e703ccda285f6b9d680b56c6a9efc0ce1ab116adf104ec2ad077335273ce70764db6f346e75246b8f53cf SHA512 e0df4685f897bcb3a8515c711f1de6c6eb5084626483ffdfff62335a2aa72455fa6f40158ba32d08e4de2756b17915d2e93ab447522fa5fe92a73cabf6bdf2ca
+EBUILD general-docs-1.06.ebuild 274 BLAKE2B fbd4894c2845c46ed8defacad92d94666c4bb4b3ea5e703ccda285f6b9d680b56c6a9efc0ce1ab116adf104ec2ad077335273ce70764db6f346e75246b8f53cf SHA512 e0df4685f897bcb3a8515c711f1de6c6eb5084626483ffdfff62335a2aa72455fa6f40158ba32d08e4de2756b17915d2e93ab447522fa5fe92a73cabf6bdf2ca
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/general-docs/general-docs-1.04.ebuild b/app-xemacs/general-docs/general-docs-1.04.ebuild
new file mode 100644
index 000000000000..c8558a82aaac
--- /dev/null
+++ b/app-xemacs/general-docs/general-docs-1.04.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="General XEmacs documentation"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND=""
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/general-docs/general-docs-1.06.ebuild b/app-xemacs/general-docs/general-docs-1.06.ebuild
new file mode 100644
index 000000000000..c8558a82aaac
--- /dev/null
+++ b/app-xemacs/general-docs/general-docs-1.06.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="General XEmacs documentation"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND=""
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/general-docs/metadata.xml b/app-xemacs/general-docs/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/general-docs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/gnats-1.17 b/app-xemacs/gnats-1.17
deleted file mode 100644
index e291182a8532..000000000000
--- a/app-xemacs/gnats-1.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=XEmacs bug reports
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/gnats-1.17-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=6f18d5d6d06266d384a2cc7f15613be2
diff --git a/app-xemacs/gnats/Manifest b/app-xemacs/gnats/Manifest
new file mode 100644
index 000000000000..d49585bcb4b5
--- /dev/null
+++ b/app-xemacs/gnats/Manifest
@@ -0,0 +1,3 @@
+DIST gnats-1.17-pkg.tar.gz 188959 BLAKE2B fd32eea586b1610abba78a51383d86714091a3656dabeeb871bb56eb5b85e7f9ff52dfba87da76bdf3abd15c1e66f98c03d807b26071879f64b33b3fac048b4e SHA512 b8d5a0faeb55c46b7a4f2d42d7b347304bff7a94f8487df72fac0a1aa4e388f188abb351de8764fac1c2381b01b3ac21abb1682878d4e998b5e141e4c443d29b
+EBUILD gnats-1.17.ebuild 307 BLAKE2B 3381b54e8e014eca3ba5acfae67eae56bfcc4c149f89c5ba807324d2c428f9f6005918504772cc6ac4436992a004ae411315570b625bdf4fd2798a3d99997474 SHA512 66844e8572299bb04788add7b30dc670aeba48b08f39d915c6f542bdcf73d645861e83025325f60a2846500523683dc83cef111d5a26697c2f57c47f6a68e766
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/gnats/gnats-1.17.ebuild b/app-xemacs/gnats/gnats-1.17.ebuild
new file mode 100644
index 000000000000..b6255576c4bf
--- /dev/null
+++ b/app-xemacs/gnats/gnats-1.17.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="XEmacs bug reports"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/gnats/metadata.xml b/app-xemacs/gnats/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/gnats/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/gnus-1.99 b/app-xemacs/gnus-1.99
deleted file mode 100644
index 3d36fe37913f..000000000000
--- a/app-xemacs/gnus-1.99
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=The Gnus Newsreader and Mailreader
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/os-utils app-xemacs/dired app-xemacs/mh-e app-xemacs/sieve app-xemacs/ps-print app-xemacs/w3 app-xemacs/pgg app-xemacs/mailcrypt app-xemacs/ecrypto app-xemacs/sasl app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/gnus-1.99-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=656d1856693d63949595f19987078f9b
diff --git a/app-xemacs/gnus/Manifest b/app-xemacs/gnus/Manifest
new file mode 100644
index 000000000000..4db1303d73d1
--- /dev/null
+++ b/app-xemacs/gnus/Manifest
@@ -0,0 +1,3 @@
+DIST gnus-1.99-pkg.tar.gz 3636886 BLAKE2B 5345498a95388998c5cefe65c20991ae34386e582e291c45d51194e509670ec395b2d4ad164ca219e4892a7377030bd769b2e76e3f624b6751d60f2a5161bb5d SHA512 f938e77d2a93e29b7eb89db5b67d717a55ff36e827b7ba3ea1d114f59eda763e06933b645fe42d51a53c483f1e6fe74c669d595af36aa97b30cb97f5ca39db79
+EBUILD gnus-1.99.ebuild 592 BLAKE2B a33dab6e121bc96858b04426178c27e7437abb7d4f815d336936304b1135a11ec23d58fe2ea75eb4398038b9535df90855df85ae12db6613e795d25a27cf78c5 SHA512 6ce4a4b61e34ee5679dad6232f7edd48fa927016a25d9d2572a7caceb0e5a27368cbb038d4432b6c277d8b70e9d2642b0b00460cee7b38645b3e2a878db1c55a
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/gnus/gnus-1.99.ebuild b/app-xemacs/gnus/gnus-1.99.ebuild
new file mode 100644
index 000000000000..713d7a5b7f95
--- /dev/null
+++ b/app-xemacs/gnus/gnus-1.99.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="The Gnus Newsreader and Mailreader"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+app-xemacs/net-utils
+app-xemacs/os-utils
+app-xemacs/dired
+app-xemacs/mh-e
+app-xemacs/sieve
+app-xemacs/ps-print
+app-xemacs/w3
+app-xemacs/pgg
+app-xemacs/mailcrypt
+app-xemacs/ecrypto
+app-xemacs/sasl
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/gnus/metadata.xml b/app-xemacs/gnus/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/gnus/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/guided-tour-0.52 b/app-xemacs/guided-tour-0.52
deleted file mode 100644
index 98e9be7d17ec..000000000000
--- a/app-xemacs/guided-tour-0.52
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Phil Sung's Guided Tour of Emacs
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=~amd64
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/guided-tour-0.52-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=e75f85e73b2aa44bf6e0d8d3bef8d366
diff --git a/app-xemacs/guided-tour/Manifest b/app-xemacs/guided-tour/Manifest
new file mode 100644
index 000000000000..72f810a88fef
--- /dev/null
+++ b/app-xemacs/guided-tour/Manifest
@@ -0,0 +1,3 @@
+DIST guided-tour-0.52-pkg.tar.gz 1450982 BLAKE2B e201ec081b563998f269dd051e298591be1a885270b8e05b1c4f8e905f977ffcd173b5ea7b684a461866939490d783ef52e6d2c12c659065b542ec85d344b038 SHA512 160a4a1a70acaf6e6b02e5d9b3a0fa1d5a31accb98a3b9ad131d08dbc0366163cee21ec912aaa0c2bde7f0c785e01c417f3541bca0ba2eed8a88ad30c0a44691
+EBUILD guided-tour-0.52.ebuild 242 BLAKE2B 434e345c29ac11bbb80de8811000f3f6fc801a4a2b3d125813ba13b8f96b6f848782acac5d167777d0735980f4daa92666929025b39698ee9d37fca5bacf2b20 SHA512 a4cd91a344fb1c1939bbd1af330cfdd6549ad0863274845e593c97a276045657194f50dbb6d66d7d37b3aefba4ddae064a79302d76d17696d024acd769501751
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/guided-tour/guided-tour-0.52.ebuild b/app-xemacs/guided-tour/guided-tour-0.52.ebuild
new file mode 100644
index 000000000000..c1bacaeb4fb2
--- /dev/null
+++ b/app-xemacs/guided-tour/guided-tour-0.52.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Phil Sung's Guided Tour of Emacs"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="~amd64"
+
+inherit xemacs-packages
diff --git a/app-xemacs/guided-tour/metadata.xml b/app-xemacs/guided-tour/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/guided-tour/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/haskell-mode-1.11 b/app-xemacs/haskell-mode-1.11
deleted file mode 100644
index 7e42c49307c0..000000000000
--- a/app-xemacs/haskell-mode-1.11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Haskell editing support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/edit-utils app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/haskell-mode-1.11-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=9258870e1634d4ea4ccc9f3aafb88cbc
diff --git a/app-xemacs/haskell-mode/Manifest b/app-xemacs/haskell-mode/Manifest
new file mode 100644
index 000000000000..93fba8745dfd
--- /dev/null
+++ b/app-xemacs/haskell-mode/Manifest
@@ -0,0 +1,3 @@
+DIST haskell-mode-1.11-pkg.tar.gz 110350 BLAKE2B 05acfe43c5fbf87dd97543d300c41695ee1383267dc0e88aa2b0ae9e2b84b179127500b5d292280099b77597fb93bee4504544979956a814d081b99bb0b88861 SHA512 719b65cbf70680be25912a972fc1c4ce4609bd93f6decac6904b8d8b6266d466c577eb1a60d179f4d356af96f755f24b2802a2803be27e01be0132a22c75abb0
+EBUILD haskell-mode-1.11.ebuild 351 BLAKE2B 0cda6ba6e4757ed8177c1ac9a2dfb506c9920e412f4effb6e9fef182cd1f80053b9eb2f8c03356ae9700bda8dfaff663d6917c69ecd30e984cf9f5d64a69cfb4 SHA512 fe9451a575cdb9d511d1602ea9e806abeada74fd7c0ee3739f2d62671a3c9b25d881e710968f7a8776e34f0ce3646b3ca430715755b32d99c6659136b67dff9a
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/haskell-mode/haskell-mode-1.11.ebuild b/app-xemacs/haskell-mode/haskell-mode-1.11.ebuild
new file mode 100644
index 000000000000..26aba7c30f11
--- /dev/null
+++ b/app-xemacs/haskell-mode/haskell-mode-1.11.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Haskell editing support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/dired
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/edit-utils
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/haskell-mode/metadata.xml b/app-xemacs/haskell-mode/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/haskell-mode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/hm-html-menus-1.23 b/app-xemacs/hm-html-menus-1.23
deleted file mode 100644
index 9863d97224a0..000000000000
--- a/app-xemacs/hm-html-menus-1.23
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=HTML editing
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/packages/hm--html-menus-1.23-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c13078c6f070a61a7a6f68531243c396
diff --git a/app-xemacs/hm-html-menus-1.24 b/app-xemacs/hm-html-menus-1.24
deleted file mode 100644
index 99d665c48b9c..000000000000
--- a/app-xemacs/hm-html-menus-1.24
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=HTML editing
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/packages/hm--html-menus-1.24-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c13078c6f070a61a7a6f68531243c396
diff --git a/app-xemacs/hm-html-menus/Manifest b/app-xemacs/hm-html-menus/Manifest
new file mode 100644
index 000000000000..9a2a122354e7
--- /dev/null
+++ b/app-xemacs/hm-html-menus/Manifest
@@ -0,0 +1,5 @@
+DIST hm--html-menus-1.23-pkg.tar.gz 179091 BLAKE2B caac889d17634f85084db88f4b6e2d97e0aa69224f52ae1e68daa536b7c339b8d1ab55e8b04f9ba26173b07e0bbfc8e6850285ff39311a30ff33d34b70671e9d SHA512 9197c8a5c8bdf10c69e974ef80c51cb3849fd86f6ac40cccc50bf044f09d47d0f8ab77c637789a3175024ed8f818cbe0ffcfb548028e7cdcc112f81e0b2c3e54
+DIST hm--html-menus-1.24-pkg.tar.gz 179443 BLAKE2B 91c8d753f7687b12f0d0b95393a21a3d05705725dcf9f1ed9eff44949763f3c6ec06367cb7df8d0ecf1aa11fbeb7409df316781dc51b0db37bd9a7ca53f77434 SHA512 2576ba402fbbb6a538e497c88fd3472c37f7047c75a41396a94e17984021fa3c2bcf2c0c7c2c81a4a1a711d1dde474ad7505b7c78d7300d46a64ce3fdceded7f
+EBUILD hm-html-menus-1.23.ebuild 371 BLAKE2B 2fadac69b5ff520a92308a1c12da9a7747794ace73cee3fce249a2e8ae0a2ee656eba445c5cd9b9192f38465ef66f1c5ec4feb30b7814b2bc8e380478aa4de7b SHA512 f1f7b1a5064a5a89ec3630e716e4eebe7b98aa5f47fe61b71ade2f31dac9ceeade33b307d3c68a245c0fcd1c61e510ca04fc4e8677122fb7c57d59acfbb43504
+EBUILD hm-html-menus-1.24.ebuild 371 BLAKE2B 2fadac69b5ff520a92308a1c12da9a7747794ace73cee3fce249a2e8ae0a2ee656eba445c5cd9b9192f38465ef66f1c5ec4feb30b7814b2bc8e380478aa4de7b SHA512 f1f7b1a5064a5a89ec3630e716e4eebe7b98aa5f47fe61b71ade2f31dac9ceeade33b307d3c68a245c0fcd1c61e510ca04fc4e8677122fb7c57d59acfbb43504
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/hm-html-menus/hm-html-menus-1.23.ebuild b/app-xemacs/hm-html-menus/hm-html-menus-1.23.ebuild
new file mode 100644
index 000000000000..56777cf73d2b
--- /dev/null
+++ b/app-xemacs/hm-html-menus/hm-html-menus-1.23.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="HTML editing"
+SRC_URI="http://ftp.xemacs.org/packages/hm--html-menus-${PV}-pkg.tar.gz"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/dired
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/hm-html-menus/hm-html-menus-1.24.ebuild b/app-xemacs/hm-html-menus/hm-html-menus-1.24.ebuild
new file mode 100644
index 000000000000..56777cf73d2b
--- /dev/null
+++ b/app-xemacs/hm-html-menus/hm-html-menus-1.24.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="HTML editing"
+SRC_URI="http://ftp.xemacs.org/packages/hm--html-menus-${PV}-pkg.tar.gz"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/dired
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/hm-html-menus/metadata.xml b/app-xemacs/hm-html-menus/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/hm-html-menus/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/hyperbole-1.16 b/app-xemacs/hyperbole-1.16
deleted file mode 100644
index e6df5d1a1ca0..000000000000
--- a/app-xemacs/hyperbole-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Hyperbole: The Everyday Info Manager
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/calendar app-xemacs/vm app-xemacs/text-modes app-xemacs/gnus app-xemacs/mh-e app-xemacs/rmail app-xemacs/apel app-xemacs/tm app-xemacs/sh-script app-xemacs/net-utils app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/hyperbole-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=960ad8f7f38b32c2f865c2adeae0ea79
diff --git a/app-xemacs/hyperbole-1.17 b/app-xemacs/hyperbole-1.17
deleted file mode 100644
index 809176ce53fe..000000000000
--- a/app-xemacs/hyperbole-1.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Hyperbole: The Everyday Info Manager
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/calendar app-xemacs/vm app-xemacs/text-modes app-xemacs/gnus app-xemacs/mh-e app-xemacs/rmail app-xemacs/apel app-xemacs/tm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/hyperbole-1.17-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=d3f13fa4f95a6b4d9a98c19eedbaf314
diff --git a/app-xemacs/hyperbole/Manifest b/app-xemacs/hyperbole/Manifest
new file mode 100644
index 000000000000..c084adcbc679
--- /dev/null
+++ b/app-xemacs/hyperbole/Manifest
@@ -0,0 +1,5 @@
+DIST hyperbole-1.16-pkg.tar.gz 636211 BLAKE2B 87099625589e1bc8d39f9d3c6ea102f6796f8a74067b0234955dff355c1f2dd2781b0825f5885f750fe6440087cdff2d219496a0b1e018d63d1472b88f83c889 SHA512 f0064bf8580c321cd73922cbf651fcd9242ab8aa409ad2eb99ae620f1e284abdd24ad0fa104636646b974f15892d7d7e895fdd35603e42827f3f06c3eca86964
+DIST hyperbole-1.17-pkg.tar.gz 555380 BLAKE2B 35deb594f6fc9c335d8e5f35dce0eb0581a0aa7c0b85dbfaaef9e50250b56e6d00cca2c633dca71e56e241f342535871393ee706598e4cd06d3db3a309e89cd8 SHA512 154e750124df8a610695847c041a3588404b4d2524dbe60a7ab86e546d4920eb95cd7abe34f82535d7c2869fbb80f12349ac41e87a67b614dbd19df034fe4c03
+EBUILD hyperbole-1.16.ebuild 502 BLAKE2B 3a2a834d0687fccbada5ee62f5ca7096cf1704f43fb4989dfe518ebe9e6053120193d639a336e6270cd39019fcc3b4357bf6655c38758924531b54bd9a1b7e17 SHA512 062def13e38f0fb8d218daebfe77a34b28a7d756ff0ce58b2264522754a1a73dd3efc1a06d87c875c73e189ee598b169ac4dfcaf927e61eddb80d43cc7a9a695
+EBUILD hyperbole-1.17.ebuild 521 BLAKE2B d214dc01766e8e333ba5c09828ab57b3f034c6b27f4d4d5d1ad60b5c5a98b8d76ad60bec383bcb11be2824d90a6b0a13dadd1c399f7a3f32f01c33eb506c0ee8 SHA512 9abc7535a5cf8690f99b99e91e96f216551fa3cdbda337584e559833a3ba122ae65415cf7a3af30b0a7ab3f48db6d3f9687c2e5559998199b57bf1c79f1c49d9
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/hyperbole/hyperbole-1.16.ebuild b/app-xemacs/hyperbole/hyperbole-1.16.ebuild
new file mode 100644
index 000000000000..687de34b8dc1
--- /dev/null
+++ b/app-xemacs/hyperbole/hyperbole-1.16.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Hyperbole: The Everyday Info Manager"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/mail-lib
+app-xemacs/calendar
+app-xemacs/vm
+app-xemacs/text-modes
+app-xemacs/gnus
+app-xemacs/mh-e
+app-xemacs/rmail
+app-xemacs/apel
+app-xemacs/tm
+app-xemacs/sh-script
+app-xemacs/net-utils
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/hyperbole/hyperbole-1.17.ebuild b/app-xemacs/hyperbole/hyperbole-1.17.ebuild
new file mode 100644
index 000000000000..b9be70c62ade
--- /dev/null
+++ b/app-xemacs/hyperbole/hyperbole-1.17.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Hyperbole: The Everyday Info Manager"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/mail-lib
+app-xemacs/calendar
+app-xemacs/vm
+app-xemacs/text-modes
+app-xemacs/gnus
+app-xemacs/mh-e
+app-xemacs/rmail
+app-xemacs/apel
+app-xemacs/tm
+app-xemacs/sh-script
+app-xemacs/net-utils
+app-xemacs/ecrypto
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/hyperbole/metadata.xml b/app-xemacs/hyperbole/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/hyperbole/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/ibuffer-1.09 b/app-xemacs/ibuffer-1.09
deleted file mode 100644
index c772dbabc1b1..000000000000
--- a/app-xemacs/ibuffer-1.09
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Advanced replacement for buffer-menu
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ibuffer-1.09-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=66e87ea8f9a10ff0766eb4dfc6241a4c
diff --git a/app-xemacs/ibuffer-1.10 b/app-xemacs/ibuffer-1.10
deleted file mode 100644
index 1008681fe3c6..000000000000
--- a/app-xemacs/ibuffer-1.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Advanced replacement for buffer-menu
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ibuffer-1.10-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=66e87ea8f9a10ff0766eb4dfc6241a4c
diff --git a/app-xemacs/ibuffer/Manifest b/app-xemacs/ibuffer/Manifest
new file mode 100644
index 000000000000..5f8ecff45548
--- /dev/null
+++ b/app-xemacs/ibuffer/Manifest
@@ -0,0 +1,5 @@
+DIST ibuffer-1.09-pkg.tar.gz 89926 BLAKE2B 3d8cac6a487e281fd73cb443137421a85367f6141b2dad3f6530540a7764b4c3f9ba7e3551b243815cd97846afdba7811cc0c3b6a02f45e6d48f31392aeb3915 SHA512 d5a9d4aa5fa9fbbab7a50d488742c271d2810f5312f7e1db04c2ef600e94473acf6a6c6e6bbe5f1ba4c35f2f550044a0f8847a7cbc0963386b18fa2ad36be1d2
+DIST ibuffer-1.10-pkg.tar.gz 87849 BLAKE2B 54e5b403d50691cc3a0989f1aad9c043d815a6b092237c8cee218b95c5b65e8b3b8bddd620546952d4d1a391c6758803dd288582e584e0534abe73c549765a28 SHA512 698ab658eabbcefe7826d8fe01978bae33158275727b61a404b8f7fcb6361b9c3bb502e50123a05e789571b06f4d113ea64052c90f669f5648d4050f5d25ad31
+EBUILD ibuffer-1.09.ebuild 305 BLAKE2B 3f7976a9174ed8f44e221acf252d53648724a3baa7224ae407d60678887936767b6f0850f59e13c436a3b5a28d2c494985cc229c1b40b04e4e8b28c24a03cbe1 SHA512 30849094610ace97ace1846593ca3474b069ca93af9bb7ab557847c970eb6fe3e34feaa4f04f136f7f81160c79466b8d6c8234b7a3c8b4233c58e926747c88a0
+EBUILD ibuffer-1.10.ebuild 305 BLAKE2B 3f7976a9174ed8f44e221acf252d53648724a3baa7224ae407d60678887936767b6f0850f59e13c436a3b5a28d2c494985cc229c1b40b04e4e8b28c24a03cbe1 SHA512 30849094610ace97ace1846593ca3474b069ca93af9bb7ab557847c970eb6fe3e34feaa4f04f136f7f81160c79466b8d6c8234b7a3c8b4233c58e926747c88a0
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ibuffer/ibuffer-1.09.ebuild b/app-xemacs/ibuffer/ibuffer-1.09.ebuild
new file mode 100644
index 000000000000..2d2dd22e8232
--- /dev/null
+++ b/app-xemacs/ibuffer/ibuffer-1.09.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Advanced replacement for buffer-menu"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ibuffer/ibuffer-1.10.ebuild b/app-xemacs/ibuffer/ibuffer-1.10.ebuild
new file mode 100644
index 000000000000..2d2dd22e8232
--- /dev/null
+++ b/app-xemacs/ibuffer/ibuffer-1.10.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Advanced replacement for buffer-menu"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ibuffer/metadata.xml b/app-xemacs/ibuffer/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/ibuffer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/idlwave-1.32 b/app-xemacs/idlwave-1.32
deleted file mode 100644
index ee024b0ae37a..000000000000
--- a/app-xemacs/idlwave-1.32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Editing and Shell mode for the Interactive Data Language
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/idlwave-1.32-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=4be95984949dcbfc3a129ed967c7cc2c
diff --git a/app-xemacs/idlwave/Manifest b/app-xemacs/idlwave/Manifest
new file mode 100644
index 000000000000..aa52bbb6ec9c
--- /dev/null
+++ b/app-xemacs/idlwave/Manifest
@@ -0,0 +1,3 @@
+DIST idlwave-1.32-pkg.tar.gz 520863 BLAKE2B 1156dcb89c9900ade58f35de3fae1e6cad96fa7dcbfeda30a9097108614bb5d1f8e8e618112dd47320700d36165ee11abee86e41d8a0cf944a8c32c9c3f5904b SHA512 deebd2e3f49e8a0cf057735a6639f890da5282edbb67cc35bb653456d488e9d0c9f5c69a73a70023f276d7c8df974d9b9a3400c2a7ef1e0bbc4c07c416353995
+EBUILD idlwave-1.32.ebuild 367 BLAKE2B 6600e69e872355459727faecc6deb2b1e5f963d06902c6eabd9d24fc3b04d284a718036069ee10caf18c3619c78acb5bb4acb34d897ea221f8c50aaf6051c52c SHA512 c0d78740b99435445102d796eeb49c537e3fa575e82c7a04e9650a2a2641609cc3d061d81f4f5667dbfc6880733ff87d7771d3822377fb34424d49e0f8038d95
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/idlwave/idlwave-1.32.ebuild b/app-xemacs/idlwave/idlwave-1.32.ebuild
new file mode 100644
index 000000000000..d8aaff829bf0
--- /dev/null
+++ b/app-xemacs/idlwave/idlwave-1.32.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Editing and Shell mode for the Interactive Data Language"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+app-xemacs/mail-lib
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/idlwave/metadata.xml b/app-xemacs/idlwave/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/idlwave/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/igrep-1.14 b/app-xemacs/igrep-1.14
deleted file mode 100644
index 0415392c0f97..000000000000
--- a/app-xemacs/igrep-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Enhanced front-end for Grep
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-xemacs/efs app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/igrep-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=a739950979a862b1e10cb5147ffcb647
diff --git a/app-xemacs/igrep-1.16 b/app-xemacs/igrep-1.16
deleted file mode 100644
index 639a5e10cdb4..000000000000
--- a/app-xemacs/igrep-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Enhanced front-end for Grep
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-xemacs/efs app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/igrep-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=a739950979a862b1e10cb5147ffcb647
diff --git a/app-xemacs/igrep/Manifest b/app-xemacs/igrep/Manifest
new file mode 100644
index 000000000000..f1428320ac80
--- /dev/null
+++ b/app-xemacs/igrep/Manifest
@@ -0,0 +1,5 @@
+DIST igrep-1.14-pkg.tar.gz 20838 BLAKE2B 5dba352e6084d9f9b6715d5a855cfbaf9e79d4e198bbd373b6e25e61f6c8cc38f19d83b0672618778eaa243695a2748c6a78ae75dfb0a25278eaf18950c2df4d SHA512 f5fd38a84cd46478bf48bb2c8629aefba9e5e967c66b0dca716df9d7a840871e9874b3786d95820219c8b00b7beafe770e3363352f1384a18bb0084ee1ed0f8e
+DIST igrep-1.16-pkg.tar.gz 21993 BLAKE2B 688a1dd31421a07558da5d567d31d2ba14bc847943e201dc136023e5bf5a2aa595a3b0227d2cf38c0f0fc3f591316ec03a340390362953aafc432bedbf48e921 SHA512 0cc70a42434398e4e15240935660477ba7104e9531d7f87f5d5fbaa73b3f36fe8016d17211270a5f7274478335930b970430921a94571b28b39d0da96d579a0e
+EBUILD igrep-1.14.ebuild 328 BLAKE2B d1415e7ed5ef3611c1203f3d2acd513ed0957a8eaa4bacf69cc7872cb84572cedadc163e8a4bdaca06b8550f38976b5d63acdbe14a06eb4b9e52b86d870cfaf4 SHA512 c4fab805232e04b45435ab7cb89b006a5f5d83268c91df659234ecddc6bc3c54e5aff219588940ddf1136d0f701398c399fda995da4f992d9c602aba8e871678
+EBUILD igrep-1.16.ebuild 328 BLAKE2B d1415e7ed5ef3611c1203f3d2acd513ed0957a8eaa4bacf69cc7872cb84572cedadc163e8a4bdaca06b8550f38976b5d63acdbe14a06eb4b9e52b86d870cfaf4 SHA512 c4fab805232e04b45435ab7cb89b006a5f5d83268c91df659234ecddc6bc3c54e5aff219588940ddf1136d0f701398c399fda995da4f992d9c602aba8e871678
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/igrep/igrep-1.14.ebuild b/app-xemacs/igrep/igrep-1.14.ebuild
new file mode 100644
index 000000000000..13d8f82a3610
--- /dev/null
+++ b/app-xemacs/igrep/igrep-1.14.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Enhanced front-end for Grep"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/dired
+app-xemacs/xemacs-base
+app-xemacs/efs
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/igrep/igrep-1.16.ebuild b/app-xemacs/igrep/igrep-1.16.ebuild
new file mode 100644
index 000000000000..13d8f82a3610
--- /dev/null
+++ b/app-xemacs/igrep/igrep-1.16.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Enhanced front-end for Grep"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/dired
+app-xemacs/xemacs-base
+app-xemacs/efs
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/igrep/metadata.xml b/app-xemacs/igrep/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/igrep/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/ilisp-1.34 b/app-xemacs/ilisp-1.34
deleted file mode 100644
index 8fd9fea0c862..000000000000
--- a/app-xemacs/ilisp-1.34
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Front-end for Inferior Lisp
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-xemacs/sh-script app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ilisp-1.34-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=fd025e6d36483e52808c2351a2e34034
diff --git a/app-xemacs/ilisp-1.36 b/app-xemacs/ilisp-1.36
deleted file mode 100644
index afd5000d2494..000000000000
--- a/app-xemacs/ilisp-1.36
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Front-end for Inferior Lisp
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-xemacs/sh-script app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ilisp-1.36-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=fd025e6d36483e52808c2351a2e34034
diff --git a/app-xemacs/ilisp/Manifest b/app-xemacs/ilisp/Manifest
new file mode 100644
index 000000000000..1a9e91772e1b
--- /dev/null
+++ b/app-xemacs/ilisp/Manifest
@@ -0,0 +1,5 @@
+DIST ilisp-1.34-pkg.tar.gz 345867 BLAKE2B 7a3faf630fabf39f25f4cbb73fafdc261441699d75bcdad0c8117ee051ae59b06735306b77617ab75c092178cfe0f0e0b98b53bda01a3026f0728ba86bef25ee SHA512 c6d024383f6bb33dcc47f175895aace02bab209fa4ece11ac90812630e49a3ac43f10931a9398fcd9dc4f14747bdb0a0694fab4f67c9b15650bcf201fea7508c
+DIST ilisp-1.36-pkg.tar.gz 347911 BLAKE2B 4e8783055d06b4824c806c80d79dacb4bad8066fcd1afb9c6e3911a176792a6ee8b6ff269726178642d7c75ce12b47856abe82504c67fa8caa5291f89e9c0f39 SHA512 71a637f80df53ef59b5e2d56ab1c36790d702a7419831d1a1ed54f4e29570e0120c757af71675039fc7076625ad1379eae07a2895c01ced0b066de88bb62576d
+EBUILD ilisp-1.34.ebuild 383 BLAKE2B da09175af93d253484b6a8ddce7d24b4dc031be3e835e676ea0df55d06d6d043f5d1213f3da587deddc8d8f2d76c0315760c1fd64861050ab8ccef7c56a077e7 SHA512 d125ed711d37d7cb56c7b27a3c387e8d29aefc8e580a879b45d035f91f0493d17356ff7505e9a5ea53e643b57d841a255e5c71e48a0aabdb46879893e4045ccc
+EBUILD ilisp-1.36.ebuild 383 BLAKE2B da09175af93d253484b6a8ddce7d24b4dc031be3e835e676ea0df55d06d6d043f5d1213f3da587deddc8d8f2d76c0315760c1fd64861050ab8ccef7c56a077e7 SHA512 d125ed711d37d7cb56c7b27a3c387e8d29aefc8e580a879b45d035f91f0493d17356ff7505e9a5ea53e643b57d841a255e5c71e48a0aabdb46879893e4045ccc
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ilisp/ilisp-1.34.ebuild b/app-xemacs/ilisp/ilisp-1.34.ebuild
new file mode 100644
index 000000000000..322725fa53fa
--- /dev/null
+++ b/app-xemacs/ilisp/ilisp-1.34.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Front-end for Inferior Lisp"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/mail-lib
+app-xemacs/fsf-compat
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ilisp/ilisp-1.36.ebuild b/app-xemacs/ilisp/ilisp-1.36.ebuild
new file mode 100644
index 000000000000..322725fa53fa
--- /dev/null
+++ b/app-xemacs/ilisp/ilisp-1.36.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Front-end for Inferior Lisp"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/mail-lib
+app-xemacs/fsf-compat
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ilisp/metadata.xml b/app-xemacs/ilisp/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/ilisp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/jde-1.51 b/app-xemacs/jde-1.51
deleted file mode 100644
index 2d24292c8ef1..000000000000
--- a/app-xemacs/jde-1.51
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Integrated Development Environment for Java
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/cc-mode app-xemacs/semantic app-xemacs/debug app-xemacs/speedbar app-xemacs/edit-utils app-xemacs/xemacs-eterm app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/eieio app-xemacs/elib app-xemacs/sh-script app-xemacs/fsf-compat app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/jde-1.51-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=7648c65488bc283f441f64f11528421b
diff --git a/app-xemacs/jde-1.52 b/app-xemacs/jde-1.52
deleted file mode 100644
index 79c77668470f..000000000000
--- a/app-xemacs/jde-1.52
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Integrated Development Environment for Java
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/cc-mode app-xemacs/semantic app-xemacs/debug app-xemacs/speedbar app-xemacs/edit-utils app-xemacs/xemacs-eterm app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/cedet-common app-xemacs/eieio app-xemacs/elib app-xemacs/sh-script app-xemacs/fsf-compat app-xemacs/os-utils app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/jde-1.52-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=60e4663743e7391f41b4cfff8ee1a259
diff --git a/app-xemacs/jde/Manifest b/app-xemacs/jde/Manifest
new file mode 100644
index 000000000000..288139933a68
--- /dev/null
+++ b/app-xemacs/jde/Manifest
@@ -0,0 +1,5 @@
+DIST jde-1.51-pkg.tar.gz 3508064 BLAKE2B f3dd080be5bedc5dc01cdd8d270da9407e70b979af4ebb0ec7beee92f664af95217354cb952bf7fcf3e4d14d4b32c4ff4b2f45dd2175fbee84b395bc991c3e0f SHA512 6bd21d073562a7aef66f4a5c3fff014b5d293bbcb08483f003c0d914c18034806a4cb9e3fb31f07149106a9e0f69eea6311e8740a1660bc2317a63d158c2acc8
+DIST jde-1.52-pkg.tar.gz 3767445 BLAKE2B fddef76a453d594d896480089b45bb8472c72535b4a259d61a8facca62932c0420e9161843f494b2badc11f977d57b85c85687c50534a2d1b3c5320ab98d1bb1 SHA512 f2fa2e266cd832b5761ee967e2b4be52694b941699a099ffc363869bb4036a439ca8010e6428b98cf0dfc474b451f48b031e042092e1f66706b9a50e0f88c413
+EBUILD jde-1.51.ebuild 554 BLAKE2B 9db7ba09f5fc0cee20f736c5fed6ba355725642188d24a8bc995fdd3435da3e3089d8f63a8700d5fb253ae7f4a1d863034def37d3e0f86d2b75e05aa42ad3141 SHA512 8f15d2b66ecf31479091cbde1294530fba41ec7f9dda9ec9149f297499aaaacde39cf61a4a23c597476f70bf7b8e9be920a2ab32503ac0197deddc4ab87042ce
+EBUILD jde-1.52.ebuild 598 BLAKE2B 53cf0c7d90cfefab084869edf67a605e8ff6e8964d9ff85cfa7ddbb79c33dc679610cd5888ad7e41b6bf9ae39057f62452b1b8044ac73a011a430736a07f918b SHA512 484eab8b5aba4b467a8c512ce69352da3f34f5bf3703ad02bd6e90cd6ac4bd6d2da2a7093e02cf9d87472fa1cbc4bb31868217de25043eb6d69513f890d5a083
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/jde/jde-1.51.ebuild b/app-xemacs/jde/jde-1.51.ebuild
new file mode 100644
index 000000000000..ff20dc506dbd
--- /dev/null
+++ b/app-xemacs/jde/jde-1.51.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Integrated Development Environment for Java"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/cc-mode
+app-xemacs/semantic
+app-xemacs/debug
+app-xemacs/speedbar
+app-xemacs/edit-utils
+app-xemacs/xemacs-eterm
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+app-xemacs/eieio
+app-xemacs/elib
+app-xemacs/sh-script
+app-xemacs/fsf-compat
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/jde/jde-1.52.ebuild b/app-xemacs/jde/jde-1.52.ebuild
new file mode 100644
index 000000000000..9be95c9814c5
--- /dev/null
+++ b/app-xemacs/jde/jde-1.52.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Integrated Development Environment for Java"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/cc-mode
+app-xemacs/semantic
+app-xemacs/debug
+app-xemacs/speedbar
+app-xemacs/edit-utils
+app-xemacs/xemacs-eterm
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+app-xemacs/cedet-common
+app-xemacs/eieio
+app-xemacs/elib
+app-xemacs/sh-script
+app-xemacs/fsf-compat
+app-xemacs/os-utils
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/jde/metadata.xml b/app-xemacs/jde/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/jde/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/latin-euro-standards-1.07 b/app-xemacs/latin-euro-standards-1.07
deleted file mode 100644
index 02f8dbe3c689..000000000000
--- a/app-xemacs/latin-euro-standards-1.07
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Support for the Latin{7,8,9,10} character sets & coding systems
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/latin-euro-standards-1.07-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=db2e4a16f002e4e996daedca7441ab05
diff --git a/app-xemacs/latin-euro-standards-1.09 b/app-xemacs/latin-euro-standards-1.09
deleted file mode 100644
index cffdc65b9df1..000000000000
--- a/app-xemacs/latin-euro-standards-1.09
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Support for the Latin{7,8,9,10} character sets & coding systems
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/latin-euro-standards-1.09-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=db2e4a16f002e4e996daedca7441ab05
diff --git a/app-xemacs/latin-euro-standards/Manifest b/app-xemacs/latin-euro-standards/Manifest
new file mode 100644
index 000000000000..b24978f86d0c
--- /dev/null
+++ b/app-xemacs/latin-euro-standards/Manifest
@@ -0,0 +1,5 @@
+DIST latin-euro-standards-1.07-pkg.tar.gz 13887 BLAKE2B 5a97c6639668d77e376af24ffa14723acd2b40a4bac0fad334f881319a537d5d610a9ddfa0a0f021e5fdba8df684bb0c3c5a514c8efbec52aaef684b1a546b24 SHA512 71e666f40be2e299394400235ab8d4474807feb7f8e041ad8f55fc743c71feb4edc71cebdc7a19a1cc22949752d4af297b16c1c03520cc17b1ed5882d6f4fc6d
+DIST latin-euro-standards-1.09-pkg.tar.gz 14360 BLAKE2B 00ce57c201c0e815f30eb284d04a04cb3670a2a8af8ef721d7fb46c926ab7a882d0ff23a8311900619347cc8daf85d9a73cb3ef43980cd179da16b119f138ce1 SHA512 d76928736b98bd8c27aa8624de23702ca1f3f121ea926cfb11306bb6a5c64f452474ca643da63ce3801e5ddf757d67f28f92ce95fe885d56ce6f4e9baecb55f3
+EBUILD latin-euro-standards-1.07.ebuild 332 BLAKE2B 84f5d202ba77612ef8c94bbbcf6c5c06207218b93e5842bcf87d471d2978796e07a4ed8f30df8c9f932d75c9b3e5f1b6e1b96922193987cbe1fed175f41bb825 SHA512 c83f14c7b7e5667b6a2937904e9acc2473eb5e2ce00300251b70771c237968f60b2f3ae74c88bf4e8153cf19da4993f00aabdb5a1f2b61a9d176ad28c2c5709a
+EBUILD latin-euro-standards-1.09.ebuild 332 BLAKE2B 84f5d202ba77612ef8c94bbbcf6c5c06207218b93e5842bcf87d471d2978796e07a4ed8f30df8c9f932d75c9b3e5f1b6e1b96922193987cbe1fed175f41bb825 SHA512 c83f14c7b7e5667b6a2937904e9acc2473eb5e2ce00300251b70771c237968f60b2f3ae74c88bf4e8153cf19da4993f00aabdb5a1f2b61a9d176ad28c2c5709a
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/latin-euro-standards/latin-euro-standards-1.07.ebuild b/app-xemacs/latin-euro-standards/latin-euro-standards-1.07.ebuild
new file mode 100644
index 000000000000..87c19f6742cd
--- /dev/null
+++ b/app-xemacs/latin-euro-standards/latin-euro-standards-1.07.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Support for the Latin{7,8,9,10} character sets & coding systems"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/mule-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/latin-euro-standards/latin-euro-standards-1.09.ebuild b/app-xemacs/latin-euro-standards/latin-euro-standards-1.09.ebuild
new file mode 100644
index 000000000000..87c19f6742cd
--- /dev/null
+++ b/app-xemacs/latin-euro-standards/latin-euro-standards-1.09.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Support for the Latin{7,8,9,10} character sets & coding systems"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/mule-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/latin-euro-standards/metadata.xml b/app-xemacs/latin-euro-standards/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/latin-euro-standards/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/latin-unity-1.20 b/app-xemacs/latin-unity-1.20
deleted file mode 100644
index 2054ab7bb00c..000000000000
--- a/app-xemacs/latin-unity-1.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: find single ISO 8859 character set to encode a buffer
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-xemacs/latin-euro-standards app-xemacs/mule-ucs app-xemacs/leim app-xemacs/fsf-compat app-xemacs/dired app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/latin-unity-1.20-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=1e347c3ef828ef1711c6777ca7bce118
diff --git a/app-xemacs/latin-unity/Manifest b/app-xemacs/latin-unity/Manifest
new file mode 100644
index 000000000000..12b5c1b16ae8
--- /dev/null
+++ b/app-xemacs/latin-unity/Manifest
@@ -0,0 +1,3 @@
+DIST latin-unity-1.20-pkg.tar.gz 106399 BLAKE2B 3e5270865879a49f0ecd2eace7635df32219834240ed84e1a1953d2ad5c943fbff96b2e6efb3bd79ea1053adcd4a0daa1de9a62320eea313d43b1cbf0dd6e994 SHA512 9e2634c69ba1382113811e31b9bb2a4d3aa5780fb5d98b0bcb3e8c3ae813ff881ae13032318e14000f9ecb2c68d4490cb168ea8b10a373889962ba7c920569d1
+EBUILD latin-unity-1.20.ebuild 429 BLAKE2B a65a1e7c7f27a5de4cb4380309dbe4d68023dabbb3a33ab015662198b2ab7e8e0d3fffda0345554cac9d0c34ed5115ab90fce9cb18ac50d7ca346086b99c57d6 SHA512 e60863ceb4ae8457331cca30bdfad2fcd76c74586a7cf1e37241a2469f44e8532b84bd7de4ddbf12ae73641a3dd8bae350334b5588ff42ca68b209432ce7bc6f
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/latin-unity/latin-unity-1.20.ebuild b/app-xemacs/latin-unity/latin-unity-1.20.ebuild
new file mode 100644
index 000000000000..cf308c9eec6f
--- /dev/null
+++ b/app-xemacs/latin-unity/latin-unity-1.20.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: find single ISO 8859 character set to encode a buffer"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/mule-base
+app-xemacs/latin-euro-standards
+app-xemacs/mule-ucs
+app-xemacs/leim
+app-xemacs/fsf-compat
+app-xemacs/dired
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/latin-unity/metadata.xml b/app-xemacs/latin-unity/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/latin-unity/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/leim-1.24 b/app-xemacs/leim-1.24
deleted file mode 100644
index 5b5e053125ff..000000000000
--- a/app-xemacs/leim-1.24
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Quail. All non-English and non-Japanese language support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-xemacs/fsf-compat app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/leim-1.24-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=358efca7001c76d7cec21274ac182960
diff --git a/app-xemacs/leim-1.31 b/app-xemacs/leim-1.31
deleted file mode 100644
index 52a30525c3dc..000000000000
--- a/app-xemacs/leim-1.31
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Quail. All non-English and non-Japanese language support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/latin-euro-standards app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/leim-1.31-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=d6ce9d8e93564c45a97b21371fcd6067
diff --git a/app-xemacs/leim/Manifest b/app-xemacs/leim/Manifest
new file mode 100644
index 000000000000..6b4661181d83
--- /dev/null
+++ b/app-xemacs/leim/Manifest
@@ -0,0 +1,5 @@
+DIST leim-1.24-pkg.tar.gz 1723174 BLAKE2B 103b0f73a3fcb81c7f8f4faab7a59b59b615f8731682eceb927d9307b21f8d1f41449cf9e908fe06579a2802187c39f6cbcf2c22949bed28fe11246bbd5f85a9 SHA512 a5f338e63806802c743b1fc8702612948cccd43cb6ce87cc88059502a6ee3d919e48bbe0e6a34b3338e4d6ed617530e399169c35988cac4e5e17fd096676b83c
+DIST leim-1.31-pkg.tar.gz 1804784 BLAKE2B e18e999335494795f1821e8a6d6e762c1a5db74f61e9ecf8f40dab4fc484ca6ff226799369f71df9628b09c1d92d328895405bd769e0cc62979cae328a1fa9a1 SHA512 1179480967e12a7a9701cba24e40f6bdeb51e57fe32e7f4ead4196e652029fa04e0470dfdbc5aecd4a0caf0b53893a815559c5c550d9dacf7e724c898ce6f26f
+EBUILD leim-1.24.ebuild 371 BLAKE2B 935252ec222ad5b8886938e3370b6176746b52a1ae477e0d277b0841f5f78619ac42d8edc1f0c5481f40daff8ada714d3051916de263b8e1b7356dd8d7e746c8 SHA512 dec3bf581588f9b6165cb8e7d017cdb00c8e391523479b3b86fffeaf50e272cd2a889a72fa525b252b33421e5ce2c90e62a12938746b75136a84756b8a5066a8
+EBUILD leim-1.31.ebuild 403 BLAKE2B fb221bb173a7f7b9ee5bb61d4214ed35dd0447072b9183364ede7e7b3852bbb8a2e6823c3b75837cf421b6b3e90b5e07730972094ab5625eeac72b7abeed2ff6 SHA512 4ffbc77bda44e9fecd2bfcd881d98a8e29798c75f1edfd3180375441b83cd51678f12c2664c2d25f03c63ac13809a6ff4c746faeb9c6a34c9ef021fd0a6fe958
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/leim/leim-1.24.ebuild b/app-xemacs/leim/leim-1.24.ebuild
new file mode 100644
index 000000000000..85bf36503143
--- /dev/null
+++ b/app-xemacs/leim/leim-1.24.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Quail.  All non-English and non-Japanese language support"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/mule-base
+app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/leim/leim-1.31.ebuild b/app-xemacs/leim/leim-1.31.ebuild
new file mode 100644
index 000000000000..6423bcbb7043
--- /dev/null
+++ b/app-xemacs/leim/leim-1.31.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Quail.  All non-English and non-Japanese language support"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/mule-base
+app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+app-xemacs/latin-euro-standards
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/leim/metadata.xml b/app-xemacs/leim/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/leim/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/locale-1.24 b/app-xemacs/locale-1.24
deleted file mode 100644
index d913f95cdd08..000000000000
--- a/app-xemacs/locale-1.24
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Localized menubars and localized splash screens
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/locale-1.24-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=1339f18331e195ec4ba7f3f706fefb37
diff --git a/app-xemacs/locale-1.28 b/app-xemacs/locale-1.28
deleted file mode 100644
index 28846bc54f55..000000000000
--- a/app-xemacs/locale-1.28
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Localized menubars and localized splash screens
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/locale-1.28-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=1339f18331e195ec4ba7f3f706fefb37
diff --git a/app-xemacs/locale/Manifest b/app-xemacs/locale/Manifest
new file mode 100644
index 000000000000..41d42cbae337
--- /dev/null
+++ b/app-xemacs/locale/Manifest
@@ -0,0 +1,5 @@
+DIST locale-1.24-pkg.tar.gz 46421 BLAKE2B ce87a15aa6480dcab5b5b5dcb7fed6c6b112207058fe43d2e369109f1560f9051b275a92ce2e19a0d7a621e94d67b2c9309fd67cfef8e41f546f955cfc71bbe4 SHA512 2c192e20f36d1d14d803cdf0c5e0949aa5a75059531a87823cc8e1192f4543a0d5ea5088a562a315e76a459bcfaaad95328b6c8a0740fd4ce1549eb2f443c3c6
+DIST locale-1.28-pkg.tar.gz 74931 BLAKE2B fa303cf6cacfada89cdc364fb9a6ab76b93b7421fe5b5a390f8f0f46f5814024dab53e4ffffe1ed76d746b08033863ce12f13b86cdeb425fa8fd500f7e8e768f SHA512 f26370be8e614d74503d57a0c0bc9eab153ea54c36466245b7a4851d508942e4c075146d140a8cffba071513fd1f6360de714eafd8fbd600ad9dba053e789d8a
+EBUILD locale-1.24.ebuild 316 BLAKE2B 3e3de5ff8d132f0b1f675e55e868731eb9d8a315b6faae3857e1f2fe8de4de702eb275cc7536e8d146d7b4284363ad133bdcfce622ee39477efcd526c35e9721 SHA512 d1b11430bc6977e58df971166bc1bf339ae40708c09d7cb2ada6fd52adfdddca53824bc5331a422a58a5b7b47fd03ae1b6267e798b74000b9817d94cf0051f86
+EBUILD locale-1.28.ebuild 316 BLAKE2B 3e3de5ff8d132f0b1f675e55e868731eb9d8a315b6faae3857e1f2fe8de4de702eb275cc7536e8d146d7b4284363ad133bdcfce622ee39477efcd526c35e9721 SHA512 d1b11430bc6977e58df971166bc1bf339ae40708c09d7cb2ada6fd52adfdddca53824bc5331a422a58a5b7b47fd03ae1b6267e798b74000b9817d94cf0051f86
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/locale/locale-1.24.ebuild b/app-xemacs/locale/locale-1.24.ebuild
new file mode 100644
index 000000000000..c3d747f0ca16
--- /dev/null
+++ b/app-xemacs/locale/locale-1.24.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Localized menubars and localized splash screens"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/mule-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/locale/locale-1.28.ebuild b/app-xemacs/locale/locale-1.28.ebuild
new file mode 100644
index 000000000000..c3d747f0ca16
--- /dev/null
+++ b/app-xemacs/locale/locale-1.28.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Localized menubars and localized splash screens"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/mule-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/locale/metadata.xml b/app-xemacs/locale/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/locale/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/lookup-1.15 b/app-xemacs/lookup-1.15
deleted file mode 100644
index b8321fe9fbd3..000000000000
--- a/app-xemacs/lookup-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Dictionary support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-xemacs/cookie app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/lookup-1.15-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=9f515e564e56f7927bb03ccb8d157d8e
diff --git a/app-xemacs/lookup/Manifest b/app-xemacs/lookup/Manifest
new file mode 100644
index 000000000000..bcf6a5915f97
--- /dev/null
+++ b/app-xemacs/lookup/Manifest
@@ -0,0 +1,3 @@
+DIST lookup-1.15-pkg.tar.gz 225952 BLAKE2B 6894dabb547accf5732859a30d6589c3a283c2bd3e45eaa6b25831a997999a619754db7b2baee9c4b87a399e2d7d2dc73ba0245b4878d03d59f5a8f3155c18f0 SHA512 06d23009bb75475b7df36274ea67046938e328077185a9567a232f4b901f948fd4e36ec39fefacaaf4e1761d800e8803f9aa45dba93d00ccf71710673db28f01
+EBUILD lookup-1.15.ebuild 305 BLAKE2B b7caedc0da9d8adf0fcb1c6a21edde4e5d64e93ff130b8c5dbf97fd0e778ddec12b6224bcba6537d8778da8991ee988b0537fe17f329d44ecae7a047c05a4856 SHA512 58e7afe381c2fa9c3b002661158e5c81a37b7311c32260cce9659e9016167e77f390278f8db96bb0b89220f58c5d708694c1b583d31d0a90de2cfeea69a20af4
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/lookup/lookup-1.15.ebuild b/app-xemacs/lookup/lookup-1.15.ebuild
new file mode 100644
index 000000000000..786117936c31
--- /dev/null
+++ b/app-xemacs/lookup/lookup-1.15.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Dictionary support"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/mule-base
+app-xemacs/cookie
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/lookup/metadata.xml b/app-xemacs/lookup/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/lookup/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/mail-lib-1.83 b/app-xemacs/mail-lib-1.83
deleted file mode 100644
index 9230e176bbc0..000000000000
--- a/app-xemacs/mail-lib-1.83
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Fundamental lisp files for providing email support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-eterm app-xemacs/xemacs-base app-xemacs/fsf-compat app-xemacs/sh-script app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/mail-lib-1.83-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=5abc92d4ea316abcf7f9ac5ba0d20614
diff --git a/app-xemacs/mail-lib/Manifest b/app-xemacs/mail-lib/Manifest
new file mode 100644
index 000000000000..34cadf664a1d
--- /dev/null
+++ b/app-xemacs/mail-lib/Manifest
@@ -0,0 +1,3 @@
+DIST mail-lib-1.83-pkg.tar.gz 211862 BLAKE2B d84e39e45b8193bbb05a6d724d6b8672aae2daf506fef5ae99a71c4d122834d5259e82e83e05aa5480c1327c523c19f58f70e921eb44a6a90f84ad4c3aac36d1 SHA512 09149c96e3716c2df054654a6111cd45f0bc86c47ea5a8c699e8c7822052c68885a01392e07611ad7b5f721679aa1a9c5da0694d1a0aef6af3a51b4290c31162
+EBUILD mail-lib-1.83.ebuild 433 BLAKE2B 0def14b49f44b85d5b256161ebe0f2eb9800655b935d79e6524b04703d7e1632a702a794fbc6687829ba76142266f22157b26f1187ab87a340c09ba2703c0819 SHA512 17e0c51e0e2b68d0aa75bf7335392ec989e570b4c07c9d5621a93ccaba192413ae9264496551a8839ece75ecc12aa952e94043df037bf9f6c0feb048d42b2ae9
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mail-lib/mail-lib-1.83.ebuild b/app-xemacs/mail-lib/mail-lib-1.83.ebuild
new file mode 100644
index 000000000000..05dfd13753a7
--- /dev/null
+++ b/app-xemacs/mail-lib/mail-lib-1.83.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Fundamental lisp files for providing email support"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/xemacs-eterm
+app-xemacs/xemacs-base
+app-xemacs/fsf-compat
+app-xemacs/sh-script
+app-xemacs/ecrypto
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/mail-lib/metadata.xml b/app-xemacs/mail-lib/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/mail-lib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/mailcrypt-2.14 b/app-xemacs/mailcrypt-2.14
deleted file mode 100644
index e7740cdc3ca2..000000000000
--- a/app-xemacs/mailcrypt-2.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Support for messaging encryption with PGP
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/cookie app-xemacs/gnus app-xemacs/mh-e app-xemacs/rmail app-xemacs/vm app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mailcrypt-2.14-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=d0ea43c3fb9f1fe2245b5505ab943075
diff --git a/app-xemacs/mailcrypt/Manifest b/app-xemacs/mailcrypt/Manifest
new file mode 100644
index 000000000000..201247031c0e
--- /dev/null
+++ b/app-xemacs/mailcrypt/Manifest
@@ -0,0 +1,3 @@
+DIST mailcrypt-2.14-pkg.tar.gz 154180 BLAKE2B a5db41632b13930cadac65921026a5c5c2d393313d94c6c851e2691eb964eb6f70a25909f71dd7748f537f1dee037e6d3a45b9a7a7d031100e2018e9b2fd0759 SHA512 61e252f67f8848d54bd372341545d88d9f2150f671dd8cf371fa7650c9183eb7e4d8f3e661255110ae1a47df152060d81143f83a2f2fbc942aa6a83d36f09e9e
+EBUILD mailcrypt-2.14.ebuild 433 BLAKE2B 82af54a90bf6f7b049b4ab45c95cca132e41a933c67e431313139ce472196e845e75190dcd80b514876910b3e450e628772a375feca5987590dfd21e786c8ffd SHA512 dce3acb3daf5278f47248c34eb8c1abc9981f60276c055a0c3be73f807b576c65826b752d663dfc48ceca00e78c20048fcbfd5e5937b5ed5c14d6938806476d8
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mailcrypt/mailcrypt-2.14.ebuild b/app-xemacs/mailcrypt/mailcrypt-2.14.ebuild
new file mode 100644
index 000000000000..13fee8df3bc2
--- /dev/null
+++ b/app-xemacs/mailcrypt/mailcrypt-2.14.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Support for messaging encryption with PGP"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+app-xemacs/cookie
+app-xemacs/gnus
+app-xemacs/mh-e
+app-xemacs/rmail
+app-xemacs/vm
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/mailcrypt/metadata.xml b/app-xemacs/mailcrypt/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/mailcrypt/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/metadata.xml b/app-xemacs/metadata.xml
new file mode 100644
index 000000000000..3cfdbce6021e
--- /dev/null
+++ b/app-xemacs/metadata.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-xemacs category contains extensions for the XEmacs text editor.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-xemacs enthält Erweiterungen für den Texteditor XEmacs.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-xemacs contiene extensiones para el editor de texto
+		XEmacs.
+	</longdescription>
+	<longdescription lang="ja">
+		app-xemacsカテゴリにはXEmacsテキストエディタに
+		関連した拡張パッケージが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De app-xemacs categorie bevat uitbreidingen voor de XEmacs text editor.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-xemacs chứa các phần mở rộng của trình soạn
+		thảo văn bản XEmacs.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-xemacs contiene estensioni per l'editor di testo
+		XEmacs.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-xemacs contém extensões para o editor de texto
+		XEmacs.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-xemacs zawiera rozszerzenia dla edytora tekstu XEmacs.
+	</longdescription>
+</catmetadata>
+
diff --git a/app-xemacs/mew-1.19 b/app-xemacs/mew-1.19
deleted file mode 100644
index ca1a7b3f6cbd..000000000000
--- a/app-xemacs/mew-1.19
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Messaging in an Emacs World
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/w3 app-xemacs/efs app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/fsf-compat app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mew-1.19-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=cb4fbf5c0f6674eee7e789e04fbf6ab1
diff --git a/app-xemacs/mew/Manifest b/app-xemacs/mew/Manifest
new file mode 100644
index 000000000000..78ae81a6f22f
--- /dev/null
+++ b/app-xemacs/mew/Manifest
@@ -0,0 +1,3 @@
+DIST mew-1.19-pkg.tar.gz 745714 BLAKE2B b2f4a6889cb1e9aed82ce7a75c6861fe4e07a924f3adf32c9592800b6ba03f9960d65da579be2e5ed8343d2d70928336720d2f8f3578752df4cb9504a1231374 SHA512 9168cae8ad96d1050eecfffa46b4c15d65fef1908407f339757a5c9af21d2ef7b53a74cc6b805f0e6bed264fbcce81656117c44382b5884c2f772503cb5f1180
+EBUILD mew-1.19.ebuild 367 BLAKE2B aade4c862b37c1f8ea44124bd2cec853d505b4e9d545c39967e17863a517de436086815168573d88cb6469c9ddb87a890765415799cd24b738b55e9132db01de SHA512 896042b88e4ff26008db92a281d0876ad20d4cd51f5a9fcbfa9d314e463bae0908b9f3e845e42b9fd3e9e126b2e013210fd78883f25d1e98bc9b14e932e4b17f
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mew/metadata.xml b/app-xemacs/mew/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/mew/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/mew/mew-1.19.ebuild b/app-xemacs/mew/mew-1.19.ebuild
new file mode 100644
index 000000000000..145d59dcbf24
--- /dev/null
+++ b/app-xemacs/mew/mew-1.19.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Messaging in an Emacs World"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/w3
+app-xemacs/efs
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/fsf-compat
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/mh-e-1.29 b/app-xemacs/mh-e-1.29
deleted file mode 100644
index 458c1ff6ff90..000000000000
--- a/app-xemacs/mh-e-1.29
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Front end support for MH
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/gnus app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/speedbar app-xemacs/rmail app-xemacs/tm app-xemacs/apel app-xemacs/sh-script app-xemacs/fsf-compat app-xemacs/xemacs-devel app-xemacs/net-utils app-xemacs/xemacs-eterm app-xemacs/os-utils app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mh-e-1.29-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=b9ad18ae75c895bfb5a3cce5f9b0aeae
diff --git a/app-xemacs/mh-e-1.32 b/app-xemacs/mh-e-1.32
deleted file mode 100644
index bf1387b0e02c..000000000000
--- a/app-xemacs/mh-e-1.32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Front end support for MH
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/gnus app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/rmail app-xemacs/tm app-xemacs/apel app-xemacs/sh-script app-xemacs/fsf-compat app-xemacs/xemacs-devel app-xemacs/net-utils app-xemacs/xemacs-eterm app-xemacs/os-utils app-xemacs/ecrypto app-xemacs/cedet-common app-xemacs/speedbar app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mh-e-1.32-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=0fe7f5e8f986055c658d2d170e7796eb
diff --git a/app-xemacs/mh-e/Manifest b/app-xemacs/mh-e/Manifest
new file mode 100644
index 000000000000..62d9ab2742f3
--- /dev/null
+++ b/app-xemacs/mh-e/Manifest
@@ -0,0 +1,5 @@
+DIST mh-e-1.29-pkg.tar.gz 578385 BLAKE2B 1b0f6dc854dc346b5b47b9ce9b85d1533c7dc9e22d2bf2a85c3728c6388798927e04f1cc4619880c75c933888eb63c481ce792b942bea938b8fcd97aba3411be SHA512 49385d5acbea34df5957569ec851ef4e933c1683f313939550705fdee96350376f5434a10d8013797222d5416bd759fc5769022449241004777991b72bde1d05
+DIST mh-e-1.32-pkg.tar.gz 580383 BLAKE2B 596c7111ae90fc19c00a30e7291a364e7695f68236f87e526af4289e58f494aeaedf07cc56f8af8ffea7743b46a29d0a14e9e0bf2c4e9f384cfb9f409ad28616 SHA512 364a1d7a1606a0cc18339a01569c64d98e6911a216d208231ea719455e8ef0bbe69fbc6def9f0ace6df180a924c2b65eca537994701bbb914cbd0f54dc75cf03
+EBUILD mh-e-1.29.ebuild 547 BLAKE2B 69de56b5e084fad9945de6a755c2b61dd42d5c34cf04a08649404f5e8a409c083d14242de46f7435aa0ec368bd7bb2b0e3c2a5465bb325aa4220415748454d83 SHA512 26f0e197a3b3eb5ef7ae8871d2a6633901bde888dc1b91482b8d6419592d02c611bf81945b2feabade17fd85569e8cb418424255736e2e871ef1957ff3d53e85
+EBUILD mh-e-1.32.ebuild 571 BLAKE2B 5a761d3ab3125b1292f4a18efec826cae640d6b80c4257dee0f4598c57bd98810dcd5e04dc330f264562f2c8a8008f78f318eefaffba3f892346cae346e2fa8c SHA512 3972481a9db695cff16abc41478eb994ac2823b75ea7a80e769ea622e91bda482a030e8169c2b8e52c3679646e95af47868c734af887a4acef6d7b36fdad85b6
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mh-e/metadata.xml b/app-xemacs/mh-e/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/mh-e/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/mh-e/mh-e-1.29.ebuild b/app-xemacs/mh-e/mh-e-1.29.ebuild
new file mode 100644
index 000000000000..e7e8bc67a14a
--- /dev/null
+++ b/app-xemacs/mh-e/mh-e-1.29.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Front end support for MH"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/gnus
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/speedbar
+app-xemacs/rmail
+app-xemacs/tm
+app-xemacs/apel
+app-xemacs/sh-script
+app-xemacs/fsf-compat
+app-xemacs/xemacs-devel
+app-xemacs/net-utils
+app-xemacs/xemacs-eterm
+app-xemacs/os-utils
+app-xemacs/ecrypto
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/mh-e/mh-e-1.32.ebuild b/app-xemacs/mh-e/mh-e-1.32.ebuild
new file mode 100644
index 000000000000..e1fe888c5820
--- /dev/null
+++ b/app-xemacs/mh-e/mh-e-1.32.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Front end support for MH"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/gnus
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/rmail
+app-xemacs/tm
+app-xemacs/apel
+app-xemacs/sh-script
+app-xemacs/fsf-compat
+app-xemacs/xemacs-devel
+app-xemacs/net-utils
+app-xemacs/xemacs-eterm
+app-xemacs/os-utils
+app-xemacs/ecrypto
+app-xemacs/cedet-common
+app-xemacs/speedbar
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/mine-1.16 b/app-xemacs/mine-1.16
deleted file mode 100644
index b309b2b1c155..000000000000
--- a/app-xemacs/mine-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Minehunt Game
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mine-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=2ce9adaa831be0aebbf4103df4a3de91
diff --git a/app-xemacs/mine/Manifest b/app-xemacs/mine/Manifest
new file mode 100644
index 000000000000..d3f98dece3f7
--- /dev/null
+++ b/app-xemacs/mine/Manifest
@@ -0,0 +1,3 @@
+DIST mine-1.16-pkg.tar.gz 67161 BLAKE2B f25b20f0e9f956c8dc31f26395435ec5d0f6f6d38e1becd4618f5a210fd4b11f2888e05ff35452b68d809770a63678ed2c419762d89f7c837be2219de71b4dd9 SHA512 5d319b2ac1e2b5a8cdc753cafe8bd2af54a44aa97443eb0c34ea5f58e3c173801e83bf6b22cbb3b5f1fcbb0e6894586a03085eac81f6d9d43236b70134b35a84
+EBUILD mine-1.16.ebuild 282 BLAKE2B 967dcf0c1861722391c5889c1138a6340fb0d5a98b75b59f695e411e368bf768bb62e512a7335328156dc898c58c794f067b73c0843e5522a8d8475726c16aa4 SHA512 ffb6f1003d3e42beb0f768bcb738333631f114de72fdbac405b55e392b6688ddd72cbdbc9bddf784351c2e670dda6066e619534bd7f87664904522897bf944d5
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mine/metadata.xml b/app-xemacs/mine/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/mine/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/mine/mine-1.16.ebuild b/app-xemacs/mine/mine-1.16.ebuild
new file mode 100644
index 000000000000..3a52de9bbef0
--- /dev/null
+++ b/app-xemacs/mine/mine-1.16.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Minehunt Game"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/misc-games-1.19 b/app-xemacs/misc-games-1.19
deleted file mode 100644
index 2898bb5bebe6..000000000000
--- a/app-xemacs/misc-games-1.19
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Other amusements and diversions
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/misc-games-1.19-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=cc2f5edf1f52e92f1e73a9d09c8729c4
diff --git a/app-xemacs/misc-games-1.22 b/app-xemacs/misc-games-1.22
deleted file mode 100644
index da3f116f6f94..000000000000
--- a/app-xemacs/misc-games-1.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Other amusements and diversions
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/misc-games-1.22-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=cc2f5edf1f52e92f1e73a9d09c8729c4
diff --git a/app-xemacs/misc-games/Manifest b/app-xemacs/misc-games/Manifest
new file mode 100644
index 000000000000..ef4c0b104ba3
--- /dev/null
+++ b/app-xemacs/misc-games/Manifest
@@ -0,0 +1,5 @@
+DIST misc-games-1.19-pkg.tar.gz 170091 BLAKE2B 4fda80c1a74061d885a5b8e553e4953750872bb5ca1c66c39af940361eb278036f412b42785a25abae9643573502fbe9932c9d71425c5678f89ba1a1db25bd24 SHA512 5c4c3a91db45df3ef4dc78f31ad6a8552118fd6fa8ccbd79b1867e8f341bbf3afe85776b3808f0c14e636feaf2311117a3d3cbfd0d70f82ee6a88df4bb0f6c46
+DIST misc-games-1.22-pkg.tar.gz 170609 BLAKE2B 336bc894d513b9750be7ff26ba6139a0c86dc0ce9acb91e07d27bd3ab617e7d9348075cedbb4242fd62ce70671d940c0c790f0bceca010f6a6d7c6f013811dff SHA512 21a970e5f35c90bb838ba3964020c025219dab65b234056cadc409d2d396d39a792aaa58d42f806a5166db99b6c0dfb66da0d724f063041468b46a253f3424e6
+EBUILD misc-games-1.19.ebuild 300 BLAKE2B fe9b575c4c686ab76f48360b9feffe2fde6f08b620ef62eb91e01fd8ec70752c48720b7e7a2b9ea121d4e17d6ac37ca927989a057d65c1363e151cdad0a2f591 SHA512 f1461522342a03cd2a94150810f6beeb6b6bdec8235910443e1c50a4e3ed9b1ad677bc958d0d05c6c3b6c90fd84df9cfe33c625404b64320695c7b7df69348ff
+EBUILD misc-games-1.22.ebuild 300 BLAKE2B fe9b575c4c686ab76f48360b9feffe2fde6f08b620ef62eb91e01fd8ec70752c48720b7e7a2b9ea121d4e17d6ac37ca927989a057d65c1363e151cdad0a2f591 SHA512 f1461522342a03cd2a94150810f6beeb6b6bdec8235910443e1c50a4e3ed9b1ad677bc958d0d05c6c3b6c90fd84df9cfe33c625404b64320695c7b7df69348ff
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/misc-games/metadata.xml b/app-xemacs/misc-games/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/misc-games/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/misc-games/misc-games-1.19.ebuild b/app-xemacs/misc-games/misc-games-1.19.ebuild
new file mode 100644
index 000000000000..6a50cc16ab91
--- /dev/null
+++ b/app-xemacs/misc-games/misc-games-1.19.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Other amusements and diversions"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/misc-games/misc-games-1.22.ebuild b/app-xemacs/misc-games/misc-games-1.22.ebuild
new file mode 100644
index 000000000000..6a50cc16ab91
--- /dev/null
+++ b/app-xemacs/misc-games/misc-games-1.22.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Other amusements and diversions"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/mmm-mode-1.02 b/app-xemacs/mmm-mode-1.02
deleted file mode 100644
index fbd905dff6e9..000000000000
--- a/app-xemacs/mmm-mode-1.02
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Multiple major modes in a single buffer
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/fsf-compat app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mmm-mode-1.02-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=a24dd9236db3e44e592f993a6ebfd417
diff --git a/app-xemacs/mmm-mode-1.05 b/app-xemacs/mmm-mode-1.05
deleted file mode 100644
index aaac02a04d93..000000000000
--- a/app-xemacs/mmm-mode-1.05
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Multiple major modes in a single buffer
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/fsf-compat app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mmm-mode-1.05-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=a24dd9236db3e44e592f993a6ebfd417
diff --git a/app-xemacs/mmm-mode/Manifest b/app-xemacs/mmm-mode/Manifest
new file mode 100644
index 000000000000..8f288c017c55
--- /dev/null
+++ b/app-xemacs/mmm-mode/Manifest
@@ -0,0 +1,5 @@
+DIST mmm-mode-1.02-pkg.tar.gz 176072 BLAKE2B 36bcf9c5bd889b988f8190277b4d02546d286fd2695c557cd7f703a8888a21416cae054d5e1192c6fcdcffa193d4017dcbb5f16a4ef341071ee8658bd9292c33 SHA512 9fa9d9d461a063a08b7b7874fb8329b9a7e84b3268593554c9c46e9ee0d433cfcff4049056a4d85b829d14d6bc50f495951b708adff27c43b7961a8ee6b4c5c3
+DIST mmm-mode-1.05-pkg.tar.gz 205381 BLAKE2B 532d29da7ec761e1c79d0b5e77c7f95694f8c22541834164c3c90d2dc21c9c2218614cec43ee2344cdfbf5acb2eba328f6fd55631a011256f7311f449479ec3c SHA512 4b5b649a0d25a6eb8967549188c32d9b6a2e7fb3abc0375b633df7c7b133a06f2c5bfae31aef8704c17e9ced32d205def85c906472fda00ff0d5fdfc6b95b01b
+EBUILD mmm-mode-1.02.ebuild 330 BLAKE2B df0c0818cad922be1e926bd3eeffae9fc1e92c40f2a7a50c965ddf1cbb715b426adbdbc86ead7248a2c4e1a7cbe9fb35605bb0f901194872f1ece2f64e930edb SHA512 156aaa9be31317d78c7fc7e21d18f0f490ab6b135067f475439344222fa3a59ac4c3858124b94e6c697baca92cb812dd63fdf461c66ebe5cdd6f5d7d70fe9f02
+EBUILD mmm-mode-1.05.ebuild 330 BLAKE2B df0c0818cad922be1e926bd3eeffae9fc1e92c40f2a7a50c965ddf1cbb715b426adbdbc86ead7248a2c4e1a7cbe9fb35605bb0f901194872f1ece2f64e930edb SHA512 156aaa9be31317d78c7fc7e21d18f0f490ab6b135067f475439344222fa3a59ac4c3858124b94e6c697baca92cb812dd63fdf461c66ebe5cdd6f5d7d70fe9f02
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mmm-mode/metadata.xml b/app-xemacs/mmm-mode/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/mmm-mode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/mmm-mode/mmm-mode-1.02.ebuild b/app-xemacs/mmm-mode/mmm-mode-1.02.ebuild
new file mode 100644
index 000000000000..038c29041613
--- /dev/null
+++ b/app-xemacs/mmm-mode/mmm-mode-1.02.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Multiple major modes in a single buffer"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/fsf-compat
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/mmm-mode/mmm-mode-1.05.ebuild b/app-xemacs/mmm-mode/mmm-mode-1.05.ebuild
new file mode 100644
index 000000000000..038c29041613
--- /dev/null
+++ b/app-xemacs/mmm-mode/mmm-mode-1.05.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Multiple major modes in a single buffer"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/fsf-compat
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/mule-base-1.49-r1 b/app-xemacs/mule-base-1.49-r1
deleted file mode 100644
index 87ada713d043..000000000000
--- a/app-xemacs/mule-base-1.49-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Basic Mule support, required for building with Mule
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/apel app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mule-base-1.49-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=5285679d043f4e35358517d53f7c56c2
diff --git a/app-xemacs/mule-base-1.56 b/app-xemacs/mule-base-1.56
deleted file mode 100644
index cf5df9ef1f17..000000000000
--- a/app-xemacs/mule-base-1.56
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Basic Mule support, required for building with Mule
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/fsf-compat app-xemacs/xemacs-base app-xemacs/apel app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mule-base-1.56-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=29353237e922c56091c47d21cd469ebd
diff --git a/app-xemacs/mule-base/Manifest b/app-xemacs/mule-base/Manifest
new file mode 100644
index 000000000000..f054aaf67308
--- /dev/null
+++ b/app-xemacs/mule-base/Manifest
@@ -0,0 +1,5 @@
+DIST mule-base-1.49-pkg.tar.gz 446628 BLAKE2B 3b6a12a621622a93afd41dd0627d8e8da6f63cb244b81ed2f1ecfd1b127d12990a92538d6fde81342fb4bf09d83937c959cd4b21f480040c38b6acac68ab93e4 SHA512 ab5dfaaf620f0b59e54ab71eead60e27a110d48261bc597dd3b933629a17e5a0498b2e7aa6e75c32b97d71a2a8666b0a4376f73997c004bc299de78d2cbd5251
+DIST mule-base-1.56-pkg.tar.gz 445956 BLAKE2B 2d016323649ea702b7826091ed4af3513e077f068fe9776212550bab9aabb9e9a8bc2414c458424dc736cba8bca167f74f8fbc2ce2c077bcd2b27de0fe22a52b SHA512 b1d3aaf08afdd68352213ca5c08bfecca08369f18f97c9c709fc412153138a567dc72af07b086c0f96f025fbfabcb0f9d1da626a199add6aca6f8a6d23809865
+EBUILD mule-base-1.49-r1.ebuild 365 BLAKE2B 47ec7ff233c20eb12895f03fe5ecbc8a7e5ec4a1a9a59cbe7f8981e79d4ad788a05d0daff60c5276f1ebc49e2c4051696ac617894f386ef199dec03816fae276 SHA512 2b68a7ff6d556c99ccaf3b98cd9f47488c9fbb30e383c2a8a31984aa6db776506d14effdda7002e804cb53a7c133a37125a8a5b6916ffb409835ed6034155996
+EBUILD mule-base-1.56.ebuild 384 BLAKE2B ff76bce98dba48c97c0d3058ad79556a3b70f91cd0fdc0e99115ef0efccf3c96772bfba039414db3d39c811ade905fe3d2bfc0a81550d7916423def99f1aba11 SHA512 57650e041aaa8d337193a779481ca00963a2d1839aa244f2d0eab9c485bbe4f0a2708b943717e310498292521ff130d336dc38db8c18f2837c516f2e65ce2235
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mule-base/metadata.xml b/app-xemacs/mule-base/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/mule-base/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/mule-base/mule-base-1.49-r1.ebuild b/app-xemacs/mule-base/mule-base-1.49-r1.ebuild
new file mode 100644
index 000000000000..d2a5c8137408
--- /dev/null
+++ b/app-xemacs/mule-base/mule-base-1.49-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Basic Mule support, required for building with Mule"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+app-xemacs/apel
+"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/mule-base/mule-base-1.56.ebuild b/app-xemacs/mule-base/mule-base-1.56.ebuild
new file mode 100644
index 000000000000..283332b95b35
--- /dev/null
+++ b/app-xemacs/mule-base/mule-base-1.56.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Basic Mule support, required for building with Mule"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+app-xemacs/apel
+"
+KEYWORDS="alpha amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd"
+
+inherit xemacs-packages
diff --git a/app-xemacs/mule-ucs-1.14 b/app-xemacs/mule-ucs-1.14
deleted file mode 100644
index 7a0fc436ac9c..000000000000
--- a/app-xemacs/mule-ucs-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Extended coding systems (including Unicode) for XEmacs
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-xemacs/latin-euro-standards app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mule-ucs-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=f02da261bc2c158865a66f8302b18579
diff --git a/app-xemacs/mule-ucs-1.18 b/app-xemacs/mule-ucs-1.18
deleted file mode 100644
index dba75e117006..000000000000
--- a/app-xemacs/mule-ucs-1.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Extended coding systems (including Unicode) for XEmacs
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mule-base app-xemacs/latin-euro-standards app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/mule-ucs-1.18-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=f02da261bc2c158865a66f8302b18579
diff --git a/app-xemacs/mule-ucs/Manifest b/app-xemacs/mule-ucs/Manifest
new file mode 100644
index 000000000000..afa4b6a44ce8
--- /dev/null
+++ b/app-xemacs/mule-ucs/Manifest
@@ -0,0 +1,5 @@
+DIST mule-ucs-1.14-pkg.tar.gz 1300714 BLAKE2B 2e87b682d5eaac563a00d8838457cc9f355f8323c95616147e74692c0edc6e1caf555be45b108c20be2988c7c91a4d3640d609e2e995407d02214e6298ddbd59 SHA512 a4c66a8b037199fdabbafcd076f9cf0e0a2e00ca1330fd9dbf58c9d2a394da2cf9bce199b6b1d5f330e587a088976f9600c874251fe129d941fdf762d3788f37
+DIST mule-ucs-1.18-pkg.tar.gz 1301082 BLAKE2B 57cb01431e8210d4ace63150b260600c14d8cb26e940dcc797d50ff0c7545f7f6278b717e703a3dffdd8906cffd77abf107b03aec958271dda2e1626f72165c9 SHA512 1796b3b56b4c3e55241563eeab25568cd020f62bedb7c2d440e01afab0077e43f1a6298b34174b7e97f253ccdfd41f3c6bc40cfcc73759e34a0d04a90fdd5ca9
+EBUILD mule-ucs-1.14.ebuild 355 BLAKE2B c7968bd3fa66cff036951c565393d4897b8757512a26c82c38bef7cb6d6e13f057024cfb0ebaf5b39d06b93f3207dfde1db29493d21e2d39b9ddae95a4094f27 SHA512 1fe7754b528250fa45ff60685234f050f9f793b8bcae4aeec7f63352c941f55df61f4c04c29f617e4a4c20770d31677fa5fce37008eadaab6448777975611b1a
+EBUILD mule-ucs-1.18.ebuild 355 BLAKE2B c7968bd3fa66cff036951c565393d4897b8757512a26c82c38bef7cb6d6e13f057024cfb0ebaf5b39d06b93f3207dfde1db29493d21e2d39b9ddae95a4094f27 SHA512 1fe7754b528250fa45ff60685234f050f9f793b8bcae4aeec7f63352c941f55df61f4c04c29f617e4a4c20770d31677fa5fce37008eadaab6448777975611b1a
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/mule-ucs/metadata.xml b/app-xemacs/mule-ucs/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/mule-ucs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/mule-ucs/mule-ucs-1.14.ebuild b/app-xemacs/mule-ucs/mule-ucs-1.14.ebuild
new file mode 100644
index 000000000000..c06b018ee2bd
--- /dev/null
+++ b/app-xemacs/mule-ucs/mule-ucs-1.14.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Extended coding systems (including Unicode) for XEmacs"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/mule-base
+app-xemacs/latin-euro-standards
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/mule-ucs/mule-ucs-1.18.ebuild b/app-xemacs/mule-ucs/mule-ucs-1.18.ebuild
new file mode 100644
index 000000000000..c06b018ee2bd
--- /dev/null
+++ b/app-xemacs/mule-ucs/mule-ucs-1.18.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Extended coding systems (including Unicode) for XEmacs"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/mule-base
+app-xemacs/latin-euro-standards
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/net-utils-1.52 b/app-xemacs/net-utils-1.52
deleted file mode 100644
index 563458cb66d8..000000000000
--- a/app-xemacs/net-utils-1.52
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Miscellaneous Networking Utilities
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/gnus app-xemacs/bbdb app-xemacs/xemacs-base app-xemacs/efs app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/net-utils-1.52-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=d58f8edd033259f0a824cdddf80d289e
diff --git a/app-xemacs/net-utils-1.56 b/app-xemacs/net-utils-1.56
deleted file mode 100644
index 947518ce5df7..000000000000
--- a/app-xemacs/net-utils-1.56
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Miscellaneous Networking Utilities
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/gnus app-xemacs/bbdb app-xemacs/xemacs-base app-xemacs/efs app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/net-utils-1.56-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=d58f8edd033259f0a824cdddf80d289e
diff --git a/app-xemacs/net-utils/Manifest b/app-xemacs/net-utils/Manifest
new file mode 100644
index 000000000000..d11238b9f859
--- /dev/null
+++ b/app-xemacs/net-utils/Manifest
@@ -0,0 +1,5 @@
+DIST net-utils-1.52-pkg.tar.gz 155813 BLAKE2B 07a1667dd74f51195f241354f199834f533a392f26295136760ad9e7e41124947ba8d83a4a2814bc1d7d66c96ad13dfc9de6e381434dfb2f1e0eff3177b8336d SHA512 93761d6d9085f6b01f227d0beafd13d4b83a2c902546ac1853be58a5ae3916d57ac528b217aeab398b9ebbac07a4e19cf6d5975ed71621c55f46ae0af5af4465
+DIST net-utils-1.56-pkg.tar.gz 157356 BLAKE2B ace09a691e7722872deb666cc5c360ca780eaa6c6cdd19d23bb1ddc4b2b3f5aa19838cb93b7fb5e6b699aa774f45339ffeb7c2108dcd4ce352510426e3a1fd31 SHA512 cfaae188a1922e3b7c51d5d1c3ce75b48a4e897a6dbb1278ba7e554f74531a984382cf0951a276b60421c5cde6a2bff3a265fcb8806d8850d9eaee3feb49ff77
+EBUILD net-utils-1.52.ebuild 370 BLAKE2B 70c4fd8e27740c4ca241293df98f548b02ad29993aafe0d6c3f3deb55e854cbe53999aaaee132c81b257afd86bb8182466b6d86a4825049b2161719203c55ec7 SHA512 0dbd4112ce8dc2cd933b9ad8f16dfabb75291c6dc36b6ac95191e62c87832c8161487027fc9eb8c8e1e53dbed0fa73883065b8730e1b8e87372e974bb3a43273
+EBUILD net-utils-1.56.ebuild 370 BLAKE2B 70c4fd8e27740c4ca241293df98f548b02ad29993aafe0d6c3f3deb55e854cbe53999aaaee132c81b257afd86bb8182466b6d86a4825049b2161719203c55ec7 SHA512 0dbd4112ce8dc2cd933b9ad8f16dfabb75291c6dc36b6ac95191e62c87832c8161487027fc9eb8c8e1e53dbed0fa73883065b8730e1b8e87372e974bb3a43273
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/net-utils/metadata.xml b/app-xemacs/net-utils/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/net-utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/net-utils/net-utils-1.52.ebuild b/app-xemacs/net-utils/net-utils-1.52.ebuild
new file mode 100644
index 000000000000..943b24f7a883
--- /dev/null
+++ b/app-xemacs/net-utils/net-utils-1.52.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Miscellaneous Networking Utilities"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/gnus
+app-xemacs/bbdb
+app-xemacs/xemacs-base
+app-xemacs/efs
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/net-utils/net-utils-1.56.ebuild b/app-xemacs/net-utils/net-utils-1.56.ebuild
new file mode 100644
index 000000000000..943b24f7a883
--- /dev/null
+++ b/app-xemacs/net-utils/net-utils-1.56.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Miscellaneous Networking Utilities"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/gnus
+app-xemacs/bbdb
+app-xemacs/xemacs-base
+app-xemacs/efs
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ocaml-0.06 b/app-xemacs/ocaml-0.06
deleted file mode 100644
index a68d67be05d0..000000000000
--- a/app-xemacs/ocaml-0.06
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Objective Caml editing support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/fsf-compat app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ocaml-0.06-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=de5b6ba4fad556d566158b4a18521dd8
diff --git a/app-xemacs/ocaml/Manifest b/app-xemacs/ocaml/Manifest
new file mode 100644
index 000000000000..a438a6d11ca1
--- /dev/null
+++ b/app-xemacs/ocaml/Manifest
@@ -0,0 +1,3 @@
+DIST ocaml-0.06-pkg.tar.gz 65300 BLAKE2B 74e672bbc94e735faf9fdae81f9a961f4b6f0b9f35b008ffc70ef978bc2b269215a1d7ab51fb585fd49281628c3bc85d362d3de60abb3fb8557a78a249ee89c7 SHA512 ab21c0c4bc6cf204c4e2b9b9e1d153a4ddc2de941032946fb460e480d7396c17c563b2234ebd5aec0ff1e833ec578470366204b959f621e1da1d0cace2eea7f2
+EBUILD ocaml-0.06.ebuild 345 BLAKE2B 3b7fc238c0c74cd8343939149652770157e4a889d346d8a84648f4fce72d38424e77e8e883aab7a453b30bb1e37e33edb2194f7780ab507d4cfb3f7c929befdb SHA512 8424ad9fb150522940328ff22f8433f4ad7387c4f7f2e279e50681232e6428976796eb809e287893b12f9ded88f8ccf0c2e01827f857baa216171d636d07e0e1
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ocaml/metadata.xml b/app-xemacs/ocaml/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/ocaml/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/ocaml/ocaml-0.06.ebuild b/app-xemacs/ocaml/ocaml-0.06.ebuild
new file mode 100644
index 000000000000..5c487aa784e9
--- /dev/null
+++ b/app-xemacs/ocaml/ocaml-0.06.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Objective Caml editing support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/fsf-compat
+"
+KEYWORDS="alpha amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd"
+
+inherit xemacs-packages
diff --git a/app-xemacs/oo-browser-1.04 b/app-xemacs/oo-browser-1.04
deleted file mode 100644
index e9a54ada90c8..000000000000
--- a/app-xemacs/oo-browser-1.04
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=The Multi-Language Object-Oriented Code Browser
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/hyperbole app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/oo-browser-1.04-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=05116b4c1ed9c44a4522b94e88ec60f1
diff --git a/app-xemacs/oo-browser-1.05 b/app-xemacs/oo-browser-1.05
deleted file mode 100644
index 0126f48a0944..000000000000
--- a/app-xemacs/oo-browser-1.05
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=The Multi-Language Object-Oriented Code Browser
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/hyperbole app-xemacs/gnus app-xemacs/sh-script app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/oo-browser-1.05-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=e81f24a8aadd7199c2041d8e2d32d516
diff --git a/app-xemacs/oo-browser/Manifest b/app-xemacs/oo-browser/Manifest
new file mode 100644
index 000000000000..6de072fbb9c4
--- /dev/null
+++ b/app-xemacs/oo-browser/Manifest
@@ -0,0 +1,5 @@
+DIST oo-browser-1.04-pkg.tar.gz 515713 BLAKE2B 96973a9af23695ac74c83d626f6e283be99540d3176b51d5ae1aa882f30079a8680929e3660674197819f2d21b75fe67ce860ffc514ddb865bc95eda5f5e6233 SHA512 385b08f64cfb76f3a661fed3584edaec1d85076ea40369fbc9475409d33c17182995ca5eccb2757438390fcfaa1a30818dad1c4292ebb342c8c7193ef9963db3
+DIST oo-browser-1.05-pkg.tar.gz 517598 BLAKE2B 6c09fbbdfce6f733e03b5f716076a30ffd3847b8e31e9f4fe1100d3e78e7c4952d2ca9977b1c4c10e4440d47a13b432345bf36c2d0beb5efb1c5606ceca17136 SHA512 29e4063fbdb7824b70fd666f1e5fa9815d38c56261653e966f85204c9f7e66a16720298b1727a3bc641d6d705deb90f7fd4127961dceb30bb1edc39093ca0d6c
+EBUILD oo-browser-1.04.ebuild 337 BLAKE2B 9533173f8aee6f5f7a3644f258f92f23fe06562643b2da4cc65e51c37fff9178b3c7a0a25b980d335dd280d1d9742db2b9aaac83c4cf462a69cc1473ed7e0cae SHA512 b652095556046c63e0b0935f9f1e8376dcc1de71757285526fd8c37d40feca6934e13c72e6c80c9a470d7f38ef66d2fe8ec1a30d182a3a6b248411b5b2597ce2
+EBUILD oo-browser-1.05.ebuild 374 BLAKE2B 8d8c854a46601df84e8410fc233e30e41bc75ea00f871fb467d7c2f78d94484c9f16cd3063b9e29609866ed300facd32779a7610830c695d9a44e9a861e55a65 SHA512 3574b7ca0abbf200e00223cc50a881bf7210480238bba0e62ddc62c59764b7250492d3c00a930f48edb403d4a30547c809bc31263a337ba6c2f92fe2bbd1c1c5
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/oo-browser/metadata.xml b/app-xemacs/oo-browser/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/oo-browser/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/oo-browser/oo-browser-1.04.ebuild b/app-xemacs/oo-browser/oo-browser-1.04.ebuild
new file mode 100644
index 000000000000..ff49d4fe2897
--- /dev/null
+++ b/app-xemacs/oo-browser/oo-browser-1.04.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="The Multi-Language Object-Oriented Code Browser"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/hyperbole
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/oo-browser/oo-browser-1.05.ebuild b/app-xemacs/oo-browser/oo-browser-1.05.ebuild
new file mode 100644
index 000000000000..5615f5ad32e1
--- /dev/null
+++ b/app-xemacs/oo-browser/oo-browser-1.05.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="The Multi-Language Object-Oriented Code Browser"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/hyperbole
+app-xemacs/gnus
+app-xemacs/sh-script
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/os-utils-1.39 b/app-xemacs/os-utils-1.39
deleted file mode 100644
index 7f02c8c5a128..000000000000
--- a/app-xemacs/os-utils-1.39
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Miscellaneous O/S utilities
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/os-utils-1.39-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=e2fb3683c4a5d1a25d2e32866fb2ae90
diff --git a/app-xemacs/os-utils-1.41 b/app-xemacs/os-utils-1.41
deleted file mode 100644
index fe69a5d5beb3..000000000000
--- a/app-xemacs/os-utils-1.41
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Miscellaneous O/S utilities
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/os-utils-1.41-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=e2fb3683c4a5d1a25d2e32866fb2ae90
diff --git a/app-xemacs/os-utils/Manifest b/app-xemacs/os-utils/Manifest
new file mode 100644
index 000000000000..8de2be45c0d2
--- /dev/null
+++ b/app-xemacs/os-utils/Manifest
@@ -0,0 +1,5 @@
+DIST os-utils-1.39-pkg.tar.gz 231532 BLAKE2B e3c0d93ee5bc9954e92f0d41c7660343742e50ea77d0ea4334cc975085f2fcedc7b8868c6c8b1326911bca0813573230ab7a620ffe263cf8a867f4d2fb0b8b94 SHA512 2e929c911a93ce41074f5c8e2dfd31c422d42869a0da044638e4766ac044c331c081356a4ebdb8b682c88d5e4d65897158827cc4c8c3fd588fb5adad3707f984
+DIST os-utils-1.41-pkg.tar.gz 232353 BLAKE2B 3212b72124c72b7c172c4767ea82aa7e072e3e4214ba9ad6be7cb7a3cc0370dd361da0d16537395fcd8761f583237ad6795ca8505ffc239af2e353af57945781 SHA512 8fab5891268f5cd011bfc62a97be750d8472f514836a3a2c29cb7400e3921fa7dccc32c9c2658503a5bc8b1b41558dd6c06b3be1560cefd00fd7407157d0b022
+EBUILD os-utils-1.39.ebuild 296 BLAKE2B 531dcdd8ca70350ef0768d106d7391c78cf3ee9d97bfaa633d39f2ec258dd155326d35f2f6a01739128da3c763e9e2382d6208a98c694e648a120008a59e91ad SHA512 8b6ecca67c66de7cdbe3fcce27fc4ca9ac19e8a1c4d52cc2099d2c97ebbd8a80326313ed50f55b733503e3aa7af79bad97b1c46197de91af553341467c206f79
+EBUILD os-utils-1.41.ebuild 296 BLAKE2B 531dcdd8ca70350ef0768d106d7391c78cf3ee9d97bfaa633d39f2ec258dd155326d35f2f6a01739128da3c763e9e2382d6208a98c694e648a120008a59e91ad SHA512 8b6ecca67c66de7cdbe3fcce27fc4ca9ac19e8a1c4d52cc2099d2c97ebbd8a80326313ed50f55b733503e3aa7af79bad97b1c46197de91af553341467c206f79
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/os-utils/metadata.xml b/app-xemacs/os-utils/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/os-utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/os-utils/os-utils-1.39.ebuild b/app-xemacs/os-utils/os-utils-1.39.ebuild
new file mode 100644
index 000000000000..76e701cfed27
--- /dev/null
+++ b/app-xemacs/os-utils/os-utils-1.39.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Miscellaneous O/S utilities"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/os-utils/os-utils-1.41.ebuild b/app-xemacs/os-utils/os-utils-1.41.ebuild
new file mode 100644
index 000000000000..76e701cfed27
--- /dev/null
+++ b/app-xemacs/os-utils/os-utils-1.41.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Miscellaneous O/S utilities"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/pc-1.28 b/app-xemacs/pc-1.28
deleted file mode 100644
index 4f70ea0e0862..000000000000
--- a/app-xemacs/pc-1.28
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=PC style interface emulation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/pc-1.28-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=1c6e10fc76765ce464cb9851ce03858a
diff --git a/app-xemacs/pc/Manifest b/app-xemacs/pc/Manifest
new file mode 100644
index 000000000000..f10d83344e66
--- /dev/null
+++ b/app-xemacs/pc/Manifest
@@ -0,0 +1,3 @@
+DIST pc-1.28-pkg.tar.gz 17720 BLAKE2B 06856dbe980ca7313a83d87d87c6d42f0a9a42c9d03e05e0f080abf3e9634e5d763003ed9acf5fedb5e541bbf8f47e0c236728f154cb8565e70b18947795e886 SHA512 cd296e2ce019b54de33560622622cf955937b85205850f7e31218c8de03a05d0516176bc2c8775c2649d271678f18fed3591d2fac572cc78fd11d9d05a43e922
+EBUILD pc-1.28.ebuild 297 BLAKE2B 34bb55d4d8dd732074d130d5ea1fe24c9c39115e1347d32263e782479aced9da68f817be4945bf733818717a7b672e6aa652f6c5463af53f322fc628d3a58963 SHA512 4412224247e1af153b265f701cfc7ee7b8391be49016f77e90bab17d353b3e80df1e1f01f6b58124d49cf3f0b71e493cb732c75db24d92aeb7ff528bab46ec35
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/pc/metadata.xml b/app-xemacs/pc/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/pc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/pc/pc-1.28.ebuild b/app-xemacs/pc/pc-1.28.ebuild
new file mode 100644
index 000000000000..1c50eafb3765
--- /dev/null
+++ b/app-xemacs/pc/pc-1.28.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="PC style interface emulation"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/pcl-cvs-1.67 b/app-xemacs/pcl-cvs-1.67
deleted file mode 100644
index e0409b83370d..000000000000
--- a/app-xemacs/pcl-cvs-1.67
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CVS frontend
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/elib app-xemacs/vc app-xemacs/dired app-xemacs/edebug app-xemacs/ediff app-xemacs/edit-utils app-xemacs/mail-lib app-xemacs/prog-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/pcl-cvs-1.67-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c85f2ecf4bf0b227bb33a21dc2d1de1a
diff --git a/app-xemacs/pcl-cvs-1.70 b/app-xemacs/pcl-cvs-1.70
deleted file mode 100644
index 7885c8d57f6b..000000000000
--- a/app-xemacs/pcl-cvs-1.70
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=CVS frontend
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/elib app-xemacs/vc app-xemacs/dired app-xemacs/edebug app-xemacs/ediff app-xemacs/edit-utils app-xemacs/mail-lib app-xemacs/prog-modes app-xemacs/tramp app-xemacs/gnus app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/pcl-cvs-1.70-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=458bf5911af4fde953f85ea2aa09eb1d
diff --git a/app-xemacs/pcl-cvs/Manifest b/app-xemacs/pcl-cvs/Manifest
new file mode 100644
index 000000000000..9135ae79ae06
--- /dev/null
+++ b/app-xemacs/pcl-cvs/Manifest
@@ -0,0 +1,5 @@
+DIST pcl-cvs-1.67-pkg.tar.gz 161871 BLAKE2B 22542886adba206ec1b7f036bad00870c2913a9a085bcfd0001d9bc798acef55ae177e03b13d71f069bbc46e0e466b9067e0d3ab3bfdec7ef14f4d67529cbed2 SHA512 db13b19d620da9ade30bbd912db20d47ee3f367f3b118a9209d14b1a0895a87bb4d8bc2c64f5d6f4276570f0533e7b03f1eb7bddf40a45cc197962a4a430c181
+DIST pcl-cvs-1.70-pkg.tar.gz 162044 BLAKE2B 24ca04714035d00d77ca82f7a9722043be75970e38686788964126aee83b1c559dc8b2f0717f299559a9780d145347acc399743311e3069e405cc5c747a193f0 SHA512 ff0667d6c4a69fd042735af2187a29c374fb86c92c150497bb74125bcb5d7756a8949482132f3fccdf1308aa214dbc3db97282a6176ed714d19e87978457e170
+EBUILD pcl-cvs-1.67.ebuild 427 BLAKE2B 6471b996d4f840b495144dd49102a0c448f7491dac4414de19753f04ec1aa2b7ca8bb5a37ac22f995f193e2bb76b3c2f5a997a5e46be7b005c81785f592ae62e SHA512 15481d4e8a118bd85bd4c12bb1ee4d6769fd70b246eabda632d1a65b4c152cdcadf7f3718d2063bd2ee1e2185e069421290e236a739abb9eb04938e5abac1f17
+EBUILD pcl-cvs-1.70.ebuild 460 BLAKE2B b272935971477e384e31f645b9a5366e6228b25d72a35335aa598458ffa7795b251a73bb4953cd9ded0d3cb9a21b6cbd1884a84d460ea3e4f0c01ccf7994dbd3 SHA512 3585dfbe0d38c210a370ba06bdf9f3b988d0f6e2168c296169fae772a298512dcbb3573028b5ab6d339bea78c7df40db7e8d26de871847eb05a608c8d7cb8913
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/pcl-cvs/metadata.xml b/app-xemacs/pcl-cvs/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/pcl-cvs/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/pcl-cvs/pcl-cvs-1.67.ebuild b/app-xemacs/pcl-cvs/pcl-cvs-1.67.ebuild
new file mode 100644
index 000000000000..8eb6ae451044
--- /dev/null
+++ b/app-xemacs/pcl-cvs/pcl-cvs-1.67.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="CVS frontend"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/elib
+app-xemacs/vc
+app-xemacs/dired
+app-xemacs/edebug
+app-xemacs/ediff
+app-xemacs/edit-utils
+app-xemacs/mail-lib
+app-xemacs/prog-modes
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/pcl-cvs/pcl-cvs-1.70.ebuild b/app-xemacs/pcl-cvs/pcl-cvs-1.70.ebuild
new file mode 100644
index 000000000000..5cd112f3d992
--- /dev/null
+++ b/app-xemacs/pcl-cvs/pcl-cvs-1.70.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="CVS frontend"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/elib
+app-xemacs/vc
+app-xemacs/dired
+app-xemacs/edebug
+app-xemacs/ediff
+app-xemacs/edit-utils
+app-xemacs/mail-lib
+app-xemacs/prog-modes
+app-xemacs/tramp
+app-xemacs/gnus
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/pcomplete-1.04 b/app-xemacs/pcomplete-1.04
deleted file mode 100644
index f96c9f29f53f..000000000000
--- a/app-xemacs/pcomplete-1.04
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Provides programmatic completion
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/sh-script app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/pcomplete-1.04-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=485af1d39d1e8613f789e994bac422a1
diff --git a/app-xemacs/pcomplete-1.06 b/app-xemacs/pcomplete-1.06
deleted file mode 100644
index b1918cb14de0..000000000000
--- a/app-xemacs/pcomplete-1.06
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Provides programmatic completion
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/sh-script app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/pcomplete-1.06-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=485af1d39d1e8613f789e994bac422a1
diff --git a/app-xemacs/pcomplete/Manifest b/app-xemacs/pcomplete/Manifest
new file mode 100644
index 000000000000..09a6e2578d68
--- /dev/null
+++ b/app-xemacs/pcomplete/Manifest
@@ -0,0 +1,5 @@
+DIST pcomplete-1.04-pkg.tar.gz 37573 BLAKE2B 0e47f8f304193ed1336bbadd0c485826905b9420fce1fe5a433060dedc10840644c39526cb6421023ec50157e52211cfce38d881a2621ec59d447bc2797aef4f SHA512 cf12f90c2546c051526cf48a6fed96a03accba871cb91acd8ea88cc3ede9931555f2d8b7eea9ce56d573326692f4a3832fff714ecb84c8081b05f133e6b4d631
+DIST pcomplete-1.06-pkg.tar.gz 37844 BLAKE2B 5440edafa50d7b83111fff29603611a437f5f420c9033b33044f270ff413f39d9352416f8998957a842ea8cab8406ad68baf3d7c2b40d4c4729e5533b78d0181 SHA512 b1406fae71f18849ea55ca0f6ecf970b1ef56c3957cfbfbf9b43ed241dab4338afeb8e7439f2de3d52344493cc6aa662f49f2ec56c465c5fddd6f1bfe50a6dcc
+EBUILD pcomplete-1.04.ebuild 322 BLAKE2B 2f97c636e4494a2fa3b5f2d327e9c30b3bf8c0d0d50f43515e149a7d90fa5cd6e57277eee8d77446d63faf22add2ae3aff142a89831b6eb1f1586356eb2a897e SHA512 cb196f3abbaaa11baa7bc9e0188353d99cc8fe6936f9ede3387f4b0b0bd58f686e1fe4fe4b90ce509c8ac891204659ef0907fd176b8b00f6ef15ffd13b086793
+EBUILD pcomplete-1.06.ebuild 322 BLAKE2B 2f97c636e4494a2fa3b5f2d327e9c30b3bf8c0d0d50f43515e149a7d90fa5cd6e57277eee8d77446d63faf22add2ae3aff142a89831b6eb1f1586356eb2a897e SHA512 cb196f3abbaaa11baa7bc9e0188353d99cc8fe6936f9ede3387f4b0b0bd58f686e1fe4fe4b90ce509c8ac891204659ef0907fd176b8b00f6ef15ffd13b086793
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/pcomplete/metadata.xml b/app-xemacs/pcomplete/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/pcomplete/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/pcomplete/pcomplete-1.04.ebuild b/app-xemacs/pcomplete/pcomplete-1.04.ebuild
new file mode 100644
index 000000000000..e224894017f0
--- /dev/null
+++ b/app-xemacs/pcomplete/pcomplete-1.04.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Provides programmatic completion"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/sh-script
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/pcomplete/pcomplete-1.06.ebuild b/app-xemacs/pcomplete/pcomplete-1.06.ebuild
new file mode 100644
index 000000000000..e224894017f0
--- /dev/null
+++ b/app-xemacs/pcomplete/pcomplete-1.06.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Provides programmatic completion"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/sh-script
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/perl-modes-1.09 b/app-xemacs/perl-modes-1.09
deleted file mode 100644
index f08b44def5ee..000000000000
--- a/app-xemacs/perl-modes-1.09
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Perl support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-ispell app-xemacs/ps-print app-xemacs/edit-utils app-xemacs/fsf-compat app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/perl-modes-1.09-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=238ed6dadf087c3adee7190d96500a9a
diff --git a/app-xemacs/perl-modes-1.14 b/app-xemacs/perl-modes-1.14
deleted file mode 100644
index 26af2be1ca93..000000000000
--- a/app-xemacs/perl-modes-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Perl support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-ispell app-xemacs/ps-print app-xemacs/edit-utils app-xemacs/fsf-compat app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/perl-modes-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=238ed6dadf087c3adee7190d96500a9a
diff --git a/app-xemacs/perl-modes/Manifest b/app-xemacs/perl-modes/Manifest
new file mode 100644
index 000000000000..d937a97da05a
--- /dev/null
+++ b/app-xemacs/perl-modes/Manifest
@@ -0,0 +1,5 @@
+DIST perl-modes-1.09-pkg.tar.gz 165762 BLAKE2B 84a6a8dc1f9a8d31891460f92a7b9ca4b1db7dca019fbfe6ed4d93bfcfc85c338bf694ebdb92a24ded6fe1f79cf1a3c6af43342b32725e531fc219af5b136475 SHA512 3c5f8627d38726e47627376bf2dc6f0d845e4d8ff4eda7e4cc94bdf365c814e022405cc6c920656079600c7cf906941739a4e9162b5e1f253dd1361d422dcc18
+DIST perl-modes-1.14-pkg.tar.gz 204091 BLAKE2B d002ac798b306594250d1cc0e5451ad9eff09bfd179ea39c7ad96c50b276045b8fca244d2bde87b76183ec2ca5fc47f6736dff939c3248e88886e6180f81b2e7 SHA512 b499951488cdfa7de0e17cd90d564c4df93fd6608dac0af5fa04a5bc76ae7dcf2c3d538c266cd92f2c8c6a37822c1900f9570e9f2280e82bfc98e3bab95f5c4a
+EBUILD perl-modes-1.09.ebuild 370 BLAKE2B 5d175889f7c830ef95cbed315b6d722eec2833646dafa9812aa55be51c2aaae01cf18f706bff3de37f7dcf8c338089c87e475200b97a64975dda33593c1c1bd7 SHA512 7ac38b042394eb3ce7093b27e3632f4122c5a1049b20fd6367ab8d26dde457fc97fe47a5aa789132342149b3068cb5bea5a2a426b67a3ac5f1f056d6c5af7e2a
+EBUILD perl-modes-1.14.ebuild 370 BLAKE2B 5d175889f7c830ef95cbed315b6d722eec2833646dafa9812aa55be51c2aaae01cf18f706bff3de37f7dcf8c338089c87e475200b97a64975dda33593c1c1bd7 SHA512 7ac38b042394eb3ce7093b27e3632f4122c5a1049b20fd6367ab8d26dde457fc97fe47a5aa789132342149b3068cb5bea5a2a426b67a3ac5f1f056d6c5af7e2a
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/perl-modes/metadata.xml b/app-xemacs/perl-modes/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/perl-modes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/perl-modes/perl-modes-1.09.ebuild b/app-xemacs/perl-modes/perl-modes-1.09.ebuild
new file mode 100644
index 000000000000..78a6bc03d528
--- /dev/null
+++ b/app-xemacs/perl-modes/perl-modes-1.09.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Perl support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-ispell
+app-xemacs/ps-print
+app-xemacs/edit-utils
+app-xemacs/fsf-compat
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/perl-modes/perl-modes-1.14.ebuild b/app-xemacs/perl-modes/perl-modes-1.14.ebuild
new file mode 100644
index 000000000000..78a6bc03d528
--- /dev/null
+++ b/app-xemacs/perl-modes/perl-modes-1.14.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Perl support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-ispell
+app-xemacs/ps-print
+app-xemacs/edit-utils
+app-xemacs/fsf-compat
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/pgg-1.06 b/app-xemacs/pgg-1.06
deleted file mode 100644
index 529ce37fb06d..000000000000
--- a/app-xemacs/pgg-1.06
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs interface to various PGP implementations
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/fsf-compat app-xemacs/edebug app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/pgg-1.06-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=8cb321d2591267747f1c4954fc0e19e3
diff --git a/app-xemacs/pgg-1.07 b/app-xemacs/pgg-1.07
deleted file mode 100644
index 5c4817ea7a9d..000000000000
--- a/app-xemacs/pgg-1.07
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs interface to various PGP implementations
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/fsf-compat app-xemacs/edebug app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/pgg-1.07-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=8cb321d2591267747f1c4954fc0e19e3
diff --git a/app-xemacs/pgg/Manifest b/app-xemacs/pgg/Manifest
new file mode 100644
index 000000000000..e8c649aac57f
--- /dev/null
+++ b/app-xemacs/pgg/Manifest
@@ -0,0 +1,5 @@
+DIST pgg-1.06-pkg.tar.gz 33917 BLAKE2B d056b276e6606312638c9c7d68c9c2cf58c4ebdcf5b7336c6ec625236b567ed4659f63506f3646fecbf4f66272630403924ef4addf5a3e30bc5460cda7f8d76a SHA512 632f345a16d9fb94ec12a62590768709795bab47481b4c3123adbb1159c6c96879f872b9e389925a7c97d268cab9eed0cf9cf21a80e8a30a87c5e10f9213227c
+DIST pgg-1.07-pkg.tar.gz 34293 BLAKE2B 1b45e947de61678a2b85a3a7dac0c34d605becb8c29c75b59d236f770aac42aa86d781e80813b88e7218dbca348abc860d41e8cd030c5128baad9a35314dee39 SHA512 cec124e85fb59c0df2e748e5f5d51a819cd168fceecd8202ce2a42ce1b9a3934d4a184a148c38038447b5ffbe795785399118e1a7735dbb5834df8bd918589f4
+EBUILD pgg-1.06.ebuild 374 BLAKE2B e5779e34b897793e0d152e60cefa278445497d06590302b785abe9993b41a12b71f155732859d4a75380b86488753c3f8953a95686cb8b788c7a911b322040b0 SHA512 94e09e75a96f7c19ba8ea952cdf8f5277198f48d3dbf8154cbf6e5dc3c04b9f44bf6984e8f0fdae5d07b81b27503ac5467b61b64e839d6e3e04c62bfec05634e
+EBUILD pgg-1.07.ebuild 374 BLAKE2B e5779e34b897793e0d152e60cefa278445497d06590302b785abe9993b41a12b71f155732859d4a75380b86488753c3f8953a95686cb8b788c7a911b322040b0 SHA512 94e09e75a96f7c19ba8ea952cdf8f5277198f48d3dbf8154cbf6e5dc3c04b9f44bf6984e8f0fdae5d07b81b27503ac5467b61b64e839d6e3e04c62bfec05634e
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/pgg/metadata.xml b/app-xemacs/pgg/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/pgg/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/pgg/pgg-1.06.ebuild b/app-xemacs/pgg/pgg-1.06.ebuild
new file mode 100644
index 000000000000..04a14a18e12b
--- /dev/null
+++ b/app-xemacs/pgg/pgg-1.06.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Emacs interface to various PGP implementations"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/fsf-compat
+app-xemacs/edebug
+app-xemacs/ecrypto
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/pgg/pgg-1.07.ebuild b/app-xemacs/pgg/pgg-1.07.ebuild
new file mode 100644
index 000000000000..04a14a18e12b
--- /dev/null
+++ b/app-xemacs/pgg/pgg-1.07.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Emacs interface to various PGP implementations"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/fsf-compat
+app-xemacs/edebug
+app-xemacs/ecrypto
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/prog-modes-2.10 b/app-xemacs/prog-modes-2.10
deleted file mode 100644
index 4f968a16655b..000000000000
--- a/app-xemacs/prog-modes-2.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Support for various programming languages
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-devel app-xemacs/xemacs-base app-xemacs/cc-mode app-xemacs/fsf-compat app-xemacs/edit-utils app-xemacs/ediff app-xemacs/emerge app-xemacs/efs app-xemacs/vc app-xemacs/speedbar app-xemacs/dired app-xemacs/ilisp app-xemacs/sh-script app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/prog-modes-2.10-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=6a2040e08e2303aab16a57f197800a2e
diff --git a/app-xemacs/prog-modes-2.20 b/app-xemacs/prog-modes-2.20
deleted file mode 100644
index a9d8289a7243..000000000000
--- a/app-xemacs/prog-modes-2.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Support for various programming languages
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-devel app-xemacs/xemacs-base app-xemacs/cc-mode app-xemacs/fsf-compat app-xemacs/edit-utils app-xemacs/ediff app-xemacs/emerge app-xemacs/efs app-xemacs/vc app-xemacs/speedbar app-xemacs/dired app-xemacs/ilisp app-xemacs/sh-script app-xemacs/cedet-common app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/prog-modes-2.20-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=a9a97e40ae40d2047e2177fd3155f280
diff --git a/app-xemacs/prog-modes/Manifest b/app-xemacs/prog-modes/Manifest
new file mode 100644
index 000000000000..500cfe6167d7
--- /dev/null
+++ b/app-xemacs/prog-modes/Manifest
@@ -0,0 +1,5 @@
+DIST prog-modes-2.10-pkg.tar.gz 777434 BLAKE2B f3061eaf61767ed3f43b2602eb2f648cb2feee04e9c77d50ad8ab95f93643126d3644ddcdd24cc40e9fa6981552cd7e44bb9dca08da733443504c87a96ab5045 SHA512 63758b8bcda1c23c6da9658de4af2a96e18c0aa3a14a2e8aec481fa1f5275a2d44b07ada45f9081f992eaf04f304caa0429acc01130e9cb718f392b630e3db39
+DIST prog-modes-2.20-pkg.tar.gz 821805 BLAKE2B 73b69223d9c51338e4e9fa4cac4db80168df2991461e4813e7277ef79f02470fa9437cc442579bd35123bd67a3fd375a76656fd9d86a35940b409dcb0df19a27 SHA512 54123746a23e7ab480485042717474a28cf78425088416a3dfeaaf949207377f465057b18beb308ab11131f852ae715708ace53e5f57f3925b21dabeca106e07
+EBUILD prog-modes-2.10.ebuild 556 BLAKE2B e7f96eb6fe7aaea8fdcf26922b6894bc438d9dd2c0760590b9d9c04ff745cdc2ae42603eff98d58f5f7eb7e29dc7000777ef9de138015b337fdbf214207bd089 SHA512 3a15ce421ca023b453cd18747c2310c0ce0a9a4795418b3571ef39146cd3f25de132eab973a8874fd484fc5a37f129709067ff81735e176585250a78eed4af81
+EBUILD prog-modes-2.20.ebuild 580 BLAKE2B f4d5f26fc0406941cdf7fb40c7409b5790f4f8a60ab83b8b909a8b9ed4d54629e3306ec125f0b7228ee6af184e8fb363ed91976e8f23ee5df6d1e52e219495e5 SHA512 c1293f75c0ea4a5653707bc84229da4c55b5b7327fbad4015a66e292a96057034e24fc55198defea0b5b692bd92543194e3f7740a49aa220821730fc88a11b6c
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/prog-modes/metadata.xml b/app-xemacs/prog-modes/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/prog-modes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/prog-modes/prog-modes-2.10.ebuild b/app-xemacs/prog-modes/prog-modes-2.10.ebuild
new file mode 100644
index 000000000000..025b202fc358
--- /dev/null
+++ b/app-xemacs/prog-modes/prog-modes-2.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Support for various programming languages"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/xemacs-devel
+app-xemacs/xemacs-base
+app-xemacs/cc-mode
+app-xemacs/fsf-compat
+app-xemacs/edit-utils
+app-xemacs/ediff
+app-xemacs/emerge
+app-xemacs/efs
+app-xemacs/vc
+app-xemacs/speedbar
+app-xemacs/dired
+app-xemacs/ilisp
+app-xemacs/sh-script
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/prog-modes/prog-modes-2.20.ebuild b/app-xemacs/prog-modes/prog-modes-2.20.ebuild
new file mode 100644
index 000000000000..ddb9e085023e
--- /dev/null
+++ b/app-xemacs/prog-modes/prog-modes-2.20.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Support for various programming languages"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/xemacs-devel
+app-xemacs/xemacs-base
+app-xemacs/cc-mode
+app-xemacs/fsf-compat
+app-xemacs/edit-utils
+app-xemacs/ediff
+app-xemacs/emerge
+app-xemacs/efs
+app-xemacs/vc
+app-xemacs/speedbar
+app-xemacs/dired
+app-xemacs/ilisp
+app-xemacs/sh-script
+app-xemacs/cedet-common
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ps-print-1.11 b/app-xemacs/ps-print-1.11
deleted file mode 100644
index dfa4350fc218..000000000000
--- a/app-xemacs/ps-print-1.11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Printing functions and utilities
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/text-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ps-print-1.11-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=9f0fc322f69e93ef5fdd7762f6d3b768
diff --git a/app-xemacs/ps-print-1.12 b/app-xemacs/ps-print-1.12
deleted file mode 100644
index 65dd47856eaf..000000000000
--- a/app-xemacs/ps-print-1.12
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Printing functions and utilities
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/text-modes app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ps-print-1.12-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=f518fef314997a9b39eb04bd99a783fd
diff --git a/app-xemacs/ps-print/Manifest b/app-xemacs/ps-print/Manifest
new file mode 100644
index 000000000000..04f308263963
--- /dev/null
+++ b/app-xemacs/ps-print/Manifest
@@ -0,0 +1,5 @@
+DIST ps-print-1.11-pkg.tar.gz 156222 BLAKE2B fb297012e292b737c6e3da4ecc84d532163bbdbbdbfc28f91a0d45a48c8f75cbf3836c4ffe831089ff85ea56f00a05393d81d2343bcaa96e08ce4364bccf3063 SHA512 c63cd0b399ab35c9171f452ddfcd914af61d37b17db27a9913fcf4a11195bafb107cd993f8db8aab68914e00211ab858319b08949f0a1173b784f4eafb6ea0a4
+DIST ps-print-1.12-pkg.tar.gz 156197 BLAKE2B 0eab7740f3b0fec7573b9da4583060ac051c233da033da299bd7756f3910af34c61a9fc676e6a8741cef628f5cecddcf6bc2eae0f5104fe34f037837551d26ae SHA512 0ba500177a9dff6d8e0b48938f3519af0700461c06af7224ed1a1e4c42465a7717761bbf1578895f32c71a205f10912d3b6ef47da2399121b47ed838bf7385fc
+EBUILD ps-print-1.11.ebuild 300 BLAKE2B f57881f2e2d073169b1e3792a2758880aaffed732bf5da42900cf8a6bde75e7a0d3e9e0d42133f90a3d1545753391c1c8496de89541b99f3120297a0f9bd9bd2 SHA512 4a201a26a0b68c9b8c0526340e607f21f03fd1d6c1d4675d8a28fed379bd7e4484eccba8e7bb33353823ce00ea86d66dee19d50143c63867fcc22b437ab4b4bf
+EBUILD ps-print-1.12.ebuild 323 BLAKE2B 28b576c2966035a1f9c22a6c42940d58df5a43b18a3a1d47e5ba31e5ec422f5a011c4c44b11454a2591f5dfd095990b0ff48d219bf1a31a8edfd5bb2f1147a74 SHA512 74ce8d396ef0534c37f5b71969785c2c74789c1692b5c6a0d0b68f2b580ea67b665002f2b14fecfce340eae97225544f583d1a1db2b3e6070cb95d61591ce714
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ps-print/metadata.xml b/app-xemacs/ps-print/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/ps-print/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/ps-print/ps-print-1.11.ebuild b/app-xemacs/ps-print/ps-print-1.11.ebuild
new file mode 100644
index 000000000000..87a034183a35
--- /dev/null
+++ b/app-xemacs/ps-print/ps-print-1.11.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Printing functions and utilities"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/text-modes
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ps-print/ps-print-1.12.ebuild b/app-xemacs/ps-print/ps-print-1.12.ebuild
new file mode 100644
index 000000000000..7ffeea9eb969
--- /dev/null
+++ b/app-xemacs/ps-print/ps-print-1.12.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Printing functions and utilities"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/text-modes
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/psgml-1.44 b/app-xemacs/psgml-1.44
deleted file mode 100644
index c01342343ca0..000000000000
--- a/app-xemacs/psgml-1.44
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Validated HTML/SGML editing
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/edit-utils app-xemacs/edebug app-xemacs/xemacs-devel app-xemacs/mail-lib app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/ps-print app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/psgml-1.44-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=a6687bb575e8686ce98f194d20689745
diff --git a/app-xemacs/psgml-1.45 b/app-xemacs/psgml-1.45
deleted file mode 100644
index f65bda58b223..000000000000
--- a/app-xemacs/psgml-1.45
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Validated HTML/SGML editing
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/edit-utils app-xemacs/edebug app-xemacs/xemacs-devel app-xemacs/mail-lib app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/ps-print app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/psgml-1.45-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=a6687bb575e8686ce98f194d20689745
diff --git a/app-xemacs/psgml-dtds-1.03 b/app-xemacs/psgml-dtds-1.03
deleted file mode 100644
index f869d51e227d..000000000000
--- a/app-xemacs/psgml-dtds-1.03
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Deprecated collection of DTDs for psgml
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/psgml app-xemacs/edit-utils app-xemacs/mail-lib app-xemacs/fsf-compat app-xemacs/xemacs-eterm app-xemacs/sh-script app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/psgml-dtds-1.03-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=a8cf6845d8e8614b206b0d47a44cf5eb
diff --git a/app-xemacs/psgml-dtds/Manifest b/app-xemacs/psgml-dtds/Manifest
new file mode 100644
index 000000000000..29c2cd705bb6
--- /dev/null
+++ b/app-xemacs/psgml-dtds/Manifest
@@ -0,0 +1,3 @@
+DIST psgml-dtds-1.03-pkg.tar.gz 367476 BLAKE2B c7b06622895757b1ea73102a1bdf39be6f456c0e276b3d633c6f5c295b09249796429104499358c12da1204c9d95f93bac66c12311e38325f69a03fec81828f5 SHA512 947e3acd754ca9e730b7c3f7e45fb4cf94044dc61874bf37f77da2f11fec9649c4468f73e00db03c92f41fa460f896cdd610088c5ce21a64954584e7ed2bfecb
+EBUILD psgml-dtds-1.03.ebuild 434 BLAKE2B 6aa90d20a62d0493dcee9c6e315c6785391deaab0c7e62a02faa04b728ad6c5ce8b30844a7bdf09233537b49458ae0b7bc6d9bef10b5a73a0faecfcf3415bcec SHA512 d13484e8c37de95926aeeda05cb9eb5c23355f528ac16d8cfbddffddfa8ce256d916da5136545090127f267c0077c1316b9a07fe43d90b9a8a7a701c47f35edc
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/psgml-dtds/metadata.xml b/app-xemacs/psgml-dtds/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/psgml-dtds/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/psgml-dtds/psgml-dtds-1.03.ebuild b/app-xemacs/psgml-dtds/psgml-dtds-1.03.ebuild
new file mode 100644
index 000000000000..28f322bdc0c2
--- /dev/null
+++ b/app-xemacs/psgml-dtds/psgml-dtds-1.03.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Deprecated collection of DTDs for psgml"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/psgml
+app-xemacs/edit-utils
+app-xemacs/mail-lib
+app-xemacs/fsf-compat
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/psgml/Manifest b/app-xemacs/psgml/Manifest
new file mode 100644
index 000000000000..c1bc7ba0a2aa
--- /dev/null
+++ b/app-xemacs/psgml/Manifest
@@ -0,0 +1,5 @@
+DIST psgml-1.44-pkg.tar.gz 302065 BLAKE2B 8f183e4b696e5cd14d3037f5360c754ba2a03da8b25bcd13c277aa6c58d0deb127a289c18788bdf05303877f26ff963d2d9d7da14ab2ca67701c39fd75a874ec SHA512 6c58520f6fd4f33e7b19bc01b8172ff670936c8dcab8ea9249ed9553423d581e5634ef09cec53d606f1d5329bbc37b8b286e5eaf689b5f9ad9ea345c37c5e177
+DIST psgml-1.45-pkg.tar.gz 307383 BLAKE2B 0d19188b0d21204a1045e792ec53596664a4400785a6f4612248e86676fde59fd6174e5fd1e999521f53c227c4a6e613e468e3a884cb7fed1402bdd8b08f8bfd SHA512 3e2e60a196d923eec5494e11a3690902c7d618d713e6c8df82412359d13d9bef40cac67e08ebc227b0584011fe0affe0c3880638d84ae47dda643b688065e570
+EBUILD psgml-1.44.ebuild 467 BLAKE2B c267c4d39f68c2771faef3c391d77d52f0ce8da25bfef9cd787ce9f4a7eafbd63e08dc65100a1170458b4a49da02e7a3f98ba291e3339e3ef0819f2180e79045 SHA512 a228a9bfa5ce457b906b1173e69aa02ce24b1c6b44b842ea536ac0ceabeb389187d88f6caf37ce220189a1a468164816175ca2f808912f740d1f32bd386c73eb
+EBUILD psgml-1.45.ebuild 467 BLAKE2B c267c4d39f68c2771faef3c391d77d52f0ce8da25bfef9cd787ce9f4a7eafbd63e08dc65100a1170458b4a49da02e7a3f98ba291e3339e3ef0819f2180e79045 SHA512 a228a9bfa5ce457b906b1173e69aa02ce24b1c6b44b842ea536ac0ceabeb389187d88f6caf37ce220189a1a468164816175ca2f808912f740d1f32bd386c73eb
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/psgml/metadata.xml b/app-xemacs/psgml/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/psgml/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/psgml/psgml-1.44.ebuild b/app-xemacs/psgml/psgml-1.44.ebuild
new file mode 100644
index 000000000000..c24433ea3194
--- /dev/null
+++ b/app-xemacs/psgml/psgml-1.44.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Validated HTML/SGML editing"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/edit-utils
+app-xemacs/edebug
+app-xemacs/xemacs-devel
+app-xemacs/mail-lib
+app-xemacs/fsf-compat
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+app-xemacs/ps-print
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/psgml/psgml-1.45.ebuild b/app-xemacs/psgml/psgml-1.45.ebuild
new file mode 100644
index 000000000000..c24433ea3194
--- /dev/null
+++ b/app-xemacs/psgml/psgml-1.45.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Validated HTML/SGML editing"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/edit-utils
+app-xemacs/edebug
+app-xemacs/xemacs-devel
+app-xemacs/mail-lib
+app-xemacs/fsf-compat
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+app-xemacs/ps-print
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/python-modes-1.08 b/app-xemacs/python-modes-1.08
deleted file mode 100644
index 59f197e93068..000000000000
--- a/app-xemacs/python-modes-1.08
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Python support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/edit-utils app-xemacs/fsf-compat app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/python-modes-1.08-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=8617027bd236631328666a61cc8832da
diff --git a/app-xemacs/python-modes-1.14 b/app-xemacs/python-modes-1.14
deleted file mode 100644
index 62f89a00f5c6..000000000000
--- a/app-xemacs/python-modes-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Python support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/edit-utils app-xemacs/fsf-compat app-xemacs/text-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/python-modes-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=e3a149a155df837cc8bba253bbe5bb12
diff --git a/app-xemacs/python-modes/Manifest b/app-xemacs/python-modes/Manifest
new file mode 100644
index 000000000000..72876ce12c9c
--- /dev/null
+++ b/app-xemacs/python-modes/Manifest
@@ -0,0 +1,5 @@
+DIST python-modes-1.08-pkg.tar.gz 93002 BLAKE2B 63e9aad70f52185efa68324bcb2d61c4b447cfa0a53aab31dd9fde07c987ccf96938418f639c16d4189724ca840386f3f831e83c338031dee712b2fafaae6222 SHA512 edac5c557d1c49b8d11f915d9ee1ae83b2bfa3fe54bac7fb457b861a3a38f3389683eadacc6abbdbe293c5bd459184e4d17315513f77a62d40cd46f3662ea4dd
+DIST python-modes-1.14-pkg.tar.gz 97116 BLAKE2B 04f2121b03e45a01b1f7c727c4aa48fd88fc06c02466583e0b4739fb3c57c0585d751f63f745edf8d7f351607dea395ef30642d42bc03e00705cb11cb75300f2 SHA512 802cab0ff8295cb6ae0387f17fdbe85afc559ea09e8b17e8a446be7d015e6945e29d8338e32cba5337b367cd07e645bd5ddf7ed6974a70cbf30de2bf63a708e0
+EBUILD python-modes-1.08.ebuild 347 BLAKE2B 3fe68ce644e1886986c91839ce575648bb1087582af60e8f5520557f9f6de21717431d8199d6a4ca6de08c1d1329e437c8d7108af0965367c7de726eae49c781 SHA512 b5bf404617837a7d3a6a72b973a26ba8a3a6d654a548921899bcfe893091d128be32200992205e0b8cfdea421249d2275810215f8b584a6245d70c85cc245622
+EBUILD python-modes-1.14.ebuild 369 BLAKE2B 61cf037f731310539e18025ab486f2a5aacb7165df14b181ef458790b52b5bf12a51a2ccf0ec19cd395b9a3319255cfa4cf387e142d515119dd58045fceba7cd SHA512 274e4f25096f013a062b88921db9f35d6291e7d77c95379d3ade04627610dd7210d64bcb7119db88f344888d310b31a5fb2c03662d84e3ab52446cc708bbe6ac
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/python-modes/metadata.xml b/app-xemacs/python-modes/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/python-modes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/python-modes/python-modes-1.08.ebuild b/app-xemacs/python-modes/python-modes-1.08.ebuild
new file mode 100644
index 000000000000..0b29eeefe0fb
--- /dev/null
+++ b/app-xemacs/python-modes/python-modes-1.08.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Python support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/mail-lib
+app-xemacs/edit-utils
+app-xemacs/fsf-compat
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/python-modes/python-modes-1.14.ebuild b/app-xemacs/python-modes/python-modes-1.14.ebuild
new file mode 100644
index 000000000000..bea65b48972d
--- /dev/null
+++ b/app-xemacs/python-modes/python-modes-1.14.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Python support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/mail-lib
+app-xemacs/edit-utils
+app-xemacs/fsf-compat
+app-xemacs/text-modes
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/re-builder-1.05 b/app-xemacs/re-builder-1.05
deleted file mode 100644
index 094109e00e08..000000000000
--- a/app-xemacs/re-builder-1.05
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Interactive development tool for regular expressions
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/re-builder-1.05-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=b9e7d7fc9d53ad230e2d692bdb21a35d
diff --git a/app-xemacs/re-builder/Manifest b/app-xemacs/re-builder/Manifest
new file mode 100644
index 000000000000..334494cf960b
--- /dev/null
+++ b/app-xemacs/re-builder/Manifest
@@ -0,0 +1,3 @@
+DIST re-builder-1.05-pkg.tar.gz 20729 BLAKE2B bc4e7124bb08ba52662702bb29192a243c4ce48572b9530ddd5e5809aef7dfc47d8cc547b9aebe233425e1091371420bc1626f6c7a97f4b10e359862b61ecb0e SHA512 13c7dd7152089a21b4d3c1310df56c4cd16c5fda39766feb3eb1e33037245a466ad055d7f4b57b98b9bce484e9ae3325a346a0c5fd139114df7219a406d1d47b
+EBUILD re-builder-1.05.ebuild 298 BLAKE2B da1bb15705616435ff5d1cbbad0548ed502c702ae6078428258d7cc54b181a801a350d273fd61e096dd1d946d5cf103e64536ed44ee3a28c2684d09091e7ed36 SHA512 c07a0c4cb4845bd5d8243d6ff1b1d9d48830fa4ac99c48260682e544dab4506f96dc6756e1a6abab05aa3d6530c0293ff0e69bf18d244b69be18419cef9b0b0c
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/re-builder/metadata.xml b/app-xemacs/re-builder/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/re-builder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/re-builder/re-builder-1.05.ebuild b/app-xemacs/re-builder/re-builder-1.05.ebuild
new file mode 100644
index 000000000000..5b0485312cf2
--- /dev/null
+++ b/app-xemacs/re-builder/re-builder-1.05.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Interactive development tool for regular expressions"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND=""
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/reftex-1.34 b/app-xemacs/reftex-1.34
deleted file mode 100644
index 0a3080e30ec6..000000000000
--- a/app-xemacs/reftex-1.34
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs support for LaTeX cross-references, citations..
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/reftex-1.34-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=31ddfdb8386b455b84eb7d68d2e597ca
diff --git a/app-xemacs/reftex/Manifest b/app-xemacs/reftex/Manifest
new file mode 100644
index 000000000000..10d929c723a1
--- /dev/null
+++ b/app-xemacs/reftex/Manifest
@@ -0,0 +1,3 @@
+DIST reftex-1.34-pkg.tar.gz 352338 BLAKE2B 1f6b5afbed3b6c6de1637f8628724fc270132fd795a2d752a6e8d7c771501aabde48fbcabbc7a45ed89fb04eb1bb17b87f8478e34de0919d6a15f5b336de4ee3 SHA512 89e5b73b3dde0ae9271a9e9e5d6195f856ddf1a45db894d8b3796cdfe68bf278aa9a24bd5656f9158d629fe286082ee91b678c48a277394cd155bd7b3365b8ab
+EBUILD reftex-1.34.ebuild 322 BLAKE2B 837a957989776f57de0e076b7dccf21e8cd09d8bc8f4d9b12cc26440748d3fcdf9c973400b5cbcb1e2766cc5408dc3165b49481f19836c83a8f02690373c2506 SHA512 04eeb8794a29ef8679d7b51cdb472feee5e5d4a6145e654a93dc3d70a2193a5cc1de17214be342636e62818a1b0a0f74df0ab23bdd6b02482857926eaef5c9ce
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/reftex/metadata.xml b/app-xemacs/reftex/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/reftex/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/reftex/reftex-1.34.ebuild b/app-xemacs/reftex/reftex-1.34.ebuild
new file mode 100644
index 000000000000..a0162a84228e
--- /dev/null
+++ b/app-xemacs/reftex/reftex-1.34.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Emacs support for LaTeX cross-references, citations.."
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/riece-1.23 b/app-xemacs/riece-1.23
deleted file mode 100644
index 819e9fcb5e10..000000000000
--- a/app-xemacs/riece-1.23
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=IRC client for Emacs
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/bbdb app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/riece-1.23-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=1d69c6e330489f58b57ff67afec2f971
diff --git a/app-xemacs/riece/Manifest b/app-xemacs/riece/Manifest
new file mode 100644
index 000000000000..0bcacd92ef32
--- /dev/null
+++ b/app-xemacs/riece/Manifest
@@ -0,0 +1,3 @@
+DIST riece-1.23-pkg.tar.gz 221779 BLAKE2B 27ca4a644fd332c6c1e06ef4886c2f2fe744d50b4e15d701e35948c9e7682ce5e505ea92e32c8d5b8c71f521cb40a91b78f0044930c1e21e1e1f93769052e592 SHA512 ead33eb49e46b47b769dc8940774f1d9e3855e2ec91c9434a80c80da4ad7783e6c04f4c25ab5b71cfb1364f96c5eec03224758cee3b68ba16530d76b310c0b74
+EBUILD riece-1.23.ebuild 325 BLAKE2B d9db7c46e0770b2ee4013cfcf4fcccf5aac72d97aebd1c2f1eabac37bbdd97bb6b0de44862950ceb06b12404b233d239283da984df2973f045b09f596e68c4da SHA512 0ca5fe759207c2d04747d44e84b86fd5a3785dfa72f77d082831ffeef933838fc8543f44fa6965b2f9f2b1df1827043bd84507039e853f14a45d34cf6c94ee5d
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/riece/metadata.xml b/app-xemacs/riece/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/riece/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/riece/riece-1.23.ebuild b/app-xemacs/riece/riece-1.23.ebuild
new file mode 100644
index 000000000000..08c5e9bdebc2
--- /dev/null
+++ b/app-xemacs/riece/riece-1.23.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="IRC client for Emacs"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/mail-lib
+app-xemacs/bbdb
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/rmail-1.14 b/app-xemacs/rmail-1.14
deleted file mode 100644
index 222ef288d897..000000000000
--- a/app-xemacs/rmail-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=An obsolete Emacs mailer
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/tm app-xemacs/apel app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/rmail-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=01294bf84f10db5685a0fb7f1f31c4fd
diff --git a/app-xemacs/rmail/Manifest b/app-xemacs/rmail/Manifest
new file mode 100644
index 000000000000..912e9b3847f5
--- /dev/null
+++ b/app-xemacs/rmail/Manifest
@@ -0,0 +1,3 @@
+DIST rmail-1.14-pkg.tar.gz 96995 BLAKE2B 4d34d4a8ae5945232ce48405aed8c48d08a7db851a9505a53d4e2a699400a3bd95e405e86512522d64aabe1fd173ea0e2997a6f69df43c9c541bfd23605ba2e7 SHA512 a0e6c4279da4d70595c5bf1b90ee2047ccf181904f753f50211e2761fcb2d86a04267423e2076b276f5ea87fe5ab044c86c026c9e389cf38232518e288f60063
+EBUILD rmail-1.14.ebuild 343 BLAKE2B c4b4456de80ff3b18432e6e42b04a13c71fa86b92c8da5da2a013f1d5d14e7cb22912acb31378146b2bb1178ef73d7656a4d2669617c956403487e1de3bbddaf SHA512 aa0db8e997f57f1d501872e3adc502dc5e873674dc03546c67fcecd12a97a31932d9ea96bce359c5f3ca1edeaf6d6368a7827a63e391db7e871e73be437689a6
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/rmail/metadata.xml b/app-xemacs/rmail/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/rmail/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/rmail/rmail-1.14.ebuild b/app-xemacs/rmail/rmail-1.14.ebuild
new file mode 100644
index 000000000000..e50d725dbe17
--- /dev/null
+++ b/app-xemacs/rmail/rmail-1.14.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="An obsolete Emacs mailer"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/tm
+app-xemacs/apel
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ruby-modes-1.02 b/app-xemacs/ruby-modes-1.02
deleted file mode 100644
index fffe34669deb..000000000000
--- a/app-xemacs/ruby-modes-1.02
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Ruby support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/debug app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ruby-modes-1.02-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=f0ba780b4b0cbffb922ff065bb8dcb1e
diff --git a/app-xemacs/ruby-modes-1.04 b/app-xemacs/ruby-modes-1.04
deleted file mode 100644
index 61f7e685ccfa..000000000000
--- a/app-xemacs/ruby-modes-1.04
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Ruby support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/debug app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/ruby-modes-1.04-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=e67b34094701f011ceb8ed83304e3b2b
diff --git a/app-xemacs/ruby-modes/Manifest b/app-xemacs/ruby-modes/Manifest
new file mode 100644
index 000000000000..03dc7f4deaa6
--- /dev/null
+++ b/app-xemacs/ruby-modes/Manifest
@@ -0,0 +1,5 @@
+DIST ruby-modes-1.02-pkg.tar.gz 21889 BLAKE2B dde2c5b566b1dac569536b233f70acf2259d1230cfe8f84a7caa3485934bc28f79d7a29c0c3e33daff48bed9de03658c4bbd11bb79262031e2f245e55186eca5 SHA512 91306a992c944f4d424934b6d90b3073bc5cd19f04678846400b3ea41acc349c92c604c337019bd9ca9beba32d401adbd6f78f72b57bf2597e78cf7cb64a4883
+DIST ruby-modes-1.04-pkg.tar.gz 31720 BLAKE2B 914d61671d48f5ba32269dc1ac68a3888c2b7361f98a293a071bce52c881ceaf5d92c70ebaf0e30ff3bfafc96d573e6c57764e2ea46f448c9671605f862d1e5a SHA512 df12bec66cc8d70c3b75e1849b0b8ab1f8408f6a86d3dcf04d2703ae3815876fd96c382ef8b37135a99074ef20ee9628a2158217dc334b4aeb72c0a676ab748b
+EBUILD ruby-modes-1.02.ebuild 303 BLAKE2B cc14942542aa0853b9e82e61ae9c7c8d9daaed20528f446ed7d66bde7ad4730abdbe675a0f360fa838f21c7c1206e7c406bc7063b0a15dd3a1a2e87555127877 SHA512 8543c9a085d4a41282ad84a1f27b8025ba0f04d6f5f9b3e8bbfcb62d18899d49f1a5b62df4f3c9b61106f3419cd6cca9a00015dd467595d5b44e75069421f8a0
+EBUILD ruby-modes-1.04.ebuild 322 BLAKE2B 4f0de3607b3d98789cf2b2c78a3669b03de1e2adb06c7756868f0757fe470175d1d3337c85e03e1bbe510e4c18088f49ebc65d2a80c8bf4a2d9c4dca612ade96 SHA512 1f572d9f257061d519bc87e2808c00ac2dd8daedc399c0f6b7454d17337b4bd747d9d15e27cc33a5a97b154f0cf9d6b0a4d0bad8b2935204f2558e81cb20b821
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/ruby-modes/metadata.xml b/app-xemacs/ruby-modes/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/ruby-modes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/ruby-modes/ruby-modes-1.02.ebuild b/app-xemacs/ruby-modes/ruby-modes-1.02.ebuild
new file mode 100644
index 000000000000..4ec74b5df268
--- /dev/null
+++ b/app-xemacs/ruby-modes/ruby-modes-1.02.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Ruby support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/debug
+"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/ruby-modes/ruby-modes-1.04.ebuild b/app-xemacs/ruby-modes/ruby-modes-1.04.ebuild
new file mode 100644
index 000000000000..dd3469929602
--- /dev/null
+++ b/app-xemacs/ruby-modes/ruby-modes-1.04.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Ruby support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/debug
+"
+KEYWORDS="alpha amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd"
+
+inherit xemacs-packages
diff --git a/app-xemacs/sasl-1.16 b/app-xemacs/sasl-1.16
deleted file mode 100644
index 86fe1573b31b..000000000000
--- a/app-xemacs/sasl-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Simple Authentication and Security Layer (SASL) library
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/sasl-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=7b8181c96f34d960fe7e2ad453c76c64
diff --git a/app-xemacs/sasl/Manifest b/app-xemacs/sasl/Manifest
new file mode 100644
index 000000000000..80c354a243b3
--- /dev/null
+++ b/app-xemacs/sasl/Manifest
@@ -0,0 +1,3 @@
+DIST sasl-1.16-pkg.tar.gz 27864 BLAKE2B 0db7238e14ed56beec938885d881375a7e8635bfd369cee52db9daa70e27401237ee313b841f6898732121beaa4bd445945468175f94dfc17efbe7a1f391fff2 SHA512 dcc0a8c14b1f7f687f7abe9409f69c9501f0f8b5ae89d12bcfe9193922c196635e01bf5a0efd7af148e89daaee5a341d84e1d3f597f4904b1e7e3bad4b8e16df
+EBUILD sasl-1.16.ebuild 320 BLAKE2B 60e2b0a255792042ccc9af2ed696885c0fe72c0073656bf1bc187f2bdf8e21f7b0d73352850061b927f74393f6c942c68a5563aa1204b9afe247ca5c57354f7f SHA512 4c9d6e9b15802298e380f877bf74bcd905e404c2c3fd37518feff7d21778f2fed5e3b0cb246f3f0106c90d22d45a74c6498b00b18b5449beebed7903d50004eb
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sasl/metadata.xml b/app-xemacs/sasl/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/sasl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/sasl/sasl-1.16.ebuild b/app-xemacs/sasl/sasl-1.16.ebuild
new file mode 100644
index 000000000000..bce12e72b5dc
--- /dev/null
+++ b/app-xemacs/sasl/sasl-1.16.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Simple Authentication and Security Layer (SASL) library"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/ecrypto
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/scheme-1.15 b/app-xemacs/scheme-1.15
deleted file mode 100644
index ae707141a19a..000000000000
--- a/app-xemacs/scheme-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Front-end support for Inferior Scheme
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/scheme-1.15-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=10e2ed618cf002c7f91705d1f7beb114
diff --git a/app-xemacs/scheme-1.18 b/app-xemacs/scheme-1.18
deleted file mode 100644
index 394f6a1a6d17..000000000000
--- a/app-xemacs/scheme-1.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Front-end support for Inferior Scheme
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/scheme-1.18-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=10e2ed618cf002c7f91705d1f7beb114
diff --git a/app-xemacs/scheme/Manifest b/app-xemacs/scheme/Manifest
new file mode 100644
index 000000000000..2f763a2e4fb3
--- /dev/null
+++ b/app-xemacs/scheme/Manifest
@@ -0,0 +1,5 @@
+DIST scheme-1.15-pkg.tar.gz 38055 BLAKE2B a90deb028f49d4baead782ab671bc3d228089a96c0f06c6dfa26aeb9bdffe99bf1b0520e267d7321d57f217d8e5dfd5f69eaf47b41c018426752f5027fd6f530 SHA512 90ce2be594a1d30a92a653bb5ba79572b0e564e32f7b701b58fffc45d367dfc7efd3dafb10295a0ae01876ebbd63ad59060a065ecf8fc4bcce25c30c3e5e3b32
+DIST scheme-1.18-pkg.tar.gz 38398 BLAKE2B ae9846c8c60d644560644535e9a3570e86db0e0ab8a89eb1db32154183ea273dd3e76467991e3eea14b2d2ee79e88fc6017049b704de54d79a979a8e2cb6d2c4 SHA512 edf4e062663b72f4aff670cd2a73282314676f52b024cbe75d35b7445aa4fa8923723d59c7babafc0c86096eb7c9158e90452c4d06f27206c80eadd15236383c
+EBUILD scheme-1.15.ebuild 306 BLAKE2B 937237c94e1a76ebaeb7c6fc604fd87fe0b782da88882dc1dad483389f86a104c32c367a737d45eeaf2dc3a47b5b3bf010bb3f0cca0967b2a35717898eca9df7 SHA512 6713c036d2e8ed929044ae8b2aabdec8cf4145915299c09c2a9881cbdeacf4a8f0c1c8e4d4c255660699eb94713696f11678dd369d71081816ae2bdfa8389096
+EBUILD scheme-1.18.ebuild 306 BLAKE2B 937237c94e1a76ebaeb7c6fc604fd87fe0b782da88882dc1dad483389f86a104c32c367a737d45eeaf2dc3a47b5b3bf010bb3f0cca0967b2a35717898eca9df7 SHA512 6713c036d2e8ed929044ae8b2aabdec8cf4145915299c09c2a9881cbdeacf4a8f0c1c8e4d4c255660699eb94713696f11678dd369d71081816ae2bdfa8389096
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/scheme/metadata.xml b/app-xemacs/scheme/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/scheme/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/scheme/scheme-1.15.ebuild b/app-xemacs/scheme/scheme-1.15.ebuild
new file mode 100644
index 000000000000..41c710f1d71e
--- /dev/null
+++ b/app-xemacs/scheme/scheme-1.15.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Front-end support for Inferior Scheme"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/scheme/scheme-1.18.ebuild b/app-xemacs/scheme/scheme-1.18.ebuild
new file mode 100644
index 000000000000..41c710f1d71e
--- /dev/null
+++ b/app-xemacs/scheme/scheme-1.18.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Front-end support for Inferior Scheme"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/semantic-1.20 b/app-xemacs/semantic-1.20
deleted file mode 100644
index b67321070d5c..000000000000
--- a/app-xemacs/semantic-1.20
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Semantic bovinator (Yacc/Lex for XEmacs). Includes Senator
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/eieio app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/edit-utils app-xemacs/speedbar app-xemacs/texinfo app-xemacs/fsf-compat app-xemacs/cc-mode app-xemacs/edebug app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/semantic-1.20-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=5ba87ae9229bbfbd5bf688697df1141c
diff --git a/app-xemacs/semantic-1.21 b/app-xemacs/semantic-1.21
deleted file mode 100644
index 9cd14e04bf95..000000000000
--- a/app-xemacs/semantic-1.21
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Semantic bovinator (Yacc/Lex for XEmacs). Includes Senator
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/ede app-xemacs/cedet-common app-xemacs/eieio app-xemacs/xemacs-base app-xemacs/xemacs-devel app-xemacs/edit-utils app-xemacs/speedbar app-xemacs/texinfo app-xemacs/fsf-compat app-xemacs/cc-mode app-xemacs/edebug app-xemacs/sgml app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/semantic-1.21-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c3c7d01a7f283e9eaaa7eb1046208028
diff --git a/app-xemacs/semantic/Manifest b/app-xemacs/semantic/Manifest
new file mode 100644
index 000000000000..05c24abe98de
--- /dev/null
+++ b/app-xemacs/semantic/Manifest
@@ -0,0 +1,5 @@
+DIST semantic-1.20-pkg.tar.gz 455896 BLAKE2B 1b3b7ba434493f328bc2141e897c344b01fffdfc0c4df29df2c9747ff0eec3523b3acdb438148c2e9d1339aaadd0e375a4e6e1a9afc3c8558bc217caf5d3d76b SHA512 5432807711c89fc0ae740f87bd04617e0497786ace687f017352c5d44562c711dab1075801e93067d02e116dd3716f1792d5cfa2f69204d92cf531f0bc7eae84
+DIST semantic-1.21-pkg.tar.gz 1367279 BLAKE2B c4c4d0fc81039455e511ccf9b8439cafc439c7f42d2fe8fa42fa614e23556615ec98254f31ef27ccb1d29ec316b37e88abed42eca33b0a8a8530dbafbe582492 SHA512 8815ccae1c38ee25176d14b2e5d9e2ca05b2d3fbf7e97105892ea8604d6acf88d81a51d6c138b8ebaf5823a518aef312eefed9dcff905c55daa39fd4c3c7139d
+EBUILD semantic-1.20.ebuild 488 BLAKE2B 3c9d67b129c5c1d202ee650f3beb5e09e9f8592362107b6c3607dc9c51dee87cadb1e80f2a9355a4f4729f5a07186b4ea32b6ba49b2e6d20c8426d9a611e8d03 SHA512 449eac40a5a46c5bfc6e80cb5d7e726da370cbf7d1ea93f774755e57a7955a5dafa4127c24bf775739ff4b1852984baba8e49c3b6de684934269f1b192798f75
+EBUILD semantic-1.21.ebuild 543 BLAKE2B 9146f0ad986a9ea4b264e13890aa9909274fdc92824d50d11f341edb03c461fa0f7735ff726c5926d34e9b6f38dffceb7cc7c71c5cc3019f3e81ac506538a14e SHA512 a877ba4c411bbb0a500eac0672cbd4f2a1a1297a58235d6e9303570e32c18594ba1431fc954aef78fe8264b6eeb90f354588f1af7842663bcb8c89d519b8e342
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/semantic/metadata.xml b/app-xemacs/semantic/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/semantic/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/semantic/semantic-1.20.ebuild b/app-xemacs/semantic/semantic-1.20.ebuild
new file mode 100644
index 000000000000..01fa5effc37e
--- /dev/null
+++ b/app-xemacs/semantic/semantic-1.20.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Semantic bovinator (Yacc/Lex for XEmacs). Includes Senator"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/eieio
+app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+app-xemacs/edit-utils
+app-xemacs/speedbar
+app-xemacs/texinfo
+app-xemacs/fsf-compat
+app-xemacs/cc-mode
+app-xemacs/edebug
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/semantic/semantic-1.21.ebuild b/app-xemacs/semantic/semantic-1.21.ebuild
new file mode 100644
index 000000000000..c4aa7f699131
--- /dev/null
+++ b/app-xemacs/semantic/semantic-1.21.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Semantic bovinator (Yacc/Lex for XEmacs). Includes Senator"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/ede
+app-xemacs/cedet-common
+app-xemacs/eieio
+app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+app-xemacs/edit-utils
+app-xemacs/speedbar
+app-xemacs/texinfo
+app-xemacs/fsf-compat
+app-xemacs/cc-mode
+app-xemacs/edebug
+app-xemacs/sgml
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/sgml-1.11 b/app-xemacs/sgml-1.11
deleted file mode 100644
index 5deb62af0603..000000000000
--- a/app-xemacs/sgml-1.11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=SGML/Linuxdoc-SGML editing
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/sgml-1.11-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=bbf5fa240503cfe1d06c5e5c39eec525
diff --git a/app-xemacs/sgml/Manifest b/app-xemacs/sgml/Manifest
new file mode 100644
index 000000000000..e455fd6a311e
--- /dev/null
+++ b/app-xemacs/sgml/Manifest
@@ -0,0 +1,3 @@
+DIST sgml-1.11-pkg.tar.gz 27506 BLAKE2B e12c4efdbdc8d66fe381bcd650462bb0b07bc9b13a7a9fa7ee51a9b850b904b737788a888ca0f4c91265e1be83d6343143c3fc97b8aaa1bccf5cd78c0e3ab0b5 SHA512 cd3e8d8694e77aad00d60f9331e60769cd6308715c698ed9d260b6d31838ba1f2e76fa0d90b430dad010b886576f8263d8223ca73ffda7d3654adcbc0d15b7d6
+EBUILD sgml-1.11.ebuild 295 BLAKE2B 3336901ea6db34402ad0f1ab6174dcf70d8e7a3090726331ed635d05075ff7f44fa0877a4503a477e8369c63cf1133706a627d32c2a1e6f203298b42ae42daba SHA512 8ed65cef663a3e4e95e5ee221cac87e14d4249e703c3fe27f1f5335002a67f5ef7a8001e53536f4102529dee6a2014c4aa67b24200eb0e8bb788f36d2fd38b1d
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sgml/metadata.xml b/app-xemacs/sgml/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/sgml/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/sgml/sgml-1.11.ebuild b/app-xemacs/sgml/sgml-1.11.ebuild
new file mode 100644
index 000000000000..5c76c0277904
--- /dev/null
+++ b/app-xemacs/sgml/sgml-1.11.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="SGML/Linuxdoc-SGML editing"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/sh-script-1.22 b/app-xemacs/sh-script-1.22
deleted file mode 100644
index aa5a0fd7e2f2..000000000000
--- a/app-xemacs/sh-script-1.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Support for editing shell scripts
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/sh-script-1.22-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=698037c910a8e4c4e406d3408ba1fb47
diff --git a/app-xemacs/sh-script-1.24 b/app-xemacs/sh-script-1.24
deleted file mode 100644
index 55ebaa89e0be..000000000000
--- a/app-xemacs/sh-script-1.24
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Support for editing shell scripts
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/sh-script-1.24-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=1c9242b1da7cdc00746003a104522ffc
diff --git a/app-xemacs/sh-script/Manifest b/app-xemacs/sh-script/Manifest
new file mode 100644
index 000000000000..1f748f2cd7de
--- /dev/null
+++ b/app-xemacs/sh-script/Manifest
@@ -0,0 +1,5 @@
+DIST sh-script-1.22-pkg.tar.gz 70396 BLAKE2B a4f1f5394ec7bb80dbb0469883fd471bc3479bb886112e4eca7b97bef39e33018d98d56b02ce8e04f2d84a1794c0f97ddc139f330be985ae4a1a5f8e74989b4f SHA512 2eee3fb6f000469e2802f55971299901d044e9206372650ab8691789ccabc21601335c6dd2e7cf233c10209d6632959fce11e854ad9565e27d4688ddfc8e2d1a
+DIST sh-script-1.24-pkg.tar.gz 70667 BLAKE2B aa1290823da1d23a1eea030ae68fa5d1458d248f2635ff4c88557456e9f2ca8b55dc293746f66d2e7cd057c39f0cd5859364b33730b417aea762148f95828884 SHA512 b39fbec933b73a21e340a47e24058cb2fd741b0bd4868aa880f171a5a164aba8f6c8e708f70a775f6e74f120254f4c283ac98ee1d3ea532e3eee95c05e960c4f
+EBUILD sh-script-1.22.ebuild 302 BLAKE2B 3ca1b4fda2b78792a2e792dedffa954c365ce59c3bd87ca6ba432bd58271eca8b8452c59beffb37f874c5bf16772a9c397c9f5493191fda99a275a0629190544 SHA512 67921ac348d705374c0333bd40e7e3bbd0e335dd6794756283dd9f2ede1b86098d06b1c50fcf484435a3353c396debbd4c528581e366750d83f7ef6f42d7a4d9
+EBUILD sh-script-1.24.ebuild 307 BLAKE2B 5dc98cf4cbc2929080098fdbfaba1b863696273d39b3e847ad41cf42553537f93ff785a877e8d6b837d65c6a5e724e33a19a958a55bf0250693d6bda55151de8 SHA512 6b2470c568159de4c31824810917ad6f3fefffbf2d865528b8fe27269cb063b67d4e57b30351294272bd68fbaabc42a0f0ff797cc72b0f50184658a088ab1f3a
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sh-script/metadata.xml b/app-xemacs/sh-script/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/sh-script/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/sh-script/sh-script-1.22.ebuild b/app-xemacs/sh-script/sh-script-1.22.ebuild
new file mode 100644
index 000000000000..affaf81527a3
--- /dev/null
+++ b/app-xemacs/sh-script/sh-script-1.22.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Support for editing shell scripts"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/sh-script/sh-script-1.24.ebuild b/app-xemacs/sh-script/sh-script-1.24.ebuild
new file mode 100644
index 000000000000..aa9278b4563f
--- /dev/null
+++ b/app-xemacs/sh-script/sh-script-1.24.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Support for editing shell scripts"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/sieve-1.18 b/app-xemacs/sieve-1.18
deleted file mode 100644
index 6491e48936ee..000000000000
--- a/app-xemacs/sieve-1.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Manage Sieve email filtering scripts
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/cc-mode app-xemacs/sasl app-xemacs/ecrypto app-xemacs/sh-script app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/sieve-1.18-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=ace5ca9839105cd6727fccb3c735e320
diff --git a/app-xemacs/sieve/Manifest b/app-xemacs/sieve/Manifest
new file mode 100644
index 000000000000..807c52ac94e1
--- /dev/null
+++ b/app-xemacs/sieve/Manifest
@@ -0,0 +1,3 @@
+DIST sieve-1.18-pkg.tar.gz 27387 BLAKE2B f619083c07840e0386a47708f79ce1e1bb0f3693b3e675b6945b0cd5cf63ae3c1bddd974e10607f4ddaaf1954b69c26ff29eb4f4d5f294b9bf81907fe236fc1e SHA512 cd870e7cc302524818ffb081422d5009e046da11b4228baecf43b0b872719f223ecd3ddc9fcaf86f474620cbeb0d6d672a505c1a7151772e07149369102a3a13
+EBUILD sieve-1.18.ebuild 400 BLAKE2B 806587a682c9daf2215a36b54790fcaf9be98208ba62afca30fa9a61d7a2a619ae1c21c9285f678d6d9612b0176a1fc4a4a1c7a00bae1ac9f3b539a3ede07c7e SHA512 a58efe0f829430abc9489471296d0bc7a49f05d5a892d9c9ba803645cdcd8eaa7ad33b2c952536daeff4e5dfaf0167f9e8e6861b103d48e1007d5aef432d9cf4
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sieve/metadata.xml b/app-xemacs/sieve/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/sieve/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/sieve/sieve-1.18.ebuild b/app-xemacs/sieve/sieve-1.18.ebuild
new file mode 100644
index 000000000000..57b325e43bff
--- /dev/null
+++ b/app-xemacs/sieve/sieve-1.18.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Manage Sieve email filtering scripts"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/mail-lib
+app-xemacs/cc-mode
+app-xemacs/sasl
+app-xemacs/ecrypto
+app-xemacs/sh-script
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/skk-1.23 b/app-xemacs/skk-1.23
deleted file mode 100644
index 2ba9e005512f..000000000000
--- a/app-xemacs/skk-1.23
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-xemacs/viper app-xemacs/mule-base app-xemacs/elib app-xemacs/xemacs-base app-xemacs/apel
-DESCRIPTION=MULE: Japanese Language Input Method
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/skk-1.23-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=7d2d24d6af2567b02f415d8c3913c44c
diff --git a/app-xemacs/skk-1.24 b/app-xemacs/skk-1.24
deleted file mode 100644
index f1921dc2bcb9..000000000000
--- a/app-xemacs/skk-1.24
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=MULE: Japanese Language Input Method
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/viper app-xemacs/mule-base app-xemacs/elib app-xemacs/xemacs-base app-xemacs/apel app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/skk-1.24-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=80471ac0475a9667a20548a9e0829a74
diff --git a/app-xemacs/skk/Manifest b/app-xemacs/skk/Manifest
new file mode 100644
index 000000000000..cc7eb0ad35b9
--- /dev/null
+++ b/app-xemacs/skk/Manifest
@@ -0,0 +1,5 @@
+DIST skk-1.23-pkg.tar.gz 1506691 BLAKE2B 2597f32c1364b530c4da5a3db3cc26b170d8576c0bccecc70666fdc54261e0e1b3b3a559766c7acc2b3894bd4304d2359e707e99421ebd135c2c9c4f29faea1a SHA512 aaad61a9db6e48d03f1decb15c1d7797d437cc10f2ecfaba6c37c0c6f8e73f87d08d378c548f0a9a168ae6c7043d8087e6db532eb74732dfc2d588cba1215656
+DIST skk-1.24-pkg.tar.gz 1464019 BLAKE2B 28dcaa38a64f4d795494e0e5e37c94125a05bb7573df59c54385ab8053c146f49aa63378831f83ce5a35aa36e68ec86dea9389e23e3165caeaf0f74e696fc34c SHA512 391c3f0a65e50ac14bcd251bd53f6fd5eba2461f52f5753553138f39291e8415428db8b326adc58d6bb0a30dfe6607c67770b3df841e5aa2c4fd1a1e1028f285
+EBUILD skk-1.23.ebuild 370 BLAKE2B 63e99b4755a3cc4235ceec41b43b960ebfc10e4c7c8e6d1948ea4d69c565788c29f0a65ae2a2fa06680930325d17ff4126d4a42d6ed0790807c68ba65ff913da SHA512 aefa13013d6237d48716cc4f37ff8686c07896030ba65d668e296d5babc52f019c4ec2c288274b6bae21605224fb4279cc6b4dec540e992a3dba60cc1721707a
+EBUILD skk-1.24.ebuild 371 BLAKE2B e26ffc0df314cda2249a6d72ab70c6d9ca0e9d726adba73d7dc07942206ab14672672ac16afd94e964a08b90e8d2b07074c7b3fadcd63492cb95874ec5200f7b SHA512 ea4ad2e797b4f998be8ef918aef72b80a9f9de0e9c98320cb4c80437c4bc909d1836f62a93ab45d158af5e337ba4ab90b72c07d008c998ea0126c3bff6c6b21d
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/skk/metadata.xml b/app-xemacs/skk/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/skk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/skk/skk-1.23.ebuild b/app-xemacs/skk/skk-1.23.ebuild
new file mode 100644
index 000000000000..3d56eaf2f8dd
--- /dev/null
+++ b/app-xemacs/skk/skk-1.23.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Japanese Language Input Method"
+XEMACS_PKG_CAT="mule"
+
+DEPEND="app-xemacs/viper
+app-xemacs/mule-base
+app-xemacs/elib
+app-xemacs/xemacs-base
+app-xemacs/apel
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/skk/skk-1.24.ebuild b/app-xemacs/skk/skk-1.24.ebuild
new file mode 100644
index 000000000000..df9526264752
--- /dev/null
+++ b/app-xemacs/skk/skk-1.24.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="MULE: Japanese Language Input Method"
+XEMACS_PKG_CAT="mule"
+
+RDEPEND="app-xemacs/viper
+app-xemacs/mule-base
+app-xemacs/elib
+app-xemacs/xemacs-base
+app-xemacs/apel
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/slider-1.15 b/app-xemacs/slider-1.15
deleted file mode 100644
index 0bc073f44565..000000000000
--- a/app-xemacs/slider-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=User interface tool
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/slider-1.15-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=4ece0e97009b590e4b482641b6c0d83c
diff --git a/app-xemacs/slider-1.16 b/app-xemacs/slider-1.16
deleted file mode 100644
index 3a2dc4e94afe..000000000000
--- a/app-xemacs/slider-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=User interface tool
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/slider-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=4ece0e97009b590e4b482641b6c0d83c
diff --git a/app-xemacs/slider/Manifest b/app-xemacs/slider/Manifest
new file mode 100644
index 000000000000..3e20ee7af44c
--- /dev/null
+++ b/app-xemacs/slider/Manifest
@@ -0,0 +1,5 @@
+DIST slider-1.15-pkg.tar.gz 12516 BLAKE2B fee3036b8002316186e18293b185d2d18818a999f6098e0aff078e93cf2205c459be7aef9f32f7825c2ab0b86e64e1d19ec80d90dbe6b005f0ce96c9cae71bfb SHA512 16e913c9f8eb5fd12954d93eec37798dc30144f3f654e6d9200fa00f524b22cdb9c9240ac43943bc7283dedd124657534216464a28d850bfc93e4b6d44db371f
+DIST slider-1.16-pkg.tar.gz 12857 BLAKE2B 6713ee639d6ebb6d21de13b59a34cf651543f3fc752179ef6c48b10bdfba77013546b620cf80ed286f6063c61944b51e48322cb6166ac85da91ad493516c8d60 SHA512 058c9ddc3efb739effcceb0cdf556d09ab74930fca27ee2cf3e12180197c8fcdad4dfcd328989e11274489c5d6a5cb22183147dcebe5e1765114a00e031515dd
+EBUILD slider-1.15.ebuild 254 BLAKE2B 9ba61d026d196eb152ff34e078458382b8dd2893e8caacda42b2c6595caa347137493ac0c128d59cce66e2d89f5fadcc75631ac23762791c0791c7609688f3f0 SHA512 b1fe14a11e8d05c5c43f240c069eccdab2f024e949c1439ff27d02386f3b845913003f2fae18f29f5212c0e9b98365822efacfed8cd106d52b2eef796d6fa800
+EBUILD slider-1.16.ebuild 254 BLAKE2B 9ba61d026d196eb152ff34e078458382b8dd2893e8caacda42b2c6595caa347137493ac0c128d59cce66e2d89f5fadcc75631ac23762791c0791c7609688f3f0 SHA512 b1fe14a11e8d05c5c43f240c069eccdab2f024e949c1439ff27d02386f3b845913003f2fae18f29f5212c0e9b98365822efacfed8cd106d52b2eef796d6fa800
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/slider/metadata.xml b/app-xemacs/slider/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/slider/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/slider/slider-1.15.ebuild b/app-xemacs/slider/slider-1.15.ebuild
new file mode 100644
index 000000000000..3c70d3b3d7ba
--- /dev/null
+++ b/app-xemacs/slider/slider-1.15.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="User interface tool"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/slider/slider-1.16.ebuild b/app-xemacs/slider/slider-1.16.ebuild
new file mode 100644
index 000000000000..3c70d3b3d7ba
--- /dev/null
+++ b/app-xemacs/slider/slider-1.16.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="User interface tool"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/sml-mode-0.12 b/app-xemacs/sml-mode-0.12
deleted file mode 100644
index a08691027eaa..000000000000
--- a/app-xemacs/sml-mode-0.12
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=SML editing support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/fsf-compat app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/sml-mode-0.12-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=a557213296156dacb158d45fafa820bb
diff --git a/app-xemacs/sml-mode/Manifest b/app-xemacs/sml-mode/Manifest
new file mode 100644
index 000000000000..3abb0c9f06fe
--- /dev/null
+++ b/app-xemacs/sml-mode/Manifest
@@ -0,0 +1,3 @@
+DIST sml-mode-0.12-pkg.tar.gz 82366 BLAKE2B 61ebbe1dc2b075a65dbe6f6d852dbbd698017414c741b9a551afe3b80f3c8d6dafa96793dcdfa22a76a89f6fdf982acf8daff9d3c033cdd0542f3f92f941ce93 SHA512 7c059c485577516a13d4b58c594fc78eaea1779714d6cdf98a1ef57edd9b1e0442e854b421a8d9e9fa32cd2d8a060cc02b7e4743d3494a1f7271ac06fb092a9f
+EBUILD sml-mode-0.12.ebuild 328 BLAKE2B d32c2512182ff911bc454d85ffd6d429628dcc6e05e8f5b28f9f147a4b43235c6a5ab32ce713a63b19b9ddc2ba167533acff4877c27eb041a8498e482fddcbc7 SHA512 1b09f2028d37b3d8f56b6768634d3c98ab781a561b3fd187e741a8ae4fc4d7effbd5e78390d236a8ee027995ad6a6314d2b58c536e8d2e104c9f2024ca1993a1
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sml-mode/metadata.xml b/app-xemacs/sml-mode/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/sml-mode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/sml-mode/sml-mode-0.12.ebuild b/app-xemacs/sml-mode/sml-mode-0.12.ebuild
new file mode 100644
index 000000000000..0c97f710fc79
--- /dev/null
+++ b/app-xemacs/sml-mode/sml-mode-0.12.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="SML editing support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/edebug
+app-xemacs/fsf-compat
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/sounds-au-1.12 b/app-xemacs/sounds-au-1.12
deleted file mode 100644
index 6eed2be6b7e6..000000000000
--- a/app-xemacs/sounds-au-1.12
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=XEmacs Sun sound files
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/sounds-au-1.12-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=cfe6165de287d928c7b515448c022e13
diff --git a/app-xemacs/sounds-au/Manifest b/app-xemacs/sounds-au/Manifest
new file mode 100644
index 000000000000..2a6bed4936a3
--- /dev/null
+++ b/app-xemacs/sounds-au/Manifest
@@ -0,0 +1,3 @@
+DIST sounds-au-1.12-pkg.tar.gz 126817 BLAKE2B d7942cb4d249ab8e147658bdccec4a837ee7834576d10fd71f7c070e3c4b23bc2df6233d707607e91172ebed3c4fd09f3aa1dccf25841ae106306764303892bf SHA512 fd7022f1a7c23b041416cb1c0eb0532fdc5dd492b37c4e1438d9d1f24ebbc7544488bcafd1eecb36b9183bdbe7494b5fe0ad6bf8b2762a573094675d80c5b5ae
+EBUILD sounds-au-1.12.ebuild 268 BLAKE2B e2a19d6b3b1c219ece8e8bd7c8acbf012a58fe97be26287484cbb44269fdc27764dbe10c5545a847298b7112f928ea613357d9036cad8141ae56f1c60f634d42 SHA512 ca12bd90c7b5eccef24fa8f79e523de64f41abdf593cfa62a24288bfbf56d6365a54b7a3490b697469f32c426a457e32e7598493f4827554e34f0a6bec2784ce
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sounds-au/metadata.xml b/app-xemacs/sounds-au/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/sounds-au/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/sounds-au/sounds-au-1.12.ebuild b/app-xemacs/sounds-au/sounds-au-1.12.ebuild
new file mode 100644
index 000000000000..8d67d5e62b37
--- /dev/null
+++ b/app-xemacs/sounds-au/sounds-au-1.12.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="XEmacs Sun sound files"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND=""
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/sounds-wav-1.12 b/app-xemacs/sounds-wav-1.12
deleted file mode 100644
index 0ecbd97e6480..000000000000
--- a/app-xemacs/sounds-wav-1.12
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=XEmacs Microsoft sound files
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/sounds-wav-1.12-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=0d66b841f62527212a94a35fba18d4c5
diff --git a/app-xemacs/sounds-wav/Manifest b/app-xemacs/sounds-wav/Manifest
new file mode 100644
index 000000000000..711253889aae
--- /dev/null
+++ b/app-xemacs/sounds-wav/Manifest
@@ -0,0 +1,3 @@
+DIST sounds-wav-1.12-pkg.tar.gz 149624 BLAKE2B 3ee397582fba2258d32351875aff4747ca799468c39d3c47411970feed6d0f352c2b572869e7cbcb456eec153036825061c0fae40c916bc0dfb79f06ee57813d SHA512 28a996d2339de6a69efdb95b42e6ca407a6fb53f1fc4af5ba8ef6a95ce7210e804d52c6e4ef85c3383324ff1125620ce45156a0c3581091836c9e21852cc5f95
+EBUILD sounds-wav-1.12.ebuild 263 BLAKE2B 67222c096b92658dcc2a63cfbaac0045d0740ac5fb095c13d2ef245d69134ba2f90fcabee68abbb74efdeed23fb272d37e4a55112c10aaee5871ece794284b14 SHA512 526448d98906c0a44e0a289503c603cb0ec61dff94124ef4d9c84ed10cd3a9fa1f391b2fdd90a8421dff695b0b325c53ec80f1ceb4292a3ebfe239fd7cce3ea7
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sounds-wav/metadata.xml b/app-xemacs/sounds-wav/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/sounds-wav/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/sounds-wav/sounds-wav-1.12.ebuild b/app-xemacs/sounds-wav/sounds-wav-1.12.ebuild
new file mode 100644
index 000000000000..00bbcf27d899
--- /dev/null
+++ b/app-xemacs/sounds-wav/sounds-wav-1.12.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="XEmacs Microsoft sound files"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/speedbar-1.28 b/app-xemacs/speedbar-1.28
deleted file mode 100644
index cd04a571f1c3..000000000000
--- a/app-xemacs/speedbar-1.28
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Provides a separate frame with convenient references
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/edebug app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/speedbar-1.28-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=4e70eb0f2c8f0e5f2c1561bd750668ad
diff --git a/app-xemacs/speedbar-1.29 b/app-xemacs/speedbar-1.29
deleted file mode 100644
index cfbf3404997f..000000000000
--- a/app-xemacs/speedbar-1.29
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Provides a separate frame with convenient references
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/edebug app-xemacs/cedet-common app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/speedbar-1.29-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c3b6db237daa4791ea9026d66b30b79f
diff --git a/app-xemacs/speedbar/Manifest b/app-xemacs/speedbar/Manifest
new file mode 100644
index 000000000000..30ab8701604f
--- /dev/null
+++ b/app-xemacs/speedbar/Manifest
@@ -0,0 +1,5 @@
+DIST speedbar-1.28-pkg.tar.gz 163269 BLAKE2B d16219dbae65136d17f402d594a0aa102e489b6e9bbae33323d6e898359d7342d45c98ed84366fabff3fffbd1a83dd5a7d75b7423d95d440b07364a22b071e5c SHA512 4852f81f17953436009c99bff537740ae921e1cb262a903dee3590b1f69906e614a7307d38dda45bec663dfe64ff1935152b84c74bd6500389f0054b3907df58
+DIST speedbar-1.29-pkg.tar.gz 153300 BLAKE2B 33b1674d9ad53b31f5fb8fc558f1f47b8422c8f067365fe7b484ea620b23a119f99a85127631e584d01f9083d7c49f115698e6e7859646a080a5cd7791ac33fc SHA512 c4550221f45a4ff29a54008ca50d3fc9c2d8ca20736240ef2fcc437b0a1cbd1551d75248ec5eb661c4943a462588035a131857450e15b5f92b1dfdba283b6547
+EBUILD speedbar-1.28.ebuild 339 BLAKE2B 9fbb402b642b13c1fbf5c0a6e9a5cea0724000dbbc5fe484c94c4359a47091959fe2cc70422143d09ae7c4da2c03cf743cf28ecded85d24729e01faa92f9653c SHA512 9fb5f072b88c4e56a672f9d1acbc4dc693a65565e56d6c9d4e969cc65c56495cc80731d3732ae99eb5f2bb5432706b2a19c9173bd6a9808d0dbbf6d85aeafed7
+EBUILD speedbar-1.29.ebuild 363 BLAKE2B 6876d3c6fbb14c8aa84715f9528c5779c9518ad349742d28c5ab979f31108e0d4f0ce839e8acc1c80a75ef6dd7544762a7dacb997fcc6bbdc3c4df2945ed9dbc SHA512 7fbe9b9bef27e7a47337171a722ee8a908ced2401d916cd2cd4c3ea3dbe38a9708f6cf6129f7408f7298526a0414c54e6a15453bf52b033471be0ee8bb725c4b
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/speedbar/metadata.xml b/app-xemacs/speedbar/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/speedbar/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/speedbar/speedbar-1.28.ebuild b/app-xemacs/speedbar/speedbar-1.28.ebuild
new file mode 100644
index 000000000000..df1df8a9180f
--- /dev/null
+++ b/app-xemacs/speedbar/speedbar-1.28.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Provides a separate frame with convenient references"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/edebug
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/speedbar/speedbar-1.29.ebuild b/app-xemacs/speedbar/speedbar-1.29.ebuild
new file mode 100644
index 000000000000..688867907ed1
--- /dev/null
+++ b/app-xemacs/speedbar/speedbar-1.29.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Provides a separate frame with convenient references"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/edebug
+app-xemacs/cedet-common
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/strokes-1.10 b/app-xemacs/strokes-1.10
deleted file mode 100644
index 2df0818bc6ab..000000000000
--- a/app-xemacs/strokes-1.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Mouse enhancement utility
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/text-modes app-xemacs/edit-utils app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/strokes-1.10-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=7a2beae2273106ceb28b6149b22a5be8
diff --git a/app-xemacs/strokes/Manifest b/app-xemacs/strokes/Manifest
new file mode 100644
index 000000000000..7ea651711e03
--- /dev/null
+++ b/app-xemacs/strokes/Manifest
@@ -0,0 +1,3 @@
+DIST strokes-1.10-pkg.tar.gz 43728 BLAKE2B 525fc8fabcbd23eb62730b2a31a962bb406712931867fcdc115c9fa96db7d5c4d9968063eadd9ec17208f54085023bce1467231a2f67c0e9839cb77d57df5640 SHA512 dc4c2e49cf5778122056cf10a20faea646598a4dbe24497b0feeaa341a6a05d845d1baf9dbd89afce1025e604f2b48b0e95abd7c5c0e749b3fb4aa0a524d924c
+EBUILD strokes-1.10.ebuild 358 BLAKE2B 224846835cd791058f90ddcb0cc89e12ad3d03328d56c784ce9927b5a7416933683bd8e2ccccba9da771ca1f3ff7e6d11ae75b9bd492a5255a7abd5ad5b81f1c SHA512 98f92d630ad338739532ae4ce33f4fb0f7102b838f3b8283ba5a797c5ac9b868ed7ce8c3fa25fb52295acf947578e55491b4c7ba1bfe1f98138c2b0863515307
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/strokes/metadata.xml b/app-xemacs/strokes/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/strokes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/strokes/strokes-1.10.ebuild b/app-xemacs/strokes/strokes-1.10.ebuild
new file mode 100644
index 000000000000..5febb7748244
--- /dev/null
+++ b/app-xemacs/strokes/strokes-1.10.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Mouse enhancement utility"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/text-modes
+app-xemacs/edit-utils
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/sun-1.16 b/app-xemacs/sun-1.16
deleted file mode 100644
index 6fa68c60cd0c..000000000000
--- a/app-xemacs/sun-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Support for Sparcworks..
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/cc-mode app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/packages/Sun-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=7190c87d35cd4208ac1d151173e30344
diff --git a/app-xemacs/sun/Manifest b/app-xemacs/sun/Manifest
new file mode 100644
index 000000000000..b24b03b6ad58
--- /dev/null
+++ b/app-xemacs/sun/Manifest
@@ -0,0 +1,3 @@
+DIST Sun-1.16-pkg.tar.gz 64431 BLAKE2B 8511f5a999f4b9f595d788fffa67458d81a9e7168613b5ff245555731af5c5276c94908598d3a469593752570ad929920ee9f86e1f81047aadec6f6fe0994b58 SHA512 1e03553132adedf2d93e80094a6934919489360391d927614dccb85abe3e6a36e930312ee8ee9c70a0608d2041fc8161dfa54649b0822236ca9532e0d26c8c2c
+EBUILD sun-1.16.ebuild 392 BLAKE2B 4879a79ac8378ee64b36223fdb115ee8bc4bcb4dfb43d9d9b775dfef63126bcfdfcaaf16e6fcbcc24094079d17e1e3a667ec2db320234097647b737a88863908 SHA512 ddab4ae951d4bb17393f4d5381f0439e952e48f0553b44d160f9a9a14169531a28b661c31be395c0b16d24e9ef6a6fe9a3c54c3c1cfd75c40ad93cff2b145ed0
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/sun/metadata.xml b/app-xemacs/sun/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/sun/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/sun/sun-1.16.ebuild b/app-xemacs/sun/sun-1.16.ebuild
new file mode 100644
index 000000000000..2d3a4fe52750
--- /dev/null
+++ b/app-xemacs/sun/sun-1.16.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Support for Sparcworks.."
+XEMACS_PKG_CAT="standard"
+
+MY_PN="Sun"
+SRC_URI="http://ftp.xemacs.org/packages/${MY_PN}-${PV}-pkg.tar.gz"
+
+RDEPEND="app-xemacs/cc-mode
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/supercite-1.21 b/app-xemacs/supercite-1.21
deleted file mode 100644
index 816d114f0da5..000000000000
--- a/app-xemacs/supercite-1.21
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=An Emacs citation tool for News & Mail messages
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/supercite-1.21-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=4a809bc7e7a373b7036db6a6cdff9850
diff --git a/app-xemacs/supercite/Manifest b/app-xemacs/supercite/Manifest
new file mode 100644
index 000000000000..3448216b3572
--- /dev/null
+++ b/app-xemacs/supercite/Manifest
@@ -0,0 +1,3 @@
+DIST supercite-1.21-pkg.tar.gz 100802 BLAKE2B 6810ba1eb207914193f22d10ec30788e87f6d59f8fbe7bb87db46b71dca668b243a1b23f33e662f248873d6770382ced1b3c8a35662725c5f36a0f1265d77183 SHA512 6b1875e6b6913af7d5a6f32888472e75702e570067460a52f93e8d6d761d05c5cd5b373bca60c86c9d4d5edb8e6d8d0b6cb363c5645d527cd81c06e4a178487c
+EBUILD supercite-1.21.ebuild 336 BLAKE2B 4437af6cc778633e7857933a48f2a2a1e42e05670ebc51d73641303e55f27b9bd888b92a3c0e8b8bb83d528cce1a009190e1b4b7f96fe38e766cca936302298d SHA512 6af5509cc7507094eb4ea55aa4a33bd0d2615b1c60fd9ee8e80ca03e1564a905fbcfd9504326859b9eebd6d23db05cd4417f0a6c378c713fcc11e2dd7f0434f6
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/supercite/metadata.xml b/app-xemacs/supercite/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/supercite/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/supercite/supercite-1.21.ebuild b/app-xemacs/supercite/supercite-1.21.ebuild
new file mode 100644
index 000000000000..69800fad24f1
--- /dev/null
+++ b/app-xemacs/supercite/supercite-1.21.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="An Emacs citation tool for News & Mail messages"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/texinfo-1.30 b/app-xemacs/texinfo-1.30
deleted file mode 100644
index 1185ae98c2f5..000000000000
--- a/app-xemacs/texinfo-1.30
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=XEmacs TeXinfo support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/text-modes app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/texinfo-1.30-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=b5977622e0cc21f0fd7047f6ebe11b78
diff --git a/app-xemacs/texinfo/Manifest b/app-xemacs/texinfo/Manifest
new file mode 100644
index 000000000000..0b148db25674
--- /dev/null
+++ b/app-xemacs/texinfo/Manifest
@@ -0,0 +1,3 @@
+DIST texinfo-1.30-pkg.tar.gz 145763 BLAKE2B f4bdd2381fb2efa5e6d318431e8a8a56911b2f84b161f96610e2e43a8e49c9ba15c63915f3219b4b47901834c3cf51aaa4fbc1b51ce18ae0d574bf99baafcae6 SHA512 dadcbb0a2dbbdc311d19a4e796ac574f18234938ddeb16da1ac8b9e150459536bac46b00b1609b8cd837ef980cc5b13f77b8321edfb347614340d1db0f3f78c0
+EBUILD texinfo-1.30.ebuild 318 BLAKE2B eefca977c12b4e5b3d6f3eba40645592a7c3306f4d4a358f2e304b1108d0a3ac51ae06bbc1cd3556581b7128520d3295c9f524837502e77842061b06c5d4caef SHA512 4be597af3575b397b4245e0f5b5b87f65ed2987f2521b0930d0343c0da1aad4ccb135340e6a24d120fad78a6ef993d324d84d2d695735f166e13d20804fc0fad
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/texinfo/metadata.xml b/app-xemacs/texinfo/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/texinfo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/texinfo/texinfo-1.30.ebuild b/app-xemacs/texinfo/texinfo-1.30.ebuild
new file mode 100644
index 000000000000..9ea018a3c053
--- /dev/null
+++ b/app-xemacs/texinfo/texinfo-1.30.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="XEmacs TeXinfo support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/text-modes
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/text-modes-1.92 b/app-xemacs/text-modes-1.92
deleted file mode 100644
index b961a3de15d6..000000000000
--- a/app-xemacs/text-modes-1.92
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Miscellaneous support for editing text files
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-ispell app-xemacs/fsf-compat app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/text-modes-1.92-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=10034f395b18907f11e07b6aec82f218
diff --git a/app-xemacs/text-modes-1.98 b/app-xemacs/text-modes-1.98
deleted file mode 100644
index dabad5278a5d..000000000000
--- a/app-xemacs/text-modes-1.98
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Miscellaneous support for editing text files
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-ispell app-xemacs/fsf-compat app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/text-modes-1.98-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=10034f395b18907f11e07b6aec82f218
diff --git a/app-xemacs/text-modes/Manifest b/app-xemacs/text-modes/Manifest
new file mode 100644
index 000000000000..6bca35051043
--- /dev/null
+++ b/app-xemacs/text-modes/Manifest
@@ -0,0 +1,5 @@
+DIST text-modes-1.92-pkg.tar.gz 443017 BLAKE2B 62991cc84bf33ed259cd8fe03b71df3db2ca7ce20e0c7601a3d4fda0415c328ba55ac6ff51b9f7ff4c6f93a8a3e88869c91ba22e3b8922ce9d4a607707fcffb7 SHA512 daec17a811b2b7d8dc9730dbad8a1fe0edf8667eb8f334b8c89502f06012b8f938967b578a91e7ca399ff7e853c23959a606021cb2a60c714c7db5a49421d63a
+DIST text-modes-1.98-pkg.tar.gz 450607 BLAKE2B f4e3c2eaba1c8a1a6e751de1a483e199179692cf380f9f48a206b77db5b0dc3f57ff58790d9853f04d5e3a2f9364159e1c775afd72e673ca866972893382a312 SHA512 72e4a20a53b52847d7b48550046eef50353e3f79e609a5a8de15f11259d6034ffad0b8369ec928cb4fd966706a16a3e020f62c890cca8eb59840729b886d8573
+EBUILD text-modes-1.92.ebuild 365 BLAKE2B cb0b4a442eb21b81889826c3568244683b4b5435d463f843d635980e4868873877794f4ad6b7fdfafd9bd15fe0fc308d05bf9adfaaff824595c3cc1362f26865 SHA512 055f0dfda57627d9ace9268542c1d18d93cf20ffb022a74cfb4edb2d25ce40b2986fb8a28d476a1b4f1da9fe7f599876dc86717b1c2db57eb361beafd4da83b8
+EBUILD text-modes-1.98.ebuild 365 BLAKE2B cb0b4a442eb21b81889826c3568244683b4b5435d463f843d635980e4868873877794f4ad6b7fdfafd9bd15fe0fc308d05bf9adfaaff824595c3cc1362f26865 SHA512 055f0dfda57627d9ace9268542c1d18d93cf20ffb022a74cfb4edb2d25ce40b2986fb8a28d476a1b4f1da9fe7f599876dc86717b1c2db57eb361beafd4da83b8
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/text-modes/metadata.xml b/app-xemacs/text-modes/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/text-modes/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/text-modes/text-modes-1.92.ebuild b/app-xemacs/text-modes/text-modes-1.92.ebuild
new file mode 100644
index 000000000000..1af096fe0b73
--- /dev/null
+++ b/app-xemacs/text-modes/text-modes-1.92.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Miscellaneous support for editing text files"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-ispell
+app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/text-modes/text-modes-1.98.ebuild b/app-xemacs/text-modes/text-modes-1.98.ebuild
new file mode 100644
index 000000000000..1af096fe0b73
--- /dev/null
+++ b/app-xemacs/text-modes/text-modes-1.98.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Miscellaneous support for editing text files"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-ispell
+app-xemacs/fsf-compat
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/textools-1.15 b/app-xemacs/textools-1.15
deleted file mode 100644
index 4343bede9097..000000000000
--- a/app-xemacs/textools-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Miscellaneous TeX support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/textools-1.15-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=64f135369fb45bd8a62e1422234919ec
diff --git a/app-xemacs/textools/Manifest b/app-xemacs/textools/Manifest
new file mode 100644
index 000000000000..b673ebedef9b
--- /dev/null
+++ b/app-xemacs/textools/Manifest
@@ -0,0 +1,3 @@
+DIST textools-1.15-pkg.tar.gz 79966 BLAKE2B 5b2de39719f7c8e9af949365e3ac6a615253017a022e027bd288456da15fa5baba13603bb5cc2a61384dfbb4fbad18b2d8e2e96d9937a14a4f298404b0d148ae SHA512 22c987d68acc1107eca9749246014f5a6c64e7d388519e7694dfa917241537cd7e815e73e5cd36edac564a27136b273c9b0e593a78ae63f683b0d70432b46310
+EBUILD textools-1.15.ebuild 294 BLAKE2B 80e695edb61506c09f0459319ed203345eb008604b815c02cc334c750dd476d059d473cd8889d2f5a203387994e075f7219382c108582e2add3f6e5206dc2a6c SHA512 e78032e9d788333fb29376ff425c78b0ae9246dee7bf132d8a5d1caba870e4bbc2e544f8869066684525ee40b52f70617f4b13bc3cced44730401033710269e7
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/textools/metadata.xml b/app-xemacs/textools/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/textools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/textools/textools-1.15.ebuild b/app-xemacs/textools/textools-1.15.ebuild
new file mode 100644
index 000000000000..f4a7926992a9
--- /dev/null
+++ b/app-xemacs/textools/textools-1.15.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Miscellaneous TeX support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/time-1.14 b/app-xemacs/time-1.14
deleted file mode 100644
index faf5bfbf8af2..000000000000
--- a/app-xemacs/time-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Display time & date on the modeline
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/time-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=637f485adf89adb140da45ff05818733
diff --git a/app-xemacs/time/Manifest b/app-xemacs/time/Manifest
new file mode 100644
index 000000000000..1107df4fbf7e
--- /dev/null
+++ b/app-xemacs/time/Manifest
@@ -0,0 +1,3 @@
+DIST time-1.14-pkg.tar.gz 20431 BLAKE2B c0b28f83de39a82fad9965e13681e4c88c1fad59d19821f951739dc7fd915b01f3308d0b6fe6485def0e65a4396b6fb6941103863243e9848f5ec235112b7c67 SHA512 62dfea425ac0fd00d4e8003377341c03970fde921acc06f94cbe98e6c37e255462e7ba9e72d0d540c557d64559ce9d39d2f21bcb7736e0ee7939e4b41ab5c0ac
+EBUILD time-1.14.ebuild 304 BLAKE2B ca4a708da9b787c518621da86b7d8495efb92d96bc5e4e5eb92a7dbc1a8b8a1fef14e3c665ef70ae27f493608f4488662b98f17396ab3b9dda6a71be3a56ff37 SHA512 96f1462556c3fe4997b6027508b5909635d7440cba30117828ca03b789b951f6db9f02536d000e8c2a88464b76816e78002a7e4f9f53c92bb410e22d583158d6
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/time/metadata.xml b/app-xemacs/time/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/time/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/time/time-1.14.ebuild b/app-xemacs/time/time-1.14.ebuild
new file mode 100644
index 000000000000..cfe2f8118490
--- /dev/null
+++ b/app-xemacs/time/time-1.14.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Display time & date on the modeline"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/tm-1.38 b/app-xemacs/tm-1.38
deleted file mode 100644
index 950c37cc78e3..000000000000
--- a/app-xemacs/tm-1.38
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs MIME support. Not needed for gnus >= 5.8.0
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/gnus app-xemacs/mh-e app-xemacs/rmail app-xemacs/vm app-xemacs/mailcrypt app-xemacs/mail-lib app-xemacs/apel app-xemacs/xemacs-base app-xemacs/fsf-compat app-xemacs/sh-script app-xemacs/net-utils app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/tm-1.38-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=2f31f4bb78657c2d27b1f999ff212d63
diff --git a/app-xemacs/tm-1.39 b/app-xemacs/tm-1.39
deleted file mode 100644
index ed284cc7d53c..000000000000
--- a/app-xemacs/tm-1.39
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs MIME support. Not needed for gnus >= 5.8.0
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/gnus app-xemacs/mh-e app-xemacs/rmail app-xemacs/vm app-xemacs/mailcrypt app-xemacs/mail-lib app-xemacs/apel app-xemacs/xemacs-base app-xemacs/fsf-compat app-xemacs/sh-script app-xemacs/net-utils app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/tm-1.39-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=2f31f4bb78657c2d27b1f999ff212d63
diff --git a/app-xemacs/tm/Manifest b/app-xemacs/tm/Manifest
new file mode 100644
index 000000000000..1ec300b0f50b
--- /dev/null
+++ b/app-xemacs/tm/Manifest
@@ -0,0 +1,5 @@
+DIST tm-1.38-pkg.tar.gz 333864 BLAKE2B f271fe59e3d4eab0e21dcf503a93191ce9bcd9630deb59f109551997511af423bef8c702a74437727223e24fe355ef05a89e88b35a2207c25c2259641d733e08 SHA512 cd051d92b538a9373509241c52e6740faf2bb49bb0c01996f253114519399b3f5ca0a47250fe9f4a61d903408ff4402640bdfbc5624c90628aeaa85e61a7a5b6
+DIST tm-1.39-pkg.tar.gz 335103 BLAKE2B a1dec2205292d4ab26f8427ca69ea6decf0935b15079244c9633b195119fb746a32410815c8ac5c5d7a2af282605bacff6e10cbd262f571b2f78d644621968b4 SHA512 084d2e57810fd2a318ab766d0b5560983f6394b635a3596a06c106b68d80fde81bae5bd531d06e816efbda08066b3b718ff0284910e40b994f4a29b3159ee0d7
+EBUILD tm-1.38.ebuild 520 BLAKE2B 14aa73a3bb89f2c63337ddeb066e8b8d4adff89b9cd962f37629ab27fcd3282dae48940b59a72d3187400c63b07747e36262977176aa7c715b0a72d894c1abb6 SHA512 818f2277133cf58ccb714937485bfefb88705342c7f4f983ac5cdf2bc77a339dbe8c2372190d49a830a1a58baa0fb82f0414179dc6e5c65b6a609dca57019ed4
+EBUILD tm-1.39.ebuild 520 BLAKE2B 14aa73a3bb89f2c63337ddeb066e8b8d4adff89b9cd962f37629ab27fcd3282dae48940b59a72d3187400c63b07747e36262977176aa7c715b0a72d894c1abb6 SHA512 818f2277133cf58ccb714937485bfefb88705342c7f4f983ac5cdf2bc77a339dbe8c2372190d49a830a1a58baa0fb82f0414179dc6e5c65b6a609dca57019ed4
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/tm/metadata.xml b/app-xemacs/tm/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/tm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/tm/tm-1.38.ebuild b/app-xemacs/tm/tm-1.38.ebuild
new file mode 100644
index 000000000000..94d9692def44
--- /dev/null
+++ b/app-xemacs/tm/tm-1.38.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Emacs MIME support. Not needed for gnus >= 5.8.0"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/gnus
+app-xemacs/mh-e
+app-xemacs/rmail
+app-xemacs/vm
+app-xemacs/mailcrypt
+app-xemacs/mail-lib
+app-xemacs/apel
+app-xemacs/xemacs-base
+app-xemacs/fsf-compat
+app-xemacs/sh-script
+app-xemacs/net-utils
+app-xemacs/ecrypto
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/tm/tm-1.39.ebuild b/app-xemacs/tm/tm-1.39.ebuild
new file mode 100644
index 000000000000..94d9692def44
--- /dev/null
+++ b/app-xemacs/tm/tm-1.39.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Emacs MIME support. Not needed for gnus >= 5.8.0"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/gnus
+app-xemacs/mh-e
+app-xemacs/rmail
+app-xemacs/vm
+app-xemacs/mailcrypt
+app-xemacs/mail-lib
+app-xemacs/apel
+app-xemacs/xemacs-base
+app-xemacs/fsf-compat
+app-xemacs/sh-script
+app-xemacs/net-utils
+app-xemacs/ecrypto
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/tooltalk-1.15 b/app-xemacs/tooltalk-1.15
deleted file mode 100644
index 8b24482da0e6..000000000000
--- a/app-xemacs/tooltalk-1.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Support for building with Tooltalk
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/tooltalk-1.15-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=9a2862959081491cc79c339dcba74698
diff --git a/app-xemacs/tooltalk/Manifest b/app-xemacs/tooltalk/Manifest
new file mode 100644
index 000000000000..6741e21ee1f0
--- /dev/null
+++ b/app-xemacs/tooltalk/Manifest
@@ -0,0 +1,3 @@
+DIST tooltalk-1.15-pkg.tar.gz 9749 BLAKE2B f483f8972c0d8514b8cb1bae0795a82eb02858a632f2929cce114a6c0c98d0a92c176556bd6d87fef926936770b7afbbaa9541e090a42af6c0a18b567279b963 SHA512 c884d357a8ba534f6a640cb9b5b0bee5138758181f53a66d8064c7cee9a7277b4e2a4c7d3d831404b4727bef724694882c1334ca7e0a39b1f934c4af966fb2aa
+EBUILD tooltalk-1.15.ebuild 269 BLAKE2B 264ff6be8cf653405aeec8ef6b6a137e65424ac058afe8abad417634697fd85ef32031350fe2cba063dc95eddd14ebfe3834f784d38d423813042f31fd68a309 SHA512 a1595fef67b54b93e9090f9bd6d521608bf4525c1362775a6b8013b17cb4509232bd84909290f41b4eaafeadedce76d8d1b2c2823ab88344c3c4e6b947bb8313
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/tooltalk/metadata.xml b/app-xemacs/tooltalk/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/tooltalk/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/tooltalk/tooltalk-1.15.ebuild b/app-xemacs/tooltalk/tooltalk-1.15.ebuild
new file mode 100644
index 000000000000..24aff9c12b60
--- /dev/null
+++ b/app-xemacs/tooltalk/tooltalk-1.15.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Support for building with Tooltalk"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/tpu-1.14 b/app-xemacs/tpu-1.14
deleted file mode 100644
index e0a8b06ce2e1..000000000000
--- a/app-xemacs/tpu-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=DEC EDIT/TPU support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/tpu-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=2555511a1a67a6ff3da17c1f08bba1fb
diff --git a/app-xemacs/tpu/Manifest b/app-xemacs/tpu/Manifest
new file mode 100644
index 000000000000..83510e6c1daa
--- /dev/null
+++ b/app-xemacs/tpu/Manifest
@@ -0,0 +1,3 @@
+DIST tpu-1.14-pkg.tar.gz 59529 BLAKE2B 75c562a4e83af5f077851410f0974aa09cb3f7dfdfe550e0c5904f7790694bbaa8c48798366086927fd26df6a17c4ce46fcb89664613cfcc967c6b548b43a239 SHA512 07c448f17be698ba9967762de3f3c0b94793276e72e5ad1562491bd6ad0a2fa431ccae919526e105313adc658dc22ec095ecc81433854f28bfbc422967cda82f
+EBUILD tpu-1.14.ebuild 266 BLAKE2B 2d7c545e63efafa5ed2a9b019a69b8846ba240ea8069326cf14451cfc7afdd61683011e47e2b778318ec3a70e2f56a428a0fb7bf4b7d632530ee4efd530ff193 SHA512 ca3946f3771062da50e0d89920f42098f6883dab4e99e8af547854af6347014e7c031833a9c720b8813e2736944b793bd11351011fe4efa1ec0bdcc98a116632
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/tpu/metadata.xml b/app-xemacs/tpu/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/tpu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/tpu/tpu-1.14.ebuild b/app-xemacs/tpu/tpu-1.14.ebuild
new file mode 100644
index 000000000000..5ac7a8a49136
--- /dev/null
+++ b/app-xemacs/tpu/tpu-1.14.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="DEC EDIT/TPU support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND=""
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/tramp-1.52 b/app-xemacs/tramp-1.52
deleted file mode 100644
index 71fb826c8709..000000000000
--- a/app-xemacs/tramp-1.52
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Remote shell-based file editing
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/vc app-xemacs/efs app-xemacs/dired app-xemacs/mail-lib app-xemacs/gnus app-xemacs/ediff app-xemacs/sh-script app-xemacs/edebug app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/beta/experimental/packages/tramp-1.52-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=93f1d3ac1f3dc4d01f16ab6a0203f85d
diff --git a/app-xemacs/tramp/Manifest b/app-xemacs/tramp/Manifest
new file mode 100644
index 000000000000..74b742bbcd92
--- /dev/null
+++ b/app-xemacs/tramp/Manifest
@@ -0,0 +1,3 @@
+DIST tramp-1.52-pkg.tar.gz 396316 BLAKE2B daa38f4ccd399564d84f9cd5445f4483c49a591302ddc8a881376e4d3eac506b1123040fa7395255fd5f76bc93f6ed124771d557104b4261a74100a2bc6273c9 SHA512 ce61fe02bf0803a845bf34df7d9c7c0f72a28bcc84e2ebbcd8b80b1a28a5304bcffd5756a5a61d297b537e79a7d90e60821ba857a4c06911d4c098f2694897c6
+EBUILD tramp-1.52.ebuild 466 BLAKE2B 79990a5c3370e602431de59152ceb46305f0035b5ea37c20e6961b1025dbb0281cd005034a8249d6d0a500aa5032897fa9d70a047b19c534809680b89c5f21db SHA512 629a84673ac29f86097e56acbff7e808e042ffa52be59fd997a387d9c0b55bf9a836e0c5e11d1e64300ef37a4c7e07599305452dc5b60910c9f27ad716595350
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/tramp/metadata.xml b/app-xemacs/tramp/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/tramp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/tramp/tramp-1.52.ebuild b/app-xemacs/tramp/tramp-1.52.ebuild
new file mode 100644
index 000000000000..f085ea53c85b
--- /dev/null
+++ b/app-xemacs/tramp/tramp-1.52.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Remote shell-based file editing"
+XEMACS_PKG_CAT="standard"
+
+XEMACS_EXPERIMENTAL="true"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/vc
+app-xemacs/efs
+app-xemacs/dired
+app-xemacs/mail-lib
+app-xemacs/gnus
+app-xemacs/ediff
+app-xemacs/sh-script
+app-xemacs/edebug
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/vc-1.41 b/app-xemacs/vc-1.41
deleted file mode 100644
index 209c96f9b014..000000000000
--- a/app-xemacs/vc-1.41
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Version Control for Free systems
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/ediff app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/vc-1.41-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=2993cb90c633768ed063fe77da9ba5de
diff --git a/app-xemacs/vc-1.48 b/app-xemacs/vc-1.48
deleted file mode 100644
index bfe6c63ac289..000000000000
--- a/app-xemacs/vc-1.48
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Version Control for Free systems
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/ediff app-xemacs/sh-script app-xemacs/pcl-cvs app-xemacs/tramp app-xemacs/prog-modes app-xemacs/elib app-xemacs/edebug app-xemacs/gnus app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/vc-1.48-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c73a4d5ebc3fdf3c5a6e1076e93ff87c
diff --git a/app-xemacs/vc-cc-1.22 b/app-xemacs/vc-cc-1.22
deleted file mode 100644
index 5d4fd07f0e0b..000000000000
--- a/app-xemacs/vc-cc-1.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Version Control for ClearCase (UnFree) systems
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/dired app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/vc-cc-1.22-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=531f3c05726d9bf075c68b09b76cc7c8
diff --git a/app-xemacs/vc-cc/Manifest b/app-xemacs/vc-cc/Manifest
new file mode 100644
index 000000000000..1e605e37cdd5
--- /dev/null
+++ b/app-xemacs/vc-cc/Manifest
@@ -0,0 +1,3 @@
+DIST vc-cc-1.22-pkg.tar.gz 95028 BLAKE2B 6ba8a0475d7a65d3f52982674f0d1eeebd262c7c9bcd939a3f4278324b7457ad9169352a3974627f03a12d9baee85908e27ec77100c3303ae186f2de1fea4a9a SHA512 34aec1f857220ff35c6aa3b428605c7d42e1f10d2e6d265a815e8a1940b3cc52ef937c22c6fbabf736e3e6363023250daacb151622f3791972ecc74d7f7e876b
+EBUILD vc-cc-1.22.ebuild 332 BLAKE2B 989412c4fbecf8da4bf295887f4002ee618986ed6966c9f0f59c4afc01c2bdcdd28bbe54f08e83295856fa8e80ad8482a966c65e4851aad1c36f90d15c738627 SHA512 d6c6db6fb845e6644929f284a0205456aa7c39f4789cf7550e13d3b60c327770e772ddcd222d46f03f249b54cce0e6bd041f24c9f2499e06a82ca8d2fd610a9b
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/vc-cc/metadata.xml b/app-xemacs/vc-cc/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/vc-cc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/vc-cc/vc-cc-1.22.ebuild b/app-xemacs/vc-cc/vc-cc-1.22.ebuild
new file mode 100644
index 000000000000..3be0a62a2596
--- /dev/null
+++ b/app-xemacs/vc-cc/vc-cc-1.22.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Version Control for ClearCase (UnFree) systems"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/dired
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/vc/Manifest b/app-xemacs/vc/Manifest
new file mode 100644
index 000000000000..221fa35d8b01
--- /dev/null
+++ b/app-xemacs/vc/Manifest
@@ -0,0 +1,5 @@
+DIST vc-1.41-pkg.tar.gz 94597 BLAKE2B f709067926105d1b6047ba2e0116145fb34ba6fc1c94c5f9c4f3405304ba78348dfbdb75955f0a8971e886592318179b8e8cd17808d6b17621f05ca688857ea6 SHA512 fb4061a2740afed7978e42cd9ba9862d6bb067a0600a8635530c5aea1c5f4069b8825b9d1a0aeccbfd338cd4d1239b3611a823cd4646899690f99a1b6c12bde8
+DIST vc-1.48-pkg.tar.gz 231122 BLAKE2B 8dd697dc7fb1d973ab1fc8f0e6a25458221fa581d1fba129e55309b0bf3c263e2802d654ea741849b1f45454817496da94b78de00ecdc22695a7e8e23edd61e1 SHA512 d043c6cac917ed80388ccb619f99c902baf50f5014af40dfd086d98fa0650e491a2b6746ef5463832d77158a75a14d2c39067a6165e55b33566c29ef4902d669
+EBUILD vc-1.41.ebuild 355 BLAKE2B a00f65a69ec60d0b3d5116e0baa6828bb620bae59036c360e1141840e049a7ba1961ffe3eb26176dd13999864a3a183483dfb7404d087bcbb10db8ae04de1e69 SHA512 3a688175d972352fcb505b8f667bbfc1f5b2b1ff9c3032cf791a341ace81891e089dbd7272837a64dea7c78b2f39c9425136651cf3b1af2b09c8b9c178c55b3c
+EBUILD vc-1.48.ebuild 484 BLAKE2B d3c8ac311417c5820b5d30539dca4f0d3563e4eb6b0554d15bb207c9a587aee32e8af586396f540501d59d520714e338049147ca5ba560f237bd28ab38544d56 SHA512 bcf16552e9a9f91cb693005b45fd65e72cde6efac823b8ac6e0e3037b829a0154fb21ae33b040f39cce7f5d6361f3fc34859c2aa2ccee24b74ef8f1eba0b2285
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/vc/metadata.xml b/app-xemacs/vc/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/vc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/vc/vc-1.41.ebuild b/app-xemacs/vc/vc-1.41.ebuild
new file mode 100644
index 000000000000..8046841ef1cc
--- /dev/null
+++ b/app-xemacs/vc/vc-1.41.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Version Control for Free systems"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/dired
+app-xemacs/xemacs-base
+app-xemacs/mail-lib
+app-xemacs/ediff
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/vc/vc-1.48.ebuild b/app-xemacs/vc/vc-1.48.ebuild
new file mode 100644
index 000000000000..1c9327ab94d2
--- /dev/null
+++ b/app-xemacs/vc/vc-1.48.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Version Control for Free systems"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/dired
+app-xemacs/xemacs-base
+app-xemacs/mail-lib
+app-xemacs/ediff
+app-xemacs/sh-script
+app-xemacs/pcl-cvs
+app-xemacs/tramp
+app-xemacs/prog-modes
+app-xemacs/elib
+app-xemacs/edebug
+app-xemacs/gnus
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/vhdl-1.22 b/app-xemacs/vhdl-1.22
deleted file mode 100644
index b22ed6012f95..000000000000
--- a/app-xemacs/vhdl-1.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Support for VHDL
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/edit-utils app-xemacs/c-support app-xemacs/speedbar app-xemacs/ps-print app-xemacs/os-utils app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/vhdl-1.22-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=bd985def8502a21391793c30463e70e5
diff --git a/app-xemacs/vhdl/Manifest b/app-xemacs/vhdl/Manifest
new file mode 100644
index 000000000000..58857694807d
--- /dev/null
+++ b/app-xemacs/vhdl/Manifest
@@ -0,0 +1,3 @@
+DIST vhdl-1.22-pkg.tar.gz 302693 BLAKE2B c0ae6c5b079cf8e394a6e09eccaf327eb8729521f7982797e9ffe11cb150cd309752f79635a2f88845ce0888c562aa5fe1e23f491966c205a7c98ebfd0a2a3ec SHA512 3b0d6995f69d7dee47d4d5ab108be3c58f7911b37d31b6a46242eb678623275e32c3ee55393c5671237e11f3b84a56d8f1fa3b8f6492032aeb9f590bb1ad0848
+EBUILD vhdl-1.22.ebuild 388 BLAKE2B 0b09aa3c65ddf8fac6e8080cb8054f22c3ed10e2f18096b499206c799972a78eb531068942b414ca1d5ab43d09e331e607d197fe8595d2647e26276d113e2641 SHA512 82f791cf9b49ee983971758f35226312169e1aa33adf1d05ed0b5c7eb87169561f87ed21075075263e6256ef9d317493785117c26a0e82456259fce8f5663def
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/vhdl/metadata.xml b/app-xemacs/vhdl/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/vhdl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/vhdl/vhdl-1.22.ebuild b/app-xemacs/vhdl/vhdl-1.22.ebuild
new file mode 100644
index 000000000000..8b8c37f70d2b
--- /dev/null
+++ b/app-xemacs/vhdl/vhdl-1.22.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Support for VHDL"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/edit-utils
+app-xemacs/c-support
+app-xemacs/speedbar
+app-xemacs/ps-print
+app-xemacs/os-utils
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/view-process-1.13 b/app-xemacs/view-process-1.13
deleted file mode 100644
index d88fcd86162a..000000000000
--- a/app-xemacs/view-process-1.13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A Unix process browsing tool
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/view-process-1.13-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=5cedc831b1dab7fd9725ce4857ce35ef
diff --git a/app-xemacs/view-process/Manifest b/app-xemacs/view-process/Manifest
new file mode 100644
index 000000000000..47e777aec93d
--- /dev/null
+++ b/app-xemacs/view-process/Manifest
@@ -0,0 +1,3 @@
+DIST view-process-1.13-pkg.tar.gz 60814 BLAKE2B 17a6ca037baf9660aa9c01eea1b52fbf86464d5b9b17bbef3d5e7a5879e7797c2ccaac28390992a3085f43d707272407daeef3e97870be534f3b8c6b1f41a7ea SHA512 01d965b9a1646ddb340c028177487010ac5411b217ac641587d62eed8c186cb4562c7d3f70f5165891ab761df20411f819abddf55c7480cfb7e73995f0d8dfcd
+EBUILD view-process-1.13.ebuild 297 BLAKE2B 63e461e14ee5868a78eb3475168425b53e19699e7a316d35687acd7c24e14e2c6099f0501f41d375799388437af40b2bc4257513924de3753d8528d7586ceec9 SHA512 b21e00953f5aff12e9f6a59258a0e64ed8350bd0fdb3ba835b7e8a599ae4a1fb8c44dba12838c9a07ea9ca0ff277b7f7ab15ebcbf30880d84816f2a15d6f8f5d
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/view-process/metadata.xml b/app-xemacs/view-process/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/view-process/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/view-process/view-process-1.13.ebuild b/app-xemacs/view-process/view-process-1.13.ebuild
new file mode 100644
index 000000000000..1053e35ea79e
--- /dev/null
+++ b/app-xemacs/view-process/view-process-1.13.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="A Unix process browsing tool"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/viper-1.55 b/app-xemacs/viper-1.55
deleted file mode 100644
index 12be5de8fe5d..000000000000
--- a/app-xemacs/viper-1.55
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=VI emulation support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/viper-1.55-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=958331f4853d765c416dfdd5d8643917
diff --git a/app-xemacs/viper-1.67 b/app-xemacs/viper-1.67
deleted file mode 100644
index 0bf2d99d0750..000000000000
--- a/app-xemacs/viper-1.67
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=VI emulation support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/viper-1.67-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=958331f4853d765c416dfdd5d8643917
diff --git a/app-xemacs/viper/Manifest b/app-xemacs/viper/Manifest
new file mode 100644
index 000000000000..845370c9cb39
--- /dev/null
+++ b/app-xemacs/viper/Manifest
@@ -0,0 +1,5 @@
+DIST viper-1.55-pkg.tar.gz 337549 BLAKE2B bd8ec3c636f3ae2900640140fcaeb32dc68e83a26ff30f4318ecbe83078f4c1d99a55f74a103cff76354dc13d29456306a3625dc5a81d79e5617ead1b5f29d90 SHA512 e8b3aac23db14b712507b36733c7cb3caa43f0261b9fdc748225e90239877267f9d4155d05bebec2d8297d30fb0553b4593ee91987ae35e9f3cfc73ccd390f6d
+DIST viper-1.67-pkg.tar.gz 338588 BLAKE2B 7898bd22d5f2e1afd02d5f6b8e13338325649b642f3a9639a23c325dd89a5ce81435f5bafb5bfeef358ddc7790e6191536a2551d876444002a30875b3bd96caa SHA512 7b768f82dcdf8246729e9f8ce0976cebf8148d41c815f3880028f795ac35628368d2a3fc5e623db588fa2cd96654f34884756ea962c9f1e03169e421a55517f8
+EBUILD viper-1.55.ebuild 289 BLAKE2B 24fece3f90016260ff1c5745c550d28819c835218162cbab5b358b313789c70a3f68d5c8b62beac87a1ae10d51d166dc4eea7340b985f4ea824b416c314fcba2 SHA512 bbe5b8ce69390efe80cbf60223e15515f5afab86e634100b75d140ed433db4261515037ab99cf1730dc057f61d121837b01f4b1c5687cd7848ca41970d6bec48
+EBUILD viper-1.67.ebuild 289 BLAKE2B 24fece3f90016260ff1c5745c550d28819c835218162cbab5b358b313789c70a3f68d5c8b62beac87a1ae10d51d166dc4eea7340b985f4ea824b416c314fcba2 SHA512 bbe5b8ce69390efe80cbf60223e15515f5afab86e634100b75d140ed433db4261515037ab99cf1730dc057f61d121837b01f4b1c5687cd7848ca41970d6bec48
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/viper/metadata.xml b/app-xemacs/viper/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/viper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/viper/viper-1.55.ebuild b/app-xemacs/viper/viper-1.55.ebuild
new file mode 100644
index 000000000000..95ab1c02cfb3
--- /dev/null
+++ b/app-xemacs/viper/viper-1.55.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="VI emulation support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/viper/viper-1.67.ebuild b/app-xemacs/viper/viper-1.67.ebuild
new file mode 100644
index 000000000000..95ab1c02cfb3
--- /dev/null
+++ b/app-xemacs/viper/viper-1.67.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="VI emulation support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/vm-7.22 b/app-xemacs/vm-7.22
deleted file mode 100644
index f2b009710b41..000000000000
--- a/app-xemacs/vm-7.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=An Emacs mailer
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/vm-7.22-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=d948ca45be381af8f71d557da33c8543
diff --git a/app-xemacs/vm-8.08 b/app-xemacs/vm-8.08
deleted file mode 100644
index e21073dde039..000000000000
--- a/app-xemacs/vm-8.08
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=An Emacs mailer
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/mail-lib app-xemacs/gnus app-xemacs/pgg app-xemacs/ecrypto app-xemacs/xemacs-eterm app-xemacs/sh-script app-xemacs/net-utils app-xemacs/ps-print app-xemacs/os-utils app-xemacs/bbdb app-xemacs/fsf-compat app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/vm-8.08-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=26db5371802faba0afe909f161df5a72
diff --git a/app-xemacs/vm/Manifest b/app-xemacs/vm/Manifest
new file mode 100644
index 000000000000..90f1e61f8af2
--- /dev/null
+++ b/app-xemacs/vm/Manifest
@@ -0,0 +1,5 @@
+DIST vm-7.22-pkg.tar.gz 822094 BLAKE2B a080c273964839d72fe81ca54839dd5c135137b4b10ffe854a04b23d7c3ef3e6b6633403f6c57f43c589c975bb86f2a173c531fdcb86506975874a82b6390cb1 SHA512 5b84f336c5de35ebc5551cdab152fdf64e3da1c3e468487011233c80e8fcb160d3b9f1629659b596132b57d64958e80fe40a7f04ea27caf14a8223fe0b63a228
+DIST vm-8.08-pkg.tar.gz 825312 BLAKE2B ab6d84dfc6b830c51007dacab55b1932626c1cb2dba9e6a84422e8eaa8327c9f4a2ca9e9ccb499c7d95449f0ab5195a294a2b67111a64aa9b41a12c0a7d0b72f SHA512 443f2634eca98a31f504828723c6aed18e8958211179f4e96206bc1b16973fe924cbf60f3fb0c45a46a3e5618890d600af888cb85aaee22fe91d496e4d61624a
+EBUILD vm-7.22.ebuild 304 BLAKE2B 3341d6a1b6ba2bd3cdd9da2fe1689aab9746e165fbce88f615ff590bb0941121ef92cdc3a88d906eea8b6290155e47df9dcfe9a230e6b578cc0bcd612b620eb8 SHA512 e2e03151189024a0b74c40ddca7e941c11a063d58db01e18c06ecb0aec735012988bb594d507ec527aaf0aa741edbd6e1091a6a2f971f4ee0703a2f3107535b9
+EBUILD vm-8.08.ebuild 498 BLAKE2B 79b36ebb60a644976ff1faf16d9e985da3c7fb0730f9aa99eef5062a7cdc2a6a864382e05782c91a6f44b28599a2d0a6ba35505f3a4cc31f525c8952c5db2cf0 SHA512 b241ef4f2765f5a411c58b1937f81fd8af8e55f0106cd6dfe406cb15ff56f77fb17b110e29dc9d221cd9b6c673f2fbc5ba7cee8b8294945f0c7af9aeea49043d
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/vm/metadata.xml b/app-xemacs/vm/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/vm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/vm/vm-7.22.ebuild b/app-xemacs/vm/vm-7.22.ebuild
new file mode 100644
index 000000000000..c2df562566c1
--- /dev/null
+++ b/app-xemacs/vm/vm-7.22.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="An Emacs mailer"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/vm/vm-8.08.ebuild b/app-xemacs/vm/vm-8.08.ebuild
new file mode 100644
index 000000000000..f79efbf43588
--- /dev/null
+++ b/app-xemacs/vm/vm-8.08.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="An Emacs mailer"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/mail-lib
+app-xemacs/gnus
+app-xemacs/pgg
+app-xemacs/ecrypto
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+app-xemacs/net-utils
+app-xemacs/ps-print
+app-xemacs/os-utils
+app-xemacs/bbdb
+app-xemacs/fsf-compat
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/w3-1.33 b/app-xemacs/w3-1.33
deleted file mode 100644
index 606b0de3e13e..000000000000
--- a/app-xemacs/w3-1.33
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A Web browser
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/w3-1.33-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=95fef236b7e0ce7fd023b5b30bdb537b
diff --git a/app-xemacs/w3-1.35 b/app-xemacs/w3-1.35
deleted file mode 100644
index d81f94228fe3..000000000000
--- a/app-xemacs/w3-1.35
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A Web browser
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/w3-1.35-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=95fef236b7e0ce7fd023b5b30bdb537b
diff --git a/app-xemacs/w3/Manifest b/app-xemacs/w3/Manifest
new file mode 100644
index 000000000000..db3996019d16
--- /dev/null
+++ b/app-xemacs/w3/Manifest
@@ -0,0 +1,5 @@
+DIST w3-1.33-pkg.tar.gz 695864 BLAKE2B 504f29d232a537318896ae3f1376f45ffb3638682a95fa56029bac8a79cb81bcf99805d2cc38200f5d0ee676d422bc56bcda0b44d743176ea4e34ba5505c8657 SHA512 f5093d9866dd229d4541e981be94a353ff27be21f4d3118701b31a8bed0e81bc04c2abdae5082f1cc26a2c414614e7b522515f3716ed1443c9ce996a013f9e54
+DIST w3-1.35-pkg.tar.gz 696392 BLAKE2B a92f46c5cc3ec4d7bb9c250a88ba417c10fe0a398b70a408c327f878e02dc78f510de0f2e231ae5431db5a2554248510ff76a3792e037d90a29b0810b97d48fb SHA512 773de63d8e1de48ab8329eba1b0f38f1892a5e29c6cbe0b20ff6b9147527c393a79e8a3ee6e4027e73d385abe68c12352f97114a83014a99a186e3672d458e92
+EBUILD w3-1.33.ebuild 321 BLAKE2B 04e846928c535de69f6c95e4dd8ce9cc8fb51d7d4abfe97b623fd899c8fe034b77d063f7c5c2a3b448c4699d9f34d341b2cc60c000e2a8be3d7a5a9247879c42 SHA512 7b72dcef1ec9b7b80af26e425a68fb1bf3acaedab21b920245372a42eabd2e876008b5c43eb05fe1aa62b7ad32eab1eab27aa4ed1c976979733d45ec81996b37
+EBUILD w3-1.35.ebuild 321 BLAKE2B 04e846928c535de69f6c95e4dd8ce9cc8fb51d7d4abfe97b623fd899c8fe034b77d063f7c5c2a3b448c4699d9f34d341b2cc60c000e2a8be3d7a5a9247879c42 SHA512 7b72dcef1ec9b7b80af26e425a68fb1bf3acaedab21b920245372a42eabd2e876008b5c43eb05fe1aa62b7ad32eab1eab27aa4ed1c976979733d45ec81996b37
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/w3/metadata.xml b/app-xemacs/w3/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/w3/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/w3/w3-1.33.ebuild b/app-xemacs/w3/w3-1.33.ebuild
new file mode 100644
index 000000000000..9ff14df5acc4
--- /dev/null
+++ b/app-xemacs/w3/w3-1.33.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="A Web browser"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/ecrypto
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/w3/w3-1.35.ebuild b/app-xemacs/w3/w3-1.35.ebuild
new file mode 100644
index 000000000000..9ff14df5acc4
--- /dev/null
+++ b/app-xemacs/w3/w3-1.35.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="A Web browser"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/ecrypto
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/x-symbol-1.10 b/app-xemacs/x-symbol-1.10
deleted file mode 100644
index b85d48305581..000000000000
--- a/app-xemacs/x-symbol-1.10
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Semi WYSIWYG for LaTeX, HTML, etc, using additional fonts
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/auctex app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/x-symbol-1.10-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=5640cfc081a0b05b6cad9ac6c6e42774
diff --git a/app-xemacs/x-symbol-1.11 b/app-xemacs/x-symbol-1.11
deleted file mode 100644
index 3d691a0f4379..000000000000
--- a/app-xemacs/x-symbol-1.11
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Semi WYSIWYG for LaTeX, HTML, etc, using additional fonts
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/auctex app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/x-symbol-1.11-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=5640cfc081a0b05b6cad9ac6c6e42774
diff --git a/app-xemacs/x-symbol/Manifest b/app-xemacs/x-symbol/Manifest
new file mode 100644
index 000000000000..3863dc88d186
--- /dev/null
+++ b/app-xemacs/x-symbol/Manifest
@@ -0,0 +1,5 @@
+DIST x-symbol-1.10-pkg.tar.gz 680100 BLAKE2B 4b36403a8cc9fc025742e512d68a3efe2afc377f32cd51f3891a878d105634da0a9a53e0064c118f81f27a6938296f25eeb8645e72e5ccfd310fa662d7e395b5 SHA512 f2ce3117aab28cbc9f5d36caad8347da1c503a12db526e901f81d6698195a73b8f7444ff7a0d9609d11e4f5e52a1d105cc4d86e55fbf9f50ffb6b89675006845
+DIST x-symbol-1.11-pkg.tar.gz 684579 BLAKE2B 46915c56133ba3232821ab75ec497b984574aecc94acc9eaaf45a3beb8a9f7507ab7fc715dd21348fe6390b69191814f624677a8171b3f425ea3392f5059ab5e SHA512 86c1d80e3a6f11c9d5a54e51991166fd5f37443f77ad6f0292765af3aaf1c072a8b827fd6379c016f428040ae7616c572732f1d6806d14b9a7a0ce52dac4169a
+EBUILD x-symbol-1.10.ebuild 364 BLAKE2B 6b6adf09a8d71ee9bdf6a80b702cfee67af4ce3b47201a3bbf182967fbcc668ac0043cd7a0b929cdff46b3014bb9bc6a0da03912449e54059d0b3d92b06b61b3 SHA512 bb34ecc190e6281915e82e2a5f0922646541a09dae2c6ba25695e3ee6b2d37d8d73fbec48ef62c6dea38963927756c722e62d63b463e8a84bd1f0b59761b8ebf
+EBUILD x-symbol-1.11.ebuild 364 BLAKE2B 6b6adf09a8d71ee9bdf6a80b702cfee67af4ce3b47201a3bbf182967fbcc668ac0043cd7a0b929cdff46b3014bb9bc6a0da03912449e54059d0b3d92b06b61b3 SHA512 bb34ecc190e6281915e82e2a5f0922646541a09dae2c6ba25695e3ee6b2d37d8d73fbec48ef62c6dea38963927756c722e62d63b463e8a84bd1f0b59761b8ebf
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/x-symbol/metadata.xml b/app-xemacs/x-symbol/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/x-symbol/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/x-symbol/x-symbol-1.10.ebuild b/app-xemacs/x-symbol/x-symbol-1.10.ebuild
new file mode 100644
index 000000000000..d70c9183c25d
--- /dev/null
+++ b/app-xemacs/x-symbol/x-symbol-1.10.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Semi WYSIWYG for LaTeX, HTML, etc, using additional fonts"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/auctex
+app-xemacs/mail-lib
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/x-symbol/x-symbol-1.11.ebuild b/app-xemacs/x-symbol/x-symbol-1.11.ebuild
new file mode 100644
index 000000000000..d70c9183c25d
--- /dev/null
+++ b/app-xemacs/x-symbol/x-symbol-1.11.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Semi WYSIWYG for LaTeX, HTML, etc, using additional fonts"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/auctex
+app-xemacs/mail-lib
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xemacs-base-2.08 b/app-xemacs/xemacs-base-2.08
deleted file mode 100644
index 0fce008da8c1..000000000000
--- a/app-xemacs/xemacs-base-2.08
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Fundamental XEmacs support, you almost certainly need this
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xemacs-base-2.08-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=b02667cb4b7749e93b748dd02fa39042
diff --git a/app-xemacs/xemacs-base-2.10-r1 b/app-xemacs/xemacs-base-2.10-r1
deleted file mode 100644
index 07b62c0442c3..000000000000
--- a/app-xemacs/xemacs-base-2.10-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Fundamental XEmacs support, you almost certainly need this
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ~hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xemacs-base-2.10-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=9e72ddc9abe30d6a146d5190e14e13bd
diff --git a/app-xemacs/xemacs-base-2.27 b/app-xemacs/xemacs-base-2.27
deleted file mode 100644
index 2d8c48bf9f03..000000000000
--- a/app-xemacs/xemacs-base-2.27
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Fundamental XEmacs support, you almost certainly need this
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xemacs-base-2.27-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=1162909d6c21e7fbe25a9e240803fb3f
diff --git a/app-xemacs/xemacs-base/Manifest b/app-xemacs/xemacs-base/Manifest
new file mode 100644
index 000000000000..2cc7ff379e63
--- /dev/null
+++ b/app-xemacs/xemacs-base/Manifest
@@ -0,0 +1,7 @@
+DIST xemacs-base-2.08-pkg.tar.gz 537716 BLAKE2B 4662de783de62da43de6c463350f1399f5d3a1ce21a08ff5784e3fef18310c7de373caa31f683dd77d677c57efea3a9b3a411ecc448039fb2bb2901a33c48776 SHA512 f72585f9c7da25361a40d632993f449f4d55f127189f9c57eac8e1f5c3bee7aebb98663c9109fcacebe813e578dc4569f2c795aaa799e95da8839ec12bc67bdf
+DIST xemacs-base-2.10-pkg.tar.gz 538066 BLAKE2B 732ddf3bc9946997e87d7b5ccae31aacea40cbdb3048eb9309069f569b4461663ebf19c5e8757cbceb462b3c51af1cadc9b46b98ac0bd178a63cb6dd65a84705 SHA512 c073b9799d5b02ace8aedf397ecd9cd25344cfe70479df52c8f1724df63f8d6400e04ed4f89714637afd0b854f3a36af6193ed68e71703f4a98e17ad59ef8fde
+DIST xemacs-base-2.27-pkg.tar.gz 535989 BLAKE2B dae22f9e8121074fc992c2b73703cc2c66c42b4d90a55bebd9facf9aaa697ce195937fef0bd4740ff1ff9aa340d43b43db70a4edeb2aeabb996e37fee22d50e8 SHA512 5ed06fdf13cacab6bcf7429cd2d600dce54d3038fe9b9184aa41e847882ca9b51e7b9841fc383aae7df21eaaec36971471d598d0c0d165b0f07d1c6b0ac71508
+EBUILD xemacs-base-2.08.ebuild 298 BLAKE2B 2438d556418fb82a1c65e5e15b9ab7317d15252981cf6bc9030fbb0f20f801eba089387a91f6284cef1bac3b03d1a308f02ee7be4c83da093c949247e916aa72 SHA512 b8ee0b44e5f31ba74544144c91969193b4ef1b8c754575a98e1156b696ea5a442ed35e2da6e06a470ad3b1c8401a0c6b9ea01b84931cbad050ee2c1d6435dff6
+EBUILD xemacs-base-2.10-r1.ebuild 299 BLAKE2B efa783ea14cd8cd8866f142192109bc8885e2a0f465b4cb9955b5e90578aa77e43fcde7d8dcf5fc012d5c9f7e42820649f5a320853c68390248a80efa8f48db7 SHA512 e891ad50ea2d62de9ccafaf4df35fd96a6f87720549ff41ac7302a621d54a91dbee1f25748ca95c9db7e3d02685ff6bd4a6f36fdbd35cd0f92f64427e1909354
+EBUILD xemacs-base-2.27.ebuild 317 BLAKE2B cde62bbe910655f291d7420f1fa8794bc4d1570c94d26c39dbfc880a2dc3e3312c66748df7c0e454d226439238975053e067d86d770c7d0aeeb80e073cd3a363 SHA512 6dcee61615c40eed6fe952e477709739f8016a42c9002e7cc5e6f5d673369909881f54b20d67b349fc16f3fc63c9e5d3da60c93ea68a1ccc86facf9a236ed799
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xemacs-base/metadata.xml b/app-xemacs/xemacs-base/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/xemacs-base/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/xemacs-base/xemacs-base-2.08.ebuild b/app-xemacs/xemacs-base/xemacs-base-2.08.ebuild
new file mode 100644
index 000000000000..01aabdec66f9
--- /dev/null
+++ b/app-xemacs/xemacs-base/xemacs-base-2.08.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Fundamental XEmacs support, you almost certainly need this"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xemacs-base/xemacs-base-2.10-r1.ebuild b/app-xemacs/xemacs-base/xemacs-base-2.10-r1.ebuild
new file mode 100644
index 000000000000..e935c2806aad
--- /dev/null
+++ b/app-xemacs/xemacs-base/xemacs-base-2.10-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Fundamental XEmacs support, you almost certainly need this"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xemacs-base/xemacs-base-2.27.ebuild b/app-xemacs/xemacs-base/xemacs-base-2.27.ebuild
new file mode 100644
index 000000000000..be6699281267
--- /dev/null
+++ b/app-xemacs/xemacs-base/xemacs-base-2.27.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Fundamental XEmacs support, you almost certainly need this"
+XEMACS_PKG_CAT="standard"
+
+KEYWORDS="alpha amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-fbsd"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xemacs-devel-1.75 b/app-xemacs/xemacs-devel-1.75
deleted file mode 100644
index a504f7cece75..000000000000
--- a/app-xemacs/xemacs-devel-1.75
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs Lisp developer support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-ispell app-xemacs/mail-lib app-xemacs/gnus app-xemacs/rmail app-xemacs/tm app-xemacs/apel app-xemacs/sh-script app-xemacs/net-utils app-xemacs/xemacs-eterm app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xemacs-devel-1.75-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=cc73b0008ed480a5d01256179785e765
diff --git a/app-xemacs/xemacs-devel-1.80 b/app-xemacs/xemacs-devel-1.80
deleted file mode 100644
index eafbde03dab7..000000000000
--- a/app-xemacs/xemacs-devel-1.80
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs Lisp developer support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xemacs-ispell app-xemacs/mail-lib app-xemacs/gnus app-xemacs/rmail app-xemacs/tm app-xemacs/apel app-xemacs/sh-script app-xemacs/net-utils app-xemacs/xemacs-eterm app-xemacs/ecrypto app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xemacs-devel-1.80-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=cc73b0008ed480a5d01256179785e765
diff --git a/app-xemacs/xemacs-devel/Manifest b/app-xemacs/xemacs-devel/Manifest
new file mode 100644
index 000000000000..6baf7e6fe1e4
--- /dev/null
+++ b/app-xemacs/xemacs-devel/Manifest
@@ -0,0 +1,5 @@
+DIST xemacs-devel-1.75-pkg.tar.gz 246585 BLAKE2B 01c8e7f3e71ae14ae40436879a84543040c6c3e84487a3df7e6dc70401bf82be5dedcab08cdf1d6d437cf1283099b37665a2f4c98c67f4811e7d4f1f1f0ba33d SHA512 f05629c0e116cb4d10e3ffcaa941be285b56250a95a9316050115fe9cb12e3581da87be59862b79fa3c3cd3fb29b5029d0514a0fd9e9d317bba1b1b3c500cf9e
+DIST xemacs-devel-1.80-pkg.tar.gz 257410 BLAKE2B c678554fac620d56b687611e56ce7ca6f048c3e70895209701e230079beb474d189d8d47b731d47c369866dcb3846f6d9781bd0c6b558ad7765eaa0e7b54c7ac SHA512 99d42ccd0b3db45a4b4fae931c59685c4e8cedd4daba744d8bf6232f6c1d388a2fb010ed58ce5a28a5e455fae73c19e9d3ad1bd12f2e95634c30605ae02099b2
+EBUILD xemacs-devel-1.75.ebuild 490 BLAKE2B a765e652abe813ccdedcda2774c88e9049b467e9e27b43a3585507c57e3f2e142d93dd57500b9a8469cc7fa7132e01173ab977e2da7d26352030be7deb793549 SHA512 f4e81cc060544a73e664e2f4e216b923e91cf7470f2a9ebb5a702f86bb49b3911347468b3f089f0a319346e6518dbe75d5ffb19a9b59ae1f94da69719d951645
+EBUILD xemacs-devel-1.80.ebuild 490 BLAKE2B a765e652abe813ccdedcda2774c88e9049b467e9e27b43a3585507c57e3f2e142d93dd57500b9a8469cc7fa7132e01173ab977e2da7d26352030be7deb793549 SHA512 f4e81cc060544a73e664e2f4e216b923e91cf7470f2a9ebb5a702f86bb49b3911347468b3f089f0a319346e6518dbe75d5ffb19a9b59ae1f94da69719d951645
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xemacs-devel/metadata.xml b/app-xemacs/xemacs-devel/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/xemacs-devel/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/xemacs-devel/xemacs-devel-1.75.ebuild b/app-xemacs/xemacs-devel/xemacs-devel-1.75.ebuild
new file mode 100644
index 000000000000..0d4758746815
--- /dev/null
+++ b/app-xemacs/xemacs-devel/xemacs-devel-1.75.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Emacs Lisp developer support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-ispell
+app-xemacs/mail-lib
+app-xemacs/gnus
+app-xemacs/rmail
+app-xemacs/tm
+app-xemacs/apel
+app-xemacs/sh-script
+app-xemacs/net-utils
+app-xemacs/xemacs-eterm
+app-xemacs/ecrypto
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xemacs-devel/xemacs-devel-1.80.ebuild b/app-xemacs/xemacs-devel/xemacs-devel-1.80.ebuild
new file mode 100644
index 000000000000..0d4758746815
--- /dev/null
+++ b/app-xemacs/xemacs-devel/xemacs-devel-1.80.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Emacs Lisp developer support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xemacs-ispell
+app-xemacs/mail-lib
+app-xemacs/gnus
+app-xemacs/rmail
+app-xemacs/tm
+app-xemacs/apel
+app-xemacs/sh-script
+app-xemacs/net-utils
+app-xemacs/xemacs-eterm
+app-xemacs/ecrypto
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xemacs-eterm-1.17 b/app-xemacs/xemacs-eterm-1.17
deleted file mode 100644
index c5c3058b00c2..000000000000
--- a/app-xemacs/xemacs-eterm-1.17
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Terminal emulation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/packages/eterm-1.17-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=cdd585fb794828e8bbd2f1b1bd746528
diff --git a/app-xemacs/xemacs-eterm-1.18-r1 b/app-xemacs/xemacs-eterm-1.18-r1
deleted file mode 100644
index b7e6d6964cde..000000000000
--- a/app-xemacs/xemacs-eterm-1.18-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Terminal emulation
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/packages/eterm-1.18-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=e591d18d79d195aeab4287bcbae20dc3
diff --git a/app-xemacs/xemacs-eterm/Manifest b/app-xemacs/xemacs-eterm/Manifest
new file mode 100644
index 000000000000..1a8c5abd1773
--- /dev/null
+++ b/app-xemacs/xemacs-eterm/Manifest
@@ -0,0 +1,5 @@
+DIST eterm-1.17-pkg.tar.gz 109229 BLAKE2B 45fdfe9dd109b960d1a86f8099f53f9c12924f9cae6eac53f8fdf10accf59b07bea5b2ce3c013d93b7dc343a7adfa070e28d3207a7a1ccedc0844f1ce529d798 SHA512 0ba75254551fc3e10647088a0050dd076c0fb92e1d9549ee02fbc855e19ec5ea41ca24d0f61e080adac17f1427289607d6320950dee486f92630bc2f4b3a3e2f
+DIST eterm-1.18-pkg.tar.gz 116169 BLAKE2B 2fdfd0575c9df55eee88ac14009518106af175aa94ba0c4243c5930c35827134d7186c1cbf7031615af3141f53cdad591b105488110584ac6b9b464fea2307a6 SHA512 110cc05d4f29f38c881eb5205c94ad841e16b67e6a4386c6d8f00945d4f1b20aa859c1295f987cee317a7b974121c59f2a5ebafac0057a261f9c7bf09eb7846a
+EBUILD xemacs-eterm-1.17.ebuild 376 BLAKE2B 9e23269f6bff9b1ffbfe09e97a0c7d924159d7ba6a612c6cfb07c46c284ca0fca0db6ad321019698e7cd2d507d1dde80f1f6c49af59cc318f0e62bff8ecaace3 SHA512 05a34244ebd4ab43661af61c2d5fea28aba5c6a7d0c04e1938fcd52b1917f08de31a70ab009ad30eb17194b686c2370a2047a400a859e10f2af4692cd115e9c2
+EBUILD xemacs-eterm-1.18-r1.ebuild 377 BLAKE2B e1c740afb56908be358ef05bf0a75d9e81721e2eebff99276c68e950b17e366bb3500415f9cda18333c80960981776510283e73d040c66f3d82dda517b437251 SHA512 2d7bd3d9e591c8e3c2a5042e4d0edc840ab097b167177accd72470440b771927c5f78d648131d30c17cef84defaf32fc83ab91d9ac6245e05738bc5233e738e4
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xemacs-eterm/metadata.xml b/app-xemacs/xemacs-eterm/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/xemacs-eterm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/xemacs-eterm/xemacs-eterm-1.17.ebuild b/app-xemacs/xemacs-eterm/xemacs-eterm-1.17.ebuild
new file mode 100644
index 000000000000..c34b5aaedcf2
--- /dev/null
+++ b/app-xemacs/xemacs-eterm/xemacs-eterm-1.17.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Terminal emulation"
+XEMACS_PKG_CAT="standard"
+
+MY_PN=${PN/xemacs-/}
+SRC_URI="http://ftp.xemacs.org/packages/${MY_PN}-${PV}-pkg.tar.gz"
+
+RDEPEND="app-xemacs/xemacs-base"
+
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xemacs-eterm/xemacs-eterm-1.18-r1.ebuild b/app-xemacs/xemacs-eterm/xemacs-eterm-1.18-r1.ebuild
new file mode 100644
index 000000000000..d3242c3e5244
--- /dev/null
+++ b/app-xemacs/xemacs-eterm/xemacs-eterm-1.18-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN=${PN/xemacs-/}
+XEMACS_PKG_CAT="standard"
+
+inherit xemacs-packages
+
+SLOT="0"
+DESCRIPTION="Terminal emulation"
+
+SRC_URI="http://ftp.xemacs.org/packages/${MY_PN}-${PV}-pkg.tar.gz"
+
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+RDEPEND="app-xemacs/xemacs-base"
diff --git a/app-xemacs/xemacs-ispell-1.32 b/app-xemacs/xemacs-ispell-1.32
deleted file mode 100644
index 34b418d1a04b..000000000000
--- a/app-xemacs/xemacs-ispell-1.32
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Spell-checking with GNU ispell
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/packages/ispell-1.32-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=c4ebc7abdd15f2a4f2e963be0b67a21d
diff --git a/app-xemacs/xemacs-ispell/Manifest b/app-xemacs/xemacs-ispell/Manifest
new file mode 100644
index 000000000000..96fe079bd1fd
--- /dev/null
+++ b/app-xemacs/xemacs-ispell/Manifest
@@ -0,0 +1,3 @@
+DIST ispell-1.32-pkg.tar.gz 83587 BLAKE2B 80c65a5bb22711c6690ddef1213d60b5f6cca8d5fe342267e931294a10a976c9f3a50e6ba2d539720e460a25779363c954aac37b4c413741784251849fce0785 SHA512 02108c33e5611ecd4ce6c574fcb12a93d3c8753079925c624ae3b155a6b13efaef581c468e311e7aa1f85e0a032cebf2a466ce8e5a9647be0b748251c3dfc070
+EBUILD xemacs-ispell-1.32.ebuild 371 BLAKE2B 8952fd46aed549fb8a0f852a76fcdadf0feeb9994dc4b16e710e9b1b6356df503c7b38ddcd905602810dc5846bf398b4d804ed58dbb59951d6747269da676021 SHA512 bcdad13ea3de590438808801a454c7c948e2fe489e50431f9510682dfbae3638879951a5500ee5a58c6fbe6e84437a7c99149691f41f2d87bf82c68422ffc6d0
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xemacs-ispell/metadata.xml b/app-xemacs/xemacs-ispell/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/xemacs-ispell/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/xemacs-ispell/xemacs-ispell-1.32.ebuild b/app-xemacs/xemacs-ispell/xemacs-ispell-1.32.ebuild
new file mode 100644
index 000000000000..8c3a5ddecadd
--- /dev/null
+++ b/app-xemacs/xemacs-ispell/xemacs-ispell-1.32.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Spell-checking with GNU ispell"
+XEMACS_PKG_CAT="standard"
+
+MY_PN=${PN/xemacs-/}
+
+SRC_URI="http://ftp.xemacs.org/packages/${MY_PN}-${PV}-pkg.tar.gz"
+
+RDEPEND=""
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xemacs-packages-all-2007.04.27-r1 b/app-xemacs/xemacs-packages-all-2007.04.27-r1
deleted file mode 100644
index 696c6836ed8d..000000000000
--- a/app-xemacs/xemacs-packages-all-2007.04.27-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for XEmacs elisp packages, similar to the sumo archives
-EAPI=6
-HOMEPAGE=http://www.xemacs.org/
-IUSE=mule
-KEYWORDS=alpha amd64 ppc sparc x86
-LICENSE=metapackage
-RDEPEND=>=app-xemacs/ada-1.14 >=app-xemacs/apel-1.32 >=app-xemacs/auctex-1.47 >=app-xemacs/bbdb-1.32 >=app-xemacs/build-1.14 >=app-xemacs/c-support-1.22 >=app-xemacs/calc-1.26 >=app-xemacs/calendar-1.32 >=app-xemacs/cc-mode-1.45 >=app-xemacs/clearcase-1.10 >=app-xemacs/cookie-1.15 >=app-xemacs/crisp-1.15 >=app-xemacs/debug-1.18 >=app-xemacs/dictionary-1.16 >=app-xemacs/dired-1.17 >=app-xemacs/docbookide-0.08 >=app-xemacs/ecb-1.22 >=app-xemacs/ecrypto-0.20 >=app-xemacs/edebug-1.22 >=app-xemacs/ediff-1.68 >=app-xemacs/edit-utils-2.39 >=app-xemacs/edt-1.13 >=app-xemacs/efs-1.33 >=app-xemacs/eieio-1.05 >=app-xemacs/elib-1.11 >=app-xemacs/emerge-1.11 >=app-xemacs/erc-0.21 >=app-xemacs/escreen-1.01 >=app-xemacs/eshell-1.10 >=app-xemacs/eudc-1.39 >=app-xemacs/footnote-1.16 >=app-xemacs/forms-1.15 >=app-xemacs/fortran-modes-1.05 >=app-xemacs/frame-icon-1.11 >=app-xemacs/fsf-compat-1.15 >=app-xemacs/games-1.17 >=app-xemacs/general-docs-1.04 >=app-xemacs/gnats-1.17 >=app-xemacs/gnus-1.91 >=app-xemacs/haskell-mode-1.11 >=app-xemacs/hm-html-menus-1.23 >=app-xemacs/hyperbole-1.16 >=app-xemacs/ibuffer-1.09 >=app-xemacs/idlwave-1.32 >=app-xemacs/igrep-1.14 >=app-xemacs/ilisp-1.34 >=app-xemacs/jde-1.51 >=app-xemacs/mail-lib-1.79 >=app-xemacs/mailcrypt-2.14 >=app-xemacs/mew-1.19 >=app-xemacs/mh-e-1.29 >=app-xemacs/mine-1.16 >=app-xemacs/misc-games-1.19 >=app-xemacs/mmm-mode-1.02 >=app-xemacs/net-utils-1.52 >=app-xemacs/ocaml-0.06 >=app-xemacs/oo-browser-1.04 >=app-xemacs/os-utils-1.39 >=app-xemacs/pc-1.28 >=app-xemacs/pcl-cvs-1.67 >=app-xemacs/pcomplete-1.04 >=app-xemacs/perl-modes-1.09 >=app-xemacs/pgg-1.06 >=app-xemacs/prog-modes-2.10 >=app-xemacs/ps-print-1.11 >=app-xemacs/psgml-1.44 >=app-xemacs/psgml-dtds-1.03 >=app-xemacs/python-modes-1.08 >=app-xemacs/re-builder-1.05 >=app-xemacs/reftex-1.34 >=app-xemacs/riece-1.23 >=app-xemacs/rmail-1.14 >=app-xemacs/ruby-modes-1.02 >=app-xemacs/sasl-1.16 >=app-xemacs/scheme-1.15 >=app-xemacs/semantic-1.20 >=app-xemacs/sgml-1.11 >=app-xemacs/sh-script-1.22 >=app-xemacs/sieve-1.18 >=app-xemacs/slider-1.15 >=app-xemacs/sml-mode-0.12 >=app-xemacs/sounds-au-1.12 >=app-xemacs/sounds-wav-1.12 >=app-xemacs/speedbar-1.28 >=app-xemacs/strokes-1.10 >=app-xemacs/sun-1.16 >=app-xemacs/supercite-1.21 >=app-xemacs/texinfo-1.30 >=app-xemacs/text-modes-1.92 >=app-xemacs/textools-1.15 >=app-xemacs/time-1.14 >=app-xemacs/tm-1.38 >=app-xemacs/tooltalk-1.15 >=app-xemacs/tpu-1.14 >=app-xemacs/tramp-1.37 >=app-xemacs/vc-1.41 >=app-xemacs/vc-cc-1.22 >=app-xemacs/vhdl-1.22 >=app-xemacs/view-process-1.13 >=app-xemacs/viper-1.55 >=app-xemacs/vm-7.22 >=app-xemacs/w3-1.33 >=app-xemacs/x-symbol-1.10 >=app-xemacs/xemacs-base-2.10 >=app-xemacs/xemacs-devel-1.75 >=app-xemacs/xemacs-eterm-1.17 >=app-xemacs/xemacs-ispell-1.32 >=app-xemacs/xetla-1.01 >=app-xemacs/xlib-1.14 >=app-xemacs/xslide-1.09 >=app-xemacs/xslt-process-1.12 >=app-xemacs/xwem-1.22 >=app-xemacs/zenirc-1.16 mule? ( >=app-xemacs/latin-unity-1.20 >=app-xemacs/egg-its-1.27 >=app-xemacs/lookup-1.15 >=app-xemacs/skk-1.23 >=app-xemacs/edict-1.16 >=app-xemacs/latin-euro-standards-1.07 >=app-xemacs/leim-1.24 >=app-xemacs/locale-1.24 >=app-xemacs/mule-base-1.49 >=app-xemacs/mule-ucs-1.14 ) !app-xemacs/xemacs-packages-sumo
-SLOT=0
-_md5_=bcd37f8010d804e7df695c19507f98c3
diff --git a/app-xemacs/xemacs-packages-all-2010.07.29 b/app-xemacs/xemacs-packages-all-2010.07.29
deleted file mode 100644
index 04c3a0713210..000000000000
--- a/app-xemacs/xemacs-packages-all-2010.07.29
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for XEmacs elisp packages, similar to the sumo archives
-EAPI=6
-HOMEPAGE=http://www.xemacs.org/
-IUSE=mule
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=metapackage
-RDEPEND=>=app-xemacs/ada-1.14 >=app-xemacs/apel-1.34 >=app-xemacs/auctex-1.51 >=app-xemacs/bbdb-1.32 >=app-xemacs/build-1.15 >=app-xemacs/c-support-1.22 >=app-xemacs/calc-1.26 >=app-xemacs/calendar-1.38 >=app-xemacs/cc-mode-1.45 >=app-xemacs/cedet-common-1.01 >=app-xemacs/clearcase-1.10 >=app-xemacs/cogre-1.02 >=app-xemacs/cookie-1.15 >=app-xemacs/crisp-1.15 >=app-xemacs/debug-1.18 >=app-xemacs/dictionary-1.16 >=app-xemacs/dired-1.20 >=app-xemacs/docbookide-0.08 >=app-xemacs/easypg-1.03 >=app-xemacs/ecb-1.22 >=app-xemacs/ecrypto-0.21 >=app-xemacs/edebug-1.22 >=app-xemacs/ede-1.03 >=app-xemacs/ediff-1.81 >=app-xemacs/edit-utils-2.43 >=app-xemacs/edt-1.14 >=app-xemacs/efs-1.34 >=app-xemacs/eieio-1.07 >=app-xemacs/elib-1.13 >=app-xemacs/emerge-1.11 >=app-xemacs/erc-0.23 >=app-xemacs/escreen-1.01 >=app-xemacs/eshell-1.18 >=app-xemacs/eudc-1.40 >=app-xemacs/footnote-1.16 >=app-xemacs/forms-1.15 >=app-xemacs/fortran-modes-1.05 >=app-xemacs/frame-icon-1.11 >=app-xemacs/fsf-compat-1.19 >=app-xemacs/games-1.20 >=app-xemacs/general-docs-1.06 >=app-xemacs/gnats-1.17 >=app-xemacs/gnus-1.94 >=app-xemacs/haskell-mode-1.11 >=app-xemacs/hm-html-menus-1.24 >=app-xemacs/hyperbole-1.17 >=app-xemacs/ibuffer-1.10 >=app-xemacs/idlwave-1.32 >=app-xemacs/igrep-1.16 >=app-xemacs/ilisp-1.36 >=app-xemacs/jde-1.52 >=app-xemacs/mail-lib-1.80 >=app-xemacs/mailcrypt-2.14 >=app-xemacs/mew-1.19 >=app-xemacs/mh-e-1.32 >=app-xemacs/mine-1.16 >=app-xemacs/misc-games-1.22 >=app-xemacs/mmm-mode-1.05 >=app-xemacs/net-utils-1.56 >=app-xemacs/ocaml-0.06 >=app-xemacs/oo-browser-1.05 >=app-xemacs/os-utils-1.41 >=app-xemacs/pc-1.28 >=app-xemacs/pcl-cvs-1.70 >=app-xemacs/pcomplete-1.06 >=app-xemacs/perl-modes-1.14 >=app-xemacs/pgg-1.06 >=app-xemacs/prog-modes-2.20 >=app-xemacs/ps-print-1.12 >=app-xemacs/psgml-1.45 >=app-xemacs/psgml-dtds-1.03 >=app-xemacs/python-modes-1.14 >=app-xemacs/re-builder-1.05 >=app-xemacs/reftex-1.34 >=app-xemacs/riece-1.23 >=app-xemacs/rmail-1.14 >=app-xemacs/ruby-modes-1.04 >=app-xemacs/sasl-1.16 >=app-xemacs/scheme-1.18 >=app-xemacs/semantic-1.21 >=app-xemacs/sgml-1.11 >=app-xemacs/sh-script-1.24 >=app-xemacs/sieve-1.18 >=app-xemacs/slider-1.16 >=app-xemacs/sml-mode-0.12 >=app-xemacs/sounds-au-1.12 >=app-xemacs/sounds-wav-1.12 >=app-xemacs/speedbar-1.29 >=app-xemacs/strokes-1.10 >=app-xemacs/sun-1.16 >=app-xemacs/supercite-1.21 >=app-xemacs/texinfo-1.30 >=app-xemacs/text-modes-1.98 >=app-xemacs/textools-1.15 >=app-xemacs/time-1.14 >=app-xemacs/tm-1.39 >=app-xemacs/tooltalk-1.15 >=app-xemacs/tpu-1.14 >=app-xemacs/tramp-1.40 >=app-xemacs/vc-1.48 >=app-xemacs/vc-cc-1.22 >=app-xemacs/vhdl-1.22 >=app-xemacs/view-process-1.13 >=app-xemacs/viper-1.67 >=app-xemacs/vm-8.08 >=app-xemacs/w3-1.35 >=app-xemacs/x-symbol-1.11 >=app-xemacs/xemacs-base-2.27 >=app-xemacs/xemacs-devel-1.80 >=app-xemacs/xemacs-eterm-1.18 >=app-xemacs/xemacs-ispell-1.32 >=app-xemacs/xetla-1.02 >=app-xemacs/xlib-1.14 >=app-xemacs/xslide-1.09 >=app-xemacs/xslt-process-1.12 >=app-xemacs/xwem-1.23 >=app-xemacs/zenirc-1.16 mule? ( >=app-xemacs/edict-1.17 >=app-xemacs/egg-its-1.27 >=app-xemacs/latin-euro-standards-1.09 >=app-xemacs/latin-unity-1.20 >=app-xemacs/leim-1.31 >=app-xemacs/locale-1.28 >=app-xemacs/lookup-1.15 >=app-xemacs/mule-base-1.56 >=app-xemacs/mule-ucs-1.18 >=app-xemacs/skk-1.24 ) !app-xemacs/xemacs-packages-sumo
-SLOT=0
-_md5_=84e957c7af9e258c489aa64ff2fa73ef
diff --git a/app-xemacs/xemacs-packages-all/Manifest b/app-xemacs/xemacs-packages-all/Manifest
new file mode 100644
index 000000000000..cc37489a830f
--- /dev/null
+++ b/app-xemacs/xemacs-packages-all/Manifest
@@ -0,0 +1,3 @@
+EBUILD xemacs-packages-all-2007.04.27-r1.ebuild 3677 BLAKE2B 1de81b1dcc451288572169d759f4ef117a6f74df5ce9b7ffab2d85cb7568e73cbacffb38e36f2405cba0f745511d1d268e5d9c0f3cbeb5748f0323213b453b16 SHA512 43b96eef5984f77199f6c91a2760320037564f45982f9ba25730ca176b40e01220dcefd16c1f4c6dbfcee3ecf2c6db7c4288cbb939f5be57ca0268949f80c4bb
+EBUILD xemacs-packages-all-2010.07.29.ebuild 3789 BLAKE2B d3fa5aa3ee1cc3d90eae67031bc8d4f45f3f84f7d8e9413729d96b2fa97168d2b965927073a11b1dfc22cef375bec75b5fd4bb3c97bf7d116bfbdc2fb33fa3e7 SHA512 ce4c7079aeeec6f76fabaa7a6c384fad28bb2d64e93dd8e271a882abba1149f083f014bdd5835c878ba21eb01b10a747a683b3212f8785cdea16293d627cd01d
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xemacs-packages-all/metadata.xml b/app-xemacs/xemacs-packages-all/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/xemacs-packages-all/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/xemacs-packages-all/xemacs-packages-all-2007.04.27-r1.ebuild b/app-xemacs/xemacs-packages-all/xemacs-packages-all-2007.04.27-r1.ebuild
new file mode 100644
index 000000000000..b9aba1bda952
--- /dev/null
+++ b/app-xemacs/xemacs-packages-all/xemacs-packages-all-2007.04.27-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Meta package for XEmacs elisp packages, similar to the sumo archives"
+HOMEPAGE="http://www.xemacs.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86"
+IUSE="mule"
+
+RDEPEND="
+	>=app-xemacs/ada-1.14
+	>=app-xemacs/apel-1.32
+	>=app-xemacs/auctex-1.47
+	>=app-xemacs/bbdb-1.32
+	>=app-xemacs/build-1.14
+	>=app-xemacs/c-support-1.22
+	>=app-xemacs/calc-1.26
+	>=app-xemacs/calendar-1.32
+	>=app-xemacs/cc-mode-1.45
+	>=app-xemacs/clearcase-1.10
+	>=app-xemacs/cookie-1.15
+	>=app-xemacs/crisp-1.15
+	>=app-xemacs/debug-1.18
+	>=app-xemacs/dictionary-1.16
+	>=app-xemacs/dired-1.17
+	>=app-xemacs/docbookide-0.08
+	>=app-xemacs/ecb-1.22
+	>=app-xemacs/ecrypto-0.20
+	>=app-xemacs/edebug-1.22
+	>=app-xemacs/ediff-1.68
+	>=app-xemacs/edit-utils-2.39
+	>=app-xemacs/edt-1.13
+	>=app-xemacs/efs-1.33
+	>=app-xemacs/eieio-1.05
+	>=app-xemacs/elib-1.11
+	>=app-xemacs/emerge-1.11
+	>=app-xemacs/erc-0.21
+	>=app-xemacs/escreen-1.01
+	>=app-xemacs/eshell-1.10
+	>=app-xemacs/eudc-1.39
+	>=app-xemacs/footnote-1.16
+	>=app-xemacs/forms-1.15
+	>=app-xemacs/fortran-modes-1.05
+	>=app-xemacs/frame-icon-1.11
+	>=app-xemacs/fsf-compat-1.15
+	>=app-xemacs/games-1.17
+	>=app-xemacs/general-docs-1.04
+	>=app-xemacs/gnats-1.17
+	>=app-xemacs/gnus-1.91
+	>=app-xemacs/haskell-mode-1.11
+	>=app-xemacs/hm-html-menus-1.23
+	>=app-xemacs/hyperbole-1.16
+	>=app-xemacs/ibuffer-1.09
+	>=app-xemacs/idlwave-1.32
+	>=app-xemacs/igrep-1.14
+	>=app-xemacs/ilisp-1.34
+	>=app-xemacs/jde-1.51
+	>=app-xemacs/mail-lib-1.79
+	>=app-xemacs/mailcrypt-2.14
+	>=app-xemacs/mew-1.19
+	>=app-xemacs/mh-e-1.29
+	>=app-xemacs/mine-1.16
+	>=app-xemacs/misc-games-1.19
+	>=app-xemacs/mmm-mode-1.02
+	>=app-xemacs/net-utils-1.52
+	>=app-xemacs/ocaml-0.06
+	>=app-xemacs/oo-browser-1.04
+	>=app-xemacs/os-utils-1.39
+	>=app-xemacs/pc-1.28
+	>=app-xemacs/pcl-cvs-1.67
+	>=app-xemacs/pcomplete-1.04
+	>=app-xemacs/perl-modes-1.09
+	>=app-xemacs/pgg-1.06
+	>=app-xemacs/prog-modes-2.10
+	>=app-xemacs/ps-print-1.11
+	>=app-xemacs/psgml-1.44
+	>=app-xemacs/psgml-dtds-1.03
+	>=app-xemacs/python-modes-1.08
+	>=app-xemacs/re-builder-1.05
+	>=app-xemacs/reftex-1.34
+	>=app-xemacs/riece-1.23
+	>=app-xemacs/rmail-1.14
+	>=app-xemacs/ruby-modes-1.02
+	>=app-xemacs/sasl-1.16
+	>=app-xemacs/scheme-1.15
+	>=app-xemacs/semantic-1.20
+	>=app-xemacs/sgml-1.11
+	>=app-xemacs/sh-script-1.22
+	>=app-xemacs/sieve-1.18
+	>=app-xemacs/slider-1.15
+	>=app-xemacs/sml-mode-0.12
+	>=app-xemacs/sounds-au-1.12
+	>=app-xemacs/sounds-wav-1.12
+	>=app-xemacs/speedbar-1.28
+	>=app-xemacs/strokes-1.10
+	>=app-xemacs/sun-1.16
+	>=app-xemacs/supercite-1.21
+	>=app-xemacs/texinfo-1.30
+	>=app-xemacs/text-modes-1.92
+	>=app-xemacs/textools-1.15
+	>=app-xemacs/time-1.14
+	>=app-xemacs/tm-1.38
+	>=app-xemacs/tooltalk-1.15
+	>=app-xemacs/tpu-1.14
+	>=app-xemacs/tramp-1.37
+	>=app-xemacs/vc-1.41
+	>=app-xemacs/vc-cc-1.22
+	>=app-xemacs/vhdl-1.22
+	>=app-xemacs/view-process-1.13
+	>=app-xemacs/viper-1.55
+	>=app-xemacs/vm-7.22
+	>=app-xemacs/w3-1.33
+	>=app-xemacs/x-symbol-1.10
+	>=app-xemacs/xemacs-base-2.10
+	>=app-xemacs/xemacs-devel-1.75
+	>=app-xemacs/xemacs-eterm-1.17
+	>=app-xemacs/xemacs-ispell-1.32
+	>=app-xemacs/xetla-1.01
+	>=app-xemacs/xlib-1.14
+	>=app-xemacs/xslide-1.09
+	>=app-xemacs/xslt-process-1.12
+	>=app-xemacs/xwem-1.22
+	>=app-xemacs/zenirc-1.16
+
+	mule? (
+	>=app-xemacs/latin-unity-1.20
+	>=app-xemacs/egg-its-1.27
+	>=app-xemacs/lookup-1.15
+	>=app-xemacs/skk-1.23
+	>=app-xemacs/edict-1.16
+	>=app-xemacs/latin-euro-standards-1.07
+	>=app-xemacs/leim-1.24
+	>=app-xemacs/locale-1.24
+	>=app-xemacs/mule-base-1.49
+	>=app-xemacs/mule-ucs-1.14
+	)
+
+	!app-xemacs/xemacs-packages-sumo
+"
diff --git a/app-xemacs/xemacs-packages-all/xemacs-packages-all-2010.07.29.ebuild b/app-xemacs/xemacs-packages-all/xemacs-packages-all-2010.07.29.ebuild
new file mode 100644
index 000000000000..2a9583db83b6
--- /dev/null
+++ b/app-xemacs/xemacs-packages-all/xemacs-packages-all-2010.07.29.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Meta package for XEmacs elisp packages, similar to the sumo archives"
+HOMEPAGE="http://www.xemacs.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE="mule"
+
+RDEPEND="
+	>=app-xemacs/ada-1.14
+	>=app-xemacs/apel-1.34
+	>=app-xemacs/auctex-1.51
+	>=app-xemacs/bbdb-1.32
+	>=app-xemacs/build-1.15
+	>=app-xemacs/c-support-1.22
+	>=app-xemacs/calc-1.26
+	>=app-xemacs/calendar-1.38
+	>=app-xemacs/cc-mode-1.45
+	>=app-xemacs/cedet-common-1.01
+	>=app-xemacs/clearcase-1.10
+	>=app-xemacs/cogre-1.02
+	>=app-xemacs/cookie-1.15
+	>=app-xemacs/crisp-1.15
+	>=app-xemacs/debug-1.18
+	>=app-xemacs/dictionary-1.16
+	>=app-xemacs/dired-1.20
+	>=app-xemacs/docbookide-0.08
+	>=app-xemacs/easypg-1.03
+	>=app-xemacs/ecb-1.22
+	>=app-xemacs/ecrypto-0.21
+	>=app-xemacs/edebug-1.22
+	>=app-xemacs/ede-1.03
+	>=app-xemacs/ediff-1.81
+	>=app-xemacs/edit-utils-2.43
+	>=app-xemacs/edt-1.14
+	>=app-xemacs/efs-1.34
+	>=app-xemacs/eieio-1.07
+	>=app-xemacs/elib-1.13
+	>=app-xemacs/emerge-1.11
+	>=app-xemacs/erc-0.23
+	>=app-xemacs/escreen-1.01
+	>=app-xemacs/eshell-1.18
+	>=app-xemacs/eudc-1.40
+	>=app-xemacs/footnote-1.16
+	>=app-xemacs/forms-1.15
+	>=app-xemacs/fortran-modes-1.05
+	>=app-xemacs/frame-icon-1.11
+	>=app-xemacs/fsf-compat-1.19
+	>=app-xemacs/games-1.20
+	>=app-xemacs/general-docs-1.06
+	>=app-xemacs/gnats-1.17
+	>=app-xemacs/gnus-1.94
+	>=app-xemacs/haskell-mode-1.11
+	>=app-xemacs/hm-html-menus-1.24
+	>=app-xemacs/hyperbole-1.17
+	>=app-xemacs/ibuffer-1.10
+	>=app-xemacs/idlwave-1.32
+	>=app-xemacs/igrep-1.16
+	>=app-xemacs/ilisp-1.36
+	>=app-xemacs/jde-1.52
+	>=app-xemacs/mail-lib-1.80
+	>=app-xemacs/mailcrypt-2.14
+	>=app-xemacs/mew-1.19
+	>=app-xemacs/mh-e-1.32
+	>=app-xemacs/mine-1.16
+	>=app-xemacs/misc-games-1.22
+	>=app-xemacs/mmm-mode-1.05
+	>=app-xemacs/net-utils-1.56
+	>=app-xemacs/ocaml-0.06
+	>=app-xemacs/oo-browser-1.05
+	>=app-xemacs/os-utils-1.41
+	>=app-xemacs/pc-1.28
+	>=app-xemacs/pcl-cvs-1.70
+	>=app-xemacs/pcomplete-1.06
+	>=app-xemacs/perl-modes-1.14
+	>=app-xemacs/pgg-1.06
+	>=app-xemacs/prog-modes-2.20
+	>=app-xemacs/ps-print-1.12
+	>=app-xemacs/psgml-1.45
+	>=app-xemacs/psgml-dtds-1.03
+	>=app-xemacs/python-modes-1.14
+	>=app-xemacs/re-builder-1.05
+	>=app-xemacs/reftex-1.34
+	>=app-xemacs/riece-1.23
+	>=app-xemacs/rmail-1.14
+	>=app-xemacs/ruby-modes-1.04
+	>=app-xemacs/sasl-1.16
+	>=app-xemacs/scheme-1.18
+	>=app-xemacs/semantic-1.21
+	>=app-xemacs/sgml-1.11
+	>=app-xemacs/sh-script-1.24
+	>=app-xemacs/sieve-1.18
+	>=app-xemacs/slider-1.16
+	>=app-xemacs/sml-mode-0.12
+	>=app-xemacs/sounds-au-1.12
+	>=app-xemacs/sounds-wav-1.12
+	>=app-xemacs/speedbar-1.29
+	>=app-xemacs/strokes-1.10
+	>=app-xemacs/sun-1.16
+	>=app-xemacs/supercite-1.21
+	>=app-xemacs/texinfo-1.30
+	>=app-xemacs/text-modes-1.98
+	>=app-xemacs/textools-1.15
+	>=app-xemacs/time-1.14
+	>=app-xemacs/tm-1.39
+	>=app-xemacs/tooltalk-1.15
+	>=app-xemacs/tpu-1.14
+	>=app-xemacs/tramp-1.40
+	>=app-xemacs/vc-1.48
+	>=app-xemacs/vc-cc-1.22
+	>=app-xemacs/vhdl-1.22
+	>=app-xemacs/view-process-1.13
+	>=app-xemacs/viper-1.67
+	>=app-xemacs/vm-8.08
+	>=app-xemacs/w3-1.35
+	>=app-xemacs/x-symbol-1.11
+	>=app-xemacs/xemacs-base-2.27
+	>=app-xemacs/xemacs-devel-1.80
+	>=app-xemacs/xemacs-eterm-1.18
+	>=app-xemacs/xemacs-ispell-1.32
+	>=app-xemacs/xetla-1.02
+	>=app-xemacs/xlib-1.14
+	>=app-xemacs/xslide-1.09
+	>=app-xemacs/xslt-process-1.12
+	>=app-xemacs/xwem-1.23
+	>=app-xemacs/zenirc-1.16
+
+	mule? (
+	>=app-xemacs/edict-1.17
+	>=app-xemacs/egg-its-1.27
+	>=app-xemacs/latin-euro-standards-1.09
+	>=app-xemacs/latin-unity-1.20
+	>=app-xemacs/leim-1.31
+	>=app-xemacs/locale-1.28
+	>=app-xemacs/lookup-1.15
+	>=app-xemacs/mule-base-1.56
+	>=app-xemacs/mule-ucs-1.18
+	>=app-xemacs/skk-1.24
+	)
+
+	!app-xemacs/xemacs-packages-sumo
+"
diff --git a/app-xemacs/xetla-1.01 b/app-xemacs/xetla-1.01
deleted file mode 100644
index 8e910ab73bf9..000000000000
--- a/app-xemacs/xetla-1.01
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Arch (tla) interface for XEmacs
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/ediff app-xemacs/xemacs-base app-xemacs/jde app-xemacs/mail-lib app-xemacs/dired app-xemacs/prog-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xetla-1.01-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=05de892d0047ef25e9d3a08438f76a7b
diff --git a/app-xemacs/xetla-1.02 b/app-xemacs/xetla-1.02
deleted file mode 100644
index ed2b3c5a5f66..000000000000
--- a/app-xemacs/xetla-1.02
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Arch (tla) interface for XEmacs
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/ediff app-xemacs/xemacs-base app-xemacs/jde app-xemacs/mail-lib app-xemacs/dired app-xemacs/prog-modes app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xetla-1.02-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=f49165b887f191696d96008e90b17347
diff --git a/app-xemacs/xetla/Manifest b/app-xemacs/xetla/Manifest
new file mode 100644
index 000000000000..acd58464133c
--- /dev/null
+++ b/app-xemacs/xetla/Manifest
@@ -0,0 +1,5 @@
+DIST xetla-1.01-pkg.tar.gz 294912 BLAKE2B 3dd9b6bf725445f98f7623a261b37906a4b0f81d046e80941658799dcf9abf77ab661255bc182b29e149be1d6eec226102ed4900fa8f94a4c56dfa51130271f7 SHA512 535c40e4a6a6b0ba28818a5835540d8d8908eb7624144e4dfb301bf5fac4b8b08f1db8c11cfbb855695d082b5d4705aee9c7f6be409969868414472e3cdf7186
+DIST xetla-1.02-pkg.tar.gz 294986 BLAKE2B fd586413dd9836987fb429e669bebe72117f10d07f98dcb530ff8b26d04803eb5b1803e6a31ccfbc37fe0ef7472c65c18c9abb407ae73fb5ac8a6a9d0a207bde SHA512 91f6886f34d3d331deda5d1b172010482b9941f7b702981c77c87ead00fd16d5ac54f650b472ba03621f551c5e400abf7b19fe53ef88d6d82f2f86e28cd0e5e2
+EBUILD xetla-1.01.ebuild 402 BLAKE2B f6243f0684a3ccfb6db1032203663921f94cc2848ca05a2d9ae56c15238fe3b983f187d34793b6379f76e8173b09ee4677cf76fd4bbd490ab981e17b4a851c41 SHA512 bd718a00ba5bc4280f5726a42e992ad24768415a3d5f1af6ae59ed4d9ca39634d58ce6af83b9a220423a97fd257a6449f93d3fac5802eb782df0794f6ca7ec3f
+EBUILD xetla-1.02.ebuild 517 BLAKE2B fc57a1e6e7b235a47304e9f5b2ec5a5f3a37fbac79867ac41b01520a6fa166f10b1bbfeca6dffde8ddb14df8ccb86219b299f9dd3b4787d0374979788ee25f8b SHA512 979ffcece6f518e21553fbe6389861d200c70d6757419fb3b2a681be1ee99d87c81fa296b707e90dd73db6d7b24acc95abc85723ff30bab072efaffd1ec376c8
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xetla/metadata.xml b/app-xemacs/xetla/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/xetla/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/xetla/xetla-1.01.ebuild b/app-xemacs/xetla/xetla-1.01.ebuild
new file mode 100644
index 000000000000..b4401b59783b
--- /dev/null
+++ b/app-xemacs/xetla/xetla-1.01.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION=" Arch (tla) interface for XEmacs"
+XEMACS_PKG_CAT="standard"
+
+DEPEND=""
+RDEPEND="app-xemacs/ediff
+app-xemacs/xemacs-base
+app-xemacs/jde
+app-xemacs/mail-lib
+app-xemacs/dired
+app-xemacs/prog-modes
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xetla/xetla-1.02.ebuild b/app-xemacs/xetla/xetla-1.02.ebuild
new file mode 100644
index 000000000000..96f3e4dc606a
--- /dev/null
+++ b/app-xemacs/xetla/xetla-1.02.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION=" Arch (tla) interface for XEmacs"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/ediff
+app-xemacs/xemacs-base
+app-xemacs/jde
+app-xemacs/mail-lib
+app-xemacs/dired
+app-xemacs/prog-modes
+"
+RDEPEND="app-xemacs/ediff
+app-xemacs/xemacs-base
+app-xemacs/jde
+app-xemacs/mail-lib
+app-xemacs/dired
+app-xemacs/prog-modes
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xlib-1.14 b/app-xemacs/xlib-1.14
deleted file mode 100644
index 5802c8e0b8c9..000000000000
--- a/app-xemacs/xlib-1.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Emacs interface to X server
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xlib-1.14-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=5e62441c0f5e5285d39a1e42308f8291
diff --git a/app-xemacs/xlib/Manifest b/app-xemacs/xlib/Manifest
new file mode 100644
index 000000000000..b3991f20f28f
--- /dev/null
+++ b/app-xemacs/xlib/Manifest
@@ -0,0 +1,3 @@
+DIST xlib-1.14-pkg.tar.gz 205806 BLAKE2B 87c98668972496db0950181354633409a1416a5a20e4764913b5b0ef6c99e3fa487ec67f2b460b60eecb2358b1ba6e9bb532fbae53036ecb5d73b07eb2b483c7 SHA512 ad704e10cfbf8fb01ab56666c47b58a0acefda615dda2d63b56c2416b023737a23e7b748f752b11336e2379271e84e1731db7e72274930ff82c16ed00921a0e0
+EBUILD xlib-1.14.ebuild 296 BLAKE2B d335e4b96e99ffe55ef6608c226b3b8b545442853160884d59f0f57afbe7d435fe99d3c9195e65f4ab21c10838904497f9152e53ecaa0d6d4a666aa4b215e4bd SHA512 e69d1072be5f6b4be30f783f860a7aab4f8f16cb8a3ee7a2e175b26d4361dac1ef6a0d7f3cd806d1866ebfbb6c214293e8ccd947f7ed0f39a0539aabc52de651
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xlib/metadata.xml b/app-xemacs/xlib/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/xlib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/xlib/xlib-1.14.ebuild b/app-xemacs/xlib/xlib-1.14.ebuild
new file mode 100644
index 000000000000..dab669c74d25
--- /dev/null
+++ b/app-xemacs/xlib/xlib-1.14.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="Emacs interface to X server"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xslide-1.09 b/app-xemacs/xslide-1.09
deleted file mode 100644
index a5feea360ecc..000000000000
--- a/app-xemacs/xslide-1.09
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=XSL editing support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-ispell app-xemacs/mail-lib app-xemacs/xemacs-base app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xslide-1.09-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=f19e8aa6fbc5825e50f411a129db6ccd
diff --git a/app-xemacs/xslide/Manifest b/app-xemacs/xslide/Manifest
new file mode 100644
index 000000000000..cfe6fe113945
--- /dev/null
+++ b/app-xemacs/xslide/Manifest
@@ -0,0 +1,3 @@
+DIST xslide-1.09-pkg.tar.gz 39199 BLAKE2B bd8cdfec35c9f7e309e51639958c15ffdbe0ed99a720f0dc3c001d1bda5904de914d075b65eb25ec0151d8b90260c2b1baadab2939f3d1c90f319461f9c2e4bf SHA512 2844b1d71b9a9938443d550e8a9dc5eb53932d92695839dd20d633dd5f0ab4448a08ff10f228d7b63380df6c367f27a236dd91e203d7cfe4b0632bb0639e6553
+EBUILD xslide-1.09.ebuild 333 BLAKE2B 3384b027407bb7b2dcabb08ae56ca8ecabe21820b5d0fa3574c93bb0cda43f5fb99303608fa0487c98b6a51d53f6879e6e5a3ca43ed362b5d0f1f32d533995da SHA512 b924cb00a99f48edd86ded3234670f37fc3fc22c027edff37516dddb961ad086aff963365ade79ccc69cda6db9b8b8fe61a2986f5be320a9994de982e5d61e8c
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xslide/metadata.xml b/app-xemacs/xslide/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/xslide/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/xslide/xslide-1.09.ebuild b/app-xemacs/xslide/xslide-1.09.ebuild
new file mode 100644
index 000000000000..b883c9482abc
--- /dev/null
+++ b/app-xemacs/xslide/xslide-1.09.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="XSL editing support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-ispell
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xslt-process-1.12 b/app-xemacs/xslt-process-1.12
deleted file mode 100644
index 38d9f62e3ad3..000000000000
--- a/app-xemacs/xslt-process-1.12
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=XSLT processing support
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/jde app-xemacs/cc-mode app-xemacs/semantic app-xemacs/debug app-xemacs/speedbar app-xemacs/edit-utils app-xemacs/xemacs-eterm app-xemacs/mail-lib app-xemacs/xemacs-base app-xemacs/elib app-xemacs/eieio app-xemacs/sh-script app-xemacs/fsf-compat app-xemacs/xemacs-devel app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xslt-process-1.12-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=39a44fdae4a11d7dfd610c8bd39204ab
diff --git a/app-xemacs/xslt-process/Manifest b/app-xemacs/xslt-process/Manifest
new file mode 100644
index 000000000000..0053a55dadf8
--- /dev/null
+++ b/app-xemacs/xslt-process/Manifest
@@ -0,0 +1,3 @@
+DIST xslt-process-1.12-pkg.tar.gz 59594 BLAKE2B 3e0d23799465a61bd209435e59ae11cc6f4d9dd58ab24674dbb83bfd836949bbd2f83e9c9d8397b904813169ec7b0e0121355046230094daaf008e95b1d5ba90 SHA512 47945fc2c105e6ce54cb7bd5e1b5a437444a85b0a059ecce7ee6ebdc22b9d6140f939711a79d7b65b43b628afd7c57acc34e56e3592efc1bd0ff488810af134e
+EBUILD xslt-process-1.12.ebuild 549 BLAKE2B b6459b9635b383ef0b34bc24aeef1640f42233844c9b41bd3f40f3f10d6283f7eda03a1f33f5d07ef287658a42c6ad1c2077e0528d764ff8fe6238509e63741c SHA512 75410632b29ecda7dbe7768e68f6565e66cb2fa7d1dcbb94e5a59be9edb89d0fac28edd2b0a708fa2f494e16683e261072580cd923089c7941aace3e5a5a7b16
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xslt-process/metadata.xml b/app-xemacs/xslt-process/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/xslt-process/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/xslt-process/xslt-process-1.12.ebuild b/app-xemacs/xslt-process/xslt-process-1.12.ebuild
new file mode 100644
index 000000000000..a953d464d0bf
--- /dev/null
+++ b/app-xemacs/xslt-process/xslt-process-1.12.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="XSLT processing support"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/jde
+app-xemacs/cc-mode
+app-xemacs/semantic
+app-xemacs/debug
+app-xemacs/speedbar
+app-xemacs/edit-utils
+app-xemacs/xemacs-eterm
+app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/elib
+app-xemacs/eieio
+app-xemacs/sh-script
+app-xemacs/fsf-compat
+app-xemacs/xemacs-devel
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xwem-1.22 b/app-xemacs/xwem-1.22
deleted file mode 100644
index c2b3af250ce6..000000000000
--- a/app-xemacs/xwem-1.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=X Emacs Window Manager
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xlib app-xemacs/strokes app-xemacs/edit-utils app-xemacs/text-modes app-xemacs/time app-xemacs/slider app-xemacs/elib app-xemacs/ilisp app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xwem-1.22-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=64145f86c3bb44891ef2a973e2a1f270
diff --git a/app-xemacs/xwem-1.23 b/app-xemacs/xwem-1.23
deleted file mode 100644
index 5b4455599d7f..000000000000
--- a/app-xemacs/xwem-1.23
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=X Emacs Window Manager
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-xemacs/xemacs-base app-xemacs/xlib app-xemacs/strokes app-xemacs/edit-utils app-xemacs/text-modes app-xemacs/time app-xemacs/slider app-xemacs/elib app-xemacs/ilisp app-xemacs/mail-lib app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/xwem-1.23-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=64145f86c3bb44891ef2a973e2a1f270
diff --git a/app-xemacs/xwem/Manifest b/app-xemacs/xwem/Manifest
new file mode 100644
index 000000000000..8612d81bb443
--- /dev/null
+++ b/app-xemacs/xwem/Manifest
@@ -0,0 +1,5 @@
+DIST xwem-1.22-pkg.tar.gz 649363 BLAKE2B 732ea3fa3810a5a2aff923ed1e9e6d5aa8d95a6b27ba888f2a9ea6590c1e61e37a4c2df1e4af35e7bed1886bc85a3118deb56b2071eee8ffb78be56583f0b22a SHA512 5de50db9a9b0e3fe33aeae0f01cf5f4df61c57760c0cb66ec37288f03f3c3da1c45805b9d37b2ab6e375ac308f7074fb2cf12d9f6174742a9075cb64c82f68f5
+DIST xwem-1.23-pkg.tar.gz 649490 BLAKE2B 1d31ae12ffda979da37872a1653709f80b8965380d23ebbb3d021cfa86b3fee7fc3c232d000c27b4c0eec2ea5e34a27c80af283f14decc0ea72acca4685dd305 SHA512 f070ca895b6b1144444e2d17198b07e3584fd72410b0663fb86fe3048635b8a795ee9b575c8f583108bddaae37de44864080a0402ae6312dd1d7172882473063
+EBUILD xwem-1.22.ebuild 457 BLAKE2B 869e50a55bc9d400af4b3d431f43d6128468e3442f4f10a15f48ee6bd01f326588f663c47e781201f62d07d7d44336b1a56c4953703deebb6733ccf3c6f5f2ed SHA512 a382b6018b4b8e7a282596f38f70c3d142502825c9000212e271971989203712be08faf86cd453bbb9d3378b3050a398e33744bfdace27fb0d60bacba8365a00
+EBUILD xwem-1.23.ebuild 457 BLAKE2B 869e50a55bc9d400af4b3d431f43d6128468e3442f4f10a15f48ee6bd01f326588f663c47e781201f62d07d7d44336b1a56c4953703deebb6733ccf3c6f5f2ed SHA512 a382b6018b4b8e7a282596f38f70c3d142502825c9000212e271971989203712be08faf86cd453bbb9d3378b3050a398e33744bfdace27fb0d60bacba8365a00
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/xwem/metadata.xml b/app-xemacs/xwem/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/xwem/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/xwem/xwem-1.22.ebuild b/app-xemacs/xwem/xwem-1.22.ebuild
new file mode 100644
index 000000000000..c9c1af4b1a43
--- /dev/null
+++ b/app-xemacs/xwem/xwem-1.22.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="X Emacs Window Manager"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xlib
+app-xemacs/strokes
+app-xemacs/edit-utils
+app-xemacs/text-modes
+app-xemacs/time
+app-xemacs/slider
+app-xemacs/elib
+app-xemacs/ilisp
+app-xemacs/mail-lib
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/xwem/xwem-1.23.ebuild b/app-xemacs/xwem/xwem-1.23.ebuild
new file mode 100644
index 000000000000..c9c1af4b1a43
--- /dev/null
+++ b/app-xemacs/xwem/xwem-1.23.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="X Emacs Window Manager"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/xlib
+app-xemacs/strokes
+app-xemacs/edit-utils
+app-xemacs/text-modes
+app-xemacs/time
+app-xemacs/slider
+app-xemacs/elib
+app-xemacs/ilisp
+app-xemacs/mail-lib
+"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/zenirc-1.16 b/app-xemacs/zenirc-1.16
deleted file mode 100644
index d806e7803599..000000000000
--- a/app-xemacs/zenirc-1.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=ZENIRC IRC Client
-EAPI=6
-HOMEPAGE=http://xemacs.org/
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86
-LICENSE=GPL-2+
-RDEPEND=app-editors/xemacs
-SLOT=0
-SRC_URI=http://ftp.xemacs.org/pub/xemacs/packages/zenirc-1.16-pkg.tar.gz
-_eclasses_=xemacs-packages	8a2518fc5877625acb8dc6c7c7c0e76c
-_md5_=4f11e7e74def7e2d645e7e84a40e5469
diff --git a/app-xemacs/zenirc/Manifest b/app-xemacs/zenirc/Manifest
new file mode 100644
index 000000000000..1a32d4f4c7b6
--- /dev/null
+++ b/app-xemacs/zenirc/Manifest
@@ -0,0 +1,3 @@
+DIST zenirc-1.16-pkg.tar.gz 277377 BLAKE2B 9d4bbe33bfa82ad1eb06ffdedb73e3eb52fe43a1eeb1b2da8692b877207a8e28a43d345472f67812b8531eb0222c17f9b99a40e3ad4bcaf14820dbbd377afd63 SHA512 2fd93791a94682bd26a2133a9a10b13587aa5a5d0b9a559c9589153f3132810c86d5fd7c6b607f2b777f22edf3aa4eab61d47ca161e0c2bf8b4a6f43ced2a07c
+EBUILD zenirc-1.16.ebuild 263 BLAKE2B 5bdcd2ebd6df48a91c82fc4f2b5b10762c02c31324f0bedf35cb2d5052b27717c515ea669c1c31e35dbb0b62be9cec59226602259485617971c031687773f6a2 SHA512 0a4ca81c63970ad7bd660875a95c1e10e5f6c1c58de441d86dbc63ab694f16115ff15ff984eccd727f2aceaed9c63f1a75ad3c2a7aadaad57a562447653ac37e
+MISC metadata.xml 261 BLAKE2B 2bc0ee46f3970104b4897908fe0ed8532badcb765971ce704f7d2b06e3556a066f0ca41c2a60e7612352167338ff88e579c89be7ff229de9d8722aef3ca9ca05 SHA512 02e04fab2304da6c05c55b2aeb44563d99a7a6db37ada15993575509ed47fc7f4eb97b6a03fd30535aeb5e30f57ee908917b9c25841fd3619914360b0629f20a
diff --git a/app-xemacs/zenirc/metadata.xml b/app-xemacs/zenirc/metadata.xml
new file mode 100644
index 000000000000..c7dd5514fddf
--- /dev/null
+++ b/app-xemacs/zenirc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xemacs@gentoo.org</email>
+    <name>Gentoo XEmacs project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-xemacs/zenirc/zenirc-1.16.ebuild b/app-xemacs/zenirc/zenirc-1.16.ebuild
new file mode 100644
index 000000000000..7400914433d7
--- /dev/null
+++ b/app-xemacs/zenirc/zenirc-1.16.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SLOT="0"
+DESCRIPTION="ZENIRC IRC Client"
+XEMACS_PKG_CAT="standard"
+
+RDEPEND=""
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+
+inherit xemacs-packages
author	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-07-14 21:03:06 +0100
commit	8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch)
tree	7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-xemacs
parent	30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff)