Drop dependency on virtual/emacs-cedet and semantic USE flag, as CEDET is included with Emacs 23.2 and later. Remove old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

4 files changed, 11 insertions, 58 deletions

diff --git a/app-emacs/company-mode/ChangeLog b/app-emacs/company-mode/ChangeLog
index 15c8f4962efd..1c69c8bf7a27 100644
--- a/app-emacs/company-mode/ChangeLog
+++ b/app-emacs/company-mode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emacs/company-mode
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/ChangeLog,v 1.14 2014/02/13 18:19:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/ChangeLog,v 1.15 2014/03/17 00:02:10 ulm Exp $
+
+  17 Mar 2014; Ulrich Müller <ulm@gentoo.org> -company-mode-0.6.11.ebuild,
+  company-mode-0.6.14.ebuild, metadata.xml:
+  Drop dependency on virtual/emacs-cedet and semantic USE flag, as CEDET is
+  included with Emacs 23.2 and later. Remove old.
 
   13 Feb 2014; Ulrich Müller <ulm@gentoo.org> company-mode-0.6.11.ebuild,
   company-mode-0.6.14.ebuild:
diff --git a/app-emacs/company-mode/company-mode-0.6.11.ebuild b/app-emacs/company-mode/company-mode-0.6.11.ebuild
deleted file mode 100644
index 9dcc9500ec0b..000000000000
--- a/app-emacs/company-mode/company-mode-0.6.11.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 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.6.11.ebuild,v 1.2 2014/02/13 18:19:49 ulm Exp $
-
-EAPI=5
-NEED_EMACS=23
-
-inherit elisp
-
-DESCRIPTION="In-buffer completion front-end"
-HOMEPAGE="http://company-mode.github.com/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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="ropemacs? ( app-emacs/pymacs )
-	semantic? ( virtual/emacs-cedet )"
-RDEPEND="${DEPEND}
-	ropemacs? ( dev-python/ropemacs )"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	# Disable backends that require extra dependencies, unless they are
-	# selected by the respective USE flag
-
-	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
-}
diff --git a/app-emacs/company-mode/company-mode-0.6.14.ebuild b/app-emacs/company-mode/company-mode-0.6.14.ebuild
index e617f35b9535..5073dfe92b3f 100644
--- a/app-emacs/company-mode/company-mode-0.6.14.ebuild
+++ b/app-emacs/company-mode/company-mode-0.6.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.6.14.ebuild,v 1.2 2014/02/13 18:19:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/company-mode-0.6.14.ebuild,v 1.3 2014/03/17 00:02:10 ulm Exp $
 
 EAPI=5
 NEED_EMACS=23
@@ -14,12 +14,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ropemacs +semantic"
+IUSE="ropemacs"
 
 # 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="ropemacs? ( app-emacs/pymacs )
-	semantic? ( virtual/emacs-cedet )"
+DEPEND="ropemacs? ( app-emacs/pymacs )"
 RDEPEND="${DEPEND}
 	ropemacs? ( dev-python/ropemacs )"
 
@@ -37,9 +36,4 @@ src_prepare() {
 		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
 }
diff --git a/app-emacs/company-mode/metadata.xml b/app-emacs/company-mode/metadata.xml
index 53b04ca593ba..3474d9f23212 100644
--- a/app-emacs/company-mode/metadata.xml
+++ b/app-emacs/company-mode/metadata.xml
@@ -3,9 +3,7 @@
 <pkgmetadata>
 <herd>emacs</herd>
 <use>
-  <flag name='ropemacs'>Install backend for <pkg>dev-python/ropemacs</pkg>
-  </flag>
-  <flag name='semantic'>Install backend for semantic
-    (<pkg>app-emacs/cedet</pkg>)</flag>
+  <flag name='ropemacs'>Install backend for
+    <pkg>dev-python/ropemacs</pkg></flag>
 </use>
 </pkgmetadata>