Block against app-editors/ersatz-emacs, since both install /usr/bin/ee. Reorder ebuild variables.

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

5 files changed, 40 insertions, 19 deletions

diff --git a/app-editors/ee/ChangeLog b/app-editors/ee/ChangeLog
index a6d602f001c9..a1d9f6ec29c3 100644
--- a/app-editors/ee/ChangeLog
+++ b/app-editors/ee/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/ee
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ChangeLog,v 1.2 2011/05/07 16:37:12 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ChangeLog,v 1.3 2011/05/07 21:12:14 ulm Exp $
+
+  07 May 2011; Ulrich Mueller <ulm@gentoo.org> ee-1.4.6.ebuild,
+  ee-1.4.7.ebuild, ee-1.5.2.ebuild:
+  Block against app-editors/ersatz-emacs, since both install /usr/bin/ee.
+  Reorder ebuild variables.
 
 *ee-1.5.2 (07 May 2011)
 
diff --git a/app-editors/ee/Manifest b/app-editors/ee/Manifest
index f532e806f74d..8e95929ea4f7 100644
--- a/app-editors/ee/Manifest
+++ b/app-editors/ee/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ee-init-location.diff 1450 RMD160 28e1c02acd8c8634a79fe9e05cb881dd0401005b SHA1 c5bb61aca17672d309ff2806933203b65ea6b82b SHA256 6e3640641fcc33407924fbdb6d61f702f8535f1079260f6998a61199eed0c728
 DIST ee-1.4.6.src.tgz 70511 RMD160 2ed8ad3123c5443b29f5db142ad367d67028da27 SHA1 6be7d03eade441a6c409b9d441ba2c144e26b157 SHA256 a85362dbc24c2bd0f675093fb593ba347b471749c0a0dbefdc75b6334a7b6e4c
 DIST ee-1.4.7.src.tgz 70936 RMD160 03ecef414431c6bcfae8564516322519dc0341c3 SHA1 0604b204f3c8735e9d4018a813c36b613feb5451 SHA256 f53010c69258b1b5a65870afe1938134bec01bb1f605b890ca474bcb03265189
 DIST ee-1.5.2.src.tgz 69651 RMD160 af1ecc2c826ef3129af3a568d563b5c4bb47ba14 SHA1 da0697f34e407c010754922531b2f94bd7a589f8 SHA256 e08d7511a48b43ee354042fe3fe7d9cb3431238caedcf4ac729c61a447003918
-EBUILD ee-1.4.6.ebuild 881 RMD160 a2700707dbd3ce41507902f97dc81cbba345fb3c SHA1 44f76bae3b1d512b04b6d603cb24d8db5e4bbff5 SHA256 f3f32e7ad9dde5979d4ef776ad100b7c3b5051ea84a189b842fa177b65ea3aa4
-EBUILD ee-1.4.7.ebuild 981 RMD160 fec4d5e2ec1995538589cd91b2ef913ce25d3ca5 SHA1 bd8f72dbcf41f7c656112734eeff5d8f1ac086ef SHA256 2ae137c7d8247ba107ca7aa2ef8174323c17cd2efc7cccad8f56dcb8f0d8a432
-EBUILD ee-1.5.2.ebuild 1040 RMD160 4f4359071fff72ef96d560692dc972300d13aba0 SHA1 1646d96e0bf8244188e2112eab249dcb3af0e488 SHA256 68d5cd6bf629ab4e9db19385c00a63873b0a2756ba395babfed1a87f31551a32
-MISC ChangeLog 2937 RMD160 82290c10c9669bc4da2d2ae23001e1bc853f4c4e SHA1 b7146d83e516ee9a17f6c45e6dcf243a0d32a63f SHA256 e15f15799a881a979afe4d39c9e1a4e8cf4f21c60c0e8662a70b1b4bb2ecd8d3
+EBUILD ee-1.4.6.ebuild 925 RMD160 10e7c84eef3b2ad10bcc34f9ebc757ed49d149e0 SHA1 97efebb864987afe2387e440501e6293ae301824 SHA256 aedac2298df0045710f9f76b50f579fd446c9651495daebbc5d73bc9802d0b5f
+EBUILD ee-1.4.7.ebuild 1025 RMD160 ec857e8fe36f7c31cd4f07592aaac0cc5a471401 SHA1 5032f661a41fb640487065ce922f3d8271bdea0a SHA256 c3caf1439d19be5ea94e83031e174eb0fd92cc0d077594443d49ec7f1bb0111e
+EBUILD ee-1.5.2.ebuild 1074 RMD160 4ea78df239f5ac4dfebbae6d360957e030aa1f1a SHA1 9cf84beb5e2b2df8b6991ff97aea3f8cd2439449 SHA256 1a64d86d8278901ed93df628fb78c572bc1ab46b53187601d64a3df43b86ee69
+MISC ChangeLog 3137 RMD160 fbe45bb0f93d30b1cfa78fd3ed4fe8ff8b215a66 SHA1 3c28946f15835096cadfe8b869a6fc22226aea59 SHA256 880fe49180ef3c4c234a0254a0772393b4ac60f58badb2a5e7edb267cc77370d
 MISC metadata.xml 230 RMD160 8e45109dbaf3c193afdb318002c1def7cb62dfa1 SHA1 9bd7aea9376c216b3f55303d1334a337cd6f06a2 SHA256 87fc07a55ee7814a0505ae1c24a871ac29ae7691c5383550647382a2b26277ae
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3Fti8ACgkQOeoy/oIi7uzoTwCg2OBI80FVDcRb5g3jN/i2svpJ
+aAAAniGXxZjMRlDKJSkJDDBn+EB0jvkU
+=1XAb
+-----END PGP SIGNATURE-----
diff --git a/app-editors/ee/ee-1.4.6.ebuild b/app-editors/ee/ee-1.4.6.ebuild
index 293b6df6578d..52fd7c6b8387 100644
--- a/app-editors/ee/ee-1.4.6.ebuild
+++ b/app-editors/ee/ee-1.4.6.ebuild
@@ -1,23 +1,25 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ee-1.4.6.ebuild,v 1.1 2011/05/07 15:46:17 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ee-1.4.6.ebuild,v 1.2 2011/05/07 21:12:15 ulm Exp $
 
 EAPI="3"
 
 inherit toolchain-funcs
 
-IUSE=""
-
 DESCRIPTION="An easy to use text editor. Intended to be usable with little or no instruction."
 HOMEPAGE="http://mahon.cwx.net/"
 SRC_URI="http://mahon.cwx.net/sources/${P}.src.tgz"
 
 LICENSE="Artistic"
-KEYWORDS="~amd64 ia64 ~mips ppc ppc64 sparc x86"
 SLOT="0"
-S="${WORKDIR}/easyedit-${PV}"
+KEYWORDS="~amd64 ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.0"
+RDEPEND="${DEPEND}
+	!app-editors/ersatz-emacs"
+
+S="${WORKDIR}/easyedit-${PV}"
 
 src_prepare() {
 
diff --git a/app-editors/ee/ee-1.4.7.ebuild b/app-editors/ee/ee-1.4.7.ebuild
index 642529f45db9..2871ff5222d4 100644
--- a/app-editors/ee/ee-1.4.7.ebuild
+++ b/app-editors/ee/ee-1.4.7.ebuild
@@ -1,23 +1,25 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ee-1.4.7.ebuild,v 1.1 2011/05/07 15:46:17 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ee-1.4.7.ebuild,v 1.2 2011/05/07 21:12:15 ulm Exp $
 
 EAPI="3"
 
 inherit toolchain-funcs
 
-IUSE=""
-
 DESCRIPTION="An easy to use text editor. Intended to be usable with little or no instruction."
 HOMEPAGE="http://mahon.cwx.net/"
 SRC_URI="http://mahon.cwx.net/sources/${P}.src.tgz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
-S="${WORKDIR}/easyedit-${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.0"
+RDEPEND="${DEPEND}
+	!app-editors/ersatz-emacs"
+
+S="${WORKDIR}/easyedit-${PV}"
 
 src_prepare() {
 
diff --git a/app-editors/ee/ee-1.5.2.ebuild b/app-editors/ee/ee-1.5.2.ebuild
index 27d1490c6bb2..e30a86b2868d 100644
--- a/app-editors/ee/ee-1.5.2.ebuild
+++ b/app-editors/ee/ee-1.5.2.ebuild
@@ -1,20 +1,22 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ee-1.5.2.ebuild,v 1.1 2011/05/07 16:37:12 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ee/ee-1.5.2.ebuild,v 1.2 2011/05/07 21:12:14 ulm Exp $
 
 EAPI="3"
 
 inherit eutils toolchain-funcs
 
-IUSE=""
-
 DESCRIPTION="An easy to use text editor. A subset of aee."
 HOMEPAGE="http://mahon.cwx.net/"
 SRC_URI="http://mahon.cwx.net/sources/${P}.src.tgz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="!app-editors/ersatz-emacs"
+
 S="${WORKDIR}/easyedit-${PV}"
 
 src_prepare() {