4 files changed, 104 insertions, 6 deletions
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
index 606c1b1a982f..0030191cfafd 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -2,6 +2,8 @@ AUX 50gtags-gentoo.el 183 BLAKE2B 242ceb0370227a6c0f1ee23477aa3798e0e8580e59849a
 AUX global-6.2.9-tinfo.patch 2047 BLAKE2B b88b65679f9b6ed0b96ca236c1918c3238baf99bdff8c7a45f85f982923d82341f23fc961cc4d61ee9269900b48e2d726ab57482e9635b035cf621e27da0f72e SHA512 f5d83716ba2fde29ad5765665d00b4d2a5b4c8d6351cd6ca9d8c375a6c953f795811e156c0cdb28549837c72abbe2c2bef9ad4cb419e7043115c50858b831698
 DIST global-6.3.1.tar.gz 1369634 BLAKE2B 8d93222ccbb4a45c0b9f114cd84b342b3f6ab99f7e0bbc18bfe00912ecd53f606be9d32fce1570e027009fd1fbe4752f03dd19c183dfda438d67a329808a6b45 SHA512 83becd6cda06f8da17ea0c701bb135523ff48cec73b233d24566387d11a35c0b42f410b62753838e2b364a5a485cac033b4aef1159cc6f4cdeca4a7b6c5bb4d6
 DIST global-6.5.7.tar.gz 2940567 BLAKE2B e0c692e09f9f7ea64ecbe47e18691efd3c641f28826e19751fb812690cd9d64a53af03055de9ec8199637da46dbd6084fec16380d7f295c83ed77553a8e301fd SHA512 0d33f718839e5e00bdd6d042b415a69c5e1f232d843610870505f8f20635b445810149b1b84ea8b77881f5f64814783ebe3cdcab2f84b8a085223b64293a9045
-EBUILD global-6.3.1.ebuild 1607 BLAKE2B 993a8c497cf7f06def3f8fa181c389ab4efc8aa0c4b75206521a45f1ca7d53e5305451fd0f2289f29e5b2f5e25ca54cd8911ab4e97c990c304b7b6b8f4f67466 SHA512 30b33ba83e1c98ff0b01b07707bc5d566ff746612b7403ab3f7e4bf64f256cbfbe15377a0de959e31aa1ab4907ca60ce77d80a0a735a8962b117a57fa34724f8
-EBUILD global-6.5.7.ebuild 1623 BLAKE2B 46d2ded4fd370550f2c588a15133875eae403b1e2f75b2f2ab4d7b14246daa1bfceaf38056374031967c9bdd87c2a269af6bbdf4f61526a19136984e6452985f SHA512 02043ad24c6cff23db1edf6cdd538b4b06b426384eb8c2c3e802694971f37e8e8dfccd13c3f597dff0df9d77df04076fcec1bcc795fe04812956ff318487cc34
+DIST global-6.6.4.tar.gz 2988969 BLAKE2B 784087537094d27c10d1f2bc992e799c35ab6ce3b86e041c31279e6954b203e80676b3158ba95e7957456b75a213d70998aae9047836cd4d388212236f05a081 SHA512 cb4ed451d3aaf47c4c59cdc3f74c97d3171108177d4846b5dac843589710e66d87c9d7bbe080c3770329e8e40105ac52dcafb4609257347593cca4d94711f483
+EBUILD global-6.3.1.ebuild 1617 BLAKE2B da9308bdd9572637c53e04dca67806ef0772acf94c749a86f53256d93c387d67e55acfcaa0727f46804aed0aee938716c35ffd9b82af4368d2218d29abc7ed14 SHA512 f161e43192b61a6f3ae10a8955c0625d8b0600529121168c32f51fbf9f6e12d5a9e88d384ab4479b3464b0f14bd9358396314a9716e7458dc298b00ddab55560
+EBUILD global-6.5.7.ebuild 1633 BLAKE2B 6120fd297353f710d91eedf03241552852567b73ff4a1b52e39f49538202961b930f07a5adcb41820c2c817f09b7556982fd2801aed4f332e43d2036bad95775 SHA512 4978e3550ca324412c01ab67264b8227ef35a7fbc0f5719b98c0b77db8f8cc09aa7420097aa3890bbd0f6b07b88a262886d4717c482c669d8d52a28adbfd52d5
+EBUILD global-6.6.4.ebuild 1654 BLAKE2B 4c4b8d0f515519534b4b43ab03a22906a71a1d2e4fa1718359a42bd0ed4f60eaa582c279acd414bc9b90c3ccc143b7110b9f93567c4de4ce7a4d957f7f7a71be SHA512 de7b306fa436ef7367dcc4f09307de5b96d2ab253853da997b280a6d7c2d8b8f96dee227248b2c07460c947b113b1d5abdc773ecd1721dd8a2f3e80ed8762b68
 MISC metadata.xml 398 BLAKE2B fb266f584dfc0e682d13870da7bbb4bbb46027cea3101b196b48d033766d627c723928f9a2f4ac4c8c6159a8ea147810b82fcec9ceb4981dc5491e54ef367c17 SHA512 89b426c4682fa885cedc1755f4720f1a003f9bc2dac725667ae45e098edebf627897830c911762f7d8856fc66cafb1c60d0f315173ddbbebada0d05ca6d8d5e8
diff --git a/dev-util/global/global-6.3.1.ebuild b/dev-util/global/global-6.3.1.ebuild
index 01ef75d4b4e6..4385230ea958 100644
--- a/dev-util/global/global-6.3.1.ebuild
+++ b/dev-util/global/global-6.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -16,7 +16,7 @@ IUSE="doc emacs vim"
 
 RDEPEND="|| ( dev-libs/libltdl:0 sys-devel/libtool:2 )
 	sys-libs/ncurses
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	vim? ( || ( app-editors/vim app-editors/gvim ) )"
 DEPEND="${DEPEND}
 	doc? ( app-text/texi2html sys-apps/texinfo )"
diff --git a/dev-util/global/global-6.5.7.ebuild b/dev-util/global/global-6.5.7.ebuild
index 196d3ce0b9c6..2b19aa0f759f 100644
--- a/dev-util/global/global-6.5.7.ebuild
+++ b/dev-util/global/global-6.5.7.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
@@ -16,7 +16,7 @@ IUSE="doc emacs vim"
 
 RDEPEND="
 	sys-libs/ncurses
-	emacs? ( virtual/emacs )
+	emacs? ( >=app-editors/emacs-23.1:* )
 	vim? ( || (
 			app-editors/vim
 			app-editors/gvim
diff --git a/dev-util/global/global-6.6.4.ebuild b/dev-util/global/global-6.6.4.ebuild
new file mode 100644
index 000000000000..e45daf3d4f7d
--- /dev/null
+++ b/dev-util/global/global-6.6.4.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common
+
+DESCRIPTION="tag system to find an object location in various sources"
+HOMEPAGE="https://www.gnu.org/software/global/global.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc emacs vim"
+
+RDEPEND="
+	sys-libs/ncurses
+	emacs? ( >=app-editors/emacs-23.1:* )
+	vim? ( || (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+	|| (
+		dev-libs/libltdl:0
+		sys-devel/libtool:2
+	)"
+
+DEPEND="${DEPEND}
+	doc? (
+		app-text/texi2html
+		sys-apps/texinfo
+	)"
+
+SITEFILE="50gtags-gentoo.el"
+
+PATCHES=( "${FILESDIR}/${PN}-6.2.9-tinfo.patch" )
+
+DOCS=( AUTHORS FAQ NEWS README THANKS )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		"$(use_with emacs lispdir "${SITELISP}/${PN}")"
+}
+
+src_compile() {
+	if use doc; then
+		texi2pdf -q -o doc/global.pdf doc/global.texi
+		texi2html -o doc/global.html doc/global.texi
+	fi
+
+	if use emacs; then
+		elisp-compile *.el
+	fi
+
+	emake
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	doins gtags.conf
+
+	if use vim; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins gtags.vim
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} *.{el,elc}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use doc; then
+		# doc/global.pdf is generated if tex executable (e.g. /usr/bin/tex) is available.
+		[[ -f doc/global.pdf ]] && DOCS+=( doc/global.pdf )
+	fi
+
+	einstalldocs
+	find "${ED}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}