[gentoo-commits] proj/emacs:master commit in: app-admin/eselect-emacs/, app-admin/eselect-ctags/

[gentoo-commits] proj/emacs:master commit in: app-admin/eselect-emacs/, app-admin/eselect-ctags/

[Ulrich Müller]

commit:     c1869977f8207685a07b04b59b00ca994c55e1c2
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 19 07:40:27 2014 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 19 07:40:27 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/emacs.git;a=commit;h=c1869977

app-admin/eselect-ctags, app-admin/eselect-emacs: Install etags module in eselect-ctags instead of eselect-emacs.

Package-Manager: portage-2.2.15

---
 app-admin/eselect-ctags/ChangeLog                    | 3 +++
 app-admin/eselect-ctags/eselect-ctags-9999.ebuild    | 9 ++++-----
 app-admin/eselect-emacs/ChangeLog                    | 3 +++
 app-admin/eselect-emacs/eselect-emacs-9999-r2.ebuild | 6 ++++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app-admin/eselect-ctags/ChangeLog b/app-admin/eselect-ctags/ChangeLog
index e49119a..c9586b2 100644
--- a/app-admin/eselect-ctags/ChangeLog
+++ b/app-admin/eselect-ctags/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Dec 2014; Ulrich Müller <ulm@gentoo.org> eselect-ctags-9999.ebuild:
+  Install etags module in eselect-ctags instead of eselect-emacs.
+
   19 Jan 2014; Ulrich Müller <ulm@gentoo.org> eselect-ctags-9999.ebuild:
   Switch from package.mask to empty KEYWORDS.
 

diff --git a/app-admin/eselect-ctags/eselect-ctags-9999.ebuild b/app-admin/eselect-ctags/eselect-ctags-9999.ebuild
index bc8dc3b..7f4328a 100644
--- a/app-admin/eselect-ctags/eselect-ctags-9999.ebuild
+++ b/app-admin/eselect-ctags/eselect-ctags-9999.ebuild
@@ -17,14 +17,13 @@ HOMEPAGE="http://wiki.gentoo.org/wiki/Project:Emacs"
 LICENSE="GPL-2+"
 SLOT="0"
 
-RDEPEND=">=app-admin/eselect-1.2.3"
+RDEPEND="!<app-admin/eselect-emacs-1.18
+	>=app-admin/eselect-1.2.3"
 
 S="${WORKDIR}/${MY_PN}"
 
-src_compile() { :; }
-
 src_install() {
 	insinto /usr/share/eselect/modules
-	doins ctags.eselect
-	doman ctags.eselect.5
+	doins {ctags,etags}.eselect
+	doman {ctags,etags}.eselect.5
 }

diff --git a/app-admin/eselect-emacs/ChangeLog b/app-admin/eselect-emacs/ChangeLog
index 96e575d..ae97fe6 100644
--- a/app-admin/eselect-emacs/ChangeLog
+++ b/app-admin/eselect-emacs/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Dec 2014; Ulrich Müller <ulm@gentoo.org> eselect-emacs-9999-r2.ebuild:
+  Install etags module in eselect-ctags instead of eselect-emacs.
+
 *eselect-emacs-9999-r2 (13 Mar 2014)
 
   13 Mar 2014; Ulrich Müller <ulm@gentoo.org> -eselect-emacs-9999-r1.ebuild,

diff --git a/app-admin/eselect-emacs/eselect-emacs-9999-r2.ebuild b/app-admin/eselect-emacs/eselect-emacs-9999-r2.ebuild
index 4ac77f9..bde01d9 100644
--- a/app-admin/eselect-emacs/eselect-emacs-9999-r2.ebuild
+++ b/app-admin/eselect-emacs/eselect-emacs-9999-r2.ebuild
@@ -21,9 +21,11 @@ RDEPEND=">=app-admin/eselect-1.2.6
 
 S="${WORKDIR}/${PN}"
 
+src_compile() { :; }
+
 src_install() {
 	insinto /usr/share/eselect/modules
-	doins {emacs,etags,gnuclient}.eselect
-	doman {emacs,etags,gnuclient}.eselect.5
+	doins {emacs,gnuclient}.eselect
+	doman {emacs,gnuclient}.eselect.5
 	dodoc ChangeLog
 }