new version for evo, see changelog for more info

9 files changed, 263 insertions, 6 deletions

diff --git a/gnome-extra/libgtkhtml/ChangeLog b/gnome-extra/libgtkhtml/ChangeLog
index 7a2fae1254be..95feb91556f2 100644
--- a/gnome-extra/libgtkhtml/ChangeLog
+++ b/gnome-extra/libgtkhtml/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for gnome-extra/libgtkhtml
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.33 2003/07/04 19:57:57 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/ChangeLog,v 1.34 2003/07/11 22:03:26 liquidx Exp $
+
+*libgtkhtml-3.0.7 (11 Jul 2003)
+
+  11 Jul 2003; Alastair Tse <liquidx@gentoo.org> libgtkhtml-3.0.7.ebuild,
+  files/libgtkhtml-3.0.7-libtool.patch:
+  finally! i have gotten to the bottom of this libtool fiasco. right now i've
+  replaced the ugly hack with a less ugly, yet still hacky way of dealing with
+  the strange reverse-deps patch from the libtool.eclass. this way, the
+  dependencies don't get stripped out but we still get the added benefit of it
+  reversing the -L search path. if any libtool geniuses find a better way,
+  let me know.
+  
+  oh, and version bumped.
 
   01 Jul 2003; Jason Wever <weeve@gentoo.org> libgtkhtml-3.0.5.ebuild:
   Added ~sparc to keywords to fix bug #23793.
diff --git a/gnome-extra/libgtkhtml/Manifest b/gnome-extra/libgtkhtml/Manifest
index 3bdcee264d7e..5808b275aa0c 100644
--- a/gnome-extra/libgtkhtml/Manifest
+++ b/gnome-extra/libgtkhtml/Manifest
@@ -1,4 +1,4 @@
-MD5 c41b1804b7355b1cdbaaa52c5def3586 ChangeLog 4323
+MD5 1148e97004c9547985564ce69a4e5c8a ChangeLog 4899
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 992c9f1c51d87cbb85e72f239b02f845 libgtkhtml-2.2.1.ebuild 805
 MD5 a98a27c7ff7d616fdd134e1cb90d3007 libgtkhtml-2.0.2.ebuild 735
@@ -6,7 +6,7 @@ MD5 34a372a1c6d00cd4f7477ea13c7947ad libgtkhtml-2.2.3.ebuild 811
 MD5 9d4a5e87c67aacffa30e6b935d139f9a libgtkhtml-3.0.4.ebuild 1920
 MD5 072cbd1bcab323a170025863f75d75d2 libgtkhtml-3.0.5.ebuild 1932
 MD5 14bb65ca2fbe85961b2cebcaf7314460 libgtkhtml-2.2.4.ebuild 844
-MD5 e3bcfd7b3b82bc173da19aff892f746f libgtkhtml-3.0.7.ebuild 1961
+MD5 fce02e663fe329f722072618c5f8ee9b libgtkhtml-3.0.7.ebuild 1390
 MD5 470c04d01c1c093ee1439465a3c650ea files/digest-libgtkhtml-2.2.1 69
 MD5 1550372a31c190050da919422b6bf051 files/digest-libgtkhtml-3.0.4 67
 MD5 3c7e7d4061cc0eb07844561b5c466b45 files/digest-libgtkhtml-3.0.5 67
@@ -15,3 +15,4 @@ MD5 59cd7ffde71d082b5c68834945dc71cc files/digest-libgtkhtml-2.2.3 69
 MD5 50c625f91326bee698360208ee9aa2cc files/digest-libgtkhtml-3.0.7 67
 MD5 8b985f9a98b7a90232d5ea193b8078d1 files/libgtkhtml-2.2.0-alpha.patch 652
 MD5 931991370c138ac1ef64cd5df5b57387 files/digest-libgtkhtml-2.2.4 69
+MD5 c802878860f7a2692df330e54e635c0c files/libgtkhtml-3.0.7-libtool.patch 656
diff --git a/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.7 b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.7
new file mode 100644
index 000000000000..9a6b0afe2c17
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/digest-libgtkhtml-3.0.7
@@ -0,0 +1 @@
+MD5 561d588d113c61e3b1977b3ea09c90ad gtkhtml-3.0.7.tar.bz2 1043147
diff --git a/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.7-libtool.patch b/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.7-libtool.patch
new file mode 100644
index 000000000000..4839a3f1f2ab
--- /dev/null
+++ b/gnome-extra/libgtkhtml/files/libgtkhtml-3.0.7-libtool.patch
@@ -0,0 +1,20 @@
+--- libtool~	2003-07-11 10:21:31.000000000 +0100
++++ libtool	2003-07-11 10:22:33.000000000 +0100
+@@ -1859,7 +1859,7 @@
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ 	    tmp_libs=
+ 	    # PKGW 
+-	    dependency_libs=
++	    #dependency_libs=
+ 	    for deplib in $dependency_libs; do
+ 	      deplibs="$deplib $deplibs"
+ 	      case "$tmp_libs " in
+@@ -1976,7 +1976,7 @@
+ 
+ 	  tmp_libs=
+ 	  #PKGW
+-	  dependency_libs=
++	  #dependency_libs=
+ 	  for deplib in $dependency_libs; do
+ 	    case $deplib in
+ 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
diff --git a/gnome-extra/libgtkhtml/libgtkhtml-3.0.7.ebuild b/gnome-extra/libgtkhtml/libgtkhtml-3.0.7.ebuild
new file mode 100644
index 000000000000..4d145bd892cd
--- /dev/null
+++ b/gnome-extra/libgtkhtml/libgtkhtml-3.0.7.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgtkhtml/libgtkhtml-3.0.7.ebuild,v 1.1 2003/07/11 22:03:26 liquidx Exp $
+
+inherit gnome2
+
+MY_P=${P/lib/}
+MY_PN=${PN/lib/}
+DESCRIPTION="Lightweight HTML Rendering/Printing/Editing Engine"
+HOMEPAGE="http://www.gnome.org/"
+
+# stolen from gnome.org eclass because it support this one-off name-mangling
+
+[ -z "${GNOME_TARBALL_SUFFIX}" ] && export GNOME_TARBALL_SUFFIX="bz2"
+PVP=($(echo " $PV " | sed 's:[-\._]: :g'))
+SRC_URI="mirror://gnome/sources/${MY_PN}/${PVP[0]}.${PVP[1]}/${MY_P}.tar.${GNOME_TARBALL_SUFFIX}"
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND=">=gnome-extra/gal-1.99.8
+	>=net-libs/libsoup-1.99.23
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/libgnomeprint-2.2
+	>=gnome-base/libgnomeprintui-2.2.1
+	>=gnome-base/libbonoboui-2.0
+	>=gnome-base/bonobo-activation-2.0
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/ORBit2-2.5.6
+	>=gnome-base/gnome-vfs-2.1
+	>=gnome-base/gail-1.1
+	>=dev-libs/libxml2-2.5"
+ 
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.12.0"
+
+USE_DESTDIR="1"
+SCROLLKEEPER_UPDATE="0"
+ELTCONF="--reverse-deps"
+
+src_compile() {
+	gnome2_src_configure
+	patch ${S}/libtool < ${FILESDIR}/${P}-libtool.patch || die "libtool patch failed"
+	emake || die "make failed"
+}
diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog
index 34a233976fc3..34b24c15dd68 100644
--- a/net-mail/evolution/ChangeLog
+++ b/net-mail/evolution/ChangeLog
@@ -1,6 +1,14 @@
 # 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.68 2003/07/09 15:46:51 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.69 2003/07/11 22:05:34 liquidx Exp $
+
+*evolution-1.4.3 (11 Jul 2003)
+
+  11 Jul 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.4.3.ebuild:
+  replaced mozilla dependency with dev-libs/nss dev-libs/nspr (#23730). SSL
+  support is still provided by either nspr/nss or openssl, use the 'mozilla' USE
+  flag to select. by default, it will use nss/nspr as ximian also packages with
+  that as default (#24185). also removed 1.4.0 release hacks.
 
   09 Jul 2003; Alastair Tse <liquidx@gentoo.org> evolution-1.3.92.ebuild,
   evolution-1.4.0.ebuild:
diff --git a/net-mail/evolution/Manifest b/net-mail/evolution/Manifest
index eea3528813e7..44594595800f 100644
--- a/net-mail/evolution/Manifest
+++ b/net-mail/evolution/Manifest
@@ -1,6 +1,6 @@
-MD5 375d6d32252ee67a7f0446391f35df77 ChangeLog 10967
+MD5 d75141539305f1ea51e86c0c1c79ebc6 ChangeLog 11372
 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
-MD5 1ce15c94196796102cb610ff417b1621 evolution-1.4.3.ebuild 4435
+MD5 6844b675c4575b6dba126fa6900c3486 evolution-1.4.3.ebuild 4725
 MD5 221166e63261beeae476283b4a012afc evolution-1.4.0.ebuild 4945
 MD5 8fefce38e3ac94cc548fc2a0929241b0 evolution-1.2.4.ebuild 6364
 MD5 2f54952fa1d20af7f01db80b741258e7 evolution-1.2.3.ebuild 5889
diff --git a/net-mail/evolution/evolution-1.4.3.ebuild b/net-mail/evolution/evolution-1.4.3.ebuild
new file mode 100644
index 000000000000..98fa2936d091
--- /dev/null
+++ b/net-mail/evolution/evolution-1.4.3.ebuild
@@ -0,0 +1,164 @@
+# 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.3.ebuild,v 1.1 2003/07/11 22:05:34 liquidx Exp $
+
+IUSE="ssl mozilla ldap doc spell pda ipv6 kerberos kde"
+
+inherit flag-o-matic virtualx gnome2
+use kde && inherit kde
+
+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"
+HOMEPAGE="http://www.ximian.com"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+# top stanza are ximian deps
+RDEPEND=">=gnome-extra/libgtkhtml-3.0.7
+    >=gnome-extra/gal-1.99.8
+    >=net-libs/libsoup-1.99.23
+	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
+	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 )
+    kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
+	doc?	 ( >=app-text/scrollkeeper-0.3.10-r1 )"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	dev-util/pkgconfig
+	>=sys-devel/libtool-1.4.1-r1
+	>=dev-util/intltool-0.20
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )"
+
+pkg_setup() {
+	if [ -x ${ROOT}/usr/bin/evolution-1.3 ]; then
+		eerror "Please un-merge the 1.3 Development Versions of Ximian Evolution."
+		eerror "You can do this by doing:"
+		eerror ""
+		eerror "   emerge -C \"=net-mail/evolution-1.3*\""
+		eerror ""
+		die "unmerge evolution-1.3 before installing evolution-1.4"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	# remove dependency on libdb1.so (its deprecated)
+	cd ${S}; sed -i -e "s/-ldb1//" configure
+	
+	# we need the omf fix, or else we get access violation
+	# errors related to sandbox
+	gnome2_omf_fix ${S}/help/C/Makefile.in	
+}
+
+##### compile evolution specific db3 for static linking #####
+src_compile_db3() {
+	einfo "Compiling DB3..."
+	cd ${WORKDIR}/${DB3}/build_unix
+	../dist/configure --prefix=${WORKDIR}/db3 || die
+
+	# Rather ugly hack to make sure pthread mutex support are not enabled ...
+	if [ -n "`egrep "^LIBS=[[:space:]]*-lpthread" Makefile`" ];  then
+		append-flags "-pthread"
+	fi
+
+	make || die "db make failed"
+	make prefix=${WORKDIR}/db3 install || die "db install failed"
+
+}
+
+src_compile() {
+	elibtoolize
+
+	# compile evo specific version of db3
+	src_compile_db3
+
+	einfo "Compiling Evolution..."
+	cd ${S}
+  
+	local myconf=""
+
+	use pda \
+		&& myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes" \
+		|| myconf="${myconf} --enable-pilot-conduits=no"
+
+	use ldap \
+		&&	myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
+		|| myconf="${myconf} --with-openldap=no"
+    
+	use kerberos \
+		&& myconf="${myconf} --with-krb5=/usr" \
+		|| myconf="${myconf} --without-krb5"
+
+	use doc \
+		&& myconf="${myconf} --enable-gtk-doc" \
+		|| myconf="${myconf} --disable-gtk-doc"
+
+	use ipv6 \
+		&& myconf="${myconf} --enable-ipv6=yes" \
+		|| myconf="${myconf} --enable-ipv6=no"
+		
+	use kde && [ -n "${KDEDIR}" ] \
+		&& myconf="${myconf} --with-kde-applnk-path=${KDEDIR}/share/applnk"
+
+	# 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=${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"
+	fi
+
+	# Else use OpenSSL if 'mozilla' not in USE  ...
+	if [ -n "`use ssl`" -a -z "`use mozilla`" ] ; then
+		myconf="${myconf} --enable-openssl=yes"
+	fi
+
+	econf --with-db3=${WORKDIR}/db3 ${myconf} || die
+
+	#needs to be able to connect to X display to build.
+	Xemake || Xmake || die "make failed"
+}
+
+USE_DESTDIR="1"
+DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
diff --git a/net-mail/evolution/files/digest-evolution-1.4.3 b/net-mail/evolution/files/digest-evolution-1.4.3
new file mode 100644
index 000000000000..58f56647f6fc
--- /dev/null
+++ b/net-mail/evolution/files/digest-evolution-1.4.3
@@ -0,0 +1,2 @@
+MD5 4cfed9d2f6a5a7ae71caa8f68494a15a evolution-1.4.3.tar.bz2 13178102
+MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117