cleanup and version bump

6 files changed, 43 insertions, 71 deletions

diff --git a/mail-client/ximian-connector/ChangeLog b/mail-client/ximian-connector/ChangeLog
index 5edb37c5ca75..bad77badbe3a 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.11 2004/10/05 19:31:50 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/ximian-connector/ChangeLog,v 1.12 2004/10/16 20:48:01 liquidx Exp $
+
+*ximian-connector-2.0.2 (16 Oct 2004)
+
+  16 Oct 2004; Alastair Tse <liquidx@gentoo.org>
+  -ximian-connector-1.4.6.0.6.1.ebuild, +ximian-connector-2.0.2.ebuild:
+  version bump
 
 *ximian-connector-2.0.1 (05 Oct 2004)
 
diff --git a/mail-client/ximian-connector/Manifest b/mail-client/ximian-connector/Manifest
index 46a5405cc052..8d20c147c7f5 100644
--- a/mail-client/ximian-connector/Manifest
+++ b/mail-client/ximian-connector/Manifest
@@ -5,9 +5,11 @@ MD5 511047f941e86598f819e4e0fe588527 ximian-connector-1.4.6.0.6.1.ebuild 1981
 MD5 601ef639b777bdd0cde42a5c9414164c ximian-connector-2.0.0.ebuild 911
 MD5 ca29ae7c8513780b1ed3ac94eb6a0421 ximian-connector-2.0.1.ebuild 999
 MD5 9907dbf85d08fb60277c5f1626114e1f ximian-connector-1.4.7.2.ebuild 969
+MD5 41921665fe232097187d3a4429fd9c74 ximian-connector-2.0.2.ebuild 1005
 MD5 9dfb89cf8aa1ed2f2530cf73c0c6c478 files/digest-ximian-connector-1.2.2_p1 173
 MD5 3730cdefc85ccad40292f6321fc0f4d3 files/digest-ximian-connector-1.4.6.0.6.1 90
 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
diff --git a/mail-client/ximian-connector/files/digest-ximian-connector-1.4.6.0.6.1 b/mail-client/ximian-connector/files/digest-ximian-connector-1.4.6.0.6.1
deleted file mode 100644
index a97df0f06bf1..000000000000
--- a/mail-client/ximian-connector/files/digest-ximian-connector-1.4.6.0.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e4607ecb8f6f2f2d05e3824d3998d291 ximian-connector-1.4.6-0.ximian.6.1.i386.rpm 4469447
diff --git a/mail-client/ximian-connector/files/digest-ximian-connector-2.0.2 b/mail-client/ximian-connector/files/digest-ximian-connector-2.0.2
new file mode 100644
index 000000000000..0ebb3979f520
--- /dev/null
+++ b/mail-client/ximian-connector/files/digest-ximian-connector-2.0.2
@@ -0,0 +1 @@
+MD5 706f53c9c26321c938248264a4456c30 ximian-connector-2.0.2.tar.bz2 1185897
diff --git a/mail-client/ximian-connector/ximian-connector-1.4.6.0.6.1.ebuild b/mail-client/ximian-connector/ximian-connector-1.4.6.0.6.1.ebuild
deleted file mode 100644
index f41b7fe86529..000000000000
--- a/mail-client/ximian-connector/ximian-connector-1.4.6.0.6.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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.4.6.0.6.1.ebuild,v 1.5 2004/09/05 07:21:26 khai Exp $
-
-inherit rpm gnome2
-
-DESCRIPTION="Ximian Connector (An Evolution Plugin to talk to Exchange Servers)"
-HOMEPAGE="http://www.ximian.com"
-
-IUSE=""
-LICENSE="Ximian-Connector"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc -alpha -mips"
-RESTRICT="nomirror fetch nostrip"
-
-# there doesn't seem to be one for ppc anymore
-XIMIAN_DIST="redhat-90-i386"
-XIMIAN_ARCH="i386"
-
-# make the ximian rev from the package version
-# bash magic to extract last 2 versions as XIMIAN_V,
-# third last version as RPM_V and the rest as MY_PV
-MY_PV=${PV%.[0-9]*.[0-9]*.[0-9]*}
-END_V=${PV/${MY_PV}./}
-RPM_V=${END_V%.[0-9]*.[0-9]*}
-XIMIAN_V=${END_V#[0-9]*.}
-
-SRC_URI="${PN}-${MY_PV}-${RPM_V}.ximian.${XIMIAN_V}.${XIMIAN_ARCH}.rpm"
-
-RDEPEND="=mail-client/evolution-${MY_PV}*
-	>=gnome-extra/gal-1.99.11
-	>=app-crypt/mit-krb5-1.2
-	net-libs/linc"
-DEPEND=""
-
-S=${WORKDIR}
-
-pkg_setup() {
-	if ! `fgrep " krb4" ${ROOT}/var/db/pkg/`best_version app-crypt/mit-krb5`/USE 2>&1 > /dev/null`; then
-		eerror "Ximian Connector requires Kerberos 4 support in app-crypt/mit-krb5."
-		eerror "You will need to remerge it by executing:"
-		eerror ""
-		eerror "USE='krb4' emerge mit-krb5 ximian-connector"
-		die "missing kerberos 4 support"
-	fi
-}
-
-pkg_nofetch() {
-	einfo "This package requires that you download the rpm from:"
-	einfo "http://ximian.com/products/connector/download/download.html"
-	einfo "and place it in ${DISTDIR}."
-	einfo ""
-	einfo "NOTE: x86 users should download the package for ${XIMIAN_ARCH}"
-#	einfo "      ppc users should download the package for yellowdog-22-ppc"
-}
-
-src_compile() {
-	return;
-}
-
-src_install() {
-	cp -dpR * ${D}
-}
-
-pkg_postinst(){
-	gnome2_gconf_install
-	einfo "NOTE: Ximian connector requires the purchase of a"
-	einfo "key from Ximian to function properly."
-}
diff --git a/mail-client/ximian-connector/ximian-connector-2.0.2.ebuild b/mail-client/ximian-connector/ximian-connector-2.0.2.ebuild
new file mode 100644
index 000000000000..2ad69c4b2670
--- /dev/null
+++ b/mail-client/ximian-connector/ximian-connector-2.0.2.ebuild
@@ -0,0 +1,33 @@
+# 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-2.0.2.ebuild,v 1.1 2004/10/16 20:48:01 liquidx Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
+HOMEPAGE="http://www.novell.com/products/connector/"
+LICENSE="GPL-2"
+
+SLOT="2.0"
+KEYWORDS="~x86 ~sparc"
+IUSE="debug doc"
+
+RDEPEND=">=mail-client/evolution-2.0.2
+		>=dev-libs/glib-2.0
+		>=gnome-base/orbit-2.3
+		>=gnome-base/gconf-2.0
+		>=net-libs/libsoup-2.2.1
+		>=gnome-base/libglade-2.0
+		>=gnome-base/libgnomeui-2.0
+		>=gnome-base/libbonobo-2.0
+		>=net-nds/openldap-2.1.30-r2
+		>=app-crypt/mit-krb5-1.3.0"
+
+DEPEND="${RDEPEND}
+		dev-util/intltool
+		dev-util/pkgconfig
+		doc? ( dev-util/gtk-doc )"
+
+MAKEOPTS="${MAKEOPTS} -j1"
+G2CONF="${G2CONF} `use_with debug e2k-debug`"
+USE_DESTDIR="1"