Version bump.

(Portage version: 2.1.2-r4)

4 files changed, 501 insertions, 1 deletions

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index 4ffd973cadcb..6e35762f47bc 100644
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/swi-prolog
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.57 2007/01/02 05:54:00 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.58 2007/01/26 20:36:35 keri Exp $
+
+*swi-prolog-5.6.27 (26 Jan 2007)
+
+  26 Jan 2007; keri <keri@gentoo.org> +files/swi-prolog-CFLAGS-r4.patch,
+  +swi-prolog-5.6.27.ebuild:
+  Version bump.
 
   02 Jan 2007; keri <keri@gentoo.org>
   +files/swi-prolog-semweb-bitmatrix.patch, swi-prolog-5.6.25.ebuild:
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.27 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.27
new file mode 100644
index 000000000000..b2cdf6681b5b
--- /dev/null
+++ b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.27
@@ -0,0 +1,3 @@
+MD5 af5e4797d3e3b8b1c086793d07b284fc pl-5.6.27.tar.gz 11661684
+RMD160 e180ad228946b36b2aaba561be25ba294da473af pl-5.6.27.tar.gz 11661684
+SHA256 cef264b0d022ca5c5f07547e5f11f1930cb9761fed7568b2a450978b3128d9a5 pl-5.6.27.tar.gz 11661684
diff --git a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r4.patch b/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r4.patch
new file mode 100644
index 000000000000..30ef88593a31
--- /dev/null
+++ b/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r4.patch
@@ -0,0 +1,354 @@
+diff -ur pl-5.6.27.orig/packages/clib/configure pl-5.6.27/packages/clib/configure
+--- pl-5.6.27.orig/packages/clib/configure	2007-01-24 08:25:14.000000000 +1300
++++ pl-5.6.27/packages/clib/configure	2007-01-27 08:40:04.000000000 +1300
+@@ -3117,7 +3117,7 @@
+ 
+ fi
+ 
+-CFLAGS="$CMFLAGS"
++#CFLAGS="$CMFLAGS"
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo "$as_me:$LINENO: checking for working alloca.h" >&5
+@@ -3709,7 +3709,7 @@
+ 
+ 
+ if test ! -z "$GCC"; then
+-    COFLAGS="-O2 -fno-strict-aliasing"
++    COFLAGS="$CFLAGS -fno-strict-aliasing"
+     CWFLAGS=${CWFLAGS--Wall}
+ else
+     COFLAGS=-O
+diff -ur pl-5.6.27.orig/packages/clib/maildrop/rfc2045/configure pl-5.6.27/packages/clib/maildrop/rfc2045/configure
+--- pl-5.6.27.orig/packages/clib/maildrop/rfc2045/configure	2005-07-25 02:37:57.000000000 +1200
++++ pl-5.6.27/packages/clib/maildrop/rfc2045/configure	2007-01-27 08:41:14.000000000 +1300
+@@ -3155,7 +3155,7 @@
+ 
+ if test "$GCC" = yes ; then
+         CXXFLAGS="$CXXFLAGS -Wall"
+-        CFLAGS="$CFLAGS -Wall"
++        CFLAGS="$CFLAGS -fpic -Wall"
+ fi
+ 
+ 
+diff -ur pl-5.6.27.orig/packages/clib/maildrop/rfc822/configure pl-5.6.27/packages/clib/maildrop/rfc822/configure
+--- pl-5.6.27.orig/packages/clib/maildrop/rfc822/configure	2005-07-25 02:37:57.000000000 +1200
++++ pl-5.6.27/packages/clib/maildrop/rfc822/configure	2007-01-27 08:41:59.000000000 +1300
+@@ -3144,7 +3144,7 @@
+ 
+ if test "$GCC" = yes ; then
+         CXXFLAGS="$CXXFLAGS -Wall"
+-        CFLAGS="$CFLAGS -Wall"
++        CFLAGS="$CFLAGS -fpic -Wall"
+ fi
+ 
+ 
+diff -ur pl-5.6.27.orig/packages/cppproxy/configure pl-5.6.27/packages/cppproxy/configure
+--- pl-5.6.27.orig/packages/cppproxy/configure	2007-01-24 08:25:14.000000000 +1300
++++ pl-5.6.27/packages/cppproxy/configure	2007-01-27 08:43:26.000000000 +1300
+@@ -3111,7 +3111,7 @@
+ 
+ fi
+ 
+-CFLAGS="$CMFLAGS"
++#CFLAGS="$CMFLAGS"
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo "$as_me:$LINENO: checking for working alloca.h" >&5
+@@ -3703,7 +3703,7 @@
+ 
+ 
+ if test ! -z "$GCC"; then
+-    COFLAGS="-O2 -fno-strict-aliasing"
++    COFLAGS="$CFLAGS -fno-strict-aliasing"
+     CWFLAGS=${CWFLAGS--Wall}
+ else
+     COFLAGS=-O
+diff -ur pl-5.6.27.orig/packages/db/configure pl-5.6.27/packages/db/configure
+--- pl-5.6.27.orig/packages/db/configure	2007-01-24 08:25:14.000000000 +1300
++++ pl-5.6.27/packages/db/configure	2007-01-27 08:47:59.000000000 +1300
+@@ -3140,13 +3140,13 @@
+ 
+ 
+ if test ! -z "$GCC"; then
+-    COFLAGS="-O2 -fno-strict-aliasing"
++    COFLAGS="$CFLAGS -fno-strict-aliasing"
+     CWFLAGS=${CWFLAGS--Wall}
+ else
+     COFLAGS=-O
+ fi
+ 
+-CFLAGS="$CMFLAGS $CIFLAGS"
++#CFLAGS="$CMFLAGS $CIFLAGS"
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo "$as_me:$LINENO: checking for working alloca.h" >&5
+diff -ur pl-5.6.27.orig/packages/jpl/configure pl-5.6.27/packages/jpl/configure
+--- pl-5.6.27.orig/packages/jpl/configure	2006-12-22 02:41:37.000000000 +1300
++++ pl-5.6.27/packages/jpl/configure	2007-01-27 08:47:00.000000000 +1300
+@@ -3115,11 +3115,11 @@
+ 
+ fi
+ 
+-CFLAGS="$CMFLAGS"
++#CFLAGS="$CMFLAGS"
+ 
+ 
+ if test ! -z "$GCC"; then
+-    COFLAGS="-O2 -cc-options,-fno-strict-aliasing"
++    COFLAGS="$CFLAGS -cc-options,-fno-strict-aliasing"
+     CWFLAGS="-Wall"
+ else
+     COFLAGS=-O
+diff -ur pl-5.6.27.orig/packages/ltx2htm/configure pl-5.6.27/packages/ltx2htm/configure
+--- pl-5.6.27.orig/packages/ltx2htm/configure	2007-01-24 08:25:14.000000000 +1300
++++ pl-5.6.27/packages/ltx2htm/configure	2007-01-27 08:49:50.000000000 +1300
+@@ -1384,6 +1384,7 @@
+ CC=$PLLD
+ LD=$PLLD
+ LDSOFLAGS=-shared
++CMFLAGS=-fpic
+ 
+ SO="$PLSOEXT"
+ 
+@@ -3048,7 +3049,7 @@
+ 
+ fi
+ 
+-CFLAGS="$CMFLAGS"
++#CFLAGS="$CMFLAGS"
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo "$as_me:$LINENO: checking for working alloca.h" >&5
+@@ -3640,7 +3641,7 @@
+ 
+ 
+ if test ! -z "$GCC"; then
+-    COFLAGS="-O2 -fno-strict-aliasing"
++    COFLAGS="$CFLAGS -fno-strict-aliasing"
+     CWFLAGS=${CWFLAGS--Wall}
+ else
+     COFLAGS=-O
+diff -ur pl-5.6.27.orig/packages/nlp/configure pl-5.6.27/packages/nlp/configure
+--- pl-5.6.27.orig/packages/nlp/configure	2007-01-24 08:25:14.000000000 +1300
++++ pl-5.6.27/packages/nlp/configure	2007-01-27 08:50:53.000000000 +1300
+@@ -3111,7 +3111,7 @@
+ 
+ fi
+ 
+-CFLAGS="$CMFLAGS"
++#CFLAGS="$CMFLAGS"
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo "$as_me:$LINENO: checking for working alloca.h" >&5
+@@ -3703,7 +3703,7 @@
+ 
+ 
+ if test ! -z "$GCC"; then
+-    COFLAGS="-O2 -fno-strict-aliasing"
++    COFLAGS="$CFLAGS -fno-strict-aliasing"
+     CWFLAGS=${CWFLAGS--Wall}
+ else
+     COFLAGS=-O
+diff -ur pl-5.6.27.orig/packages/odbc/configure pl-5.6.27/packages/odbc/configure
+--- pl-5.6.27.orig/packages/odbc/configure	2007-01-24 08:25:14.000000000 +1300
++++ pl-5.6.27/packages/odbc/configure	2007-01-27 08:52:04.000000000 +1300
+@@ -3147,7 +3147,7 @@
+ 
+ fi
+ 
+-CFLAGS="$CMFLAGS"
++#CFLAGS="$CMFLAGS"
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo "$as_me:$LINENO: checking for working alloca.h" >&5
+@@ -3739,7 +3739,7 @@
+ 
+ 
+ if test ! -z "$GCC"; then
+-    COFLAGS="-O2 -fno-strict-aliasing"
++    COFLAGS="$CFLAGS -fno-strict-aliasing"
+     CWFLAGS=${CWFLAGS--Wall}
+ else
+     COFLAGS=-O
+diff -ur pl-5.6.27.orig/packages/semweb/configure pl-5.6.27/packages/semweb/configure
+--- pl-5.6.27.orig/packages/semweb/configure	2007-01-24 08:25:14.000000000 +1300
++++ pl-5.6.27/packages/semweb/configure	2007-01-27 08:52:41.000000000 +1300
+@@ -3145,7 +3145,7 @@
+ 
+ fi
+ 
+-CFLAGS="$CMFLAGS"
++#CFLAGS="$CMFLAGS"
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo "$as_me:$LINENO: checking for working alloca.h" >&5
+@@ -4294,7 +4294,7 @@
+ 
+ 
+ if test ! -z "$GCC"; then
+-    COFLAGS="-O3 -fno-strict-aliasing"
++    COFLAGS="$CFLAGS -fno-strict-aliasing"
+     CWFLAGS=${CWFLAGS--Wall}
+ else
+     COFLAGS=-O
+diff -ur pl-5.6.27.orig/packages/sgml/configure pl-5.6.27/packages/sgml/configure
+--- pl-5.6.27.orig/packages/sgml/configure	2007-01-25 03:17:48.000000000 +1300
++++ pl-5.6.27/packages/sgml/configure	2007-01-27 08:53:34.000000000 +1300
+@@ -2394,7 +2394,7 @@
+ SO="$PLSOEXT"
+ 
+ if test ! -z "$GCC"; then
+-    COFLAGS="-O2 -fno-strict-aliasing"
++    COFLAGS="$CFLAGS -fno-strict-aliasing"
+     CWFLAGS=${CWFLAGS--Wall}
+ else
+     COFLAGS=-O
+@@ -3190,7 +3190,7 @@
+ 
+ fi
+ 
+-CFLAGS="$CMFLAGS"
++#CFLAGS="$CMFLAGS"
+ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+ echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
+ if test "${ac_cv_c_bigendian+set}" = set; then
+diff -ur pl-5.6.27.orig/packages/ssl/configure pl-5.6.27/packages/ssl/configure
+--- pl-5.6.27.orig/packages/ssl/configure	2007-01-24 08:25:14.000000000 +1300
++++ pl-5.6.27/packages/ssl/configure	2007-01-27 08:54:24.000000000 +1300
+@@ -3110,7 +3110,7 @@
+ 
+ fi
+ 
+-CFLAGS="$CMFLAGS"
++#CFLAGS="$CMFLAGS"
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo "$as_me:$LINENO: checking for working alloca.h" >&5
+@@ -3702,7 +3702,7 @@
+ 
+ 
+ if test ! -z "$GCC"; then
+-    COFLAGS="-O2 -fno-strict-aliasing"
++    COFLAGS="$CFLAGS -fno-strict-aliasing"
+     CWFLAGS=${CWFLAGS--Wall}
+ else
+     COFLAGS=-O
+diff -ur pl-5.6.27.orig/packages/table/configure pl-5.6.27/packages/table/configure
+--- pl-5.6.27.orig/packages/table/configure	2007-01-24 08:25:14.000000000 +1300
++++ pl-5.6.27/packages/table/configure	2007-01-27 08:55:05.000000000 +1300
+@@ -3112,7 +3112,7 @@
+ 
+ fi
+ 
+-CFLAGS="$CMFLAGS"
++#CFLAGS="$CMFLAGS"
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo "$as_me:$LINENO: checking for working alloca.h" >&5
+@@ -3704,7 +3704,7 @@
+ 
+ 
+ if test ! -z "$GCC"; then
+-    COFLAGS="-O2 -fno-strict-aliasing"
++    COFLAGS="$CFLAGS -fno-strict-aliasing"
+     CWFLAGS=${CWFLAGS--Wall}
+ else
+     COFLAGS=-O
+diff -ur pl-5.6.27.orig/packages/xpce/src/configure pl-5.6.27/packages/xpce/src/configure
+--- pl-5.6.27.orig/packages/xpce/src/configure	2007-01-24 08:25:14.000000000 +1300
++++ pl-5.6.27/packages/xpce/src/configure	2007-01-27 08:56:24.000000000 +1300
+@@ -6522,13 +6522,13 @@
+ 
+ 
+ if test ! -z "$GCC"; then
+-    COFLAGS="-O2 -fno-strict-aliasing"
++    COFLAGS="$CFLAGS -fno-strict-aliasing"
+     CWFLAGS=${CWFLAGS--Wall}
+ else
+     COFLAGS=-O
+ fi
+ 
+-CFLAGS="$CMFLAGS"
++#CFLAGS="$CMFLAGS"
+ echo "$as_me:$LINENO: checking for inline" >&5
+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
+ if test "${ac_cv_c_inline+set}" = set; then
+diff -ur pl-5.6.27.orig/packages/zlib/configure pl-5.6.27/packages/zlib/configure
+--- pl-5.6.27.orig/packages/zlib/configure	2007-01-24 08:25:14.000000000 +1300
++++ pl-5.6.27/packages/zlib/configure	2007-01-27 08:57:11.000000000 +1300
+@@ -3109,7 +3109,7 @@
+ 
+ fi
+ 
+-CFLAGS="$CMFLAGS"
++#CFLAGS="$CMFLAGS"
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+ echo "$as_me:$LINENO: checking for working alloca.h" >&5
+@@ -3701,7 +3701,7 @@
+ 
+ 
+ if test ! -z "$GCC"; then
+-    COFLAGS="-O2 -fno-strict-aliasing"
++    COFLAGS="$CFLAGS -fno-strict-aliasing"
+     CWFLAGS=${CWFLAGS--Wall}
+ else
+     COFLAGS=-O
+diff -ur pl-5.6.27.orig/src/Makefile.in pl-5.6.27/src/Makefile.in
+--- pl-5.6.27.orig/src/Makefile.in	2007-01-09 02:02:08.000000000 +1300
++++ pl-5.6.27/src/Makefile.in	2007-01-27 09:03:18.000000000 +1300
+@@ -69,7 +69,7 @@
+ CWFLAGS=@CWFLAGS@
+ CIFLAGS=@CIFLAGS@
+ CMFLAGS=@CMFLAGS@
+-CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
++CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CMFLAGS)
+ LDFLAGS=@LDFLAGS@
+ 
+ PLFOREIGN=@PLFOREIGN@
+diff -ur pl-5.6.27.orig/src/configure pl-5.6.27/src/configure
+--- pl-5.6.27.orig/src/configure	2007-01-24 22:30:36.000000000 +1300
++++ pl-5.6.27/src/configure	2007-01-27 09:03:03.000000000 +1300
+@@ -3809,7 +3809,7 @@
+ 		esac
+ 	fi
+ else
+-	COFLAGS=$CFLAGS
++	COFLAGS="$CFLAGS -fno-strict-aliasing"
+ fi
+ 
+ 
+@@ -15607,7 +15607,7 @@
+   LNLIBS="$LIBS"
+ fi
+ 
+-echo "	CFLAGS=$CWFLAGS $COFLAGS $CIFLAGS $CMFLAGS"
++echo "	CFLAGS=$CWFLAGS $COFLAGS $CMFLAGS"
+ echo "	LDFLAGS=$LDFLAGS"
+ echo "	LIBS=$LIBS"
+ 
+diff -ur pl-5.6.27.orig/src/libtai/Makefile.in pl-5.6.27/src/libtai/Makefile.in
+--- pl-5.6.27.orig/src/libtai/Makefile.in	2006-07-11 20:41:05.000000000 +1200
++++ pl-5.6.27/src/libtai/Makefile.in	2007-01-27 09:03:46.000000000 +1300
+@@ -29,7 +29,7 @@
+ CIFLAGS=@CIFLAGS@
+ CMFLAGS=@CMFLAGS@
+ LDFLAGS=@LDFLAGS@
+-CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
++CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CMFLAGS)
+ 
+ INSTALL=@INSTALL@
+ INSTALL_PROGRAM=@INSTALL_PROGRAM@
+diff -ur pl-5.6.27.orig/src/rc/Makefile.in pl-5.6.27/src/rc/Makefile.in
+--- pl-5.6.27.orig/src/rc/Makefile.in	2006-07-11 20:22:28.000000000 +1200
++++ pl-5.6.27/src/rc/Makefile.in	2007-01-27 09:04:03.000000000 +1300
+@@ -30,7 +30,7 @@
+ CIFLAGS=@CIFLAGS@
+ CMFLAGS=@CMFLAGS@
+ LDFLAGS=@LDFLAGS@
+-CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
++CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CMFLAGS)
+ 
+ INSTALL=@INSTALL@
+ INSTALL_PROGRAM=@INSTALL_PROGRAM@
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild
new file mode 100644
index 000000000000..becdc087d069
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.27.ebuild,v 1.1 2007/01/26 20:36:35 keri Exp $
+
+inherit eutils
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="berkdb doc gmp java minimal odbc readline ssl static tetex threads zlib X"
+
+DEPEND="!dev-lang/swi-prolog-lite
+	sys-libs/ncurses
+	zlib? ( sys-libs/zlib )
+	odbc? ( dev-db/unixODBC )
+	berkdb? ( sys-libs/db )
+	readline? ( sys-libs/readline )
+	gmp? ( dev-libs/gmp )
+	ssl? ( dev-libs/openssl )
+	java? ( >=virtual/jdk-1.4
+		dev-java/junit )
+	X? (
+		media-libs/jpeg
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-proto/xproto )"
+
+S="${WORKDIR}/pl-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i -e "s/man boot library/boot library/" src/Makefile.in
+	epatch "${FILESDIR}"/${PN}-portage-r1.patch
+	epatch "${FILESDIR}"/${PN}-CFLAGS-r4.patch
+	epatch "${FILESDIR}"/${PN}-PLBASE-r2.patch
+	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
+	epatch "${FILESDIR}"/${PN}-jpl-PLARCH.patch
+	epatch "${FILESDIR}"/${PN}-jpl-LDPATH-r2.patch
+	epatch "${FILESDIR}"/${PN}-jpl-junit.patch
+	epatch "${FILESDIR}"/${PN}-jpl-check_java.patch
+	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
+	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
+	epatch "${FILESDIR}"/${PN}-thread-tests.patch
+	epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
+	epatch "${FILESDIR}"/${PN}-xpce-test-r1.patch
+}
+
+src_compile() {
+	einfo "Building SWI-Prolog compiler"
+
+	local threadconf
+	if use java && ! use minimal || use threads ; then
+		threadconf="--enable-mt"
+	else
+		threadconf="--disable-mt"
+	fi
+
+	cd "${S}"/src
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		${threadconf} \
+		$(use_enable gmp) \
+		$(use_enable readline) \
+		$(use_enable !static shared) \
+		--disable-custom-flags \
+		|| die "econf failed"
+	emake || die "emake failed"
+
+	if ! use minimal ; then
+		einfo "Building SWI-Prolog additional packages"
+
+		cd "${S}/packages"
+		econf \
+			--libdir=/usr/$(get_libdir) \
+			${threadconf} \
+			$(use_enable !static shared) \
+			--without-C-sicstus \
+			--with-chr \
+			--with-clib \
+			--with-clpqr \
+			--with-cpp \
+			--with-cppproxy \
+			$(use_with berkdb db) \
+			--with-http \
+			--without-jasmine \
+			$(use_with java jpl) \
+			$(use_with tetex ltx2htm) \
+			--with-nlp \
+			$(use_with odbc) \
+			--with-pldoc \
+			--with-plunit \
+			--with-semweb \
+			--with-sgml \
+			--with-sgml/RDF \
+			$(use_with ssl) \
+			--with-table \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			|| die "packages econf failed"
+
+		emake || die "packages emake failed"
+	fi
+}
+
+src_install() {
+	make -C src DESTDIR="${D}" install || die "install src failed"
+
+	if ! use minimal ; then
+		make -C packages DESTDIR="${D}" install || die "install packages failed"
+		if use doc ; then
+			make -C packages DESTDIR="${D}" html-install || die "html-install failed"
+			make -C packages/cppproxy DESTDIR="${D}" install-examples || die "install-examples failed"
+		fi
+	fi
+
+	dodoc ANNOUNCE ChangeLog INSTALL INSTALL.notes PORTING README README.GUI VERSION
+}
+
+src_test() {
+	cd "${S}/src"
+	make check || die "make check failed. See above for details."
+
+	if ! use minimal ; then
+		cd "${S}/packages"
+		make check || die "make check failed. See above for details."
+	fi
+}