gentoo resync : 03.03.2021

5 files changed, 34 insertions, 7 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index f19fb8d89fc1..42fae6525558 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/emacs-common-gentoo/Manifest b/app-emacs/emacs-common-gentoo/Manifest
index 511334038a96..c394966135c2 100644
--- a/app-emacs/emacs-common-gentoo/Manifest
+++ b/app-emacs/emacs-common-gentoo/Manifest
@@ -1,4 +1,5 @@
 DIST emacs-common-gentoo-1.6.tar.xz 61224 BLAKE2B 70e4f30c26c9098fdb02a53cab5d60cb611143d8bac6947707f3c7596b5a81ceb513b5a0809ee90f351472824f1d4216720c02cadb51d25b3dfce5e436e02bdf SHA512 a7daed2241d778ab283482ecc016801e25084eed10fcbbc50e187d5f842df5a0d278a77f94ae950b086c8651e8ca1a18f89c11dffdde9cf9168755288aae926a
-EBUILD emacs-common-gentoo-1.6-r3.ebuild 2817 BLAKE2B a51921c1963794fa8a082e3a5fd1c817e8e08dcb41d532e5282a1c870533b4f3a24036e5f78177ac0c65e78cfa527769b80864d3f7b41353a52cb6f185e269a0 SHA512 26f71e5d8b2cccd9850ceb11faedaf599bd65209ef84ea9b1ce66e0d35ac08cd885b84af48dca6253da909aea2d43e08a8001dd1615bb95b26994aa64f1b5f98
+DIST emacs-common-gentoo-1.7.tar.xz 61344 BLAKE2B bb5ec108ce230cfd45fa9cff1426b3731baf6a25b8346681128b0fc149649db5ca3b22720b3f8dba8495544f1ec5357a612aa35c687e36f5a181b2ab2fc324e5 SHA512 6c321a63d5329fe5e33f674951f1483acd724072a1d453ac0f4dbcb9b87825b735ac865fd9b9706a460b88828d1bfefbd65cc83d24a87b6359dd354c686605ce
 EBUILD emacs-common-gentoo-1.6-r4.ebuild 2825 BLAKE2B 9528a1c14c99d835334b2753bc9e8c10ab32f39532d38912898f77caaaff2706acb328675daf6783c7746f62a615450387011444e67e42f821b5ce4e441d29fb SHA512 bc987ccebb269bb20152934dec00ef58bab7f1310dfd91c4dc34dccbdba622c40ad2b9d841a1d5d0f5b1a406ffdad8716af0656bac36d7fedde74a9ee91835d6
+EBUILD emacs-common-gentoo-1.7.ebuild 2895 BLAKE2B efad77e6d07629efd12b0ffade40c817fc22918b88c6787eede21a67b36a156b9656f598385af311925699e1a8c13901384ee15e1ebb261e269fba453cc62bf2 SHA512 047c1e3f21238458293f8c4f39908a1a586502424f0540a8d37b15961cc708303092bf8f51e66443535d74a355c14406f0bfa283fee730865767bb8af7eb6bdd
 MISC metadata.xml 360 BLAKE2B e7e420afb7a8377bffcf2a23f3954bbf4cc80fcd19a8514733e2e0164f4235271e21dc860bf77cb9cfcd1a4026ef3dafe97a10dc397e2d8e6f001f02bf6e9bc7 SHA512 d57f8f097617229f774b06437aaa83595aab2a6d9321d51b97dac8bd56fa94db396c7bdca538570f0912390e25ae8643c5adc374908757f67f1422fa1f872605
diff --git a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.7.ebuild
index 8a4fe25ab120..314ea5c739ad 100644
--- a/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.6-r3.ebuild
+++ b/app-emacs/emacs-common-gentoo/emacs-common-gentoo-1.7.ebuild
@@ -11,8 +11,8 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="games X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="games gui"
 
 RDEPEND="games? ( acct-group/gamestat )"
 DEPEND="${RDEPEND}"
@@ -20,7 +20,8 @@ PDEPEND=">=app-editors/emacs-23.1:*"
 
 src_install() {
 	insinto "${SITELISP}"
-	doins subdirs.el
+	sed -e "s:@libdir@:$(get_libdir):g" subdirs.el.in | newins - subdirs.el
+	assert
 	newins site-gentoo.el{,.orig}
 
 	keepdir /etc/emacs
@@ -33,7 +34,7 @@ src_install() {
 		fperms g+w /var/games/emacs
 	fi
 
-	if use X; then
+	if use gui; then
 		local i
 		domenu emacs.desktop emacsclient.desktop
 
@@ -87,7 +88,7 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	if use X; then
+	if use gui; then
 		xdg_desktop_database_update
 		xdg_icon_cache_update
 	fi
@@ -95,7 +96,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	if use X; then
+	if use gui; then
 		xdg_desktop_database_update
 		xdg_icon_cache_update
 	fi
diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index 5e9028132dbc..cf4fe732a66d 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -2,7 +2,9 @@ AUX 50with-editor-gentoo.el 38 BLAKE2B e96c6cf48d1522d89450e11d339c76210c6723772
 DIST with-editor-2.8.3.tar.gz 30648 BLAKE2B 8989f8506fb58c1f54efa4fcb72fa8ddd477c0c73d82672028bdb027f74093b62c44ab5a545cd9db2e0e3222bf461e605aebc805112c5ae8486c224b22806c26 SHA512 389aa084f7dfb7f7b59a37802441718e20ee70d88b9af9631b1fc547e4c3238d053bb2b3ef50a4e6332fc3befae183a49d55b3c7bd7719a149cf83001d23810c
 DIST with-editor-2.9.2.tar.gz 31201 BLAKE2B 9aa1edbf217b7b1f0d1755f74526d4623d71eb3b66654b774d84a0faac9e3b39e2b8c511db23b15a151e263f0944e08aad07a1c3cba92aa309cf9e63b97b61ed SHA512 040028dd47cc5aaef5f0324fa8e4f53e55578b69efd55d0904e357f6cce2b69243b51d22bed8d56fc19649621446edca72fc11a3c7f4342056ce76d02f3a0502
 DIST with-editor-2.9.4.tar.gz 31639 BLAKE2B 9a9dddc7f4470d06fc3d94c7a41d034483f6143cb38c1cbded3ec4c760799da6f7a85b474e113a976a57db4ed609200f6395b48dedea2d805e3d7b1a9ec9ecb0 SHA512 017d9d815bb1ead3331e0f8d8c89cdc5646fb5e37ecbf7c1f4c8e7003e23acce21187d0a22e483a293096796b76f0bd1403d1e58bc02d212ecdf01bbc4329802
+DIST with-editor-3.0.2.tar.gz 31992 BLAKE2B ca7d63d07f44243a0d6218b02d5a96b01e92e07ad5c515fc74f3aaa08b78f2114410cfc634b17ac8d342381d679787c2608a526b5147ed29f2a45a5e1c513685 SHA512 3040358f5cb78c89a110fabed62c9693c2c69b742cd42d603fa3de6d3b1fcee693a1e7bf052b9e5a3da1e3f935911d4a054f14430367012a713caf1541ec9f6c
 EBUILD with-editor-2.8.3.ebuild 585 BLAKE2B dfb15f185a82227721d375b17e162e98b0e2620bb3bf71e6e110a68c1a8ec5f38a07d847918a9cedae4a506b2028c03f6032794c3ddb3341385fd5d518bbd10a SHA512 051602ed7993dcf52e8ce87ea00caa88e35b46a46e84acfb38adefe49808976f179f6e4672196032caf4901acc59439abf07cfa97234dc4d4038e9cbff35c847
 EBUILD with-editor-2.9.2.ebuild 588 BLAKE2B 79c96cde6bb7fa2998827b490b8ccc8fcc809364d8a846132d6abc3083e1ee19e578a41107cd7cd11549c1e2737c04568249ae5fe6352a7ecf50f37da72f22e9 SHA512 2ca005827f37bcfe9b3044486abd9492621ad19bd868bcf973c7fd3eafdb993aa0d1de1cbb311ddaeb5fe92a325531f4d830560c06e3cb8c774d480b1fad13db
 EBUILD with-editor-2.9.4.ebuild 588 BLAKE2B 79c96cde6bb7fa2998827b490b8ccc8fcc809364d8a846132d6abc3083e1ee19e578a41107cd7cd11549c1e2737c04568249ae5fe6352a7ecf50f37da72f22e9 SHA512 2ca005827f37bcfe9b3044486abd9492621ad19bd868bcf973c7fd3eafdb993aa0d1de1cbb311ddaeb5fe92a325531f4d830560c06e3cb8c774d480b1fad13db
+EBUILD with-editor-3.0.2.ebuild 588 BLAKE2B d8fda53659a95060e2ed96307d5f2b9ef3381eda05551a3e99609d8262cef9f4b35142eec138b5b625cd6b993b8a365d9455371457a03ea7953152984639eadc SHA512 97a68fd31882bbbc112096d76ebcf6326af1984d3d31b538f66654e068d4eb53adc0ccffb03d03a614ac2956679010539b94e700992a358309c96f325af10541
 MISC metadata.xml 707 BLAKE2B 7f4c983cfd2f8b87a3708301ccc570a0d88b3d9b21b3e089e44dc5b22f8313826d2469efabe7ff4dc2b27262f93dc4b5e8fe0e68b2b3b7a6f79fa6f34283eeab SHA512 bce73ef41113175585cc46d00fc1306537c71f860b1f2d699c086f2b1042d26fb02e9770122c586594ab9012eeea0fa73438a2fb9a9cf3b2c077481eef13a5b6
diff --git a/app-emacs/with-editor/with-editor-3.0.2.ebuild b/app-emacs/with-editor/with-editor-3.0.2.ebuild
new file mode 100644
index 000000000000..5ac353224ec1
--- /dev/null
+++ b/app-emacs/with-editor/with-editor-3.0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
+HOMEPAGE="https://magit.vc/manual/with-editor"
+SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md with-editor.org"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} sys-apps/texinfo"