Version bump, bug 319225. Remove old.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 61 insertions, 60 deletions

diff --git a/app-emacs/company-mode/ChangeLog b/app-emacs/company-mode/ChangeLog
index 29fafbdb2b2b..bed15bd1a085 100644
--- a/app-emacs/company-mode/ChangeLog
+++ b/app-emacs/company-mode/ChangeLog
@@ -1,6 +1,13 @@
 # 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.9 2009/08/27 19:41:44 ulm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/ChangeLog,v 1.10 2010/05/15 15:28:20 ulm Exp $
+
+*company-mode-0.5 (15 May 2010)
+
+  15 May 2010; Ulrich Mueller <ulm@gentoo.org> -company-mode-0.4.2.ebuild,
+  -files/company-mode-0.4.2-disable-semantic.patch, +company-mode-0.5.ebuild:
+  Version bump, bug 319225. Turn on semantic USE flag by default, because
+  CEDET is available with Emacs 23.2. Remove old.
 
   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
diff --git a/app-emacs/company-mode/Manifest b/app-emacs/company-mode/Manifest
index 6f7147d6e786..25f8bda85f78 100644
--- a/app-emacs/company-mode/Manifest
+++ b/app-emacs/company-mode/Manifest
@@ -2,17 +2,16 @@
 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
+DIST company-0.5.tar.bz2 32573 RMD160 00ff18e88e8fddce9e52d2237652a8f64188fb92 SHA1 26a458d157b3582f5c3df363ec7c9de0a1f41e19 SHA256 126eee519bc8ad5934657e51512496a0d2534a0e10daf12b07177409f4cb3999
 EBUILD company-mode-0.4.3.ebuild 1283 RMD160 6a9b3645ef7e084afbbd7e6a8d0eef2c2cb8300c SHA1 f74f758901106dcf9f5322a690760e95c4c56d6f SHA256 b06cf7720a79be076ee81e8cae8f53335f6b82f2dd6b069a03b7e3a900372c14
-MISC ChangeLog 1754 RMD160 e8449eeccc84c604aa145faf901de4e6b3f9cd13 SHA1 89fff1706b2db6df700d2acff1b73a63ba615c44 SHA256 dd86bcb1a6b219402532b957738191c65e064e3520db0401b06db84038c923d6
+EBUILD company-mode-0.5.ebuild 1286 RMD160 83833386838a104dbffc4bb87141115f647fb7d4 SHA1 cd91f14eb3f1a786a9ef9cba3b92e427a66bbf89 SHA256 cfb4e9f45212d7c9835fd4ba11712bb8152802ddbaa2a5f76051ff6dc9219ab6
+MISC ChangeLog 2066 RMD160 0342128ac8e980841247601178e29b387c94f3fc SHA1 db7a790d9cf764bf52b210c60f9d852d8f139a55 SHA256 7f24fc2d65f691064b2778fd67950b4dcbadda4d0ddce283a4d879d9721f445d
 MISC metadata.xml 358 RMD160 c065e01a9c6a7089c645d6a0597a2dedd284f84d SHA1 1addca794dee5e6a5106b714d9f6fd4c0d4a8ca1 SHA256 f650e282fb657a351fffe19fb2d29d6cf48d5b60f77b852c4b6c1490e283fd76
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkqW4fYACgkQOeoy/oIi7uyWgwCg0WFbBFXn6BTvM39QC+bIO7gu
-yscAmwWqHuLUOXgegaBvOshDyEczv8FJ
-=IYNB
+iEYEARECAAYFAkvuva8ACgkQOeoy/oIi7uxR+ACgp3U/Zj4PZMt6U2du8ARsXXQf
+fEkAn2bzJDtFAib3FmqIzvPmgiQ60GU5
+=4W56
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/company-mode/company-mode-0.4.2.ebuild b/app-emacs/company-mode/company-mode-0.4.2.ebuild
deleted file mode 100644
index 8adedd52042f..000000000000
--- a/app-emacs/company-mode/company-mode-0.4.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# 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.2.ebuild,v 1.1 2009/04/25 21:38:10 ulm Exp $
-
-EAPI=2
-NEED_EMACS=22
-
-inherit elisp eutils
-
-DESCRIPTION="In-buffer completion front-end"
-HOMEPAGE="http://nschum.de/src/emacs/company-mode/"
-SRC_URI="http://nschum.de/src/emacs/${PN}/company-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="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 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	# Disable semantic backend, unless selected by its USE flag
-	if ! use semantic; then
-		elog "Disabling semantic backend, as requested by USE=-semantic"
-		rm "company-semantic.el" || die
-		epatch "${FILESDIR}/${P}-disable-semantic.patch"
-	fi
-}
diff --git a/app-emacs/company-mode/company-mode-0.5.ebuild b/app-emacs/company-mode/company-mode-0.5.ebuild
new file mode 100644
index 000000000000..cde5cc5772a6
--- /dev/null
+++ b/app-emacs/company-mode/company-mode-0.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 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.5.ebuild,v 1.1 2010/05/15 15:28:20 ulm Exp $
+
+EAPI=2
+NEED_EMACS=22
+
+inherit elisp
+
+DESCRIPTION="In-buffer completion front-end"
+HOMEPAGE="http://nschum.de/src/emacs/company-mode/"
+SRC_URI="http://nschum.de/src/emacs/${PN}/company-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+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="|| ( app-emacs/nxml-mode >=virtual/emacs-23 )
+	ropemacs? ( app-emacs/pymacs )
+	semantic? ( virtual/emacs-cedet )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+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/files/company-mode-0.4.2-disable-semantic.patch b/app-emacs/company-mode/files/company-mode-0.4.2-disable-semantic.patch
deleted file mode 100644
index fc2dd365339f..000000000000
--- a/app-emacs/company-mode/files/company-mode-0.4.2-disable-semantic.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- company.el~	2009-04-25 09:15:30.000000000 +0200
-+++ company.el	2009-04-25 23:33:30.000000000 +0200
-@@ -277,5 +277,4 @@
-     (company-nxml . "nxml")
-     (company-oddmuse . "Oddmuse")
--    (company-semantic . "CEDET Semantic")
-     (company-tempo . "Tempo templates")
-     (company-xcode . "Xcode")))
-@@ -291,5 +290,5 @@
- 
- (defcustom company-backends '(company-elisp company-nxml company-css
--                              company-eclim company-semantic company-xcode
-+                              company-eclim company-xcode
-                               (company-gtags company-etags company-dabbrev-code
-                                company-keywords)