ensure we remove seamonkey-bin-1* before installing seamonkey-2

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

diff --git a/www-client/seamonkey-bin/ChangeLog b/www-client/seamonkey-bin/ChangeLog
index fe393f6df8e72d83b57d516ca3a77bb2ba518cfa..bee665f2724989534b3f614a99f615108b8ba865 100644 (file)
--- a/www-client/seamonkey-bin/ChangeLog
+++ b/www-client/seamonkey-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/seamonkey-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/ChangeLog,v 1.74 2010/07/15 00:31:31 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/ChangeLog,v 1.75 2010/07/19 00:30:58 anarchy Exp $
+
+  18 Jul 2010; Jory A. Pratt <anarchy@gentoo.org>
+  seamonkey-bin-2.0.5.ebuild:
+  Block upgrade if <www-client/seamonkey-bin-2 is installed
 
 *seamonkey-bin-2.0.5 (15 Jul 2010)
 

diff --git a/www-client/seamonkey-bin/Manifest b/www-client/seamonkey-bin/Manifest
index b0585899b8a0ec49fe2d896c2685f72ff1259fdc..692bd77de9865f860298af52e086236a73d7a786 100644 (file)
--- a/www-client/seamonkey-bin/Manifest
+++ b/www-client/seamonkey-bin/Manifest
@@ -4,6 +4,6 @@ AUX icon/seamonkey-bin.png 3428 RMD160 96d1a81a7baf547391dfe905e7736bee781636ba
 DIST seamonkey-1.1.18.en-US.linux-i686.tar.gz 15125907 RMD160 57a96244f79b8e4828b897b1ec6a75953bad06fd SHA1 e5b2749906d54b60865a14fb5bfafef3439586a1 SHA256 dbe124e3a6fc4cba9c0bdf8e88529a9318b57265ddf16fe8ff70879a256ac8c6
 DIST seamonkey-2.0.5.tar.bz2 13201461 RMD160 447c058da6494c39f5e9cb3a043975ae37584342 SHA1 86dc56410a95865ec96e771c3b2e915d89584d4b SHA256 5cce6a1cb6f6d8a2d3dca2d9cda7d918aa608c27ecad9dceaf184975a5a7d654
 EBUILD seamonkey-bin-1.1.18.ebuild 1940 RMD160 6e20c872f22efaa2bebe01d915185a611f30dc72 SHA1 403dc169950642dc44cebd78a5bf523bbd52557b SHA256 a7622ef0eb47d32a033feb5cbd755e590718dd587ec8856e3a8311882ab20e60
-EBUILD seamonkey-bin-2.0.5.ebuild 2242 RMD160 687628ee4d9cc4aba62a3f59db3ee3094aafcb99 SHA1 e715fd5ba8b2fa6abbd79a334070320d4fbc3296 SHA256 be08eca6116e9558121c4497dd8929973cc8c4d3fdef3253165a5109bacd8a26
-MISC ChangeLog 9501 RMD160 31961fdce561d62d009fb211f9d2ee2e4a09f49a SHA1 45e9a8cc356f632213194f36e7bba4e70af5d8e7 SHA256 ff148a15396c71b6084fe62c545ea57bd5c4f9400210001746d070459fc36dbe
+EBUILD seamonkey-bin-2.0.5.ebuild 2272 RMD160 77c7d6c8992596e6bd3fdc319d4964208dadb8f7 SHA1 bba099fb12071c2aa1bd640fd49200ae5fd01956 SHA256 cc31455d55506c205e84729fa644a2e73a276a39b950a720ab1e9aae4d5e247e
+MISC ChangeLog 9642 RMD160 fedee30d5d303a08c5798f78a1179fd7b5c71f33 SHA1 6ff03307a209e5e4b12df21df57da91a7b734baa SHA256 63082d6367de78fcdc816a3b6d26c8f80362b04787b57b9d96f7bb826c5d4af5
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b

diff --git a/www-client/seamonkey-bin/seamonkey-bin-2.0.5.ebuild b/www-client/seamonkey-bin/seamonkey-bin-2.0.5.ebuild
index c2ec02646a9e007b730153c7dd2531f14830549a..e2435081bd038997d402d40b2be42fb8305d7f91 100644 (file)
--- a/www-client/seamonkey-bin/seamonkey-bin-2.0.5.ebuild
+++ b/www-client/seamonkey-bin/seamonkey-bin-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/seamonkey-bin-2.0.5.ebuild,v 1.1 2010/07/15 00:31:31 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey-bin/seamonkey-bin-2.0.5.ebuild,v 1.2 2010/07/19 00:30:58 anarchy Exp $
 
 inherit eutils mozilla-launcher multilib
 
@@ -31,7 +31,8 @@ RDEPEND="dev-libs/dbus-glib
                >=app-emulation/emul-linux-x86-baselibs-20081109
                >=app-emulation/emul-linux-x86-gtklibs-20081109
                >=app-emulation/emul-linux-x86-soundlibs-20081109
-       )"
+       )
+       !<www-client/seamonkey-bin-2"
 
 S="${WORKDIR}/seamonkey"