gentoo resync : 24.02.2018

3 files changed, 2 insertions, 75 deletions

diff --git a/app-emacs/gnuserv/Manifest b/app-emacs/gnuserv/Manifest
index 3c5136aee6e9..07fb43439d89 100644
--- a/app-emacs/gnuserv/Manifest
+++ b/app-emacs/gnuserv/Manifest
@@ -1,6 +1,5 @@
 AUX 50gnuserv-gentoo.el 237 BLAKE2B 53e2fb102e832b852ebd23d3a7cda10a1cde7e1733818dd357edaa0ba67e66d925ea589195dd5b797ba37e62f44e26706669594f875409fb6afb294bba05d549 SHA512 24edf596178da29d68add510382241bf257ccb6ed0f9bd1aa65a2bda268b2fa506be616f70c75628d82cc8fda06617f5a4b58e602a9dc082476ac4ad4f0e047d
 AUX gnuclient.desktop 608 BLAKE2B b50695688d76ec34dae2fb68b4865769ab531a2a5add76a48c71eac6542ea3736f6e2239f1b05775e88bee3bc2ccfc6e50bc0c49a6eacbb277d822bb2cfb3003 SHA512 35616b5fe182f4127635454f4af89b307c0c52653878ef163efee4741c4b5fe5ab88d78f89ebfe499cc02516d2a7093c49dc2232a2768e952acd61651ff16468
 DIST gnuserv-3.12.8.tar.gz 124070 BLAKE2B 7531d85f6cd1873f75499c37230907f96ac484e1d58a4a3459f44d3bfaa6a6124d44f99a7c27d1fa3deb16b1cc29d08313b911cdc1782a1c5b24bd702ef4c9ba SHA512 e8f387a554c22fb2eb166d388085b9d68a0d865ae56ab71f3ffe09ff46bef04a4ba5b05ca51a1110e1dff67ae2cd6acc8b18a0fb9df9299dbbf4a001f0924f31
-EBUILD gnuserv-3.12.8-r2.ebuild 1765 BLAKE2B 59e4a4ce86ded0d90d629260bf259fb864d7005f437b62d34254ba00128181dc87fe241c3031f7dfa9b5c6ae98f41d69550494d5f1d09ae535fbb17fae0f1388 SHA512 53f7528b9eb3d07c1c5b4da048f0e1c32e98bfb495191fb8d66018df77112f52bf48304e7c0daf2c79c59c8102467c57dde25e3ff05bac6ba5d0a1ab693b4fd3
-EBUILD gnuserv-3.12.8-r3.ebuild 1520 BLAKE2B c4db1e1152fdbcde2a23fd0fb07275701dc5e991566c095addffeaf0c9479a9060980a08935be2bbbf2fc0ed00292fc46c327e8488f5d58215c6a3441a5aa5ec SHA512 8476dd1ff471c76d74cd9aeb494b8b37733c3555add9acb4c5a0f1c99c36476dd1fb6796439c7eb9c05fef3ec760cc1a47134254ce24c0dee8e2a0b0ef8b60fe
+EBUILD gnuserv-3.12.8-r3.ebuild 1519 BLAKE2B 4bd34511f83edfe948947dd71817031f178d9a7b5f1e9557b3085c64677cedcb05423e4d252c1817b821898c0299ca6be1a5d1fca1a6d713f7675941de0000fe SHA512 253290bb9f30f6eba50cb9f95ffd82b9376570fc6bfda2843b839112f2d588627cf2160a6db2dc69578067401202827dff9d49935b594be3b252d9f2bee33487
 MISC metadata.xml 259 BLAKE2B 3e6f3a8d36eff69f3dc47c089b6b31bbd853db73e3ec9e6534f068caacea5f1651547da161de8ecd712c6937cde45f5a4a39ab5025633f09c791e5a4f498a429 SHA512 9a5c456aae7919a4cdbb10b67a27c232daf2ec6db4202e04ba6d5873242fc982a659410443dd6fb4498d42af00b495acc51a6a2cbe12aeab91b585dfac7233a3
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild
deleted file mode 100644
index 38b3c602b4da..000000000000
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp multilib desktop fdo-mime
-
-DESCRIPTION="Attach to an already running Emacs"
-HOMEPAGE="http://meltin.net/hacks/emacs/"
-SRC_URI="http://meltin.net/hacks/emacs/src/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~x86-linux ~ppc-macos"
-IUSE="X"
-
-DEPEND=">=app-eselect/eselect-emacs-1.15
-	X? ( x11-libs/libXau )"
-RDEPEND="${DEPEND}
-	!!app-emacs/gnuserv-programs
-	!!<app-editors/xemacs-21.4.22-r3
-	!!~app-editors/xemacs-21.5.29 !!~app-editors/xemacs-21.5.30
-	!!~app-editors/xemacs-21.5.31 !!~app-editors/xemacs-21.5.33
-	!!=app-editors/xemacs-21.5.34 !!=app-editors/xemacs-21.5.34-r1"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	sed -i -e 's/exec gnuclient/&-emacs/' gnudoit || die
-}
-
-src_configure() {
-	econf $(use_enable X xauth) \
-		--x-includes="${EPREFIX}"/usr/include \
-		--x-libraries="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_compile() {
-	default
-}
-
-src_install() {
-	exeinto /usr/libexec/emacs
-	doexe gnuserv
-	newbin gnuclient gnuclient-emacs
-	newbin gnudoit gnudoit-emacs
-	# Don't install gnuattach, it is not functional with FSF GNU Emacs
-
-	newman gnuserv.1 gnuserv-emacs.1
-	echo ".so man1/gnuserv-emacs.1" | newman - gnuclient-emacs.1
-	echo ".so man1/gnuserv-emacs.1" | newman - gnudoit-emacs.1
-
-	elisp-install ${PN} *.el *.elc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	dodoc ChangeLog README README.orig
-
-	if use X; then
-		domenu "${FILESDIR}"/gnuclient.desktop || die
-	fi
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	use X && fdo-mime_desktop_database_update
-	eselect gnuclient update ifunset
-}
-
-pkg_postrm() {
-	elisp-site-regen
-	use X && fdo-mime_desktop_database_update
-	eselect gnuclient update ifunset
-}
diff --git a/app-emacs/gnuserv/gnuserv-3.12.8-r3.ebuild b/app-emacs/gnuserv/gnuserv-3.12.8-r3.ebuild
index e3f052adc7a1..fdecaef90eec 100644
--- a/app-emacs/gnuserv/gnuserv-3.12.8-r3.ebuild
+++ b/app-emacs/gnuserv/gnuserv-3.12.8-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://meltin.net/hacks/emacs/src/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86 ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~x86-linux ~ppc-macos"
 IUSE="X"
 
 DEPEND=">=app-eselect/eselect-emacs-1.15