Sync with portage [Tue Oct 15 23:58:58 MSK 2019].

5 years ago · 09648d73cf
parent 678c918b62
commit 09648d73cf
650 changed files with 4824 additions and 7529 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/sudo/sudo-1.8.28.ebuild
+++ b/app-admin/sudo/sudo-1.8.28.ebuild
@ -22,7 +22,7 @@ else
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-solaris"
+		KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~sparc-solaris"
 	fi
 fi

--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/blogmax/Manifest
+++ b/app-emacs/blogmax/Manifest
@ -1,2 +1 @@
-DIST blogmax-20110305.zip 194956 BLAKE2B b5f90254a218fc45b65faa8d5cdc53ec55f092716286a5757f483eed621d2142aeda398449b1c1b9c3acad67575025ce6bf9b9dce42f1d97d35227d13a0aa65e SHA512 dc0529c5d61ea9beaecf9dfdfe0631ae31fb9737845aa81f2ac7c19df7aa30eb7392f73ea96a00b678cd441f0815129bb04d521e697ce2cb3938d8699483d19b
 DIST blogmax-20170321.tar.xz 81704 BLAKE2B f7f45cb0d5981a0af09ad75b8b004aca950dad59efb0182f81596d6777caf31df6089c2cabb856168d5c031c5e60282e9a88f822219f5ec728f5dddc1c6adcb6 SHA512 bca3fd0bb10d98604426b4091831e709b2a731aa2e4cfc0737f14714bc6648a279c1909e1939f4504cf49aa470737458a00da598139d7797128563212997a4c1
--- a/app-emacs/blogmax/blogmax-20110305.ebuild
+++ b/app-emacs/blogmax/blogmax-20110305.ebuild
@ -1,43 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils readme.gentoo elisp
-
-DESCRIPTION="Blogging in Emacs"
-HOMEPAGE="http://billstclair.com/blogmax/index.html"
-# taken from http://billstclair.com/blogmax.zip
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.zip"
-
-LICENSE="GPL-1+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	rm *.elc gpl.txt || die
-	edos2unix *.{el,html,inc,ini,tmpl,txt,xml} docs/*.{html,txt}
-}
-
-src_compile() {
-	elisp-compile blogmax.el
-}
-
-src_install() {
-	elisp-install ${PN} blogmax.{el,elc}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-
-	DOC_CONTENTS="To get started with BlogMax, use the example site file
-		from /usr/share/doc/${PF}/example as a template for your own blog."
-	readme.gentoo_create_doc
-
-	dodoc README
-	dodoc -r docs
-	docinto example
-	dodoc *.{html,inc,ini,png,tmpl,txt,xml}
-}
--- a/app-emacs/blogmax/files/README.Gentoo
+++ b/app-emacs/blogmax/files/README.Gentoo
@ -1,8 +0,0 @@
-                                                            -*-outline-*-
-* Getting Started With BlogMax
-
-Use the example site file from /usr/share/doc/blogmax-*/example as a
-template for your own blog.
-
-- 
-Matthew Kennedy <mkennedy@gentoo.org>
--- a/app-emacs/bm/Manifest
+++ b/app-emacs/bm/Manifest
@ -1 +1,2 @@
 DIST bm-1.32_p20140214.tar.xz 11800 BLAKE2B 0c27f35a64dac09e5fff4391d6958ce5b2a2a6a8194a29500322137979e5fc0618fe1d47ca844bccba78d388d8a2569c5742f1a531c43c42a02845a31fb1f6c2 SHA512 0a40c5dc3d21c0b8af7e885f7e2f48c92413dff48a6a3a10366f9a63274886cd22a247b61ef25e4ad1f283446b05093658f233c6501c6d0bf5312d9a67b83ff4
+DIST bm-201905.tar.gz 23618 BLAKE2B 0770d571cae220215431d546892b9cebd03675565b24afad0dbfa9a74d50aaa73a6962b6bec81196700147f3fde835264c0727e7a4c02287fa3e4018ac133831 SHA512 81efd32572d0bcae2b0b91c277b4d634524f3c14c914015ebf06e5e9db2937c6d989ae65c745e214b2bc1a94d169433dede37a47519984e7211d9b8c4202a954
--- a/app-emacs/bm/bm-201905.ebuild
+++ b/app-emacs/bm/bm-201905.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Visible bookmarks in buffer"
+HOMEPAGE="http://joodland.github.io/bm/
+	https://www.emacswiki.org/emacs/VisibleBookmarks"
+SRC_URI="https://github.com/joodland/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+ELISP_REMOVE="bm-tests.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
--- a/app-emacs/browse-kill-ring/Manifest
+++ b/app-emacs/browse-kill-ring/Manifest
@ -1,2 +1 @@
-DIST browse-kill-ring-1.3c.el.bz2 9757 BLAKE2B 3287de095f1909a7da702a12575c6ac0254c5dd4ea485007a96bcda0ac75fb9c9017a1f594b688387b7c005bb2dba2c689464730bb8ea9ff3f005a9cc02f4caa SHA512 a7244db55b08b7247047cb71aa024dd2ba8579bd1588a31d65120145228729a329dac87c268b4be14b79beded6ec4f3473542c26bfb3c5624557023369737644
 DIST browse-kill-ring-2.0.0.tar.gz 16559 BLAKE2B 865be7da04bb25ab5bb68dfe7171bf790333a04643146c4cfbbf78dd4685c2264d94629d560277bab12f1dde156511a79e3818936498489b914e5d266d176d4c SHA512 724614ede752e633f0f219732be03af443c19cad146244a1815c131581499d5b856973bee25f053d8ad5296bd6283b2bf6024bbd8b5fcfd03aecf150763ce8ac
--- a/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
+++ b/app-emacs/browse-kill-ring/browse-kill-ring-1.3c.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit elisp
-
-DESCRIPTION="An improved interface to kill-ring"
-HOMEPAGE="https://www.emacswiki.org/emacs/BrowseKillRing
-	https://github.com/T-J-Teru/browse-kill-ring"
-# taken from upstream git repo
-SRC_URI="mirror://gentoo/${P}.el.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/calfw/Manifest
+++ b/app-emacs/calfw/Manifest
@ -1,2 +1 @@
-DIST calfw-1.3.tar.gz 67187 BLAKE2B 7a8f34c5d6ad2ac245837b89c6854ca0c3c8f94733752a8c0d86e460eb2424e4017bd01b877d2b4d6b8fe05f6ffac8dae2d838d6cdf68fad489264fe861317df SHA512 76fc957dac22b2e4e41fa3d5ef3eb9e603369044d5aa90fa2e32ca0abbaa897d4537358f7849d0491c366b6a76c1b463e57e7a9483fca7c67555a8f6157f46bc
 DIST calfw-1.6.tar.gz 74776 BLAKE2B 26aee13fa7533c17eac9c32e8355c6e2fd760e8f87166d7a28ae90040a156ad8e8d8205387b37e5069705fa42095f318a40032ba5ce161f3d84f4823ee6619be SHA512 0c51c1747cfdda003a3b2244224e1bc2afe7b3dbdbb47804734504013ad94f7c5aaa30a2370ae9383f3836f266d47f695ca3d90419d899c8a639d474fab14180
--- a/app-emacs/calfw/calfw-1.3.ebuild
+++ b/app-emacs/calfw/calfw-1.3.ebuild
@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp eutils
-
-DESCRIPTION="A calendar framework for Emacs"
-HOMEPAGE="https://github.com/kiwanami/emacs-calfw"
-SRC_URI="https://github.com/kiwanami/emacs-calfw/tarball/v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="howm"
-
-DEPEND="howm? ( app-emacs/howm )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	mv kiwanami-emacs-calfw-* ${P} || die
-}
-
-src_prepare() {
-	use howm || rm -f calfw-howm.el
-}
--- a/app-emacs/circe/Manifest
+++ b/app-emacs/circe/Manifest
@ -1,3 +1 @@
-DIST circe-1.3.tar.gz 118776 BLAKE2B 61ffc7df022be50beaba29a4025fde6d7cbde5cab28d0661e2e3388f712281f8d9370b92e8c56b4eb49984573d5a2f7edff308a7d1fe74ff630620f0867b1441 SHA512 60bbd752c73e875f2306877591ad8de324db0a7446bbfebf460e44ef19c0c28d40d08c8ed9e0caa4062859b07545d310d86380377a479eb6bc38c72decfaa213
 DIST circe-2.11.tar.gz 237797 BLAKE2B f5a6e72ac51a8e8638d1e05e4781688d83e7cd4fcf3e3e21e517793588c3a32b1686d390ab286d26fce3cbb7dd3ba7a30bb09ec677deacead16057ae8037e1c8 SHA512 aee0b5c7dfa03a190ba697941664e4afc76ec30b8602b2e95ad771fb6172ef2b76f4d05ad8af68f6b274f7f89373e05308b63e9c9cc494b7df0bf2c58fdca4e3
-DIST circe-2.7.tar.gz 237375 BLAKE2B d9978cc3e0c6431dace919efbd323f90e36ce40debb6e03c955b8cdfbed60ac0bbe27c68dcebfe2df9aabd2e7198d2d6da993c2ad41b5ede0b5d1b142217ec8f SHA512 6f4e0925381ad051e4680b5413eed000a6796d2e9bef35a052464a07968f67edb19d99f74be93620359e061c044a910e35afd1f88608453d264bf37826e10af3
--- a/app-emacs/circe/circe-1.3.ebuild
+++ b/app-emacs/circe/circe-1.3.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="A great IRC client for Emacs"
-HOMEPAGE="https://github.com/jorgenschaefer/circe
-	https://www.emacswiki.org/emacs/Circe"
-SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-
-S="${WORKDIR}/${PN}-${P}/lisp"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="../README.md"
--- a/app-emacs/circe/circe-2.7.ebuild
+++ b/app-emacs/circe/circe-2.7.ebuild
@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-NEED_EMACS=24
-
-inherit elisp
-
-DESCRIPTION="A great IRC client for Emacs"
-HOMEPAGE="https://github.com/jorgenschaefer/circe
-	https://www.emacswiki.org/emacs/Circe"
-SRC_URI="https://github.com/jorgenschaefer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-ELISP_REMOVE="circe-pkg.el"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="AUTHORS.md CONTRIBUTING.md NEWS.md README.md"
--- a/app-emacs/color-theme/color-theme-6.6.0-r2.ebuild
+++ b/app-emacs/color-theme/color-theme-6.6.0-r2.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Install color themes (includes many themes)"
+HOMEPAGE="http://www.nongnu.org/color-theme/"
+SRC_URI="http://download.savannah.gnu.org/releases-noredirect/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-replace-in-string.patch
+	"${FILESDIR}"/${P}-emacs-26.patch
+)
+ELISP_REMOVE="color-theme-autoloads.*"
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	elisp-install ${PN} *.el *.elc
+	elisp-install ${PN}/themes themes/*.el
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc AUTHORS BUGS ChangeLog README
+
+	DOC_CONTENTS="To use color-theme non-interactively, initialise it
+		in your ~/.emacs file as in the following example (which is
+		for the \"Blue Sea\" theme):
+		\n
+		\n(color-theme-initialize)
+		\n(color-theme-blue-sea)"
+	readme.gentoo_create_doc
+}
--- a/app-emacs/color-theme/files/color-theme-6.6.0-emacs-26.patch
+++ b/app-emacs/color-theme/files/color-theme-6.6.0-emacs-26.patch
@ -0,0 +1,48 @@
+Some updates taken from https://www.emacswiki.org/emacs/color-theme.el
+in order to make this work with Emacs 26. EmacsWiki calls this
+version 6.6.1, but doesn't package any other files from the upstream
+tarball.
+
+--- color-theme-6.6.0-orig/color-theme.el
+++ color-theme-6.6.0/color-theme.el
+@@ -1077,13 +1077,11 @@
+   (let ((rules '((font-lock-builtin-face font-lock-reference-face)
+ 		 (font-lock-doc-face font-lock-doc-string-face)
+ 		 (font-lock-constant-face font-lock-preprocessor-face)
+-		 ;; In Emacs 21 `modeline' is just an alias for
+-		 ;; `mode-line'.  I recommend the use of
+-		 ;; `modeline' until further notice.
+-		 (modeline mode-line)
+-		 (modeline modeline-buffer-id)
+-		 (modeline modeline-mousable)
+-		 (modeline modeline-mousable-minor-mode)
+		 ;; D.ADAMS - Emacs 24.3 made `modeline' obsolete, so I've just commented-out these four lines.
+		 ;; (modeline mode-line)
+		 ;; (modeline modeline-buffer-id)
+		 ;; (modeline modeline-mousable)
+		 ;; (modeline modeline-mousable-minor-mode)
+ 		 (region primary-selection)
+ 		 (region zmacs-region)
+ 		 (font-lock-string-face dired-face-boring "^dired")
+@@ -1254,7 +1252,9 @@
+ 	   (val (cdr (assq param params)))
+ 	   (frame (if color-theme-is-global nil (selected-frame))))
+       (when val
+-	(set-face-property face prop val frame)))))
+	(if (fboundp 'set-face-property)
+	    (set-face-property face prop val frame)
+	  (set-face-attribute face frame prop val))))))
+ 
+ (defun color-theme-alist-reduce (old-list)
+   "Reduce OLD-LIST.
+@@ -1332,7 +1332,9 @@
+     (dolist (var vars)
+       (if (or color-theme-is-global color-theme-xemacs-p)
+ 	  (set (car var) (cdr var))
+-	(make-variable-frame-local (car var))
+	;; DADAMS
+	;; `make-variable-frame-local' was removed from Emacs C code in Emacs 26.
+	(when (fboundp 'make-variable-frame-local) (make-variable-frame-local (car var)))
+ 	(modify-frame-parameters (selected-frame) (list var))))))
+ 
+ (defun color-theme-install-faces (faces)
--- a/app-emacs/company-mode/Manifest
+++ b/app-emacs/company-mode/Manifest
@ -1,2 +1,2 @@
-DIST company-mode-0.6.14.tar.gz 51776 BLAKE2B 2e5a651b13d959d964847a307814106b5db95092d764e1d6889c94412d0aa1995d2a34182786493afc426b6c6ae4f229498f58b7556d1dc264c71ec57dcb8b6f SHA512 7b8c0b70dc9c010214e8671fd7393faa9d1dd0839f41d532eb93eda91c77b4c93f2145ad2d688011976bfbb45282f35b937f195499f29cda79147ec2815e94d9
 DIST company-mode-0.7.tar.gz 54670 BLAKE2B 4b56182d6d37e1c0dd827babf3e5c17c49a2e86959c99aa4dc6832f5003a9c1baf0019c610cf9bd46e6db5f1d68e72381ae22f71afb636873552440c48b218c0 SHA512 375c8541a0c5b34fba37ea136c8549e6ec916c238bee8115f036d88f273d6bcb0c0f436a6193d3b4be6528945d8f85c605de8d340e903a9764f5ace664f8cf61
+DIST company-mode-0.9.10.tar.gz 85982 BLAKE2B 393e8ff31f4a88d1c156418bd0c827572ec078b833e78bd1007779961e9fb852737f12a5c1aeba154ebba53d81058bdc2871f7d88880aaa7dd8cb9692461c8fb SHA512 b6571c55bcf68a5e83e7c92c8b53e0ac6b4e84bce1246331a7da4495f4ee5c3ab38035310fd2eb7a87748db1c034996d99c7ead8aa831d552800642b31cf9fe0
--- a/app-emacs/company-mode/company-mode-0.6.14.ebuild
+++ b/app-emacs/company-mode/company-mode-0.6.14.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="In-buffer completion front-end"
-HOMEPAGE="https://company-mode.github.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ropemacs"
-RESTRICT="test"
-
-# Note: company-mode supports many backends, and we refrain from including
-# them all in RDEPEND. Only depend on things that are needed at build time.
-DEPEND="ropemacs? ( app-emacs/pymacs )"
-RDEPEND="${DEPEND}
-	ropemacs? ( dev-python/ropemacs )"
-
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md NEWS.md"
-
-src_prepare() {
-	# Disable backends that require extra dependencies, unless they are
-	# selected by the respective USE flag
-
-	elog "Removing pysmell backend"
-	rm company-pysmell.el || die
-
-	if ! use ropemacs; then
-		elog "Removing ropemacs backend, as requested by USE=-ropemacs"
-		rm company-ropemacs.el || die
-	fi
-}
--- a/app-emacs/company-mode/company-mode-0.9.10.ebuild
+++ b/app-emacs/company-mode/company-mode-0.9.10.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="In-buffer completion front-end"
+HOMEPAGE="https://company-mode.github.com/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+# Note: company-mode supports many backends, and we refrain
+# from including them in RDEPEND.
+
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md NEWS.md"
--- a/app-emacs/csharp-mode/Manifest
+++ b/app-emacs/csharp-mode/Manifest
@ -1,2 +1 @@
-DIST csharp-mode-0.7.0.tar.bz2 6254 BLAKE2B 259d3ab7a6005428043398d44068dd8accc222c50581b7a760c740af96275a5877efc186d2582dccdc73442b9549bc8f5e1ff7f95e69effa7c90bbffc46fe461 SHA512 b6cbf2899853c29f44d19f37a01984a03c61f7bde144880f6f32e2a890d3b90a546ff69ad328d157e5494191aed37836373f49ddbafac49d8b9bd1cea3e22de9
 DIST csharp-mode-0.9.0.tar.gz 50453 BLAKE2B ed4b6ba56a9283687db332749510dcb63cc4bfc35687979cabae48b76d9e36598c88ff43f2920ca5272b56833d5cadd6602b47be21d88a7cd25d6ecb0e748493 SHA512 81661d98acdf03e01caf3b9388da8571e78402b8914755b223a38a723457a988201adcaf7b5b825c4e0126ad5e7628063f85dd4e60ee272102a5f1509f9446ef
--- a/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild
+++ b/app-emacs/csharp-mode/csharp-mode-0.7.0-r1.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="A derived Emacs mode implementing most of the C# rules"
-HOMEPAGE="http://mfgames.com/csharp-mode/start"
-SRC_URI="http://mfgames.com/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-ELISP_PATCHES="${P}-emacs-24.4.patch"
-SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch
+++ b/app-emacs/csharp-mode/files/csharp-mode-0.7.0-emacs-24.4.patch
@ -1,14 +0,0 @@
-https://bugs.gentoo.org/528374
-
--- a/csharp-mode.el
-+++ b/csharp-mode.el
-@@ -125,6 +125,9 @@
- 		  (stringp byte-compile-dest-file))
- 	     (cons (file-name-directory byte-compile-dest-file) load-path)
- 	   load-path)))
-+    (and (= emacs-major-version 24)
-+	 (>= emacs-minor-version 4)
-+	 (require 'cl))
-     (load "cc-mode" nil t)
-     (load "cc-fonts" nil t)
-     (load "cc-langs" nil t)))
--- a/app-emacs/csv-mode/Manifest
+++ b/app-emacs/csv-mode/Manifest
@ -1 +1,2 @@
 DIST csv-mode-1.50.tar.gz 14379 BLAKE2B 8b3b60414aa8d6c54f18a0452c1f0d7ea4cb85311392f928e3ec99555b91cd9e7a47e4315b07df3970acf4c05b05b85e1a4e2e7b87b3bb8527904003f89ade75 SHA512 f62e9561f3ec9c14d0fc44de92f83b733ab86e45ba4b8919e5dbbee05d25a346cf7f1412aa0c5be7e88079d219dd4c22d6e198f4e53f801ae1b137e014a7943c
+DIST csv-mode-1.9.el.xz 17392 BLAKE2B f49ca9612857f8723d6bec35309fa8c357cfb62589404718141e1fa1cf9a7188c759441e7993dc8e2af5424055d2f68f99d7cff8bba80cf0a1ead9785213f0a8 SHA512 fcf008ba30589a57c362f8501a20bcb494ce9e971ff9e2d3833436658295c94af3bc55be8a32e83deed407c19143ca421a33b3a93d7457a272de34f1d758969b
--- a/app-emacs/csv-mode/csv-mode-0_pre20040823.ebuild
+++ b/app-emacs/csv-mode/csv-mode-0_pre20040823.ebuild
@ -1,16 +1,18 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=5

 inherit elisp

+MY_P="${PN}-1.50"
 DESCRIPTION="A major mode for editing comma-separated value files"
 HOMEPAGE="http://centaur.maths.qmw.ac.uk/Emacs/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"

 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"

+S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/csv-mode/csv-mode-1.9.ebuild
+++ b/app-emacs/csv-mode/csv-mode-1.9.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="A major mode for editing comma-separated value files"
+HOMEPAGE="https://elpa.gnu.org/packages/csv-mode.html
+	https://www.emacswiki.org/emacs/CsvMode"
+# Taken from https://elpa.gnu.org/packages/${P}.el
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/d-mode/Manifest
+++ b/app-emacs/d-mode/Manifest
@ -1 +1,2 @@
+DIST d-mode-2.0.10.tar.gz 22394 BLAKE2B 16993c1da1b4362df4ef4674f58645da13466d6bf9a6215667a70868be7f6d3f992f0e60d9a3b6c4bcac7c3f4014fa987bfec2f3ee4e1503740efe316f29d249 SHA512 510ee3b1c1288b4b6772cdc9c436d691cc4c09fd1337886abe9a8c86e64a6fede3d8e2aaf46e847417cb667d36f9c5db3c446e7f5ca88fe2bc8b8fb80bcd1297
 DIST d-mode-2.0.6.tar.gz 5465 BLAKE2B 4ccb9341ac25c4856c1dc3ce7a7acc68942fb7ce3dbb6818b2fab6de843b6f6757907e994d2e777d0590b8ae26fbf4483eaa7d1b5e0ab7d635047ced4a276c60 SHA512 8706459af61e49b3ca1ef6d4021abff752706b4dca9385c4fbe2b7c29ecb028dc3df558b1e9b3a358e5c38e3d2ab7121505583f95d3afdd9a06bc9449ed678f2
--- a/app-emacs/d-mode/d-mode-2.0.10.ebuild
+++ b/app-emacs/d-mode/d-mode-2.0.10.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Emacs major mode for editing D code"
+HOMEPAGE="https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode
+	https://www.emacswiki.org/emacs/DMode"
+SRC_URI="https://github.com/Emacs-D-Mode-Maintainers/Emacs-D-Mode/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/Emacs-D-Mode-${PV}"
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/dash/Manifest
+++ b/app-emacs/dash/Manifest
@ -1,3 +1,2 @@
-DIST dash-2.13.0.tar.gz 146280 BLAKE2B e9552a19b1f84db0e16fba07fe5bcfc0eb8a6871aabf395fa7ca527b77ba23616fdaa29e67d73e6cf11260bd23807be17de1e52f4abd23b0f9562cb26e6a5feb SHA512 59969e3df1b258a1bae76904e5abaf64c5143de9b8994a04799dad3a317c6ccc1dcd19b99a337a23bce0e46cfb6bc90bf8c6b0e6a532946b4f0ec188d331b559
 DIST dash-2.14.1.tar.gz 141115 BLAKE2B 87fc7a02c66161d1c16debc54c6336f36cc47cf7c7c470d190424b9c463723058ef6f72cadf3f4d4215b36f369b9e5356101c4ea16fede10cefde90b5e0b384b SHA512 cfd4ed7a9eab881a0c3bd2744e78c5ef99a92db4d3afee8c632c0a766adcdbf1999f4e9770e2c4e941526d488dd6f9327937389490cc2310d79b38c5bf2ddd12
 DIST dash-2.16.0.tar.gz 148151 BLAKE2B 1c51d926a6dd4ecdbc2ad132347af7bbd27e604d6e2c61a6cfe548802b08a57678ca26aba69f8ae27ca7cdeca84cd469bd9a7849bf28c2abae44f7172ad2659d SHA512 a0196327c8e81d1b343bb56de00a3c2f59b1d3f86dc4e923cf350658590fa106aa0be933aa0f51ff3c02d9aff8450c5e055d169ae8fb876be068bf15a52af216
--- a/app-emacs/dash/dash-2.13.0.ebuild
+++ b/app-emacs/dash/dash-2.13.0.ebuild
@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="A modern list library for Emacs"
-HOMEPAGE="https://github.com/magnars/dash.el"
-SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-DEPEND="sys-apps/texinfo"
-
-S="${WORKDIR}/${PN}.el-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-ELISP_TEXINFO="dash.texi"
-DOCS="README.md"
-
-src_test() {
-	./run-tests.sh || die
-}
--- a/app-emacs/develock/Manifest
+++ b/app-emacs/develock/Manifest
@ -1 +1,2 @@
 DIST develock-0.45.el.gz 13627 BLAKE2B 8c67a46ae7eba961fd64b202128ca19da54251d1079bb4c9091c2b99a6dd6d3f42f1273c5d7ffd371911af3fb3b64e723f6a6d0bd432a1c243701d8ad793bf64 SHA512 e868efe9426ad6aed4c46bbbac3bc90c9207cd94367dedf7ac93710ae04d9f18348b10603c56d436dc1553be94f65b79615d5293578b9e7bb1a7b783d7a3f41e
+DIST develock-0.47.el.gz 14156 BLAKE2B a0749689fec9fc5b5fc480a1a27eea83f9ab57ac232c8aa1054a1ac23a25fa56cb9728db0bfccad141f562721852f7c4717c1f0432c0af53f44128a551ccea87 SHA512 8864416d67cb37b8535dbb2fecc336b13434b2284a27142d59ff6789ccf32515d12369082b0d481f2999e868db72de603f79998d408239c35f7c9aeed8ef82cb
--- a/app-emacs/develock/develock-0.47.ebuild
+++ b/app-emacs/develock/develock-0.47.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="An Emacs minor mode for highlighting broken formatting rules"
+HOMEPAGE="https://www.jpl.org/ftp/pub/elisp/
+	https://www.emacswiki.org/emacs/DevelockMode"
+# taken from https://www.jpl.org/ftp/pub/elisp/${PN}.el.gz
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/distel/Manifest
+++ b/app-emacs/distel/Manifest
@ -1,2 +1 @@
-DIST distel-4.0.6.tar.gz 210257 BLAKE2B 615682bfc2b773a78ad85d4817135144dda787d1db57b2743ea2fca8ed672fc1e37f6bc23803c9cc2b6096e7376d318cd7c25c3133f7b9c1326dbd451273841b SHA512 510f82b6794379d89020d234462e09251e0db285ebc111eaf096e32a4e3619384650cb2b47ed68d38762a496504b58981c73ca5b930bd0eb1407aee9599c149f
 DIST distel-4.1.1.tar.gz 214189 BLAKE2B 0a24039c11d603814ca352ccc09e776b2431ab1172c195a528aba6ecd85eeb15d9739bb37fcc850fd33e2af928eb9d2c7bc8a1721b46f79792ec658f58d41a4e SHA512 3ef73a650775f25f8e77c78cfaec3d2277a4e097128819d118ba566ac477455a1764383959f1d8eca33f8dedfa937eab605dfff899d344b9b03262c2abc7ac44
--- a/app-emacs/distel/distel-4.0.6.ebuild
+++ b/app-emacs/distel/distel-4.0.6.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Distributed Emacs Lisp for Erlang"
-HOMEPAGE="https://code.google.com/p/distel/
-	https://www.emacswiki.org/emacs/DistributedEmacsLisp"
-SRC_URI="https://github.com/massemanet/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-# "New BSD License" according to https://code.google.com/p/distel/
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND=">=dev-lang/erlang-11.2.5[emacs]"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake base info
-	cd elisp || die
-	elisp-compile *.el
-}
-
-src_install() {
-	emake prefix="${ED}"/usr \
-		ELISP_DIR="${ED}${SITELISP}/${PN}" install
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	doinfo doc/distel.info
-	dohtml doc/distel/*.html
-	dodoc AUTHORS ChangeLog NEWS README*
-	use doc && dodoc doc/gorrie02distel.pdf
-}
--- a/app-emacs/ecb/Manifest
+++ b/app-emacs/ecb/Manifest
@ -1,2 +1 @@
-DIST ecb-2.41_pre20140215.tar.xz 565404 BLAKE2B 135aa4a71bb41e78933604c5e549d8a163715061c7946e90a115cf802499f9a78884e554cbf4fd4edc9b5856b1f32b3189eb3e1e2537b16e5dd57cfe3ccd1ee3 SHA512 bf87bdd38e7ddaeec044fc56d56f7c456ef0a1922f50b962f932bf739895f046387bab7a934439e749fd7e838d9f742938408f4f9cb47079440abd8c1ba181b6
 DIST ecb-2.50_pre20170728.tar.xz 562144 BLAKE2B 922a1f101d01717c5d078fbb055903c43e91360061b792e96e9aa9421d19df2cd47f7e69aae6dba4f188e26682d2a758ff8aa57ff500e5b6fdeaea6920b21a25 SHA512 074738cc323b595caf3d34d6eaa08d6a1a8d3a53762c9bf48b751ab25a16a26a8c71984996b7e7616f4999a0876c6d03751e1e45b68aad712020778da387a59d
--- a/app-emacs/ecb/ecb-2.41_pre20140215-r1.ebuild
+++ b/app-emacs/ecb/ecb-2.41_pre20140215-r1.ebuild
@ -1,51 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp eutils
-
-DESCRIPTION="Source code browser for Emacs"
-HOMEPAGE="http://ecb.sourceforge.net/"
-# snapshot of https://github.com/alexott/ecb.git, created with "make distrib"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="java"
-
-DEPEND="!!<app-emacs/cedet-2.0
-	java? ( app-emacs/jde )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-SITEFILE="70${PN}-gentoo.el"
-DOC_CONTENTS="ECB is autoloaded in site-gentoo.el. Add the line
-	\n\t(require 'ecb)
-	\nto your ~/.emacs file to enable all features on Emacs startup."
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.32-gentoo.patch"
-	sed -i -e "s:@PF@:${PF}:" ecb-help.el || die "sed failed"
-}
-
-src_compile() {
-	local loadpath="" sl=${EPREFIX}${SITELISP}
-	if use java; then
-		loadpath="${sl}/elib ${sl}/jde ${sl}/jde/lisp"
-	fi
-
-	emake LOADPATH="${loadpath}"
-}
-
-src_install() {
-	elisp_src_install
-
-	insinto "${SITEETC}/${PN}"
-	doins -r ecb-images
-
-	doinfo info-help/ecb.info*
-	dohtml html-help/*.html
-	dodoc NEWS README RELEASE_NOTES
-}
--- a/app-emacs/emms/Manifest
+++ b/app-emacs/emms/Manifest
@ -1,4 +1,2 @@
-DIST emms-3.0.tar.gz 200838 BLAKE2B bca2f720abfa79d8ba460115169660ef1c52be895d9f49638cb771e2824456f59a4bbb8e92c4dafe3eb11203099ec564e4033e4fcaf305d26f39047423efde93 SHA512 a6637d6d9bcf7fdc81815e698b51579d2dcb51b70b39d65117a81d180541f4774c82a1da23f5e67a5ffd37d5f1a4ce4fe5f653f8e443f899910320eaf5420119
-DIST emms-4.1.tar.gz 283625 BLAKE2B 4ec32ca724f414024ef26db1f93f573f36605b32530ace833d2f3b1a7230f2da374c0cd3307082d44372c201ac6fd8b8eec9da0938db1699437b93236bda5cbe SHA512 b92773bb102e8d082a70644743665d5a1bfa470f579b8aaa1df60a29d0156aa6c4d516ea92a842db50d3418d63be7eb0cd36f18e9e3574b840056ed4ea210107
 DIST emms-4.3.tar.gz 287153 BLAKE2B 2b8dab4f18ea7a6eb4e0b982d795d5f16dcdbe39dc091e6f6fe056cf1143b11620ef8ee4fc83612224c6674978747b8c96575e797f0779b6fab71f46f921f918 SHA512 fd674e8637700d0a08cbdf0253ffd285623ba8181fac389eb94a701091ce25b071f995baa4fd68d60528dbbb90bbf034705bf52b41d9d5edd7af12c2c99418ed
 DIST emms-4.4.tar.gz 288922 BLAKE2B d86cd9124f1d92d9d91aa96c45f7fd5e86776ff5f15cfa5e139eb40bc72e673f394b3d5209e64da62d3ab02ef18d6ac690e1d4e4273f3aad9c53b7e5ac4e7839 SHA512 d0aaac80728b542366885916e43c2c50302a5a5d6c9e35ff53a5b46a7185fda19459ea28f0d77929920873d7d9732fa531a4ef50f5052ed4df42cc474d14d0ba
--- a/app-emacs/emms/emms-3.0-r1.ebuild
+++ b/app-emacs/emms/emms-3.0-r1.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp toolchain-funcs
-
-DESCRIPTION="The Emacs Multimedia System"
-HOMEPAGE="https://www.gnu.org/software/emms/
-	https://www.emacswiki.org/emacs/EMMS"
-SRC_URI="https://www.gnu.org/software/emms/download/${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="media-libs/taglib"
-RDEPEND="${DEPEND}"
-
-# EMMS can use almost anything for playing media files therefore the dependency
-# possibilities are so broad that we refrain from setting anything explicitly
-# in DEPEND/RDEPEND.
-
-ELISP_PATCHES="${P}-Makefile.patch
-	${P}-texinfo-5.patch"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		EMACS=emacs \
-		all emms-print-metadata
-}
-
-src_install() {
-	elisp-install ${PN} *.{el,elc}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	doinfo *.info*
-	dobin *-wrapper emms-print-metadata
-	dodoc AUTHORS ChangeLog FAQ NEWS README RELEASE
-}
--- a/app-emacs/emms/emms-4.1.ebuild
+++ b/app-emacs/emms/emms-4.1.ebuild
@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit elisp toolchain-funcs
-
-DESCRIPTION="The Emacs Multimedia System"
-HOMEPAGE="https://www.gnu.org/software/emms/
-	https://www.emacswiki.org/emacs/EMMS"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="media-libs/taglib"
-RDEPEND="${DEPEND}"
-
-# EMMS can use almost anything for playing media files therefore the dependency
-# possibilities are so broad that we refrain from setting anything explicitly
-# in DEPEND/RDEPEND.
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake CC="$(tc-getCC)" \
-		all emms-print-metadata
-}
-
-src_install() {
-	elisp-install ${PN} lisp/*.{el,elc}
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	doinfo doc/emms.info*
-	dobin src/emms-print-metadata
-	doman emms-print-metadata.1
-	dodoc AUTHORS ChangeLog NEWS README THANKGNU
-}
--- a/app-emacs/emms/files/emms-3.0-Makefile.patch
+++ b/app-emacs/emms/files/emms-3.0-Makefile.patch
@ -1,11 +0,0 @@
--- emms-3.0-orig/Makefile	2007-06-29 18:16:24.000000000 +0200
-+++ emms-3.0/Makefile	2010-08-09 22:14:39.000000000 +0200
-@@ -41,7 +41,7 @@
- 	makeinfo --html --no-split $<
- 
- emms-print-metadata: emms-print-metadata.c
-	$(CC) -o $@ $< -I/usr/include/taglib -L/usr/lib -ltag_c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< `taglib-config --libs --cflags` -ltag_c
- 
- install:
- 	test -d $(SITELISP) || mkdir -p $(SITELISP)
--- a/app-emacs/emms/files/emms-3.0-texinfo-5.patch
+++ b/app-emacs/emms/files/emms-3.0-texinfo-5.patch
@ -1,17 +0,0 @@
--- emms-3.0-orig/gpl.texi
-+++ emms-3.0/gpl.texi
-@@ -659,6 +659,8 @@
- Program, unless a warranty or assumption of liability accompanies a
- copy of the Program in return for a fee.
- 
-+@end enumerate
-+
- @iftex
- @heading END OF TERMS AND CONDITIONS
- @end iftex
-@@ -721,5 +723,3 @@
- applications with the library.  If this is what you want to do, use
- the GNU Lesser General Public License instead of this License.  But
- first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
-
-@end enumerate
--- a/app-emacs/folding/Manifest
+++ b/app-emacs/folding/Manifest
@ -1,2 +1,2 @@
-DIST folding-2012.0226.1623.el.bz2 49503 BLAKE2B 6e364c9c93c92d4e9c322b5cc75b2525d95d63fe5a5b5916e054063fb2452f8ade4cce7e805243cb95a078157f33feff1bc9890b3a7d0de66813c63c74be0dbf SHA512 efb645e46e55174f2b538b6812f36d08f576f765ffffdf25af756c852e7bfd6455cb3bc3a540089a60600251b2c144384b7f58b412840a95ce614efd9d5b50c9
 DIST folding-2013.0613.1821.el.xz 52164 BLAKE2B cb9dc74ab409ddeff8434191f53dadac5c53a15fdf4b8edb041daa156221e7271bd30bf66e60049ebd4ed761f16b1adfa113e05967cc70729f6b5c3f1dc71306 SHA512 9eb7cf4e1b01d7f37969bab0a66ad564da3742981ec0623b3100b0aef1bb997a80c91b88286ac673775edd197110496e1849210cc40fe310d8a478471cc1ec53
+DIST folding-2019.0524.1621.tar.gz 70386 BLAKE2B 3025b0487b8f72459393348abf811b953cacedb292667f3bf30955bdc7d6f1055125d8e481fb0bb1be0e04e7c819dde3df091bfb8e50d4972685bb2adc18755e SHA512 807e544760f09eccf6322610d6e00d525caebec9542588948cbd84435ace09edeaec1a68cec781415dcb2528780a35887705eb80b5c2b61138284e6a250d220e
--- a/app-emacs/folding/files/folding-2019.0524.1621-info-filename.patch
+++ b/app-emacs/folding/files/folding-2019.0524.1621-info-filename.patch
@ -0,0 +1,11 @@
+--- a/folding.texi
+++ b/folding.texi
+@@ -2,7 +2,7 @@
+ \input texinfo
+ 
+ @c %**start of header
+-@setfilename info/folding
+@setfilename folding.info
+ @settitle folding
+ @documentencoding ISO-8859-1
+ @c %**end of header
--- a/app-emacs/folding/folding-2012.0226.1623.ebuild
+++ b/app-emacs/folding/folding-2012.0226.1623.ebuild
@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="A folding-editor-like Emacs minor mode"
-HOMEPAGE="https://www.emacswiki.org/emacs/FoldingMode"
-# taken from http://git.savannah.gnu.org/cgit/emacs-tiny-tools.git
-SRC_URI="mirror://gentoo/${P}.el.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 x86"
-
-SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/folding/folding-2019.0524.1621.ebuild
+++ b/app-emacs/folding/folding-2019.0524.1621.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+MY_PN="project-emacs--${PN}-mode"
+COMMIT="a1361aa154b27bd4db2e1cfe6c3b81b4fc1fdc9a"
+
+DESCRIPTION="A folding-editor-like Emacs minor mode"
+HOMEPAGE="https://www.emacswiki.org/emacs/FoldingMode"
+SRC_URI="https://github.com/jaalto/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${COMMIT}"
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="folding.texi"
+PATCHES=("${FILESDIR}"/${P}-info-filename.patch)
--- a/app-emacs/graphviz-dot-mode/Manifest
+++ b/app-emacs/graphviz-dot-mode/Manifest
@ -1,4 +1,2 @@
-DIST graphviz-dot-mode-0.3.7.el.xz 10840 BLAKE2B 6d4d80705ba01723ce538dcf97a218197c4d5295196d94c72dc5debdd59bf3e755227088a89b55c0ef019c9c4dbdaf5a7c01c441440ae8be32d5d472711160b2 SHA512 1b142cd4ea257a1b18f557d9b166db9c69538238c100d3eb682219df3488803566bbb366be6b57d129753c745b21a585eb815dbef870ad2e71560d4acc33edf3
-DIST graphviz-dot-mode-0.4.20171103.tar.gz 353912 BLAKE2B 526a14c7bfe4178f89268f6b3f381e69c1223e6576adfeca7864df8c6b62042fcd8e4f718f658ac210e2ce596eedd83a665a72c8d698e83fa28ae3ebf6eecc69 SHA512 73e7570ad1a954dc49b8151b336733af2141126555f27cfe9d6258361131c86325e8717e9740968926452f81fabb66e219534022c9de396bbcb50b9a124be9f5
 DIST graphviz-dot-mode-0.4.20181118.tar.gz 353971 BLAKE2B eab5279ec25a93bae311c6db430b41f5352a63f545573694f9760e5f5cbbbeae54904361c63c909cd8c77da68e757d0fad24271edb07d4267521535e2d9f7db7 SHA512 c02523d2a2a3be2d4be187b7bed34d3d5a897532d7ad2205683a69e3ae849a1e002f5f17637987b1774b4e65f0923e52b5bf048cc0fcd62ae4bf3693b90420db
 DIST graphviz-dot-mode-0.4.tar.gz 12288 BLAKE2B 2757734b1aae33322d3c093be4d650dd8c464292a50915463ea23e946a695986c6b36650c3f5baee69d402b2cd3747cc453cf18c56bd128dc6bdc9e15e2445ba SHA512 db50adc0550629adcee8ea7482e678b2fbfa8db514e9ea80381dec47fef75cd0a61b7cfbeef59aae102e50d824edfb06b8ee56c4e964cd3e90ec8540b1b250a6
--- a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild
+++ b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.3.7.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Emacs mode for editing and previewing Graphviz dot graphs"
-HOMEPAGE="http://users.skynet.be/ppareit/projects/graphviz-dot-mode/graphviz-dot-mode.html
-	http://www.graphviz.org/"
-# taken from http://users.skynet.be/ppareit/projects/${PN}/${PN}.el
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.20171103.ebuild
+++ b/app-emacs/graphviz-dot-mode/graphviz-dot-mode-0.4.20171103.ebuild
@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-COMMIT=c456a2b65c734089e6c44e87209a5a432a741b1a
-
-DESCRIPTION="Emacs mode for editing and previewing Graphviz dot graphs"
-HOMEPAGE="http://users.skynet.be/ppareit/projects/graphviz-dot-mode/graphviz-dot-mode.html
-	https://github.com/ppareit/graphviz-dot-mode
-	https://www.graphviz.org/"
-SRC_URI="https://github.com/ppareit/graphviz-dot-mode/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-SITEFILE="50${PN}-gentoo.el"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
--- a/app-emacs/hexrgb/Manifest
+++ b/app-emacs/hexrgb/Manifest
@ -1 +1,2 @@
+DIST hexrgb-0_p1019.el.xz 10156 BLAKE2B 0f6681460b5a2d631763324015004800d58ffa93852bbb1fb4f5e07eee89d8a5db8c2f416af7fc7b885a37c520b544e959814f693adb7b41b27e0a76d38dc6c3 SHA512 4c05115e6889035e699ba9f920b1bf4f638e3c9980477dbaddeca6ec45f5c2e8574d26745e1d570d002a5ed83e7dc3f389144d1fff5efbbf7247508278ae567e
 DIST hexrgb-0_p957.el.xz 9620 BLAKE2B 6bcb432cce9a0981f19acd4beba785941148fa9ca8ebd2575b2ef4a39fe28c641160b5c27d6515220f122e66154d89807ba0075e41c2506d5c8aa1a6b291404c SHA512 5948dac5a771a7d3e9632a9783478181a39c4cb0e6d399ec8793730883182e44eb1aeef1dc9ebaadb4004f1b766e85033f79fa6db4b68ed5b11d38eec5b934d1
--- a/app-emacs/hexrgb/hexrgb-0_p1019.ebuild
+++ b/app-emacs/hexrgb/hexrgb-0_p1019.ebuild
@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Functions to manipulate colors, including RGB hex strings"
+HOMEPAGE="https://www.emacswiki.org/emacs/hexrgb.el"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/icicles/Manifest
+++ b/app-emacs/icicles/Manifest
@ -1,2 +1 @@
-DIST icicles-2013.04.23.23400.tar.gz 886525 BLAKE2B 92325f9486f3008b45d336828025e828b83bdeb91ea7fef3a72f8093b9800ca1303cebcc3cc6c7c4bfadb9b66a26371f55a98498a34d23dc3511d1e2f6de4b36 SHA512 548c20fe83f72d03820d620d0d5f9feb6d249ca96c8f951ddbf650691ad30649d28d736b7c01677e260fed0490382a5771c0e88adef6c9c0089ecbd225f9acd5
 DIST icicles-2018.02.13.23733.tar.xz 697112 BLAKE2B 63b60a74cfcc5b855e9ffbf7a91d0cb561c46ef1a93fb1baca00a0a5462326da983c734bef1943c0f17583aeb065d8fd5d88769eec2dc35f36a59ea4ff86609b SHA512 6c5d2270c735fafa8e2180134fbe7175e1c99cb6ae904a70dbdf1144293bd1ffa84d9e81b1c1b03296348a6b31ebab62ea7981a4b7f5be8bb5238bd143ccb3c0
--- a/app-emacs/icicles/icicles-2013.04.23.23400.ebuild
+++ b/app-emacs/icicles/icicles-2013.04.23.23400.ebuild
@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Minibuffer input completion and cycling"
-HOMEPAGE="https://www.emacswiki.org/emacs/Icicles"
-SRC_URI="https://github.com/emacsmirror/icicles/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/lua-mode/Manifest
+++ b/app-emacs/lua-mode/Manifest
@ -1 +1,2 @@
 DIST lua-mode-20130419.tar.gz 26242 BLAKE2B 25f75c70982ba2fb0077fb249501367f9dde3eee5ff7bb45c0d8d97857b6268c481652e06e5a92bd04d9b9fcac0fa3368dfbdc3efcbaefc34268aeb490ac6ad9 SHA512 e66ebe6c953e81b07a8f9d86264b1baa5e0b730a6d26b1acf7fb48ceb8cc0f008cdea0046d89e380fefefe0e0b189ef360280236befc79ade69e0622a2e7eb92
+DIST lua-mode-20151025.tar.gz 35319 BLAKE2B d84c79622793c51caf7262749d4648baa106f7a2d639706b495097d89fbe8f3ce09482ca12a0473e4a4eaf04cab83ee8b65d62e505b32b12302571efdd1881d4 SHA512 1b2877ba9ba24694b2a820a4e1408d0f475f04bdee424d346fc2248980863aaaf230f757365095304cda763addb32de7e6a2585218770f66d519455d1a32762d
--- a/app-emacs/lua-mode/lua-mode-20151025.ebuild
+++ b/app-emacs/lua-mode/lua-mode-20151025.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="An Emacs major mode for editing Lua scripts"
+HOMEPAGE="http://lua-users.org/wiki/LuaEditorSupport
+	http://immerrr.github.io/lua-mode/"
+SRC_URI="https://github.com/immerrr/${PN}/archive/rel-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+S="${WORKDIR}/${PN}-rel-${PV}"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="NEWS README README.md TODO"
--- a/app-emacs/markdown-mode/Manifest
+++ b/app-emacs/markdown-mode/Manifest
@ -1,2 +1 @@
-DIST markdown-mode-2.1.el.xz 50484 BLAKE2B 12ae664f0680a420727148c2ed78275ab7dcdc8ae742a0152f82dc25150cea9bd5d880b9244351792354ac1d64789267163512e55c2b83f64855bbc0ab0ac33e SHA512 3f0d68b03408281e49c9dbf4d26b8c1f766aa675efea6789b13722c7b1d831af35d3ea30ac071be00242279bca31d04fe92a28b901698fe2072d4504d9901253
 DIST markdown-mode-2.3.el 387130 BLAKE2B acb583126a6f952835537f9e386df5f9a8fda5e49a14520e153c0cc99fc58cca596607b282f9f7070b001fe8165d50adb9abb81de1b03ae102cf2061de587810 SHA512 0820c5ae585e0f5ee8fef9eca40f2de2ad632a2559ea7f447cd19ded592de38bf2f3df8491796c15eb06723fe2af904335535af145356c7a7f9f855612263aaf
--- a/app-emacs/markdown-mode/files/markdown-mode-2.1-text-auto-mode.patch
+++ b/app-emacs/markdown-mode/files/markdown-mode-2.1-text-auto-mode.patch
@ -1,23 +0,0 @@
-From a70e74e0eedb436c4126ac69b0beaa4ab848b78e Mon Sep 17 00:00:00 2001
-From: Steve Purcell <steve@sanityinc.com>
-Date: Mon, 14 Mar 2016 09:18:16 +1300
-Subject: Remove autoload for .text
-
-While .md and .markdown are clearly markdown files, the handling of .text is not a choice that markdown-mode should be making on the user's behalf without any opportunity to prevent it.
-
-diff --git a/markdown-mode.el b/markdown-mode.el
-index b7a32cc..978e040 100644
--- a/markdown-mode.el
-+++ b/markdown-mode.el
-@@ -6634,8 +6634,6 @@ BEG and END are the limits of scanned region."
- ;;;###autoload
- (add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
- ;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.text\\'" . markdown-mode))
-;;;###autoload
- (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
- 
- 
-- 
-cgit v0.10.2
-
--- a/app-emacs/markdown-mode/markdown-mode-2.1.ebuild
+++ b/app-emacs/markdown-mode/markdown-mode-2.1.ebuild
@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Major mode for editing Markdown-formatted text files"
-HOMEPAGE="https://jblevins.org/projects/markdown-mode/"
-# Cannot use this url because its hash differ about every five minutes
-# SRC_URI="http://jblevins.org/git/${PN}.git/snapshot/${P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="|| ( dev-python/markdown2 dev-python/markdown )"
-
-SITEFILE="50${PN}-gentoo.el"
-ELISP_PATCHES="${P}-text-auto-mode.patch"
--- a/app-emacs/mediawiki/Manifest
+++ b/app-emacs/mediawiki/Manifest
@ -1,2 +1 @@
-DIST mediawiki-2.2.4.1.el.xz 19108 BLAKE2B e8603a622c80943153f96f6f9997053fd0913ef23e0a672576726fbac3d2a5de850afbcdb3748a05769b9c880bc641aa8aa5e48bf6dca800b1fbadd6c8b8a2ce SHA512 4526c04c560679196900310c90d6321ab10a447ff4f904b0bc40bfc56296c3a773cc8fe7d4001cdfc108e9e11ce3ca4dd6677e51b220eb3b453a1b975118f52c
 DIST mediawiki-2.2.9.tar.gz 36595 BLAKE2B a044008115e545d043045e943762072981b5bcc7776e5f38480a2170168929989b990d90b225f3416a8ce9052d3a310bb77ac6ac1d273f112180ff2bddeb850c SHA512 7586558b953c3e2a41b792db55ba9b3520b07377a555c2dd38829c0be24f3388313dfaa049520c632d6fd3a471cb777ba662f723c56cd59c307b68faf9d8adb0
--- a/app-emacs/mew/Manifest
+++ b/app-emacs/mew/Manifest
@ -1,2 +1 @@
-DIST mew-6.6.tar.gz 989941 BLAKE2B 7ec4e502865e13108cc51dc74ffa246dd1084ae369979c05b9c1fc326c01f716766b7aa445ac489fe7c34cbc610e130738fa7578ab338d496970f6e59847c295 SHA512 55a91faaba09a28dfe7da33d34a8c3638540db71a3572ce01646976fbdd0ac3e327475ccc2908876ee6f516c6ee60082a27413b210c4591ef12cc4f878a07472
 DIST mew-6.8.tar.gz 991876 BLAKE2B 6055c30ac7f9286a2792fd3fb5fc53412ffed091594e64fa802cd4346fbd7ce542a930e3b38552dc39fa728898a68e1d71f0626f38ef8f815515af95fae0197d SHA512 e4713a4485fa31a95820100465728998b6d5b4822e2a522293754ab269fbfa625756417a55eccf400994a4cc6f6230b8142463ffe416917f321da5053abdb98c
--- a/app-emacs/mew/mew-6.6.ebuild
+++ b/app-emacs/mew/mew-6.6.ebuild
@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-DESCRIPTION="Great MIME mail reader for Emacs/XEmacs"
-HOMEPAGE="http://www.mew.org/"
-SRC_URI="http://www.mew.org/Release/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="ssl l10n_ja"
-RESTRICT="test"
-
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}
-	ssl? ( net-misc/stunnel )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_configure() {
-	econf \
-		--with-elispdir="${SITELISP}/${PN}" \
-		--with-etcdir="${SITEETC}/${PN}"
-}
-
-src_compile() {
-	emake
-	use l10n_ja && emake jinfo
-	rm -f info/*~				# remove spurious backup files
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use l10n_ja && emake DESTDIR="${D}" install-jinfo
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc 00api 00changes* 00diff 00readme dot.*
-
-	DOC_CONTENTS="Please refer to /usr/share/doc/${PF} for sample
-		configuration files."
-	readme.gentoo_create_doc
-}
--- a/app-emacs/mpg123-el/mpg123-el-1.60.ebuild
+++ b/app-emacs/mpg123-el/mpg123-el-1.60.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"

 LICENSE="mpg123-el"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"

 RDEPEND="media-sound/mpg123
 	media-sound/alsa-utils"
--- a/app-emacs/mu-cite/Manifest
+++ b/app-emacs/mu-cite/Manifest
@ -1,2 +1 @@
-DIST mu-cite-201202272330.tar.gz 19212 BLAKE2B d52378258b3804e2867d6f8f6f471a73eebb3ff955df70a2ddc5dfd91d6ada2ea2349d44e86c81e1c314b88787b08b39f40238b22760a74b77f8393361aecdcc SHA512 78013bed020c46baeecf56bcd155eb6058d11b1d61a0af55b075454601e3cd1a992bdad887e125ffd569782a38e4509d60efdc431ded501c35da096133b475b8
 DIST mu-cite-201808232348.tar.gz 20443 BLAKE2B 814ebbd3ab45af4af65fee54884a1960a0cecccd07e1e0e084e860fcab4884ca0d97f4042f14f530b8ead4ee4347d13dbde9ecc96f5e82121bad44e0b93855ac SHA512 5a30124041ea5a807f5d8ea8a1ef18afcc7020d3f2d2bee4dd163fa1098d37d27b43db81c1b538bf1d1b06720840fb5c3f95d999fddd624437dd251fa061f699
--- a/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild
+++ b/app-emacs/mu-cite/mu-cite-8.1_p201202272330.ebuild
@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-MY_P="${PN}-${PV#*_p}"
-DESCRIPTION="Message citation utilities for emacsen"
-HOMEPAGE="http://www.jpl.org/elips/mu/"
-SRC_URI="http://www.jpl.org/elips/mu/snapshots/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="app-emacs/apel
-	app-emacs/flim"
-DEPEND="${RDEPEND}"
-
-SITEFILE="50${PN}-gentoo.el"
-DOCS="ChangeLog NEWS README.en"
-
-S="${WORKDIR}/${MY_P}"
-
-src_compile() {
-	emake EMACS=emacs
-}
--- a/app-emacs/multiple-cursors/Manifest
+++ b/app-emacs/multiple-cursors/Manifest
@ -1,2 +1 @@
-DIST multiple-cursors-1.3.0.tar.gz 25880 BLAKE2B b0578299fc1e700ec627f1cdcf153e47d0c32df3374db2bad0d88a76933b0253de61f4670ff155fe6cb7d92d43204d47ffd44d8b90f093fee64a18ee3085049b SHA512 2d321f9016b78aeb37507071756781c84b576a0fbefa385474c8c6287c989412b72b83dfdbe79bc0da1485893ea01952b6e0d392573386338db9e8728f722259
 DIST multiple-cursors-1.4.0.tar.gz 30152 BLAKE2B a63c09afb464cd208296e359f59babbc9c9fdace1d5261386bac4ab44f7896bfe2eae869e49c2c094b80af453bd50936c7feeb42e530536d148154c879ece90c SHA512 070121365380db3dc77749ab6f0da2f034a979cacc07a11e805f1da81ae70fccff1abb4a0353fa30670b3a8d686ebd25e501d13fcc42d765f5c015a83c62146f
--- a/app-emacs/multiple-cursors/multiple-cursors-1.3.0.ebuild
+++ b/app-emacs/multiple-cursors/multiple-cursors-1.3.0.ebuild
@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Multiple cursors for Emacs"
-HOMEPAGE="https://github.com/magnars/multiple-cursors.el"
-SRC_URI="https://github.com/magnars/${PN}.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/${PN}.el-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
-
-src_compile() {
-	elisp-compile *.el
-	elisp-make-autoload-file
-}
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@ -1 +1,2 @@
 DIST libvirt-1.2.1.tar.gz 27228694 BLAKE2B 5552508f87bddbd8d2dd65a37298f7f7e7238a7ac5aeef878bd8b3c6d5ecab8f2cf6fb94c8d520312b6c6399f1e663f8d68febf2badd544020635df841f5488f SHA512 6184840623156ca01ee7f59078ebf031bc84c25b37bb110372c7bcf230a79b74e267475f989fb73db5e3c096dcc74f03cb30adfc5de022f756ed2cd6ab05bfd0
+DIST libvirt-5.8.0.tar.xz 13129328 BLAKE2B ff49b0b6dca86f35c68edfb880677c88e0aed8021ed01ebd145922821914edd70c355ca777fe470e2b0e4baf36f2813c1100be9377344f81c9df374068307da1 SHA512 73d18fdf307b8029921a9f1a0c84ca31c50c662a3c0339e3850d6d2f31574168807a6f34943b286ed86a44031decbbc1339f27366da7269e29d38c7094503113
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-5.8.0.ebuild
+++ b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-5.8.0.ebuild
@ -0,0 +1,35 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+MY_P="libvirt-${PV}"
+DESCRIPTION="Extension for nxml-mode with libvirt schemas"
+HOMEPAGE="http://www.libvirt.org/"
+SRC_URI="http://libvirt.org/sources/${MY_P}.tar.xz"
+
+# 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"
+RESTRICT="test"
+
+# 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"
+S="${WORKDIR}/${MY_P%-rc*}"
+
+src_compile() {
+	emake -C docs/schemas -f "${FILESDIR}"/Makefile-trang
+}
+
+src_install() {
+	insinto "${SITEETC}/${PN}"
+	doins "${FILESDIR}"/schemas.xml docs/schemas/*.rnc
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+}
--- a/app-emacs/quack/Manifest
+++ b/app-emacs/quack/Manifest
@ -1 +1,2 @@
 DIST quack-0.47.el.xz 44508 BLAKE2B 36b05926e019d191a21bac6e8e0d8f2c0228a4decee807f3ed61b145db56af5bdede43708c5e04d1f65f261b7de645a40a02a95f0300b8673b454293011903e9 SHA512 41775f5850518a8738aae9d7185c733ad4d5a778859a9d9a7235c84184fb7b84dd49d37a607291f39fac4ddc1cd507806a01dd19ab3351646ecf35e747feb8ce
+DIST quack-0.48.el.xz 44552 BLAKE2B c66cb3053b0ec9b2df6fefb3e383628e5c95a90a489fccd5a759c088e695f50e6ee1f12be213114aee99e91716e5f5549248a4188d85bbbe5546d958677a44d8 SHA512 ab6db23645c6c0582cfb9322139dcb2f45662473b1b32cc0eabda3243392e47b19cbba7a2ac3324519e877168e5694bb2d6ea76229a318d9c6c0cba4cc446dc7
--- a/app-emacs/quack/quack-0.48.ebuild
+++ b/app-emacs/quack/quack-0.48.ebuild
@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Enhances Emacs support for Scheme"
+HOMEPAGE="http://www.neilvandyke.org/quack/"
+SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/scheme-complete/Manifest
+++ b/app-emacs/scheme-complete/Manifest
@ -1,2 +1 @@
-DIST scheme-complete-0.8.11.el.gz 38847 BLAKE2B 649a4124b0b643211c2132dc0e03e8930ea7f311637b3afd375d75e3aa33abaae888b1aa34744bf22d13738179d4048faa173ec8e5e0868f5789623fb7b11c0c SHA512 90fe73dfee3377f19eca2107deb6c9d88260b2097358416dab5ad839dabc0a0678b7254ab6dbdc058cae2be5feeaa4cba2f66296e49060df5251c1888044fea8
 DIST scheme-complete-0.9.8.el.gz 39923 BLAKE2B a7f08917823145db0b79a0d0dd2987c98eb6711acc861fa840759c6377045f7ae3edb9973bc285e468c4a20fff02ade6f638a340ba8694007ab37000f3870cd4 SHA512 b162d7766184e8e58d25b93c8e4154848963fa1c29e59f90a4741c6cfb44c217d9ae655d1106d05eb53cefab0c91bf7800b9387143268490d5f8f0685a9a2483
--- a/app-emacs/scheme-complete/scheme-complete-0.8.11.ebuild
+++ b/app-emacs/scheme-complete/scheme-complete-0.8.11.ebuild
@ -1,16 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="Scheme tab-completion and word-completion for Emacs"
-HOMEPAGE="http://synthcode.com/"
-SRC_URI="http://synthcode.com/emacs/${P}.el.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
-
-SITEFILE="60${PN}-gentoo.el"
--- a/app-emacs/sokoban/Manifest
+++ b/app-emacs/sokoban/Manifest
@ -1 +1,2 @@
+DIST sokoban-1.4.8.tar 71680 BLAKE2B faf7218dc4d1a629008b1d7fa79a9f747eeda056a89cf9e677f0b20a3dae1dad468a4f968da89be6a1daee0188ea36eb64e02c8a54f6948a89f5dcd039038c39 SHA512 bca8ba4c6357768bd3ec84d8093697acb0fcc84a565290f9517e844bc39301e9ebe7a0e8d3a2c9ef2304387ff539366048a2d2334990f1b7e3895ea1b113e613
 DIST sokoban-1.4.tar 61440 BLAKE2B b0348084517e4fddfe5adffc6fac3020bc7147983733354fe18bbe90bdd49e620dfb392385c0dbb7ffed47bfd05d6b9b28cdf1bd81cc182fde83b243d33b6415 SHA512 8c04f509013e1d8f6e8cc1e182ec253fc84870e5733623038ea03f2447952dcbc77236c64b158ea4e4613dafce192f2c4b50aac3e1e219a049a6a951a44a7ac1
--- a/app-emacs/sokoban/sokoban-1.4.8.ebuild
+++ b/app-emacs/sokoban/sokoban-1.4.8.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Implementation of Sokoban for Emacs"
+HOMEPAGE="https://elpa.gnu.org/packages/sokoban.html"
+SRC_URI="https://elpa.gnu.org/packages/${P}.tar"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+ELISP_REMOVE="sokoban-pkg.el"
+SITEFILE="50${PN}-gentoo.el"
+DOCS="ChangeLog"
+
+src_install() {
+	elisp_src_install
+	insinto "${SITEETC}/${PN}"
+	doins sokoban.levels
+}
--- a/app-emacs/thinks/Manifest
+++ b/app-emacs/thinks/Manifest
@ -1 +1,2 @@
+DIST thinks-1.12.tar.gz 3058 BLAKE2B 2a46e6a9896c62fbebdc62e81c68f14e589e0bebb5a4143578f01824be75cb3f94e6772f22bd1d9302305b87721515a6245b2a3f80d3c40a3936c15cfa8edd0c SHA512 31208821c25824cca53744afbce5ec3b94d799652811edac0a140d37c7bbdb7fbe1809be1c2b88a324aef1908493885fd7dcd9eb908440fe56bedc5c6c82ffed
 DIST thinks-1.9.el.bz2 2989 BLAKE2B 91fd4fe2b004625f758f0a3941228c0db6de37c637fcbf0456060e2a2f6e9c3618f6a815d9c649a87da286745f4831df21ebf225947d926f89ae20c49e3e8403 SHA512 ba85485df0decb2825a832b60b01a4ae8ef2e32dc356d16b770a4b59a795e138f3c26e14d8eb27e97038d10d2633945c7b2bd14933fdf7815f6c0abc07de5802
--- a/app-emacs/thinks/thinks-1.12.ebuild
+++ b/app-emacs/thinks/thinks-1.12.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp
+
+DESCRIPTION="Insert text in a think bubble"
+HOMEPAGE="http://www.davep.org/emacs/"
+SRC_URI="https://github.com/davep/${PN}.el/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
+
+S="${WORKDIR}/${PN}.el-${PV}"
+SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/tuareg-mode/Manifest
+++ b/app-emacs/tuareg-mode/Manifest
@ -1,2 +1 @@
-DIST tuareg-mode-2.0.10.tar.gz 102576 BLAKE2B fac81b5f43dc9143a62fe7ebf5d35bc44994db3a155b780329339b73b087cf53e63aa15b7e817388a92f1effcc08febc617747b242d57d5e900b20fe100a8f03 SHA512 53bdc3b2b78bcf7e6b075932b9319f9d08b02b4b3fd74fc9aa30b390b30e4069e19e09e0fbb03fb11877e6d89649b8e59c645cc8de196115c1bbdab308145743
 DIST tuareg-mode-2.2.0.tar.gz 83392 BLAKE2B eead49dff45bb039abef0ffa8f4b874dd6d3bb36e81791b84e411031b4d714324637f99a0cfc3d4029b47032c61ca45424831a2d837fe5b01fa93383237cb14d SHA512 5f0b470920abd44e5b99e84e817ba678aded3042751b8949884c06f3a928105acbe96a28af3a8a089f6b607f8dd70cba7a669e9a61b906b1dad840c7f88bce12
--- a/app-emacs/tuareg-mode/tuareg-mode-2.0.10.ebuild
+++ b/app-emacs/tuareg-mode/tuareg-mode-2.0.10.ebuild
@ -1,18 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="An Objective Caml/Camllight mode for Emacs"
-HOMEPAGE="http://forge.ocamlcore.org/projects/tuareg/"
-SRC_URI="https://github.com/ocaml/tuareg/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-S="${WORKDIR}/tuareg-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
--- a/app-emacs/uptimes/Manifest
+++ b/app-emacs/uptimes/Manifest
@ -1,2 +1 @@
-DIST uptimes-2.3.tar.bz2 3637 BLAKE2B 75517032993f8192c4985d6bb5793b90c828565495a4471845e3efb6fa939268c7b94751baa6b85f5462cfb2a944ea4f4904a75b950a071c0840bb21313bb751 SHA512 31a8e4da410c1c02e96b3aa910fb3afe99c924af0f8299465e1c1b4b22e925aeb427b1ad349df459f93d2efd8bbf66804186f26486957d9e8196eda1b50eb5ba
 DIST uptimes-3.7.tar.gz 3913 BLAKE2B 3148b17a8e61201027702891e0303870cddaace650770621bf7847cb86ba917c74aa5938f55fe2e6275180f9e66755f418dee47bc80b6fd7439276ff525ea9d8 SHA512 6e31cdacabc93a8f9d206d95eb4d16ad4a6b4a69f1032e93710693eebe8064446b19e4938eb342c8a66fac7e52e22da36b26bd3417216ab302c9c8e50dba27c3
--- a/app-emacs/uptimes/uptimes-2.3-r2.ebuild
+++ b/app-emacs/uptimes/uptimes-2.3-r2.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-DESCRIPTION="Track and display emacs session uptimes"
-HOMEPAGE="http://www.davep.org/emacs/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-SITEFILE="50${PN}-gentoo.el"
-DOC_CONTENTS="Uptimes is not enabled as a site default. Add the following
-	line to your ~/.emacs file to enable tracking of session uptimes:
-	\n(require 'uptimes)"
--- a/app-emacs/visual-basic-mode/Manifest
+++ b/app-emacs/visual-basic-mode/Manifest
@ -1 +1,2 @@
 DIST visual-basic-mode-1.4.12.el.xz 16872 BLAKE2B 849a639dc54bf595541256424e26b6a157f2b75ab3c9fab8c6d7000d9abda6b9b979b51d06e81ff6a276353709aec5f4608e9806233560fcd4cdbdeff2e359f6 SHA512 ef8fdb883dbaa957d1d7526e0548611f755a7d3700a62d32790aafc0e25d97b3f6784969b584dcdda39da681b4e59253daff217bde5a783b923257e77e9549ca
+DIST visual-basic-mode-1.5.el.xz 17460 BLAKE2B d87cfe6c9952d728fe5807ac98284b6af518e47ae0da12a463227c4a15a12896998385e5c57adb0a2eee6b5642dc4853506a4d24fa9cb4c4d3eb8cb9562dd6c9 SHA512 f10480993b96fa29602cac51042ddc708d85c940d3ad405b2548037eab8af8d4c9b548cc3c4b770bb65681f150491d2b14255c65207050139d79f78a9a4bf888
--- a/app-emacs/visual-basic-mode/visual-basic-mode-1.5.ebuild
+++ b/app-emacs/visual-basic-mode/visual-basic-mode-1.5.ebuild
@ -1,12 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7

 inherit elisp

-DESCRIPTION="MediaWiki client for Emacs"
-HOMEPAGE="https://launchpad.net/mediawiki-el"
+DESCRIPTION="A mode for editing Visual Basic programs"
+HOMEPAGE="https://www.emacswiki.org/emacs/VisualBasicMode"
+# taken from https://www.emacswiki.org/emacs/${PN}.el
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"

 LICENSE="GPL-3+"
--- a/app-emacs/wgrep/Manifest
+++ b/app-emacs/wgrep/Manifest
@ -1 +1,2 @@
 DIST wgrep-2.1.10.el.xz 8708 BLAKE2B f3881a5b774dd9bad6169f5621d4da4662127892786e708d31815cba2ff2f5a75170863ca5882cef67efb8e27964cab4176eda7c7ca561888edeb590943ae573 SHA512 39761964406d3eedca9253f2f29f81dd9ee71c4e049a985c236ada4dd9b70dc553bf1e9e94cb6d3c8749f065146e2759a46a6ac52ed8e5e5f046e196798bc681
+DIST wgrep-2.3.0.tar.gz 16241 BLAKE2B 83802934b36dfcad17e3486a7405cdd170b20bd6574d92032c92aa2a8ae84a2b6ce47313c8ca70327982bebc4fb78363181c66d1c745d2179ba84fc655c617be SHA512 2f817ef482d8ce98531494a5f19f477d7544bcc8b2747ebe184194a058c6cb26d571ba7de22f7e4307aa110806fa45f683b2363b1520b8fe5edaa05ce5ba8d61
--- a/app-emacs/wgrep/wgrep-2.3.0.ebuild
+++ b/app-emacs/wgrep/wgrep-2.3.0.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Writable grep buffer and apply the changes to files"
+HOMEPAGE="https://github.com/mhayashi1120/Emacs-wgrep"
+SRC_URI="https://github.com/mhayashi1120/Emacs-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/Emacs-${P}"
+SITEFILE="50${PN}-gentoo.el"
+DOC_CONTENTS="See commentary in ${SITELISP}/${PN}/wgrep.el for documentation.
+	\n\nTo activate wgrep, add the following line to your ~/.emacs file:
+	\n\t(require 'wgrep)"
--- a/app-emacs/xclip/Manifest
+++ b/app-emacs/xclip/Manifest
@ -1,2 +1 @@
-DIST xclip-1.3.el.xz 2164 BLAKE2B 739cad92a92732a12ac077fc9749bc883b4386977d4c47e793023811c1e668668277f6e0a6bc7105cb7a1186c0d6b3ab276dfb655478d5a6063882f60fa9a7e6 SHA512 5b51703a365fa3991a97c06734b6baf6473ba672ab2ed572db45330fc6b761258403191079725f8c3e8d72919355a2cadf0c04e31396805718de30474ac08520
 DIST xclip-1.9.el.xz 5120 BLAKE2B a2cdfda709d51d7cb8cc3792d23d97fee5b03d1a1fbcf8dfb7810aa91080b0e4af47854ec1fc9e184055c50590d181639c0da100bf4e0a0d41dd856c2f75269d SHA512 96df6cc4257125876b57f3aba469c78136c2366d045b5be38c1f2d8ba69752e6625ec6deacc25da013da2a1bff54821d2171bab9308b24ab3e49a18c3d39ddbb
--- a/app-emacs/xclip/xclip-1.3.ebuild
+++ b/app-emacs/xclip/xclip-1.3.ebuild
@ -1,19 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit readme.gentoo elisp
-
-DESCRIPTION="Emacs Interface to XClip"
-HOMEPAGE="https://elpa.gnu.org/packages/xclip.html"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="x11-misc/xclip"
-
-SITEFILE="50${PN}-gentoo.el"
-DOC_CONTENTS="To enable xclip-mode, add (xclip-mode 1) to your ~/.emacs file."
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@ -1,3 +1,4 @@
 DIST libvirt-5.2.0.tar.xz 14992888 BLAKE2B d68aedb634a70063a116e112689f252d3fc2fe5369a4cdde8cacd392e806203bf277406bb10c751bae27f34f27a38355fde84573b6221fc4843393f9ae60ae5c SHA512 378dc1552263cce746117487abc0a1f3411e5be149331717158ba23825734ceae7ca474290264d71de798fdd089ad9672026bcb242fa5b3aef87294284d06f04
 DIST libvirt-5.5.0.tar.xz 12930224 BLAKE2B 4add0b727e4754bd1b2b4e9020942b17872533737e496ddf7976bf86a0fd3bcfbebd83387a8f3bab8dcc9afb05755b245e55682ed17d6094085d3dc96d94eefe SHA512 47923aaca605fb43a53238ac535abc1f88f73435336b8f3e88cb01df277ed205d99c586991e523aa32b50c832a0a7c949ab5f84dc78eb8d18a4951cfc791448d
 DIST libvirt-5.6.0.tar.xz 13147976 BLAKE2B dbfc997123f43fcf9d635b59fffa00d96826e673c4037105151bde2c4a0fb3015a0e458e8e67969b5513a4ddbf41d062feb91e6a86054ddcc1d661f0554fd1f7 SHA512 95fe931394fb31288faf73349bb298f08f63cf062f851b9935303145f8166f69128be9360757f0e1845256c14f4d7672843dba0dc6c086b1c3c8bfc035cc8986
+DIST libvirt-5.8.0.tar.xz 13129328 BLAKE2B ff49b0b6dca86f35c68edfb880677c88e0aed8021ed01ebd145922821914edd70c355ca777fe470e2b0e4baf36f2813c1100be9377344f81c9df374068307da1 SHA512 73d18fdf307b8029921a9f1a0c84ca31c50c662a3c0339e3850d6d2f31574168807a6f34943b286ed86a44031decbbc1339f27366da7269e29d38c7094503113
--- a/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch
+++ b/app-emulation/libvirt/files/libvirt-5.7.0-do-not-use-sysconf.patch
@ -1,5 +1,5 @@
-From eee203f582af1f96e7a9451d447079cf49f47495 Mon Sep 17 00:00:00 2001
-Message-Id: <eee203f582af1f96e7a9451d447079cf49f47495.1565963722.git.mprivozn@redhat.com>
+From e387be8671d0de88632d063e2ecd2c12eb1b2fdf Mon Sep 17 00:00:00 2001
+Message-Id: <e387be8671d0de88632d063e2ecd2c12eb1b2fdf.1567522968.git.mprivozn@redhat.com>
 From: Michal Privoznik <mprivozn@redhat.com>
 Date: Sat, 16 Mar 2019 12:33:00 +0100
 Subject: [PATCH] gentoo: do not use sysconf
@ -16,10 +16,10 @@ Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
 7 files changed, 15 insertions(+), 37 deletions(-)

 diff --git a/src/Makefile.am b/src/Makefile.am
-index 3ae4b87abb..69729d15b4 100644
+index f5093b9c90..e2ebc51c87 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -666,23 +666,6 @@ libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
+@@ -672,23 +672,6 @@ libvirt_lxc_la_LIBADD = libvirt.la $(CYGWIN_EXTRA_LIBADD)
 
 EXTRA_DIST += $(SYSCONF_FILES)
 
@ -43,7 +43,7 @@ index 3ae4b87abb..69729d15b4 100644
 LOGROTATE_FILES := $(LOGROTATE_FILES_IN:remote/%.in=%)
 
 EXTRA_DIST += $(LOGROTATE_FILES_IN)
-@@ -740,14 +723,14 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
+@@ -746,14 +729,14 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
 BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
 DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
 
@ -89,20 +89,16 @@ index daff48e67d..43736191d5 100644
 # Loosing the logs is a really bad thing that will
 # cause the machine to be fenced (rebooted), so make
 diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
-index 4c5b28b478..032ea940fa 100644
+index 9c8c54a2ef..a042280cef 100644
 --- a/src/remote/libvirtd.service.in
 +++ b/src/remote/libvirtd.service.in
-@@ -22,12 +22,11 @@ Documentation=https://libvirt.org
+@@ -25,8 +25,7 @@ Documentation=https://libvirt.org
 
 [Service]
 Type=notify
 -EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd
- # libvirtd.service is set to run on boot so that autostart of
- # VMs can be performed. We don't want it to stick around if
- # unused though, so we set a timeout. The socket activation
- # then ensures it gets started again if anything needs it
-ExecStart=@sbindir@/libvirtd --timeout 120 $LIBVIRTD_ARGS
-+ExecStart=@sbindir@/libvirtd --timeout 120
+-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
+ExecStart=@sbindir@/libvirtd
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=on-failure
--- a/app-emulation/libvirt/libvirt-5.8.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.8.0.ebuild
@ -0,0 +1,383 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit autotools bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
+	SRC_URI=""
+	KEYWORDS=""
+	SLOT="0"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="
+	apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
+	iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
+	parted pcap phyp pm-utils policykit +qemu rbd sasl selinux +udev +vepa
+	virtualbox virt-network wireshark-plugins xen zfs
+"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	policykit? ( dbus )
+	qemu? ( libvirtd )
+	vepa? ( macvtap )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	acct-user/qemu
+	policykit? ( acct-group/libvirt )
+	app-misc/scrub
+	dev-libs/libgcrypt:0
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.7.6
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-1.0.25:0=
+	net-libs/libssh2
+	net-libs/libtirpc
+	net-libs/rpcsvc-proto
+	>=net-misc/curl-7.18.0
+	sys-apps/dmidecode
+	!sys-apps/systemd[-cgroup-hybrid(+)]
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:=
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dbus? ( sys-apps/dbus )
+	dtrace? ( dev-util/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( >=sys-fs/fuse-2.8.6:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( net-libs/libssh )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[-device-mapper-only(-)]
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	pm-utils? ( sys-power/pm-utils )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? (
+		>=app-emulation/qemu-1.5.0
+		dev-libs/yajl
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? (
+		>=app-emulation/xen-4.6.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/udev
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.0-do-not-use-sysconf.patch
+	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
+)
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use macvtap && CONFIG_CHECK+="
+		~MACVTAP"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP_NF_TARGET_MASQUERADE
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	if kernel_is ge 3 6; then
+		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
+	fi
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+
+	default
+
+	if [[ ${PV} = *9999* ]]; then
+		# Reinitialize submodules as this is required for gnulib's bootstrap
+		git submodule init
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+		    git submodule status .gnulib | awk '{ print $1 }'
+		    git hash-object bootstrap.conf
+		    git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
+		) >.git-module-status
+	fi
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with apparmor)
+		$(use_with apparmor apparmor-profiles)
+		$(use_with audit)
+		$(use_with caps capng)
+		$(use_with dbus)
+		$(use_with dtrace)
+		$(use_with firewalld)
+		$(use_with fuse)
+		$(use_with glusterfs)
+		$(use_with glusterfs storage-gluster)
+		$(use_with iscsi storage-iscsi)
+		$(use_with iscsi-direct storage-iscsi-direct)
+		$(use_with libvirtd)
+		$(use_with libssh)
+		$(use_with lvm storage-lvm)
+		$(use_with lvm storage-mpath)
+		$(use_with lxc)
+		$(use_with macvtap)
+		$(use_enable nls)
+		$(use_with numa numactl)
+		$(use_with numa numad)
+		$(use_with openvz)
+		$(use_with parted storage-disk)
+		$(use_with pcap libpcap)
+		$(use_with phyp)
+		$(use_with pm-utils )
+		$(use_with policykit polkit)
+		$(use_with qemu)
+		$(use_with qemu yajl)
+		$(use_with rbd storage-rbd)
+		$(use_with sasl)
+		$(use_with selinux)
+		$(use_with udev)
+		$(use_with vepa virtualport)
+		$(use_with virt-network network)
+		$(use_with wireshark-plugins wireshark-dissector)
+		$(use_with xen libxl)
+		$(use_with zfs storage-zfs)
+
+		--without-hal
+		--without-netcf
+		--without-sanlock
+
+		--with-esx
+		--with-init-script=systemd
+		--with-qemu-group=$(usex caps qemu root)
+		--with-qemu-user=$(usex caps qemu root)
+		--with-remote
+		--with-storage-fs
+		--with-vmware
+
+		--disable-static
+		--disable-werror
+
+		--localstatedir="$EPREFIX/var"
+		--with-runstatedir="$EPREFIX/run"
+	)
+
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+	else
+		myeconfargs+=( $(use_with virtualbox vbox) )
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd .gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}"
+
+	# remove problematic tests, bug #591416, bug #591418
+	sed -i -e 's#commandtest$(EXEEXT) # #' \
+		-e 's#virfirewalltest$(EXEEXT) # #' \
+		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
+		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
+		tests/Makefile
+
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+	rm -rf "${D}"/run
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd || die
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests || die
+	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd || die
+	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd || die
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd || die
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests || die
+
+	newbashcomp "${S}/tools/bash-completion/vsh" virsh
+	bashcomp_alias virsh virt-admin
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	readme.gentoo_print_elog
+}
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@ -50,6 +50,7 @@ RDEPEND="
 	acct-user/qemu
 	policykit? ( acct-group/libvirt )
 	app-misc/scrub
+	>=dev-libs/glib-2.48.0
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
 	>=dev-libs/libxml2-2.7.6
--- a/app-emulation/libvirt/metadata.xml
+++ b/app-emulation/libvirt/metadata.xml
@ -71,6 +71,9 @@
 	<flag name="pcap">
 		Support auto learning IP addreses for routing
 	</flag>
+	<flag name="pm-utils">
+		Add runtime support for <pkg>sys-power/pm-utils</pkg>
+	</flag>
 	<flag name="macvtap">
 		Support for MAC-based TAP (macvlan/macvtap). For networking instead
 		of the normal TUN/TAP. It has its advantages and disadvantages.
--- a/app-emulation/spice-vdagent/spice-vdagent-0.17.0_p20180319-r1.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.17.0_p20180319-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -16,7 +16,7 @@ SRC_URI="https://www.spice-space.org/download/releases/${MY_P}.tar.bz2
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+consolekit selinux systemd"
+IUSE="consolekit selinux systemd"
 S="${WORKDIR}/${MY_P}"

 CDEPEND="
--- a/app-emulation/spice-vdagent/spice-vdagent-0.19.0-r1.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.19.0-r1.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://www.spice-space.org/download/releases/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+consolekit selinux systemd"
+IUSE="consolekit gtk selinux systemd"
 S="${WORKDIR}/${MY_P}"

 CDEPEND="
@ -28,6 +28,7 @@ CDEPEND="
 	x11-libs/libX11
 	x11-libs/libXinerama
 	consolekit? ( sys-auth/consolekit sys-apps/dbus )
+	gtk? ( x11-libs/gtk+:3 )
 	systemd? ( sys-apps/systemd )"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
@ -56,6 +57,7 @@ src_configure() {
 	econf \
 		--with-init-script=systemd \
 		--localstatedir="${EPREFIX}"/var \
+		$(use_with gtk) \
 		"${opt[@]}"
 }

--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@ -1,5 +1,5 @@
 DIST qpdf-8.2.1.tar.gz 8256216 BLAKE2B 67e9b897ed938b9dd2e8508efaddd4dd6f63568aa23332ef72918a0888cc1e1b8fe844f0c1424b8ab568ee5ce42f8efd04293cd525e9d8de0c5fe7b352f49367 SHA512 ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c
 DIST qpdf-8.4.1.tar.gz 16990752 BLAKE2B 6e7ccd212cf8d01aea3dc615f5924c0575392f19cdd20b35327a71bd1f97d7e515fe1a73cd2e3901964f621cafa19ab07a1314af19f40ded28d3e9f683c02ab0 SHA512 d5ac3376345650f05278f8b4d99182cd58b927537085a4a6415d3df0b80b7ddd80a7c33778ec8c3b85d9788ea081ea3266bd4a9315eda9820988e9e54a22f80d
 DIST qpdf-8.4.2.tar.gz 16988263 BLAKE2B 358836310575fd0f454d4504a70796b72d2e3120c5820e2c33e84ea79c5c115d1c84f8d58392d870b5357407d0fbed05028bd854d164be0b32b348c587845300 SHA512 9cde046fb5e42dc331933294155583fb20408704a0cab3075cc3e97bd4643e3178e4162b8de7434aa2304097e7734f985fdc8e7b05cc028c37193dce91797f7a
-DIST qpdf-9.0.0.tar.gz 18172400 BLAKE2B 90b59d54dd87378ccc766f19bc142950f435e4314594fd78923f1c9099393a1b141bf7772f507df7553d9f4afbbe49414c75c0276296481c65017a48d3a5ff01 SHA512 bb20eaf4a12f33ad2ca6933a21123cdfd7d6031da472a881f8c60979881c19bc363db585c2be0635081c7380f0f0819921af7c3a4847de57505013c6e3959ea0
 DIST qpdf-9.0.1.tar.gz 18172693 BLAKE2B ddb389b773b4664c1c3da270f1804f015c8f0a04ed57df7a4a1de9ff80cd47c6fd07c29836573bd6459cde42e8fd3986855a68632495df5363d220d6062669c7 SHA512 1bca5cf39f0019443f744c01ddc93773febca6883063fcec7f3541dd68359d8da44f34cf111cacb3bd9564f10bf1b09ea58173efd3ae06116e5c3832e61e82cc
+DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
--- a/app-text/qpdf/qpdf-9.0.2.ebuild
+++ b/app-text/qpdf/qpdf-9.0.2.ebuild
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@ -2,6 +2,7 @@ DIST xapian-omega-1.2.25.tar.xz 440224 BLAKE2B 1e67cff0ed1796349df5da7d33c07febb
 DIST xapian-omega-1.4.10.tar.xz 532952 BLAKE2B dec0ebc7b4de24d6f11ea91f090925c0a2dd088ec6468e47e1ea6e60f31acd99d8480f47275df597a508b51c3d2046ce89cd1c8f10e19ff4ad4ce5e593e25852 SHA512 53dde1705eea39fa26afd4db6a0ab39e050ecd1ffc71d2e4c2a2287930d926993c48c36d0c2ad6268188a29876bac1f0e3c29fc54afd2fb6f831899929ebb302
 DIST xapian-omega-1.4.11.tar.xz 533596 BLAKE2B 5002f809a310cfff8b7316c6d1f7fa17f93fd88381aa5ca5de14a443f2b3bfd7f00738bae7b2e3a739a170bd8f454e82f696212fc43282d342946a774b7bfaa0 SHA512 135077e26dc0b0707d1d14c64eeb25db67374b1b7909e9f3e925b10e03b1557263339d2f84c5a82046a159e58a5301834e76e99843d66342666d5694f91ed4f3
 DIST xapian-omega-1.4.12.tar.xz 539324 BLAKE2B 01a9f54dc622699fc4362c3d36a9b529f31c87b6c424f5d55d5dc7e676e8dff895df7e31fa187680afd5eb9e90d65b06d39fc06912b9ae5db8a9e13b694d980d SHA512 2d2c48646f4f06fc4b2666e0901e4f73b2c5da93c4a8e8a5ea6d32e9076a2f18c15c14c7dd2ae2d421a501119ea19b52fe324ad98f9f0bfd6b80f4286721aa2e
+DIST xapian-omega-1.4.13.tar.xz 540216 BLAKE2B a6133e4ac8423f5bbbb67013a8f7a9d936574d8b16dd0adfe42307044e0d0de7773624cd7a7c127bf6cb4bb887ec70a101621ab8077b8918c5b3c83b84b36f66 SHA512 438b015aa554d9a315b1e2a5a2d7a77e0fbf80455f81fc2abc47e7f70d3cb64e4b7811566df2f790cc39b75293de42e2e685dc9df0ac6744763b11216f265785
 DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde25402235fee280118a90930888543b2da7821ad7d30143d04d35dccfb0de6c375231f2db4a4f4dcbaeeaf5d4e54045cfc SHA512 895da1e1a3ddf2e5e8576fd41853cc5cb7c6e4f0223a0d25f6303fd01ca26f64c8e41616d6d66b2309a4ca5763b2b20b208dbf6054f0498411f2678422c07893
 DIST xapian-omega-1.4.7.tar.xz 510644 BLAKE2B e2106b07a0ccf765dad25c3e83a745936156b002e638fbd9cbd1fd194f507ad663c305fc4981d72f92a74f645601aa83b1bc3133d10d8d4c308f28657a90a356 SHA512 e7e2c7dfa3e76ccdde103b34aa1b0732033e9f218346a81f1b0b865c6e2d17c356b96a4522a3a2273fb55eb2fbd2dd57e835368771f46c9fb458c0c11329893b
 DIST xapian-omega-1.4.8.tar.xz 521352 BLAKE2B 01d914c0dcd7e8a8cf7ec4b997af49c01883d83a5c9bd1c59da058d3329dab5f517bb4d3aa243a3e47ad36311acafd64505fda1ecf86d3605a38ef70760d8711 SHA512 5d27c03891ff941b23c899b1a293ed9be0129de08ff46156380638408360ea6e4aa2dfb4fe0ffb13726807849802fe8d19f6dc817a52ec5bf50c2bf94ed94c2f
--- a/app-text/xapian-omega/xapian-omega-1.4.13.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.13.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/30
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/Show More
+++ b/Show More