Bug #264730 - tarsync dep should not be conditional on ARCH.

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

diff --git a/app-portage/emerge-delta-webrsync/ChangeLog b/app-portage/emerge-delta-webrsync/ChangeLog
index 369b1278421a4ef60ddf8c7b24162ec1b9fdc7d6..97b0120157a155a173eaf7613e971b30a4e8d672 100644 (file)
--- a/app-portage/emerge-delta-webrsync/ChangeLog
+++ b/app-portage/emerge-delta-webrsync/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-portage/emerge-delta-webrsync
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/ChangeLog,v 1.28 2010/01/03 21:47:20 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/ChangeLog,v 1.29 2010/04/13 16:42:39 zmedico Exp $
+
+  13 Apr 2010; Zac Medico <zmedico@gentoo.org>
+  emerge-delta-webrsync-3.5.1-r3.ebuild:
+  Bug #264730 - tarsync dep should not be conditional on ARCH.
 
 *emerge-delta-webrsync-3.5.1-r3 (03 Jan 2010)
 

diff --git a/app-portage/emerge-delta-webrsync/Manifest b/app-portage/emerge-delta-webrsync/Manifest
index 09cce0acf1aa9e901ef234ffb06f21ea32a482f7..27fa4b940b1388adeeb3c56eecb96df9ffb9ca02 100644 (file)
--- a/app-portage/emerge-delta-webrsync/Manifest
+++ b/app-portage/emerge-delta-webrsync/Manifest
@@ -5,13 +5,13 @@ AUX 3.5.1-md5sum.patch 1191 RMD160 987459f6315c9bcab56893cc890293eec23fe871 SHA1
 AUX 3.5.1-metadata.patch 1287 RMD160 649f7bf66b0ae5a5512f43a09d02cc707ce1a92f SHA1 e39480a88f0e865ffccfe31fea6715b459274ac9 SHA256 46b89bd6fa3aa53e1affb29061dc9bcdde3ba1f2987f206afd91a2e235b65ca6
 AUX 3.5.1-post_sync.patch 330 RMD160 44ca5416310253ffe6f7eb823f250025878efa75 SHA1 7ca8efb7813d4e796cdfd3441bd70f8d0568a20f SHA256 3908a6a8b885a830ab1c2bf69ecf7677cb493bb59873265af70758d4b1b8c71b
 DIST emerge-delta-webrsync-3.5.1 13289 RMD160 02e7798183930fc8ef8d3b76f38c7393acf914b9 SHA1 b242519b6e585a3b39074e6dc62327786f56322e SHA256 663ce5e800dec988ba5e1bb283ca243205d1ebdc27e3d0c269e5c0bb198f7d4a
-EBUILD emerge-delta-webrsync-3.5.1-r3.ebuild 1225 RMD160 b4a7a30f29d1a60bd42a0bbf3a17cf48f6e0c943 SHA1 8c5a217e21a70a9e9a47bd57e6e9373c69b21496 SHA256 18789e1ab64ad32ea0578b48dd2a4e7830f0ab068a3288b39bb71aee08ae5e07
-MISC ChangeLog 5557 RMD160 8c5cb80f40f027c81b8c3a4e19d8658ecf21f144 SHA1 f0b4ea80389a9c4cff28fa1a87c087293755714d SHA256 20f158793eaaf2e5213b6ab09184c852870c54c2e12c7a5b103604e93497fb7d
+EBUILD emerge-delta-webrsync-3.5.1-r3.ebuild 1455 RMD160 9448560449e0f506a8f45bb9de032bcbec19433a SHA1 163d356402c4b199359c56cf4b3e4d19fb86af32 SHA256 32c5c37b77e0f1038ecdefa197aa01862c4cda1892c0bcd7f1ac301c3e57e9bb
+MISC ChangeLog 5709 RMD160 4477466f41193aa245ddc8b6b5095f1598e7732c SHA1 e0f40aac9a9a592504130651b87393cdbb0003de SHA256 43062d96f99707df01d6640267218580b4feb634fe3ddc2cb3837c6621a5785f
 MISC metadata.xml 219 RMD160 613195ece366b33606e71ff1753be048f2507841 SHA1 d162fb909241ef50b95a3539bdfcde95429bdf81 SHA256 cbd3a20e5c89a48a842f7132fe705bf39959f02c1025052efce8aad8a8baa8dc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktBELcACgkQ/ejvha5XGaOx7gCg39HWeSJwqhI8hlKahhXVs4cS
-th0An1wykPbBq7rxtN4AIYVtdy2GPGiv
-=YZKn
+iEYEARECAAYFAkvEnxQACgkQ/ejvha5XGaMw6gCgwaZDsdtJpIvEE8rXLpx9yFG4
+RZgAoJAjGFxvVsZzQTcGjIZNvmC/WqSU
+=a3NE
 -----END PGP SIGNATURE-----

diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r3.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r3.ebuild
index ee8b230e5d2d1388b96aee66e4dcd38c62a2acbd..08a28f8b88d6e35756f665d10ba019eaa797f403 100644 (file)
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r3.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r3.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/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r3.ebuild,v 1.1 2010/01/03 21:47:20 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.5.1-r3.ebuild,v 1.2 2010/04/13 16:42:39 zmedico Exp $
 
 inherit eutils
 
@@ -15,8 +15,7 @@ IUSE=""
 
 DEPEND=""
 RDEPEND=">=sys-apps/portage-2.1.1-r1
-       >=dev-util/diffball-0.6.5
-       x86? ( app-arch/tarsync )"
+       >=dev-util/diffball-0.6.5"
 
 S=${WORKDIR}
 
@@ -40,4 +39,14 @@ src_install() {
 
 pkg_preinst() {
        chgrp portage "${D}"/var/delta-webrsync
+       has_version "$CATEGORY/$PN"
+       WAS_PREVIOUSLY_INSTALLED=$?
+}
+
+pkg_postinst() {
+       if [[ $WAS_PREVIOUSLY_INSTALLED != 0 ]] && \
+               ! has_version app-arch/tarsync ; then
+               elog "For maximum emerge-delta-webrsync" \
+                       "performance, install app-arch/tarsync."
+       fi
 }