From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4DFB9138334 for ; Mon, 16 Dec 2019 07:50:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D8F9E085E; Mon, 16 Dec 2019 07:50:22 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A145E085E for ; Mon, 16 Dec 2019 07:50:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F8AF34D8CF for ; Mon, 16 Dec 2019 07:50:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 951BD887 for ; Mon, 16 Dec 2019 07:50:02 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1576482593.1ad34e90754efd7ee3123420d59ada703b1b3db4.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/, app-admin/puppet/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/puppet/files/50puppet-mode-gentoo.el app-admin/puppet/puppet-4.10.12.ebuild X-VCS-Directories: app-admin/puppet/files/ app-admin/puppet/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 1ad34e90754efd7ee3123420d59ada703b1b3db4 X-VCS-Branch: master Date: Mon, 16 Dec 2019 07:50:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dfccdf99-d677-4eb4-8491-6ebd38455ee8 X-Archives-Hash: 3bd974a4870e71d3b7850b8d08908151 commit: 1ad34e90754efd7ee3123420d59ada703b1b3db4 Author: Ulrich Müller gentoo org> AuthorDate: Sat Dec 14 23:16:41 2019 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Mon Dec 16 07:49:53 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ad34e90 app-admin/puppet: Drop XEmacs support from version 4.10.12. This has been dropped in later versions already, and puppet-4.10.12 is the last ebuild in the tree that inherits xemacs-elisp-common.eclass. Closes: https://bugs.gentoo.org/702952 Acked-by: Matthew Thode gentoo.org> Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Ulrich Müller gentoo.org> app-admin/puppet/files/50puppet-mode-gentoo.el | 6 ------ app-admin/puppet/puppet-4.10.12.ebuild | 23 ++--------------------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/app-admin/puppet/files/50puppet-mode-gentoo.el b/app-admin/puppet/files/50puppet-mode-gentoo.el deleted file mode 100644 index 64c38ae5a31..00000000000 --- a/app-admin/puppet/files/50puppet-mode-gentoo.el +++ /dev/null @@ -1,6 +0,0 @@ - -;;; puppet-mode site-lisp configuration - -(add-to-list 'load-path "@SITELISP@") -(autoload 'puppet-mode "puppet-mode" "Major mode for editing puppet manifests") -(add-to-list 'auto-mode-alist '("\\.pp$" . puppet-mode)) diff --git a/app-admin/puppet/puppet-4.10.12.ebuild b/app-admin/puppet/puppet-4.10.12.ebuild index 77c0ff21fd5..7e3b54d90ab 100644 --- a/app-admin/puppet/puppet-4.10.12.ebuild +++ b/app-admin/puppet/puppet-4.10.12.ebuild @@ -9,7 +9,7 @@ USE_RUBY="ruby23 ruby24" RUBY_FAKEGEM_EXTRAINSTALL="locales" -inherit xemacs-elisp-common eutils user ruby-fakegem versionator +inherit eutils user ruby-fakegem versionator DESCRIPTION="A system automation and configuration management software." HOMEPAGE="https://puppet.com/" @@ -46,8 +46,6 @@ ruby_add_rdepend " # >=dev-ruby/webmock-1.24:0 # )" -DEPEND+=" ${DEPEND} - xemacs? ( app-editors/xemacs )" RDEPEND+=" ${RDEPEND} rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( @@ -106,13 +104,7 @@ all_ruby_prepare() { } all_ruby_compile() { - if use xemacs ; then - # Create a separate version for xemacs to be able to install - # emacs and xemacs in parallel. - mkdir ext/xemacs - cp ext/emacs/* ext/xemacs/ - xemacs-elisp-compile ext/xemacs/puppet-mode.el - fi + : } each_ruby_install() { @@ -150,11 +142,6 @@ all_ruby_install() { fowners -R :puppet /etc/puppetlabs fowners -R :puppet /var/lib/puppet - if use xemacs ; then - xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* - xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - if use ldap ; then insinto /etc/openldap/schema; doins ext/ldap/puppet.schema fi @@ -187,10 +174,4 @@ pkg_postinst() { elog fi done - - use xemacs && xemacs-elisp-site-regen -} - -pkg_postrm() { - use xemacs && xemacs-elisp-site-regen }