8 files changed, 52 insertions, 5 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 1ae1dd60d055..c1fa51f9cc40 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/dockerfile-mode/Manifest b/app-emacs/dockerfile-mode/Manifest
index dc91056a7cd3..c481e1821626 100644
--- a/app-emacs/dockerfile-mode/Manifest
+++ b/app-emacs/dockerfile-mode/Manifest
@@ -1,8 +1,8 @@
-AUX 50dockerfile-mode-gentoo.el 283 BLAKE2B 0ef92381fb8058ce72cea9bdef593401eb279ea521b952f97747b35dbaaf344039dd2ed5e6384c86beafb98f92cea864626ad2bb7a2c61303a9830e257df34a2 SHA512 7b7a72fd9cde179a3e0847c92a2361d09bd6145c9de24236e8da3a56a880b02db9623e8b535f31f94482e05424bc758cd5d977c6d643689ab75894d128c3097b
+AUX 50dockerfile-mode-gentoo.el 415 BLAKE2B a2056e31385e6df1fe37795170f326fd75c2248e8eb8e90cb43f8ce642345533050495fd2d1d4b84b307aece7f201c862706ecd229263efedc36355d643b7d57 SHA512 47dff9c6794240e90eaeff876ff467b981025981eb2e2975d7420b6b401facafdb6deb340f4fc76bbb557fdda8957c254d19edd779ff2234d70de9345dc458e9
 DIST dockerfile-mode-1.6.tar.gz 7795 BLAKE2B 3ba19ed2957d6d5bb1c8a43710bfda7c5681159820d313a19d03a00ba7982237ec09c4b1af5d6f304d4fcb9c228b7ff92ec0af1ae0efd4f2f18aedaf2a3a790a SHA512 64077ed231544bc737a5d7fd3bafd43f46861eb39e31908b90a50a6a7c4ea71f82239d7b4eb4cf2abb852da2a619c82aaeb236f7b0c537ff85b0ce4c1090a0de
 DIST dockerfile-mode-1.7.tar.gz 7880 BLAKE2B 72a4824ab2b89f516de7988d5ba3674e59e88b713c70ba585a4bbe517685b297b18ab34ff1a1066036f901725b4fb6b292286529935800a1366abb5e3649f900 SHA512 eb05e1f0ba0b9752f780106b94a939c3182512a1c9670b2e63c8d0c797b8e0eb979751868a3d337986568fa104302e09d7a1bae514cb2e210454d3dae419e58b
 DIST dockerfile-mode-1.8.tar.gz 7882 BLAKE2B 8db9ffadbc673ed37e04cd300834ceff3505b5addf3ea7432dcbfc221d392c63f7641ef80d1f464576963aadff9d038b2761c7dde72004fed5e0027519045d30 SHA512 8bae08037813730b93919135fe727a6506bfb0decdc385b22afe41d7f1df750d3f0cc508453faa7b0e90d347584f805acca54bbf7da6cae2cf3108ff1047fd58
-EBUILD dockerfile-mode-1.6.ebuild 435 BLAKE2B a81acbf2796981c7ce37c223780c8844af83304deef4188ae8b50fba42c15db2bbfd705c5c49e62300906e3964f7017d7909576a2ee1dcb999e8378ed0c87675 SHA512 4f531f03d4507cc5e5bc565b6ea47b58f04ec49144cc0eb8dddf8e31b1dcfe765665ac19bf0be380bbad94e0cb14a942f65481e98e9b344ab5f70257f3847876
-EBUILD dockerfile-mode-1.7.ebuild 435 BLAKE2B a81acbf2796981c7ce37c223780c8844af83304deef4188ae8b50fba42c15db2bbfd705c5c49e62300906e3964f7017d7909576a2ee1dcb999e8378ed0c87675 SHA512 4f531f03d4507cc5e5bc565b6ea47b58f04ec49144cc0eb8dddf8e31b1dcfe765665ac19bf0be380bbad94e0cb14a942f65481e98e9b344ab5f70257f3847876
-EBUILD dockerfile-mode-1.8.ebuild 435 BLAKE2B a81acbf2796981c7ce37c223780c8844af83304deef4188ae8b50fba42c15db2bbfd705c5c49e62300906e3964f7017d7909576a2ee1dcb999e8378ed0c87675 SHA512 4f531f03d4507cc5e5bc565b6ea47b58f04ec49144cc0eb8dddf8e31b1dcfe765665ac19bf0be380bbad94e0cb14a942f65481e98e9b344ab5f70257f3847876
+EBUILD dockerfile-mode-1.6-r1.ebuild 435 BLAKE2B a81acbf2796981c7ce37c223780c8844af83304deef4188ae8b50fba42c15db2bbfd705c5c49e62300906e3964f7017d7909576a2ee1dcb999e8378ed0c87675 SHA512 4f531f03d4507cc5e5bc565b6ea47b58f04ec49144cc0eb8dddf8e31b1dcfe765665ac19bf0be380bbad94e0cb14a942f65481e98e9b344ab5f70257f3847876
+EBUILD dockerfile-mode-1.7-r1.ebuild 435 BLAKE2B a81acbf2796981c7ce37c223780c8844af83304deef4188ae8b50fba42c15db2bbfd705c5c49e62300906e3964f7017d7909576a2ee1dcb999e8378ed0c87675 SHA512 4f531f03d4507cc5e5bc565b6ea47b58f04ec49144cc0eb8dddf8e31b1dcfe765665ac19bf0be380bbad94e0cb14a942f65481e98e9b344ab5f70257f3847876
+EBUILD dockerfile-mode-1.8-r1.ebuild 435 BLAKE2B a81acbf2796981c7ce37c223780c8844af83304deef4188ae8b50fba42c15db2bbfd705c5c49e62300906e3964f7017d7909576a2ee1dcb999e8378ed0c87675 SHA512 4f531f03d4507cc5e5bc565b6ea47b58f04ec49144cc0eb8dddf8e31b1dcfe765665ac19bf0be380bbad94e0cb14a942f65481e98e9b344ab5f70257f3847876
 MISC metadata.xml 460 BLAKE2B 169050e19dd4324eee4cb06d1bb4e5ebefad6e0b94408cc95aaf946222a2d48bb8904d6dfba625de3c0444a6b12e465a4d0ea8ca43f64eef3f971edbe024b1dd SHA512 1ee48f2a4ebbf9b2f321731e69306221cbb5b3c43ad72f0a0cc69fe87f6eba76f1848b383339654dd9f2ca5ff71a7860b3abf12371fbb36c72c160a8eb011fc0
diff --git a/app-emacs/dockerfile-mode/dockerfile-mode-1.6.ebuild b/app-emacs/dockerfile-mode/dockerfile-mode-1.6-r1.ebuild
index 8ac741485198..8ac741485198 100644
--- a/app-emacs/dockerfile-mode/dockerfile-mode-1.6.ebuild
+++ b/app-emacs/dockerfile-mode/dockerfile-mode-1.6-r1.ebuild
diff --git a/app-emacs/dockerfile-mode/dockerfile-mode-1.7.ebuild b/app-emacs/dockerfile-mode/dockerfile-mode-1.7-r1.ebuild
index 8ac741485198..8ac741485198 100644
--- a/app-emacs/dockerfile-mode/dockerfile-mode-1.7.ebuild
+++ b/app-emacs/dockerfile-mode/dockerfile-mode-1.7-r1.ebuild
diff --git a/app-emacs/dockerfile-mode/dockerfile-mode-1.8.ebuild b/app-emacs/dockerfile-mode/dockerfile-mode-1.8-r1.ebuild
index 8ac741485198..8ac741485198 100644
--- a/app-emacs/dockerfile-mode/dockerfile-mode-1.8.ebuild
+++ b/app-emacs/dockerfile-mode/dockerfile-mode-1.8-r1.ebuild
diff --git a/app-emacs/dockerfile-mode/files/50dockerfile-mode-gentoo.el b/app-emacs/dockerfile-mode/files/50dockerfile-mode-gentoo.el
index f4f04b32e72c..e2ec3ced9b78 100644
--- a/app-emacs/dockerfile-mode/files/50dockerfile-mode-gentoo.el
+++ b/app-emacs/dockerfile-mode/files/50dockerfile-mode-gentoo.el
@@ -1,5 +1,9 @@
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'dockerfile-mode "dockerfile-mode"
   "A major mode to edit Dockerfiles." t)
-(add-to-list 'auto-mode-alist '("/Dockerfile\\(?:\\.[^/\\]*\\)?\\'" . dockerfile-mode))
+(add-to-list 'auto-mode-alist
+             (cons (concat "[/\\]"
+                           "\\(?:Containerfile\\|Dockerfile\\)"
+                           "\\(?:\\.[^/\\]*\\)?\\'")
+                   'dockerfile-mode))
 (add-to-list 'auto-mode-alist '("\\.dockerfile\\'" . dockerfile-mode))
diff --git a/app-emacs/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
index 4349f1823efe..74197cda87f3 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -3,6 +3,8 @@ AUX Makefile-trang 108 BLAKE2B 4f80e5f4e0550bd4732668ae5298d890d2293d34379902cf2
 AUX schemas.xml 560 BLAKE2B 32f01d2dd047aa7109112b47155a21825686385845fae2af0f6d052dbd36f3e1ca5027ec39d654735e390ef9aa8a31f7ae5c86b15b0cd9c4ef84128326e87ee9 SHA512 82ef6189610fc4e1a0d5546ae15f2f315e7c0d460fa141201c43a93e59d147613c7186302fdc3e6b2f0ec5c343e5566966892d4e9f55dc4957e4ad58793fc3ff
 DIST libvirt-7.10.0.tar.xz 8798000 BLAKE2B 6cb2ab5913d382b11d24b46154dc3250355050cd3038f64ba571b35f33ae5bd0a322d4b96469bd6c78fd848c87f2e6fc7213c33e5bdb9d375a9b81d2a40899bb SHA512 c7eecc9538b68852a8cc67565566d64ec7b087b6f009858b2eb524bc3ef0f6ca3c0da67edf801e6a3ae3fcc0364e65e108fa92bcb01ee810c85fa5f37785aa32
 DIST libvirt-8.7.0.tar.xz 8937316 BLAKE2B 131d46206662627e952b6daa3ceeab187321ff5fb1984980bc2816dfedf730c6ccd4b5a1cbfb46f33cc9e84508621e2625fa661f06b9e35561e8de52906824e5 SHA512 35d33d0e0dab525e8f0a8a592d286e9d17fc5c5d1ff2fab5af5c40b85248481dd17b5c3daf64e8c6e1b8a93328eebee6ece3e95edacff208a81d8b78dc102d7a
+DIST libvirt-8.8.0.tar.xz 8941928 BLAKE2B f3b8cb4fe30a156884a03e5c873f3fcef0c8d13315c79b865f387ea053635ae2435a3b4d6e81c988cfcd087d55223450e7b874e24e4503479d152b417c398250 SHA512 868e49b369afe200c5af6e2cd0606de2eeebfa92523b5ad3c653203c8838d304bd0cdc5acfb3c4d4c33c0a87ab8e769b84cc62e3f06e055936c43573a23d7190
 EBUILD nxml-libvirt-schemas-7.10.0.ebuild 873 BLAKE2B 02b97f936c302f2657280e597ed595b6061e6c71d6fe4c1e2f06c667da87dc51f5b6554ee4392b85f5f12e29f33df7a5a2ab6c4fa1fbe3fa09e66ab786d1ef5f SHA512 1f143986674b1878271a4c6e49fc7473ebbb8900ebfcf662467a84437f072de2e665395381e619e0cffafaefc24ecaf99ae26ccc22e3c0ae0783ab4a55a5be35
 EBUILD nxml-libvirt-schemas-8.7.0.ebuild 1052 BLAKE2B 2f66499763abab90bc7ff91c49853d5c2be7dda44b0c708443f531db1d2e82fafc8db3c8c5363695b65e40a46cea9838eadd53aca68285e22bd9d31e9b3bc94e SHA512 e633a25db9d1c550952d94b8a37ed74cc37c645e14f01463a62ed4d41c6aae26abd325ec0535691a9be61b6c653853cf99f21633ace83ddc0bd1cc34416583c8
+EBUILD nxml-libvirt-schemas-8.8.0.ebuild 1052 BLAKE2B 2f66499763abab90bc7ff91c49853d5c2be7dda44b0c708443f531db1d2e82fafc8db3c8c5363695b65e40a46cea9838eadd53aca68285e22bd9d31e9b3bc94e SHA512 e633a25db9d1c550952d94b8a37ed74cc37c645e14f01463a62ed4d41c6aae26abd325ec0535691a9be61b6c653853cf99f21633ace83ddc0bd1cc34416583c8
 MISC metadata.xml 390 BLAKE2B 05bd110c71244cf02d22bcf823d3285e73bdb03f3bb06b8c9e2c13cd346f2367380345747d5eb0861f37983be970dc6c9fe5e7d93b422205a7b447dc3330852e SHA512 bb803aed730418caf43baf132b989963e84f5e0e0d8db915a48cae407f20fb52e27c147725cac88fc94303db070f300a7ce3bf6c18e7dc66dec37bf9ccea5f5b
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.8.0.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.8.0.ebuild
new file mode 100644
index 000000000000..1c0188f9655a
--- /dev/null
+++ b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.8.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Packages which get releases together:
+# app-emacs/nxml-libvirt-schemas
+# dev-python/libvirt-python
+# dev-perl/Sys-Virt
+# app-emulation/libvirt
+# Please bump them together!
+
+inherit elisp
+
+MY_P="libvirt-${PV}"
+DESCRIPTION="Extension for nxml-mode with libvirt schemas"
+HOMEPAGE="https://www.libvirt.org/"
+SRC_URI="https://libvirt.org/sources/${MY_P}.tar.xz"
+S="${WORKDIR}/${MY_P%-rc*}/src/conf/schemas"
+
+# This is the license of the package, but the schema files are
+# provided without license, maybe it's bad.
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Yes this requires Java, but I'd rather not repackage this, if you
+# know something better in C, I'll be glad to use that.
+BDEPEND="app-text/trang"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() {
+	emake -f "${FILESDIR}"/Makefile-trang
+}
+
+src_install() {
+	insinto "${SITEETC}/${PN}"
+	doins "${FILESDIR}"/schemas.xml *.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}