commit: 6263af6ba00c9879506357a81df87baa65804a9c Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Mon Mar 17 00:40:46 2014 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Mon Mar 17 00:40:46 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=6263af6b
Merge changes from Portage tree. Package-Manager: portage-2.2.8-r1 --- app-emacs/rudel/ChangeLog | 3 +++ app-emacs/rudel/rudel-9999.ebuild | 24 +++++++++--------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/app-emacs/rudel/ChangeLog b/app-emacs/rudel/ChangeLog index e1b3ef6..1fea41c 100644 --- a/app-emacs/rudel/ChangeLog +++ b/app-emacs/rudel/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 17 Mar 2014; Ulrich Müller <[email protected]> rudel-9999.ebuild: + Merge changes from Portage tree. + 19 Jan 2014; Ulrich Müller <[email protected]> rudel-9999.ebuild: Switch from package.mask to empty KEYWORDS. diff --git a/app-emacs/rudel/rudel-9999.ebuild b/app-emacs/rudel/rudel-9999.ebuild index 561d939..4f2f4a1 100644 --- a/app-emacs/rudel/rudel-9999.ebuild +++ b/app-emacs/rudel/rudel-9999.ebuild @@ -2,22 +2,19 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 NEED_EMACS=23 -inherit elisp bzr +inherit readme.gentoo elisp bzr EBZR_REPO_URI="bzr://rudel.bzr.sourceforge.net/bzrroot/rudel/trunk" DESCRIPTION="Collaborative editing environment for GNU Emacs" HOMEPAGE="http://rudel.sourceforge.net/ http://www.emacswiki.org/emacs/Rudel"; -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" -DEPEND="virtual/emacs-cedet" -RDEPEND="${DEPEND}" - SITEFILE="60${PN}-gentoo.el" src_compile() { @@ -34,19 +31,16 @@ src_install() { doins ${dir}/*.{el,elc} done - elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die + elisp-site-file-install "${FILESDIR}/${SITEFILE}" insinto "${SITEETC}/${PN}" doins -r icons dodoc README INSTALL ChangeLog TODO doc/card.pdf -} - -pkg_postinst() { - elisp_pkg_postinst - elog "Connections to Gobby servers require the gnutls-cli program" - elog "(net-libs/gnutls)." - elog "The Avahi daemon (net-dns/avahi) is required for automatic" - elog "session discovery and advertising." + DOC_CONTENTS="Connections to Gobby servers require the gnutls-cli program + (net-libs/gnutls). + \\n\\nThe Avahi daemon (net-dns/avahi) is required for automatic + session discovery and advertising." + readme.gentoo_create_doc }
