diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2003-01-08 20:38:56 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2003-01-08 20:38:56 +0000 |
commit | 201234a7f0ebde0d68788857ce28ca8a9bab8bfc (patch) | |
tree | 27fa96d7457b3063a6f6a26be157f9b9fd735027 /net-mail | |
parent | mark stable for x86 (diff) | |
download | historical-201234a7f0ebde0d68788857ce28ca8a9bab8bfc.tar.gz historical-201234a7f0ebde0d68788857ce28ca8a9bab8bfc.tar.bz2 historical-201234a7f0ebde0d68788857ce28ca8a9bab8bfc.zip |
bump stable for x86
Diffstat (limited to 'net-mail')
-rw-r--r-- | net-mail/evolution/ChangeLog | 6 | ||||
-rw-r--r-- | net-mail/evolution/evolution-1.0.7.ebuild | 6 | ||||
-rw-r--r-- | net-mail/evolution/evolution-1.0.8-r2.ebuild | 9 | ||||
-rw-r--r-- | net-mail/evolution/evolution-1.2.1.ebuild | 17 |
4 files changed, 29 insertions, 9 deletions
diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog index a7250b2f554e..31166bfaa238 100644 --- a/net-mail/evolution/ChangeLog +++ b/net-mail/evolution/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-mail/evolution # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.37 2002/12/17 09:13:07 cretin Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.38 2003/01/08 20:38:56 azarah Exp $ + + 08 Jan 2003; Martin Schlemmer <azarah@gentoo.org> evolution-1.0.8-r2.ebuild, evolution-1.2.1.ebuild : + Mark 1.2.1 stable for x86. Do not install 1.0.8 if gnome-spell-0.5 or + gtkhtml-1.1 installed. 10 Dec 2002; foser <foser@gentoo.org> evolution-1.0.7.ebuild evolution-1.0.8-r2.ebuild evolution-1.2.0.ebuild evolution-1.2.0-r1.ebuild : Fixed gob deps (bug #11633) diff --git a/net-mail/evolution/evolution-1.0.7.ebuild b/net-mail/evolution/evolution-1.0.7.ebuild index aecb0ff6303c..a249a36fce55 100644 --- a/net-mail/evolution/evolution-1.0.7.ebuild +++ b/net-mail/evolution/evolution-1.0.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.0.7.ebuild,v 1.7 2002/12/11 17:39:17 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.0.7.ebuild,v 1.8 2003/01/08 20:38:56 azarah Exp $ IUSE="ssl nls mozilla ldap doc spell pda" @@ -20,7 +20,9 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="x86 sparc " -RDEPEND=">=gnome-extra/bonobo-conf-0.14 +RDEPEND="!>=app-text/gnome-spell-0.5 + !>=gnome-extra/gtkhtml-1.1 + >=gnome-extra/bonobo-conf-0.14 >=gnome-base/bonobo-1.0.18 >=gnome-extra/gal-0.19.2 ( >=gnome-base/gconf-1.0.7 diff --git a/net-mail/evolution/evolution-1.0.8-r2.ebuild b/net-mail/evolution/evolution-1.0.8-r2.ebuild index 44283b17d63a..d52e5ccd48a3 100644 --- a/net-mail/evolution/evolution-1.0.8-r2.ebuild +++ b/net-mail/evolution/evolution-1.0.8-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.0.8-r2.ebuild,v 1.4 2002/12/11 17:39:17 foser Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.0.8-r2.ebuild,v 1.5 2003/01/08 20:38:56 azarah Exp $ IUSE="ssl nls mozilla ldap doc spell pda" @@ -20,12 +20,15 @@ SLOT="0" LICENSE="GPL-2" KEYWORDS="x86 ppc sparc " -RDEPEND="app-text/scrollkeeper +RDEPEND="!>=app-text/gnome-spell-0.5 + !>=gnome-extra/gtkhtml-1.1 + app-text/scrollkeeper >=gnome-extra/bonobo-conf-0.14 >=gnome-base/bonobo-1.0.18 >=gnome-extra/gal-0.19.2 =gnome-base/gconf-1.0* - >=gnome-extra/gtkhtml-1.0.2-r2 + =gnome-extra/gtkhtml-1.0* + !>=gnome-extra/gtkhtml-1.1 >=gnome-base/oaf-0.6.7 >=gnome-base/ORBit-0.5.12 ( >=gnome-base/libglade-0.17-r1 diff --git a/net-mail/evolution/evolution-1.2.1.ebuild b/net-mail/evolution/evolution-1.2.1.ebuild index 6e9b013692ce..d1d39dd439d3 100644 --- a/net-mail/evolution/evolution-1.2.1.ebuild +++ b/net-mail/evolution/evolution-1.2.1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.2.1.ebuild,v 1.1 2002/12/17 09:13:07 cretin Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.2.1.ebuild,v 1.2 2003/01/08 20:38:56 azarah Exp $ IUSE="ssl nls mozilla ldap doc spell pda ipv6" #provide Xmake and Xemake -inherit eutils gnome.org virtualx libtool +inherit eutils flag-o-matic gnome.org libtool virtualx DB3="db-3.1.17" S="${WORKDIR}/${P}" @@ -16,7 +16,7 @@ SRC_URI="${SRC_URI} HOMEPAGE="http://www.ximian.com" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~x86 ~ppc ~sparc" +KEYWORDS="x86 ~ppc ~sparc" RDEPEND="app-text/scrollkeeper >=gnome-extra/bonobo-conf-0.16 @@ -94,10 +94,21 @@ src_compile() { # # ************************************************************* + # Rather ugly hack to make sure pthread mutex support are not enabled ... + cd ${WORKDIR}/${DB3}/dist +# cp configure configure.orig +# awk '!/MUTEX.*THREADS/ { sub("mut_pthread", "mut_fcntl"); print }' \ +# configure.orig > configure + 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 |