version bump

6 files changed, 79 insertions, 81 deletions

diff --git a/net-mail/evolution/Manifest b/net-mail/evolution/Manifest
index 495e340b6c3a..96bbb22b90fd 100644
--- a/net-mail/evolution/Manifest
+++ b/net-mail/evolution/Manifest
@@ -1,21 +1,17 @@
-MD5 3d8d547dd2c6c84a66a9a1e351a0768e ChangeLog 12912
+MD5 0cb6eb88842a415ffe0ddd4296ae5558 ChangeLog 13135
 MD5 fd51120c812adc8785b04136acd16237 evolution-1.2.3.ebuild 5875
 MD5 bd65cf47228c497e81dd457c0e6b85e4 evolution-1.2.4.ebuild 6344
-MD5 796ac43d587070509aed240345e3c2f4 evolution-1.4.0.ebuild 4840
 MD5 cc30d4c2504328e985a41218cacb6ad6 evolution-1.4.3.ebuild 4754
-MD5 a8480cf32204a0c14c608ecbe61e4950 evolution-1.4.4.ebuild 5309
-MD5 332750a904f5c6b5addc1690560b4f89 evolution-1.4.5.ebuild 5318
+MD5 7a33b5905150fd18c6da33ea376fa35e evolution-1.4.4.ebuild 5313
+MD5 c53f3d724f7a6ae1f757f67a06cef817 evolution-1.4.5.ebuild 5325
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
 MD5 f17beebbd2d9ff5d49f48352be1b359c files/digest-evolution-1.2.3 131
 MD5 3137288dd17e357d0972dab00e4f6b6d files/digest-evolution-1.2.4 1230
-MD5 7a38783a2b9633cc85de53ca692c5159 files/digest-evolution-1.4.0 132
 MD5 d1cfb9ff73d996333d728b93087e2a7a files/digest-evolution-1.4.3 132
 MD5 832931a5d78d8cb1509639674340409e files/digest-evolution-1.4.4 132
 MD5 49463c08f32ee1df0970196b6c4cef2b files/digest-evolution-1.4.5 132
 MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
 MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
 MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
-MD5 421c88eda3d1c318f6214f2103ffaedb files/evolution-1.4.0-bad-1.3.patch 949
 MD5 ce92ec3768b690210c738d724996adea files/evolution-1.4.4-alpha.patch 2265
-MD5 b76c2b1a7df1950221f0e34b4c1693db files/evolution-1.4.4-conduits.patch 1734
 MD5 980771bb5349699c8d8ecd6b6f035b50 files/gnome-pilot.m4 6452
diff --git a/net-mail/evolution/evolution-1.4.4.ebuild b/net-mail/evolution/evolution-1.4.4.ebuild
index 7392d9f1a888..44efaf5a93b2 100644
--- a/net-mail/evolution/evolution-1.4.4.ebuild
+++ b/net-mail/evolution/evolution-1.4.4.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.4.ebuild,v 1.9 2003/09/09 07:05:20 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.4.ebuild,v 1.10 2003/09/24 15:32:58 liquidx Exp $
 
 IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.ximian.com"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~alpha"
 
 # Top stanza are ximian deps
 RDEPEND=">=gnome-extra/libgtkhtml-3.0.8
@@ -170,5 +170,13 @@ src_compile() {
 	Xemake || Xmake || die "make failed"
 }
 
+pkg_postinst() {
+	einfo "To change the default browser if you are not using GNOME, do:"
+	einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
+	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
+	einfo ""
+	einfo "Replace 'mozilla %s' with which ever browser you use."
+}
+
 USE_DESTDIR="1"
 DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
diff --git a/net-mail/evolution/evolution-1.4.0.ebuild b/net-mail/evolution/evolution-1.4.5.ebuild
index d2b466f0c9aa..c091e29d38c4 100644
--- a/net-mail/evolution/evolution-1.4.0.ebuild
+++ b/net-mail/evolution/evolution-1.4.5.ebuild
@@ -1,11 +1,10 @@
 # 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.10 2003/09/09 07:05:20 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.4.5.ebuild,v 1.1 2003/09/24 15:32:58 liquidx Exp $
 
-IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde"
+inherit flag-o-matic virtualx gnome2 kde
 
-inherit flag-o-matic virtualx gnome2
-use kde && inherit kde
+replace-flags -O3 -O2
 
 DB3="db-3.1.17"
 S="${WORKDIR}/${P}"
@@ -13,19 +12,20 @@ DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
 SRC_URI="${SRC_URI} http://www.sleepycat.com/update/snapshot/${DB3}.tar.gz"
 HOMEPAGE="http://www.ximian.com"
 
+IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc"
-
-# top stanza are ximian deps
-RDEPEND=">=gnome-extra/libgtkhtml-3.0.5
-	>=gnome-extra/gal-1.99.7
-	>=net-libs/libsoup-1.99.23
-	pda?     ( >=app-pda/gnome-pilot-2.0.9
-		>=app-pda/pilot-link-0.11.7
-		>=app-pda/gnome-pilot-conduits-2.0.9 )
-	spell?   ( >=app-text/gnome-spell-1.0.4 )
-
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha"
+
+# Top stanza are ximian deps
+RDEPEND=">=gnome-extra/libgtkhtml-3.0.9
+	>=gnome-extra/gal-1.99.10
+	>=net-libs/libsoup-1.99.26
+	>=gnome-extra/yelp-2.2
+	pda? ( >=app-pda/gnome-pilot-2.0.10-r1
+	       >=app-pda/pilot-link-0.11.8
+	       >=app-pda/gnome-pilot-conduits-2.0.10-r1 )
+	spell? ( >=app-text/gnome-spell-1.0.5 )
 	>=gnome-base/ORBit2-2.6.0
 	>=gnome-base/libbonoboui-2.0
 	>=gnome-base/gnome-vfs-2.0
@@ -37,12 +37,14 @@ RDEPEND=">=gnome-extra/libgtkhtml-3.0.5
 	>=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 >=net-www/mozilla-firebird-0.6 ) ) )
+	ssl? ( mozilla? ( || ( ( >=dev-libs/nspr-4.3 >=dev-libs/nss-3.8 )
+	                       net-www/mozilla
+	                     )
+	                ) )
 	ssl? ( !mozilla? ( >=dev-libs/openssl-0.9.5 ) )
-	ldap?    ( >=net-nds/openldap-2.0 )
+	ldap? ( >=net-nds/openldap-2.0 )
 	kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
-	app-text/scrollkeeper"
+	doc? ( >=app-text/scrollkeeper-0.3.10-r1 )"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4
@@ -65,18 +67,21 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	# remove dependency on libdb1.so (its deprecated)
+
+	# Remove dependency on libdb1.so (its deprecated)
 	cd ${S}; sed -i -e "s/-ldb1//" configure
-	# fix desktop link
-	epatch ${FILESDIR}/evolution-1.4.0-bad-1.3.patch
 
-	# we need the omf fix, or else we get access violation
+	# We need the omf fix, or else we get access violation
 	# errors related to sandbox
 	gnome2_omf_fix ${S}/help/C/Makefile.in
 
+	# Patches for 64-bit
+	if use alpha; then
+		epatch ${FILESDIR}/evolution-1.4.4-alpha.patch || die "epatch failed"
+	fi
 }
 
-##### compile evolution specific db3 for static linking #####
+##### Compile evolution specific db3 for static linking #####
 src_compile_db3() {
 	einfo "Compiling DB3..."
 	cd ${WORKDIR}/${DB3}/build_unix
@@ -87,29 +92,26 @@ src_compile_db3() {
 		append-flags "-pthread"
 	fi
 
-	make || die
-	make prefix=${WORKDIR}/db3 install || die
+	make || die "db make failed"
+	make prefix=${WORKDIR}/db3 install || die "db install failed"
 
 }
 
 src_compile() {
+	elibtoolize
 
-	# compile evo specific version of db3
+	if [ "${ARCH}" = "hppa" ]; then
+		append-flags "-fPIC -ffunction-sections"
+		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
+	fi
+
+	# Compile evo specific version of db3
 	src_compile_db3
 
 	einfo "Compiling Evolution..."
 	cd ${S}
 
-	local myconf=""
-	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
+	local myconf=
 
 	use pda \
 		&& myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes" \
@@ -134,13 +136,24 @@ src_compile() {
 	use kde && [ -n "${KDEDIR}" ] \
 		&& myconf="${myconf} --with-kde-applnk-path=${KDEDIR}/share/applnk"
 
-	# Use Mozilla NSS libs if 'mozilla' *and* 'ssl' in USE
+	# Use Mozilla NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
 	if [ -n "`use ssl`" -a -n "`use mozilla`" ] ; then
+		if has_version "dev-libs/nspr"; then
+			NSS_LIB=/usr/lib
+			NSS_INC=/usr/include
+		elif has_version "net-www/mozilla"; then
+			NSS_LIB=/usr/lib/mozilla
+			NSS_INC=/usr/lib/mozilla/include
+		else
+			eerror "Neither net-www/mozilla nor dev-libs/nspr found."
+			die "unexpected error. unable to find nss/nspr"
+		fi
+
 		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}"
+			--with-nspr-includes=${NSS_INC}/nspr \
+			--with-nspr-libs=${NSS_LIB} \
+			--with-nss-includes=${NSS_INC}/nss \
+			--with-nss-libs=${NSS_LIB}"
 	else
 		myconf="${myconf} --without-nspr-libs --without-nspr-includes \
 			--without-nss-libs --without-nss-includes"
@@ -153,11 +166,16 @@ src_compile() {
 
 	econf --with-db3=${WORKDIR}/db3 ${myconf} || die
 
-	# regenerate evolution.desktop
-	cd ${S}/data; make evolution.desktop; cd ${S}
+	# Needs to be able to connect to X display to build.
+	Xemake || Xmake || die "make failed"
+}
 
-	#needs to be able to connect to X display to build.
-	Xemake || Xmake || die
+pkg_postinst() {
+	einfo "To change the default browser if you are not using GNOME, do:"
+	einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
+	einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
+	einfo ""
+	einfo "Replace 'mozilla %s' with which ever browser you use."
 }
 
 USE_DESTDIR="1"
diff --git a/net-mail/evolution/files/digest-evolution-1.4.0 b/net-mail/evolution/files/digest-evolution-1.4.0
deleted file mode 100644
index a28b1af8e124..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.4.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cc671769a912e315dc895f5b458e1a33 evolution-1.4.0.tar.bz2 12844056
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.4.5 b/net-mail/evolution/files/digest-evolution-1.4.5
new file mode 100644
index 000000000000..9b6429c969e8
--- /dev/null
+++ b/net-mail/evolution/files/digest-evolution-1.4.5
@@ -0,0 +1,2 @@
+MD5 f16a86d6eaa9d9683f215586fcdac374 evolution-1.4.5.tar.bz2 13641682
+MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/evolution-1.4.0-bad-1.3.patch b/net-mail/evolution/files/evolution-1.4.0-bad-1.3.patch
deleted file mode 100644
index 9df5cf4c2510..000000000000
--- a/net-mail/evolution/files/evolution-1.4.0-bad-1.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur evolution-1.4.0.orig/data/evolution.desktop.in evolution-1.4.0/data/evolution.desktop.in
---- evolution-1.4.0.orig/data/evolution.desktop.in	2003-03-26 17:13:05.000000000 +0100
-+++ evolution-1.4.0/data/evolution.desktop.in	2003-06-10 13:51:55.000000000 +0200
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- _Name=Ximian Evolution
- _Comment=The Evolution groupware suite
--Exec=evolution-1.3
--Icon=evolution-1.3.png
-+Exec=evolution-1.4
-+Icon=evolution-1.4.png
- Terminal=false
- Type=Application
- Categories=GNOME;Application;Office;X-Red-Hat-Base;
-diff -ur evolution-1.4.0.orig/shell/evolution-nognome.in evolution-1.4.0/shell/evolution-nognome.in
---- evolution-1.4.0.orig/shell/evolution-nognome.in	2003-04-29 20:14:49.000000000 +0200
-+++ evolution-1.4.0/shell/evolution-nognome.in	2003-06-10 13:55:20.000000000 +0200
-@@ -9,5 +9,5 @@
- 
- export LD_LIBRARY_PATH GNOME2_PATH PATH
- 
--exec @libexecdir@/evolution-1.3 "$@"
-+exec @libexecdir@/evolution-1.4 "$@"
-