Removed pkg_setup() function, KEYWORDS covers that. Remove sed in global scope for bash regex. Fixed SRC_URI to be cache-friendly, test for arch? ( get arch.rpm )

3 files changed, 17 insertions, 26 deletions

diff --git a/mail-client/ximian-connector/ChangeLog b/mail-client/ximian-connector/ChangeLog
index d3f933911a4a..5b2762c4d1f1 100644
--- a/mail-client/ximian-connector/ChangeLog
+++ b/mail-client/ximian-connector/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/ximian-connector
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/ximian-connector/ChangeLog,v 1.13 2004/10/22 22:37:46 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/ximian-connector/ChangeLog,v 1.14 2004/11/30 17:07:33 obz Exp $
+
+  30 Nov 2004; Mike Gardiner <obz@gentoo.org>
+  ximian-connector-1.2.2_p1.ebuild:
+  Removed pkg_setup() function, KEYWORDS covers that. Remove sed in global
+  scope for bash regex. Fixed SRC_URI to be cache-friendly, test for arch? (
+  get arch.rpm )
 
   22 Oct 2004; Alastair Tse <liquidx@gentoo.org>
   ximian-connector-1.4.7.2.ebuild, ximian-connector-2.0.0.ebuild,
diff --git a/mail-client/ximian-connector/Manifest b/mail-client/ximian-connector/Manifest
index 660854b14dbe..d9f43f402b8d 100644
--- a/mail-client/ximian-connector/Manifest
+++ b/mail-client/ximian-connector/Manifest
@@ -1,23 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b77d4d4160912977c63d70ffc80a13d0 ChangeLog 6110
+MD5 4515a4f59e11ebb0112244d53b6065f6 ChangeLog 6358
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 d2116d58ad25ce6b7f4d6c960edc49f9 ximian-connector-1.2.2_p1.ebuild 1883
+MD5 f190bc915d55d2576cddd6652a921e32 ximian-connector-1.2.2_p1.ebuild 1832
+MD5 279f3c12bf43cc57e6a1fcef3ba9bd8d ximian-connector-1.4.7.2.ebuild 957
 MD5 7d1011e7aed9deb24a6fc1433700e40c ximian-connector-2.0.0.ebuild 896
 MD5 d5d4638760f932e0fead2e6e8391ee08 ximian-connector-2.0.1.ebuild 985
-MD5 279f3c12bf43cc57e6a1fcef3ba9bd8d ximian-connector-1.4.7.2.ebuild 957
 MD5 7b066344f1bd66fd6d5b4928fcd26b7a ximian-connector-2.0.2.ebuild 906
 MD5 9dfb89cf8aa1ed2f2530cf73c0c6c478 files/digest-ximian-connector-1.2.2_p1 173
 MD5 7d1775fcd3f66e7fb5a1631fc9db5fcc files/digest-ximian-connector-1.4.7.2 76
 MD5 e9d7f494208fffcff73379ac9e7f12c8 files/digest-ximian-connector-2.0.0 76
 MD5 6d2437fbb82a87aa651c1c9b25ab4c3e files/digest-ximian-connector-2.0.1 76
-MD5 c54395967f9527952a219a01253770c9 files/ximian-connector-2.0.1-exchange2003.patch 625
 MD5 26036add2c9eea8522d465fa529fc43f files/digest-ximian-connector-2.0.2 76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBmQpPRkyva5PS18kRAgmhAJ0QE0Q1weYCzzJgbaceQ2eR8ISAGACgprxf
-sTAG+tPR+U6mfLH4sM+lqFg=
-=3gF+
------END PGP SIGNATURE-----
+MD5 c54395967f9527952a219a01253770c9 files/ximian-connector-2.0.1-exchange2003.patch 625
diff --git a/mail-client/ximian-connector/ximian-connector-1.2.2_p1.ebuild b/mail-client/ximian-connector/ximian-connector-1.2.2_p1.ebuild
index 36664d90822e..61efb64a6cd0 100644
--- a/mail-client/ximian-connector/ximian-connector-1.2.2_p1.ebuild
+++ b/mail-client/ximian-connector/ximian-connector-1.2.2_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/ximian-connector/ximian-connector-1.2.2_p1.ebuild,v 1.7 2004/09/05 07:21:26 khai Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/ximian-connector/ximian-connector-1.2.2_p1.ebuild,v 1.8 2004/11/30 17:07:33 obz Exp $
 
 DESCRIPTION="Ximian Connector (An Evolution Plugin to talk to Exchange Servers)"
 HOMEPAGE="http://www.ximian.com"
@@ -23,9 +23,12 @@ fi
 
 # make the ximian rev from the package version
 # 1.2.1_p2 should result in 1.2.1-2
-XIMIAN_REV=`echo ${PV} | sed -e "s/_p/-/"`
+XIMIAN_REV="${PV/_p/-}"
 
-SRC_URI="${PN}-${XIMIAN_REV}.ximian.1.${XIMIAN_ARCH}.rpm"
+# we break the cache if we use $ARCH in the global scope,
+# so we specify the x86/ppc rpms here
+SRC_URI="x86? ( ${PN}-${XIMIAN_REV}.ximian.1.i386.rpm )
+		 ppc? ( ${PN}-${XIMIAN_REV}.ximian.1.ppc.rpm )"
 RDEPEND="=mail-client/evolution-1.2*"
 DEPEND="app-arch/rpm2targz
 		${RDEPEND}"
@@ -39,14 +42,6 @@ pkg_nofetch() {
 	einfo "      ppc users should download the package for yellowdog-22-ppc"
 }
 
-pkg_setup() {
-	if [ "${ARCH}" != "x86" -a "${ARCH}" != "ppc" ]
-	then
-		einfo "This package is only available for x86 and ppc, sorry"
-		die "Not supported on your ARCH"
-	fi
-}
-
 src_unpack() {
 	rpm2targz ${DISTDIR}/${A}
 	tar -xzf ${WORKDIR}/${PN}-${XIMIAN_REV}.ximian.1.${XIMIAN_ARCH}.tar.gz