Version bump.

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

4 files changed, 65 insertions, 5 deletions

diff --git a/app-emacs/company-mode/ChangeLog b/app-emacs/company-mode/ChangeLog
index cfc136620fde..4aa88083313b 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.5 2009/04/16 23:03:16 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/ChangeLog,v 1.6 2009/04/25 21:38:10 ulm Exp $
+
+*company-mode-0.4.2 (25 Apr 2009)
+
+  25 Apr 2009; Ulrich Mueller <ulm@gentoo.org>
+  +files/company-mode-0.4.2-disable-semantic.patch,
+  +company-mode-0.4.2.ebuild:
+  Version bump.
 
   16 Apr 2009; Ulrich Mueller <ulm@gentoo.org> company-mode-0.3.1.ebuild:
   Fix dependency on nxml-mode.
diff --git a/app-emacs/company-mode/Manifest b/app-emacs/company-mode/Manifest
index 4c306f6b35d0..9d4408e70257 100644
--- a/app-emacs/company-mode/Manifest
+++ b/app-emacs/company-mode/Manifest
@@ -2,14 +2,17 @@
 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.3.1.tar.bz2 21545 RMD160 e86dd8a8b107ffcb699afd2ec676b4e4ed187903 SHA1 c6477625511cf64b6bbfd12459d76ccc9543abc8 SHA256 968b796053cb982e06ef92fc802cf0eff69ec7dc55b808f2893be244389c9447
+DIST company-0.4.2.tar.bz2 27565 RMD160 8ed77b16c16345913bedd67a07e8480c11549a5b SHA1 65238a217de030e8527b5ccb5d3b1314600e8fdf SHA256 505f963b6e953473d5789c403830211a610ebd7be5405d0843e83d41487af4ca
 EBUILD company-mode-0.3.1.ebuild 1062 RMD160 e01470a351f6a5a0a8aa7222459f1e77f955e310 SHA1 d5a2b40f3a3eb0d8be73eff5fa5e4b2844724fa1 SHA256 e8d1556899057e67cd7cca4422fd0452631e0ea5b8d65bf372f6031d1f983989
-MISC ChangeLog 1116 RMD160 cc14d763ce84068dfc9bfcb483a4edcf170654ae SHA1 f75cd5b33a128112d607f96db5a919c1016ecdf8 SHA256 2689f309a15cf41ce0e28fabf81444478572aecc50fd0d801e3d03b899e3118b
+EBUILD company-mode-0.4.2.ebuild 1063 RMD160 484dfce414fd73e56722864ed64477045e1a88ab SHA1 202fa82d1c376fb35838de6cd6ca03aba47a79e7 SHA256 c7de91caa3b68679fcc96d2feb151b7d20f30d92a3d78b4adf3b28a2e5366b99
+MISC ChangeLog 1297 RMD160 f1a448a17336f31e5ff9d31e95cd7d4a3a55c47b SHA1 7f658a135e7576db0a76f8a74f0c863907a9a40e SHA256 c4586ab69291bbd80b2142e1c2e083f53a472ba045ac2bb221739c81eee6ac5b
 MISC metadata.xml 264 RMD160 fee47893caceaee540a298ea5be98c1ccc30c4bb SHA1 c22d054bd4537d56ae81dd7bcd5d91da0541d5c7 SHA256 d87731d73adb0aeb01ff8ec113f72121cfae828470693060904ca8d3fa26ee9a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAknnuZAACgkQOeoy/oIi7uxQ6wCeKyJNJMmNshPyCWNXFhGOFDsK
-1zoAnAtD9aeMhjLzcpM30SGCxtUWilbg
-=oXGc
+iEUEARECAAYFAknzgyAACgkQOeoy/oIi7uy9AgCXRhM9yfH4kZLQFCrloBm8izcO
+kwCg1A48UZmYfyVFlZ413tELOtBMbCc=
+=MJVA
 -----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
new file mode 100644
index 000000000000..8adedd52042f
--- /dev/null
+++ b/app-emacs/company-mode/company-mode-0.4.2.ebuild
@@ -0,0 +1,35 @@
+# 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/files/company-mode-0.4.2-disable-semantic.patch b/app-emacs/company-mode/files/company-mode-0.4.2-disable-semantic.patch
new file mode 100644
index 000000000000..fc2dd365339f
--- /dev/null
+++ b/app-emacs/company-mode/files/company-mode-0.4.2-disable-semantic.patch
@@ -0,0 +1,15 @@
+--- 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)