more console build fixes

8 files changed, 26 insertions, 299 deletions

diff --git a/net-mail/evolution/ChangeLog b/net-mail/evolution/ChangeLog
index 5e8b3a311af2..2dc1677fd0b1 100644
--- a/net-mail/evolution/ChangeLog
+++ b/net-mail/evolution/ChangeLog
@@ -1,6 +1,12 @@
 # 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.8 2002/04/04 16:17:39 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/ChangeLog,v 1.9 2002/04/09 19:24:09 azarah Exp $
+
+*evolution-1.0.3-r3 (9 April 2002)
+
+  09 Apr 2002; M.Schlemmer <azarah@gentoo.org> evolution-1.0.3-r3.ebuild :
+
+  Update to use the virtualx eclass for enabling build in console.
 
   03 Apr 2002; M.Schlemmer <azarah@gentoo.org> evolution-1.0.3-r2.ebuild :
 
diff --git a/net-mail/evolution/evolution-1.0.2.ebuild b/net-mail/evolution/evolution-1.0.2.ebuild
deleted file mode 100644
index 9be6c208252f..000000000000
--- a/net-mail/evolution/evolution-1.0.2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Mikael Hallendal <hallski@gentoo.org>, Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.0.2.ebuild,v 1.2 2002/02/01 21:41:19 g2boojum Exp $
-
-DB3=db-3.1.17
-S=${WORKDIR}/${P}
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.gz
-	 ftp://ftp.ximian.com/pub/source/${PN}/${P}.tar.gz
-	 http://people.codefactory.se/~micke/${PN}/${P}.tar.gz
-	 http://www.sleepycat.com/update/3.1.17/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-
-RDEPEND=">=gnome-extra/bonobo-conf-0.14
-	 >=gnome-base/bonobo-1.0.18
-	 >=gnome-extra/gal-0.19
-         >=gnome-base/gconf-1.0.7
-	 >=gnome-extra/gtkhtml-1.0.1
-	 >=gnome-base/oaf-0.6.7
-	 >=gnome-base/ORBit-0.5.12
-	 >=gnome-base/libglade-0.17-r1
-	 >=media-libs/gdk-pixbuf-0.14.0
-	 >=dev-libs/libxml-1.8.16
-	 >=gnome-base/gnome-vfs-1.0.2-r1
-	 >=gnome-base/gnome-print-0.34
-	 >=app-text/scrollkeeper-0.2
-	 ssl?     ( >=net-www/mozilla-0.9.6-r3 )
-	 ldap?    ( >=net-nds/openldap-2.0 )
-	 mozilla? ( >=net-www/mozilla-0.9.6-r3 )
-	 pda?     ( >=gnome-extra/gnome-pilot-0.1.61-r2 )" 
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.11
-	>=sys-devel/libtool-1.4.1-r1
-	sys-devel/gettext"
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	patch -p0 < ${FILESDIR}/filter-crash.patch
-}
-
-src_compile() {
-
-	libtoolize --copy --force
-
-	cd ${WORKDIR}/${DB3}/build_unix
-	../dist/configure --prefix=${WORKDIR}/db3 || die
-	make || die # make -j 4 doesn't work, use make
-	make prefix=${WORKDIR}/db3 install || die
-
-	cd ${S}
-  
-	local myconf=""
-
-	MOZILLA=$MOZILLA_FIVE_HOME
-
-	if [ "`use pda`" ] ; then
-		myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes"
-	else
-		myconf="${myconf} --enable-pilot-conduits=no"
-	fi
-
-	if [ "`use ldap`" ] ; then
-		myconf="${myconf} --with-openldap=yes"
-	else
-		myconf="${myconf} --with-openldap=no"
-	fi
-
-	if [ "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-			        --with-nspr-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes"
-	fi
-
-	if [ "`use ssl`" ] ; then
-		myconf="${myconf} --with-nss-includes=${MOZILLA}/include/nss   \
-				--with-nss-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nss-libs --without-nss-includes"
-	fi
-
-	# SSL needs NSPR libs  ...
-	if [ "`use ssl`" ] && [ -z "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-				--with-nspr-libs=${MOZILLA}"
-	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 \
-			--enable-file-locking=no \
-			--with-db3=${WORKDIR}/db3 \
-			--disable-python-bindings \
-			${myconf} || die
-
-	# emake might not work, so fall back to make
-	emake || make || die
-}
-
-src_install() {
-        cd omf-install
-        cp Makefile Makefile.old
-        sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
-        rm Makefile.old
-        cd ${S}
-
-	# Don't use DESTDIR it violates sandbox // Hallski
-	make 	prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		KDE_APPLNK_DIR=${D}/usr/share/applnk \
-		install || die
-
-	dodoc AUTHORS COPYING ChangeLog HACKING MAINTAINERS
-	dodoc NEWS README
-}
-
-pkg_postinst() {
-        echo ">>> Updating Scrollkeeper database..."
-        scrollkeeper-update >/dev/null 2>&1
-}
-
-pkg_postrm() {
-        echo ">>> Updating Scrollkeeper database..."
-        scrollkeeper-update >/dev/null 2>&1
-}
diff --git a/net-mail/evolution/evolution-1.0.3-r1.ebuild b/net-mail/evolution/evolution-1.0.3-r3.ebuild
index f5227c42962a..8eba71d006e9 100644
--- a/net-mail/evolution/evolution-1.0.3-r1.ebuild
+++ b/net-mail/evolution/evolution-1.0.3-r3.ebuild
@@ -1,7 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Mikael Hallendal <hallski@gentoo.org>, Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.0.3-r1.ebuild,v 1.1 2002/04/02 01:58:23 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.0.3-r3.ebuild,v 1.1 2002/04/09 19:24:09 azarah Exp $
+
+#provide Xmake and Xemake
+. /usr/portage/eclass/inherit.eclass
+inherit virtualx
 
 DB3=db-3.1.17
 S=${WORKDIR}/${P}
@@ -28,13 +32,14 @@ RDEPEND=">=gnome-extra/bonobo-conf-0.14
 	ssl?     ( >=net-www/mozilla-0.9.9 )
 	ldap?    ( >=net-nds/openldap-2.0 )
 	mozilla? ( >=net-www/mozilla-0.9.9 )
-	pda?     ( >=gnome-extra/gnome-pilot-0.1.61-r2 )" 
+	pda?     ( >=gnome-extra/gnome-pilot-0.1.61-r2 )
+	spell?   ( >=app-text/gnome-spell-0.4.1-r1 )"
 
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.11
 	>=sys-devel/libtool-1.4.1-r1
-	sys-devel/gettext
-	perl?    ( dev-util/gtk-doc )"
+	perl? ( dev-util/gtk-doc )
+	nls?  ( >=dev-util/intltool-0.11
+	        sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
@@ -62,7 +67,8 @@ src_compile() {
 
 	cd ${WORKDIR}/${DB3}/build_unix
 	../dist/configure --prefix=${WORKDIR}/db3 || die
-	make || die # make -j 4 doesn't work, use make
+
+	make || die
 	make prefix=${WORKDIR}/db3 install || die
 
 	cd ${S}
@@ -109,21 +115,24 @@ src_compile() {
 		myconf="${myconf} --disable-gtk-doc"
 	fi
 
+	if [ -z "`use nls`" ] ; then
+		myconf="${myconf} --disable-nls"
+	fi
+
 	CFLAGS="${CFLAGS} -I/usr/include/libpisock"
-	./configure	--host=${CHOST} \
+	./configure --host=${CHOST} \
 		--prefix=/usr \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--datadir=/usr/share \
 		--sysconfdir=/etc \
 		--localstatedir=/var/lib \
-		--enable-file-locking=no \
 		--with-db3=${WORKDIR}/db3 \
 		--disable-python-bindings \
 		${myconf} || die
 
-	# emake might not work, so fall back to make
-	emake || make || die
+	#needs to be able to connect to X display to build.
+	Xemake || Xmake || die
 }
 
 src_install() {
diff --git a/net-mail/evolution/evolution-1.0.3.ebuild b/net-mail/evolution/evolution-1.0.3.ebuild
deleted file mode 100644
index d38206286bfb..000000000000
--- a/net-mail/evolution/evolution-1.0.3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Mikael Hallendal <hallski@gentoo.org>, Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-mail/evolution/evolution-1.0.3.ebuild,v 1.2 2002/03/30 00:23:40 blocke Exp $
-
-DB3=db-3.1.17
-S=${WORKDIR}/${P}
-DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
-SRC_URI="
-	 ftp://ftp.ximian.com/pub/source/${PN}/${P}.tar.gz
-	 http://people.codefactory.se/~micke/${PN}/${P}.tar.gz
-	 http://www.sleepycat.com/update/3.1.17/${DB3}.tar.gz"
-HOMEPAGE="http://www.ximian.com"
-
-RDEPEND=">=gnome-extra/bonobo-conf-0.14
-	>=gnome-base/bonobo-1.0.18
-	>=gnome-extra/gal-0.19
-	>=gnome-base/gconf-1.0.7
-	>=gnome-extra/gtkhtml-1.0.1
-	>=gnome-base/oaf-0.6.7
-	>=gnome-base/ORBit-0.5.12
-	>=gnome-base/libglade-0.17-r1
-	>=media-libs/gdk-pixbuf-0.14.0
-	>=dev-libs/libxml-1.8.16
-	>=gnome-base/gnome-vfs-1.0.2-r1
-	>=gnome-base/gnome-print-0.34
-	>=app-text/scrollkeeper-0.2
-	ssl?	( >=net-www/mozilla-0.9.9 )
-	ldap?	( >=net-nds/openldap-2.0 )
-	mozilla?	( >=net-www/mozilla-0.9.9 )
-	pda?	( >=gnome-extra/gnome-pilot-0.1.61-r2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.11
-	>=sys-devel/libtool-1.4.1-r1
-	sys-devel/gettext
-	perl?   ( dev-util/gtk-doc )"  
-
-src_unpack() {
-	unpack ${A}
-	
-	cd ${S}
-	# fix KDE detection
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-kde.patch
-	# call pilot conduit applet (not pilot link applet)
-	patch -d ${S} -p1 < ${FILESDIR}/evolution-1.0.2-conduit.patch
-}
-
-src_compile() {
-
-	libtoolize --copy --force
-
-	cd ${WORKDIR}/${DB3}/build_unix
-	../dist/configure --prefix=${WORKDIR}/db3 || die
-	make || die # make -j 4 doesn't work, use make
-	make prefix=${WORKDIR}/db3 install || die
-
-	cd ${S}
-  
-	local myconf=""
-
-	MOZILLA=$MOZILLA_FIVE_HOME
-
-	if [ "`use pda`" ] ; then
-		myconf="${myconf} --with-pisock=/usr --enable-pilot-conduits=yes"
-	else
-		myconf="${myconf} --enable-pilot-conduits=no"
-	fi
-
-	if [ "`use ldap`" ] ; then
-		myconf="${myconf} --with-openldap=yes"
-	else
-		myconf="${myconf} --with-openldap=no"
-	fi
-
-	if [ "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-			        --with-nspr-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nspr-libs --without-nspr-includes"
-	fi
-
-	if [ "`use ssl`" ] ; then
-		myconf="${myconf} --with-nss-includes=${MOZILLA}/include/nss   \
-				--with-nss-libs=${MOZILLA}"
-	else
-		myconf="${myconf} --without-nss-libs --without-nss-includes"
-	fi
-
-	# SSL needs NSPR libs  ...
-	if [ "`use ssl`" ] && [ -z "`use mozilla`" ] ; then
-		myconf="${myconf} --with-nspr-includes=${MOZILLA}/include/nspr \
-				--with-nspr-libs=${MOZILLA}"
-	fi
-
-	use perl && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --disable-gtk-doc"
-
-	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 \
-			--enable-file-locking=no \
-			--with-db3=${WORKDIR}/db3 \
-			--disable-python-bindings \
-			${myconf} || die
-
-	# emake might not work, so fall back to make
-	emake || make || die
-}
-
-src_install() {
-        cd omf-install
-        cp Makefile Makefile.old
-        sed -e "s:scrollkeeper-update.*::g" Makefile.old > Makefile
-        rm Makefile.old
-        cd ${S}
-
-	# Don't use DESTDIR it violates sandbox // Hallski
-	make 	prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		datadir=${D}/usr/share \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		KDE_APPLNK_DIR=${D}/usr/share/applnk \
-		install || die
-
-	dodoc AUTHORS COPYING* ChangeLog HACKING INSTALL MAINTAINERS
-	dodoc NEWS README
-}
-
-pkg_postinst() {
-        echo ">>> Updating Scrollkeeper database..."
-        scrollkeeper-update >/dev/null 2>&1
-}
-
-pkg_postrm() {
-        echo ">>> Updating Scrollkeeper database..."
-        scrollkeeper-update >/dev/null 2>&1
-}
diff --git a/net-mail/evolution/files/digest-evolution-1.0.2 b/net-mail/evolution/files/digest-evolution-1.0.2
deleted file mode 100644
index b8f8e50540a2..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.0.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 05ca33abfabeaa14b8fd61c682fddad3 evolution-1.0.2.tar.gz 12118839
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.0.2.20020320 b/net-mail/evolution/files/digest-evolution-1.0.2.20020320
deleted file mode 100644
index 3470c4f3a280..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.0.2.20020320
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 81f6b80d2cbf7799b3014122fa95c7cd evolution-1.0.2.20020320.tar.gz 11163418
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
diff --git a/net-mail/evolution/files/digest-evolution-1.0.3 b/net-mail/evolution/files/digest-evolution-1.0.3
deleted file mode 100644
index 13fa8fa12831..000000000000
--- a/net-mail/evolution/files/digest-evolution-1.0.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5baeb94fb934d0bf783ea42117c400be db-3.1.17.tar.gz 1954117
-MD5 28ffb3911f46a591466a78f5c805c0aa evolution-1.0.3.tar.gz 12908768
diff --git a/net-mail/evolution/files/digest-evolution-1.0.3-r1 b/net-mail/evolution/files/digest-evolution-1.0.3-r3
index c04a2f7454ba..c04a2f7454ba 100644
--- a/net-mail/evolution/files/digest-evolution-1.0.3-r1
+++ b/net-mail/evolution/files/digest-evolution-1.0.3-r3