summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2009-08-27 19:41:44 +0000
committerUlrich Müller <ulm@gentoo.org>2009-08-27 19:41:44 +0000
commit0dff26631e66773915cd11b15f8d385d40a0834b (patch)
tree1b67edbf43953fd0c61169f5ecdea28a8fc31c30 /app-emacs/company-mode
parentVersion bump. (diff)
downloadgentoo-2-0dff26631e66773915cd11b15f8d385d40a0834b.tar.gz
gentoo-2-0dff26631e66773915cd11b15f8d385d40a0834b.tar.bz2
gentoo-2-0dff26631e66773915cd11b15f8d385d40a0834b.zip
Add missing dependency on app-emacs/pymacs. Unroll loop for backend removal.
(Portage version: 2.2_rc40/cvs/Linux i686)
Diffstat (limited to 'app-emacs/company-mode')
-rw-r--r--app-emacs/company-mode/ChangeLog6
-rw-r--r--app-emacs/company-mode/company-mode-0.4.3.ebuild26
2 files changed, 22 insertions, 10 deletions
diff --git a/app-emacs/company-mode/ChangeLog b/app-emacs/company-mode/ChangeLog
index 0b1175a1137f..29fafbdb2b2b 100644
--- a/app-emacs/company-mode/ChangeLog
+++ b/app-emacs/company-mode/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-emacs/company-mode
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/ChangeLog,v 1.8 2009/08/25 19:41:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/ChangeLog,v 1.9 2009/08/27 19:41:44 ulm Exp $
+
+ 27 Aug 2009; Ulrich Mueller <ulm@gentoo.org> company-mode-0.4.3.ebuild:
+ Add missing dependency on app-emacs/pymacs. Unroll loop for backend
+ removal in src_prepare, on request of Mr_Bones_.
*company-mode-0.4.3 (25 Aug 2009)
diff --git a/app-emacs/company-mode/company-mode-0.4.3.ebuild b/app-emacs/company-mode/company-mode-0.4.3.ebuild
index 77fff73ddbc9..d9f96cb56c2e 100644
--- a/app-emacs/company-mode/company-mode-0.4.3.ebuild
+++ b/app-emacs/company-mode/company-mode-0.4.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/company-mode-0.4.3.ebuild,v 1.2 2009/08/27 05:59:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/company-mode-0.4.3.ebuild,v 1.3 2009/08/27 19:41:44 ulm Exp $
EAPI=2
NEED_EMACS=22
@@ -18,8 +18,9 @@ IUSE="ropemacs semantic"
# Note: company-mode supports many backends, and we refrain from including
# them all in RDEPEND. Only depend on things that are needed at build time.
-DEPEND="semantic? ( app-emacs/cedet )
- || ( app-emacs/nxml-mode >=virtual/emacs-23 )"
+DEPEND="|| ( app-emacs/nxml-mode >=virtual/emacs-23 )
+ ropemacs? ( app-emacs/pymacs )
+ semantic? ( app-emacs/cedet )"
RDEPEND="${DEPEND}"
S="${WORKDIR}"
@@ -28,10 +29,17 @@ SITEFILE="50${PN}-gentoo.el"
src_prepare() {
# Disable backends that require extra dependencies, unless they are
# selected by the respective USE flag
- local backend
- for backend in pysmell ropemacs semantic; do
- has ${backend} ${IUSE} && use ${backend} && continue
- elog "Removing ${backend} backend"
- rm "company-${backend}.el" || die
- done
+
+ elog "Removing pysmell backend"
+ rm company-pysmell.el || die
+
+ if ! use ropemacs; then
+ elog "Removing ropemacs backend, as requested by USE=-ropemacs"
+ rm company-ropemacs.el || die
+ fi
+
+ if ! use semantic; then
+ elog "Removing semantic backend, as requested by USE=-semantic"
+ rm company-semantic.el || die
+ fi
}