dep cleanup

5 files changed, 22 insertions, 215 deletions

diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog
index bf0017e2cec2..34a233976fc3 100644
--- a/net-mail/evolution/ChangeLog
+++ b/net-mail/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-mail/evolution
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.67 2003/07/07 02:19:55 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.68 2003/07/09 15:46:51 liquidx Exp $
+
+  09 Jul 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.3.92.ebuild,
+  evolution-1.4.0.ebuild:
+  dep clean
 
   07 Jul 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.4.0.ebuild:
   add scrolllkeeper dep
diff --git a/net-mail/evolution/Manifest b/net-mail/evolution/Manifest
index d976c973b97e..22cd0635ba5c 100644
--- a/net-mail/evolution/Manifest
+++ b/net-mail/evolution/Manifest
@@ -1,10 +1,8 @@
-MD5 a6a659697766b6c9e49a822217875277 ChangeLog 10854
+MD5 375d6d32252ee67a7f0446391f35df77 ChangeLog 10967
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
-MD5 186cb5289b83e319145a5543357b43b5 evolution-1.3.92.ebuild 6027
-MD5 f3554df2b059f5c340813094b3f58221 evolution-1.4.0.ebuild 4462
+MD5 221166e63261beeae476283b4a012afc evolution-1.4.0.ebuild 4945
 MD5 8fefce38e3ac94cc548fc2a0929241b0 evolution-1.2.4.ebuild 6364
 MD5 2f54952fa1d20af7f01db80b741258e7 evolution-1.2.3.ebuild 5889
-MD5 c58e6d56b40d64fc79185915163e87d8 files/digest-evolution-1.3.92 133
 MD5 7a38783a2b9633cc85de53ca692c5159 files/digest-evolution-1.4.0 132
 MD5 421c88eda3d1c318f6214f2103ffaedb files/evolution-1.4.0-bad-1.3.patch 949
 MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
diff --git a/net-mail/evolution/evolution-1.3.92.ebuild b/net-mail/evolution/evolution-1.3.92.ebuild
deleted file mode 100644
index ff2ddc6f674d..000000000000
--- a/net-mail/evolution/evolution-1.3.92.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.3.92.ebuild,v 1.3 2003/06/07 01:36:56 liquidx Exp $
-
-IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde"
-
-inherit eutils flag-o-matic gnome.org libtool virtualx debug gnome2
-
-DB3="db-3.1.17"
-S="${WORKDIR}/${P}"
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="${SRC_URI} http://www.sleepycat.com/update/snapshot/${DB3}.tar.gz"
-#SRC_URI="ftp://ftp.ximian.com/pub/ximian-evolution-beta/source/${P}.tar.gz
-#	http://www.sleepycat.com/update/snapshot/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-
-# NOTE: Release notes specify these can't be parallel installed with 1.2,
-#       but in fact that can.
-SLOT="2" 
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
-
-# top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.0.4
-    >=gnome-extra/gal-1.99.6
-    >=net-libs/libsoup-1.99.22
-	pda?     ( >=gnome-extra/gnome-pilot-2.0.9
-		>=dev-libs/pilot-link-0.11.7
-		>=gnome-extra/gnome-pilot-conduits-2.0.9 )
-	spell?   ( >=app-text/gnome-spell-1.0.4 )
-	
-	>=gnome-base/ORBit2-2.6.0
-    >=gnome-base/libbonoboui-2.0
-    >=gnome-base/gnome-vfs-2.0
-    >=gnome-base/libgnomeui-2.0
-    >=gnome-base/libglade-2.0
-    >=gnome-base/libgnome-2.0
-    >=gnome-base/bonobo-activation-2.2.1
-    >=dev-libs/libxml2-2.5
-    >=gnome-base/gconf-2.0
-    >=gnome-base/libgnomecanvas-2.2.0.2
-    >=gnome-base/libgnomeprintui-2.2
-    >=gnome-base/libgnomeprint-2.2
-	doc?	 ( >=app-text/scrollkeeper-0.3.10-r1 )
-	ssl? ( mozilla? ( >=net-www/mozilla-0.9.9 ) : ( >=dev-libs/openssl-0.9.5 ) )
-	ldap?    ( >=net-nds/openldap-2.0 )
-    kerberos? ( >=app-crypt/mit-krb5-1.2.5 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/libtool-1.4.1-r1
-	>=dev-util/intltool-0.20
-	sys-devel/gettext
-	doc? ( dev-util/gtk-doc )"
-
-pkg_setup() {
-    ewarn "This is a Preview Release. According to Ximian : "
-    echo
-    ewarn "These snapshots of Evolution are UNSTABLE. This means"
-    ewarn "that it will probably crash very often, and possibly eat"
-    ewarn "your mail, calendar, appointments, anything. The purpose"
-    ewarn "of this release is to help users to test the new code; use"
-    ewarn "at your own risk, but please do report the bugs."
-    echo
-    ewarn "It is highly recommended that you make a backup of your 1.2"
-    ewarn "~/evolution directory before switching to Evolution 1.3 to"
-    ewarn "prevent data loss. If you are using POP mail, please consider"
-    ewarn "using the \"Leave messages on server\" option to prevent your"
-    ewarn "mail from being erased on the server after download."
-    echo
-    ewarn "Please read this page for more info:"
-    ewarn "http://developer.ximian.com/projects/evolution/release_notes/1.3.92.html"
-	sleep 5
-	
-}
-
-src_unpack() {
-	unpack ${A}
-	# remove dependency on libdb1.so (its deprecated)
-	cd ${S}; sed -i -e "s/-ldb1//" configure	
-}
-
-src_compile() {
-
-	# *************************************************************
-	#
-	#   DB3 compile...
-	#
-	# *************************************************************
-
-	# Rather ugly hack to make sure pthread mutex support are not enabled ...
-	cd ${WORKDIR}/${DB3}/dist
-	einfo "Compiling DB3..."
-	cd ${WORKDIR}/${DB3}/build_unix
-	../dist/configure --prefix=${WORKDIR}/db3 || die
-
-	if [ "`egrep "^LIBS=[[:space:]]*-lpthread" Makefile`" ]
-	then
-		append-flags "-pthread"
-	fi
-
-	make || die
-	make prefix=${WORKDIR}/db3 install || die
-
-	# *************************************************************
-	#
-	#   Evolution compile...
-	#
-	# *************************************************************
-
-	einfo "Compiling Evolution..."
-	cd ${S}
-  
-	local myconf=""
-	local MOZILLA="${MOZILLA_FIVE_HOME}"
-
-	if [ -n "`use pda`" ] ; then
-		myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes"
-	else
-		myconf="${myconf} --enable-pilot-conduits=no"
-	fi
-
-	if [ -n "`use ldap`" ] ; then
-		myconf="${myconf} --with-openldap=yes --with-static-ldap=no"
-	else
-		myconf="${myconf} --with-openldap=no"
-	fi
-    
-    # Kerberos
-	if [ -n "`use kerberos`" ]; then
-		myconf="${myconf} --with-krb5=/usr"
-    else
-    	myconf="${myconf} --without-krb5"
-    fi
-        
-
-	# Use Mozilla NSS libs if 'mozilla' *and* 'ssl' in USE
-	if [ -n "`use ssl`" -a -n "`use mozilla`" ] ; then
-		myconf="${myconf} --enable-nss=yes \
-			--with-nspr-includes=${MOZILLA}/include/nspr \
-			--with-nspr-libs=${MOZILLA} \
-			--with-nss-includes=${MOZILLA}/include/nss \
-			--with-nss-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	# Else use OpenSSL if 'mozilla' not in USE  ...
-	if [ -n "`use ssl`" -a -z "`use mozilla`" ] ; then
-		myconf="${myconf} --enable-openssl=yes"
-	fi
-
-	if [ -n "`use doc`" ] ; then
-		myconf="${myconf} --enable-gtk-doc"
-	else
-		myconf="${myconf} --disable-gtk-doc"
-	fi
-
-	if [ -n "`use ipv6`" ] ; then
-		myconf="${myconf} --enable-ipv6=yes"
-	else
-		myconf="${myconf} --enable-ipv6=no"
-	fi
-
-	CFLAGS="${CFLAGS} -I/usr/include/libpisock"
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--datadir=/usr/share \
-		--sysconfdir=/etc \
-		--localstatedir=/var/lib \
-		--with-db3=${WORKDIR}/db3 \
-		${myconf} || die
-
-	#needs to be able to connect to X display to build.
-	Xemake || Xmake || die
-}
-
-src_install() {
-
-    # fix kde shortcut otherwise make install fails (evo-1.3.1)
-    cd ${S}/data
-    cp Makefile Makefile.old
-	sed -e 's,^install-kde-applnk:,install-kde-applnk:\n\t$(mkinstalldirs) $(DESTDIR)$(kdedesktopdir); \\,' Makefile.old > Makefile
-    rm Makefile.old
-
-	cd ${S}
-	export USE_DESTDIR="1"
-	export DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
-	gnome2_src_install "KDE_APPLNK_DIR=/usr/share/applnk"
-	
-	# remove kde applnk if -kde
-	if [ -z "`use kde`" ]; then
-		rm -rf ${D}/usr/share/applnk
-	fi
-
-	# remove symlink to allow parallel installations
-	rm -f ${D}/usr/bin/evolution
-
-}
diff --git a/net-mail/evolution/evolution-1.4.0.ebuild b/net-mail/evolution/evolution-1.4.0.ebuild
index 4aae7bd623fd..e317d63f1bd8 100644
--- a/net-mail/evolution/evolution-1.4.0.ebuild
+++ b/net-mail/evolution/evolution-1.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.0.ebuild,v 1.4 2003/07/07 02:19:55 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.0.ebuild,v 1.5 2003/07/09 15:46:51 liquidx Exp $
 
 IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde"
 
@@ -39,16 +39,18 @@ RDEPEND=">=gnome-extra/libgtkhtml-3.0.5
     >=gnome-base/libgnomeprintui-2.2
     >=gnome-base/libgnomeprint-2.2
 	doc?	 ( >=app-text/scrollkeeper-0.3.10-r1 )
-	ssl? ( mozilla? ( >=net-www/mozilla-0.9.9 ) : ( >=dev-libs/openssl-0.9.5 ) )
+	ssl? ( mozilla? ( || ( >=net-www/mozilla-0.9.9 >=net-www/mozilla-firebird-0.6 ) ) )
+	ssl? ( !mozilla? ( >=dev-libs/openssl-0.9.5 ) )
 	ldap?    ( >=net-nds/openldap-2.0 )
-    kerberos? ( >=app-crypt/mit-krb5-1.2.5 )"
+    kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
+	app-text/scrollkeeper"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
+	dev-util/pkgconfig
 	>=sys-devel/libtool-1.4.1-r1
 	>=dev-util/intltool-0.20
 	sys-devel/gettext
-	app-text/scrollkeeper	
 	doc? ( dev-util/gtk-doc )"
 
 pkg_setup() {
@@ -100,7 +102,15 @@ src_compile() {
 	cd ${S}
   
 	local myconf=""
-	local MOZILLA="${MOZILLA_FIVE_HOME}"
+	if [ -n "${MOZILLA_FIVE_HOME}" -o -f "/usr/lib/mozilla/include/nspr/nspr.h" ]; then
+		local MOZILLA="${MOZILLA_FIVE_HOME}"
+	elif [ -f "/usr/lib/MozillaFirebird/include/nspr/nspr.h" ]; then
+		local MOZILLA="/usr/lib/MozillaFirebird"
+	elif [ -n "`use ssl`" -a "`use mozilla`" ]; then
+		eerror "unable to find mozilla or mozilla-firebird installed"
+		eerror "please emerge with USE='-mozilla'"
+		die "unable to find mozilla/mozilla-firebird"
+	fi		
 
 	use pda \
 		&& myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes" \
diff --git a/net-mail/evolution/files/digest-evolution-1.3.92 b/net-mail/evolution/files/digest-evolution-1.3.92
deleted file mode 100644
index e085a0ad6e2f..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.3.92
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c652b5873188d460e38bd73abbf1308f evolution-1.3.92.tar.bz2 12338905
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117