Add missing dependency on app-emacs/pymacs. Unroll loop for backend removal.

Package-Manager: portage-2.2_rc40/cvs/Linux i686

3 files changed, 34 insertions, 12 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/Manifest b/app-emacs/company-mode/Manifest
index 7312232a584e..6f7147d6e786 100644
--- a/app-emacs/company-mode/Manifest
+++ b/app-emacs/company-mode/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50company-mode-gentoo.el 79 RMD160 ccb20f0d54ed7cfbe9f26b2819fcb3419b8e13ba SHA1 56354ef1d7f03d4eeb59f11e5455ccf15af2b1df SHA256 9e50754cd23e5babffb29c4c93b4df8c34680fb714f6fc36a73d5c739cc4c3b0
 AUX company-mode-0.4.2-disable-semantic.patch 662 RMD160 ab1f63f5522efc6be96902c059ee78b7a228b296 SHA1 bf65786726c964478aa06ab1e74d5131a7e5e064 SHA256 9006a7d34fb59a0fb6476c8f0d99c913de99e904720ffbd20b25384b099754df
 DIST company-0.4.2.tar.bz2 27565 RMD160 8ed77b16c16345913bedd67a07e8480c11549a5b SHA1 65238a217de030e8527b5ccb5d3b1314600e8fdf SHA256 505f963b6e953473d5789c403830211a610ebd7be5405d0843e83d41487af4ca
 DIST company-0.4.3.tar.bz2 29751 RMD160 6cb519c756ad6229461538e67b3a28eddc9459a9 SHA1 69a46fea0337a98d28cc3d77bceca2241c8550c2 SHA256 25d3613bb5d8761d43773507e45568c514fecc8c1c1f373a7699f9b995a62fad
 EBUILD company-mode-0.4.2.ebuild 1063 RMD160 484dfce414fd73e56722864ed64477045e1a88ab SHA1 202fa82d1c376fb35838de6cd6ca03aba47a79e7 SHA256 c7de91caa3b68679fcc96d2feb151b7d20f30d92a3d78b4adf3b28a2e5366b99
-EBUILD company-mode-0.4.3.ebuild 1132 RMD160 b258ae9dae2e239c32cb71060397c7f699276ecb SHA1 9d7bac13bcfee5379b3995ebde89ebf0cce7a942 SHA256 4aa68f2efb86332822367f08f43d152bd0082b191d1e1cfadbd4eb30da3b7296
-MISC ChangeLog 1558 RMD160 28246e1dc24a183579561249bd1c926d176264e4 SHA1 7b5c02d8df8b02b3fb6d83a3c9eca8b95df51454 SHA256 1256078571df0ddaa5864e74eeb43aee26628dbec8b2e34b211c2ea1ce32cc52
+EBUILD company-mode-0.4.3.ebuild 1283 RMD160 6a9b3645ef7e084afbbd7e6a8d0eef2c2cb8300c SHA1 f74f758901106dcf9f5322a690760e95c4c56d6f SHA256 b06cf7720a79be076ee81e8cae8f53335f6b82f2dd6b069a03b7e3a900372c14
+MISC ChangeLog 1754 RMD160 e8449eeccc84c604aa145faf901de4e6b3f9cd13 SHA1 89fff1706b2db6df700d2acff1b73a63ba615c44 SHA256 dd86bcb1a6b219402532b957738191c65e064e3520db0401b06db84038c923d6
 MISC metadata.xml 358 RMD160 c065e01a9c6a7089c645d6a0597a2dedd284f84d SHA1 1addca794dee5e6a5106b714d9f6fd4c0d4a8ca1 SHA256 f650e282fb657a351fffe19fb2d29d6cf48d5b60f77b852c4b6c1490e283fd76
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkqW4fYACgkQOeoy/oIi7uyWgwCg0WFbBFXn6BTvM39QC+bIO7gu
+yscAmwWqHuLUOXgegaBvOshDyEczv8FJ
+=IYNB
+-----END PGP SIGNATURE-----
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
 }