Drop dependency on app-emacs/nxml-mode, because it is included with all supported Emacs versions.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 25 insertions, 20 deletions

diff --git a/app-emacs/company-mode/ChangeLog b/app-emacs/company-mode/ChangeLog
index 9e60b185d3d9..15c8f4962efd 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.13 2014/02/10 20:14:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/company-mode/ChangeLog,v 1.14 2014/02/13 18:19:49 ulm Exp $
+
+  13 Feb 2014; Ulrich Müller <ulm@gentoo.org> company-mode-0.6.11.ebuild,
+  company-mode-0.6.14.ebuild:
+  Drop dependency on app-emacs/nxml-mode, because it is included with all
+  supported Emacs versions.
 
 *company-mode-0.6.14 (10 Feb 2014)
 
diff --git a/app-emacs/company-mode/Manifest b/app-emacs/company-mode/Manifest
index 163f0b8a7848..31e26f3bd9d1 100644
--- a/app-emacs/company-mode/Manifest
+++ b/app-emacs/company-mode/Manifest
@@ -4,21 +4,21 @@ Hash: SHA256
 AUX 50company-mode-gentoo.el 79 SHA256 9e50754cd23e5babffb29c4c93b4df8c34680fb714f6fc36a73d5c739cc4c3b0 SHA512 8c3c1d4a50bfd4729f8a06f33bf9d754b5865814cf15eee1f3c84c6726734f8ff26c21547f1453f7417a0b9d008fe7804104ee6e30f13c54625d2b4b6faa7e99 WHIRLPOOL 6f7259e32cec3249764b5c1858468f3625f7084b8b651392574a9ed20a9b42ae00d6abe5c601516df5b19cf934859237151d388b365bf5e0ba713d44e2a37bbc
 DIST company-mode-0.6.11.tar.gz 49129 SHA256 7edd6f7aeb70de6a35e108af16b2ca4bfc4965feb1dc53dfe2750433a4b1c7f7 SHA512 67bd5aa7f5814cbac584d0377e2401c42f9f11d67e0351c5853421fa75cd500b8214b4e3205ec8b244f6eefe44c216d0bf5a9e2b943bc28a70a81090b88f1f24 WHIRLPOOL 75f3e0fc27bf1d37fc8d4df4e6a85887df5c60b09cf315d425f532d7b18fc823e960c45bdd3c73dc7afbe3a389d00d915dd72b6915dd25b69db597b8d599d680
 DIST company-mode-0.6.14.tar.gz 51776 SHA256 5472cd634bf09da4557f055d3615afdd5436f814f63923ad94ccbebe60ab5e08 SHA512 7b8c0b70dc9c010214e8671fd7393faa9d1dd0839f41d532eb93eda91c77b4c93f2145ad2d688011976bfbb45282f35b937f195499f29cda79147ec2815e94d9 WHIRLPOOL 1aeefc6e4a5d7e3696150c38187131811c88fd3e9478a401400a31a7f7f7e3aad42736cabb093398470f9b20041639143665bb9d7335e2ae40ccfab8d2ab91ce
-EBUILD company-mode-0.6.11.ebuild 1299 SHA256 0e17639dac239fb46309d61d6c90263a35a03d9822732efe64b3b182ce971561 SHA512 6209b9e0ced09503ea889470d53f3981c2530472ec6c57761d10c5263ce037620cad6b8dcbca65c9ecae7525c6be133417069059a039db86778f5a9cc13cc524 WHIRLPOOL a098758a7fc8f4c2c5ae4377701ba56c5b9939eee72849444b3f502bab52e3a99378a54246abdf87b9bddff5470b762661c3d742ed490f2a55443c21d7e89d7c
-EBUILD company-mode-0.6.14.ebuild 1324 SHA256 2fa5edb7780bf195d88721649589ee72d949fa573a19d26a95074cdc161c3779 SHA512 b1f33bf2d7069f416d104f7ff7637f25dbfe14282281d14471f69a75baa2acc38ad95fd8b18ed1e574057657be0440571f857815b6db4232e104d212149ac27d WHIRLPOOL cb91f0a8073b49dc36ebbcbffa835ff0d31629ba3485882caa692e350b7ff6adb6afac84e17571f8b706ecef388d0ad783755337653905f98c42fffbc8d5d4fb
-MISC ChangeLog 2596 SHA256 4166756e4e8149d7d7e7ebdb7d6655fb2be9014c6a916e1f188a47e03095e352 SHA512 9a3e59576e1a8e86e60590033035e8c0ba3975df2a8a75ffc7195e210cdcf05bf71d4cc2253d625d1756e709dc8315259ee2619ad42cbd8f2ccf51e2dc881719 WHIRLPOOL 401ba1557b9c25764caed36a723a998384af8713c6c3200f80acabe50473120e7fc767dd7164fc84cc82cad4570604f3cad2484186e111297c28546dea6a0e49
+EBUILD company-mode-0.6.11.ebuild 1266 SHA256 c8f5701a1fb7e90e5e563ce15cc6c722e6178c3d2b4a43059bc139907faa6777 SHA512 c922d84cea7e9c171114dfb68de215e3e9edc417c86d1c33145c090bcbb82272a131cdf23fe6f6954fe30048732dc469d8fdc00e9d7ec94c9e9b37e0493e3a3a WHIRLPOOL 20454f1eba0e489592777d4d52b30ee4e515c0a32e9b48b3507338ce37f5b7af4e12fd88ba6fbc6a112a399503ec12e00765f32b72750b0cb856e91dc673131a
+EBUILD company-mode-0.6.14.ebuild 1291 SHA256 2e0834918cd55dc7e6d2154b3b28c1fa3da4764f3db0d6677f864f1a6452c60c SHA512 cf820e02ca5e9fb6e0f7e8ef98a19049a902bdd3949cffd974848767d7432a21c6ac2215da0522a426313f22e6247959ddb966f6b5132974651ea10a65513762 WHIRLPOOL 6acc85a1b5d1a433b1912f7fcda295ac2b8785ac178a187a30f0c279768ff59ab54010284b263c9760e9f3544ebdbb5ccfcf86885c570ae75a655765152de2be
+MISC ChangeLog 2804 SHA256 009b9e739d5edc1ce555a8b1aa94791e0410d8a5a0c419dcf3d248769abf6e64 SHA512 391cdc489fbbbf9795b6e3f1b8fde229bf923a1ead83d2b5bf88b71bb5353b1dbb2732d6b8fbad2557bc27625be80923220e9b80cfbd881206ca7b3a07c1763c WHIRLPOOL 738ba736763aeba041cbf0f59905c194c6229aae91ca0b24276d0858b0459f66e5074c7806b3bb4e921aa629aa4163045079bdd41a7ccb5d0810e822fb074adb
 MISC metadata.xml 349 SHA256 10c0d14dfa632e1f59739242615029dc26802006b1075001b9fb7b8529359853 SHA512 1658b6592e3827ab0c344dc49f62c94c0cf9f296a8766e8aa9288d490cc918e88e4bc9e69d6a55ec88d20b195b55a30c2fdea919b90399011c1e9e4ec0face30 WHIRLPOOL acc92548f421770f0aae0fe2b41a67dac13b452cd38f8e9eee5f5d6a41570b7fdc3e5854b92f6342f48437e5a0a85f72e5d8794511eb408bc00c36b91885a3ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQGcBAEBCAAGBQJS+TR8AAoJEJQzkH1pP7W4fgcL/3Rh6hCQ+J8MoK+qdoCbFb4G
-aFr2/h/ZANp2zhyom20sjVhFHUNJ8647+j/rfpVjfZYlw45ewAXC4t7f/IGEOqDV
-kz++onAZMQ+fPqMAYgPZexNqy2CZbUsZZxjJMNiuhvmQWS+TYmAnGpABX5V99/JG
-wj3S7Z2PaBwAEQDhu39r6rDHRu8maBrG/bQjj6Poqs5CKdWzdPS4Ptk+0U3L9gBB
-QaW08GK/eahlsLh6B2Vz8IaTDJk6VhgGXRWk4ZqfwzVLpYiUltV6bc+XtbzPTSxi
-9n1MSL0HKQqUfyrfRJ2y/DnPUd0NOh4v6NuaO4BPc13z0W5ft1rFcadjFqwFFzLs
-fdlvkjf0IJmo1sOd4D0qZp0m1xjGgiwVFmKZ1rEESEWm9R8yPfcONXG+CL3vyLrp
-C4RDK0dDeE7EghEWIQbg0xhve9vUqil5SKKK+sNn/HkW3G2fad7Xcz0HBPp1Y1xR
-LFYnTUU29rOmOlJsMj4bWqP2narlejxRr8JUd4Byqg==
-=xVTZ
+iQGcBAEBCAAGBQJS/Q4QAAoJEJQzkH1pP7W4lvkMAJwELe8CBXRPE92TYSFlFsQt
+jQJZVLkYckdmjhf6AD3DZLIz+zJCqKlbMG+x1zZl5CWLTksv+882iyG0h/NLgz7R
+wPHeMpmNdlhFMiITBAyPiufQFCgxQyEVcz9zWafHxpHSlqojZ/Bl6+XmCdyxMzRt
+n7aeA+DNuieIzpOV0a9z1Md7V3+N0mrNCnGh/RKrVlMqqPlaTYc5OOMI7oKf2Clf
+Zt/DbmGhsepOiPVdJ2ooTdA7sPBz0ntHCudsyO9Ma48mVmC/LkP7DJCMolXj0ezb
+TEBenXUoyWweVTAvj4pecurIT92uBvAFovVi96PemuZgM0A8Cxe4O2tK2jXLQcnS
+2ucPeVCZKZXUIUiJYFIHHKGF3r/rzJlZFoXXrR+5F293ho8JNG4NEysR1MefYXZ3
+nSsTSen2boq+QY/Tuzs7V0bEZDrkxFYcj0Etapc+tforoCbqD7WLr86YMMcsGGhY
+TQIWMavycrbwKaOeOQ4lsvKO+wCYF0am0cO/LnURAQ==
+=c1NI
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/company-mode/company-mode-0.6.11.ebuild b/app-emacs/company-mode/company-mode-0.6.11.ebuild
index d4d34bae5a89..9dcc9500ec0b 100644
--- a/app-emacs/company-mode/company-mode-0.6.11.ebuild
+++ b/app-emacs/company-mode/company-mode-0.6.11.ebuild
@@ -1,8 +1,9 @@
 # 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.1 2014/01/01 17:44:25 ulm Exp $
+# $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
 
@@ -17,8 +18,7 @@ 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 )
+DEPEND="ropemacs? ( app-emacs/pymacs )
 	semantic? ( virtual/emacs-cedet )"
 RDEPEND="${DEPEND}
 	ropemacs? ( dev-python/ropemacs )"
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 9d877bec9cc9..e617f35b9535 100644
--- a/app-emacs/company-mode/company-mode-0.6.14.ebuild
+++ b/app-emacs/company-mode/company-mode-0.6.14.ebuild
@@ -1,8 +1,9 @@
 # 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.1 2014/02/10 20:14:40 ulm Exp $
+# $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 $
 
 EAPI=5
+NEED_EMACS=23
 
 inherit elisp
 
@@ -17,8 +18,7 @@ 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 )
+DEPEND="ropemacs? ( app-emacs/pymacs )
 	semantic? ( virtual/emacs-cedet )"
 RDEPEND="${DEPEND}
 	ropemacs? ( dev-python/ropemacs )"