Respect LDFLAGS; Use correct multilibdir

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 216 insertions, 2 deletions

diff --git a/dev-lang/xsb/ChangeLog b/dev-lang/xsb/ChangeLog
index 59abf2947b32..0698cabe0ceb 100644
--- a/dev-lang/xsb/ChangeLog
+++ b/dev-lang/xsb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/xsb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.22 2010/07/16 19:25:49 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.23 2010/08/21 07:29:23 keri Exp $
+
+*xsb-3.2-r1 (21 Aug 2010)
+
+  21 Aug 2010; <keri@gentoo.org> +xsb-3.2-r1.ebuild:
+  Respect LDFLAGS; Use correct multilibdir
 
   16 Jul 2010; <keri@gentoo.org> Manifest:
   Regenerate manifest for patchset-2. Closes #328577
diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest
index 26305cca6e0c..344b4f52a6d8 100644
--- a/dev-lang/xsb/Manifest
+++ b/dev-lang/xsb/Manifest
@@ -20,8 +20,10 @@ DIST XSB.tar.gz 10808490 RMD160 66b4e79f9b47cd5db9f3f8b718929181f7f6c401 SHA1 35
 DIST xsb-3.0.1-src.tar.gz 4523327 RMD160 6f71401ad3cc9031ec0ced16df7d9dfd594b3fb2 SHA1 8cbef419913731617ec8811dd69799406119b9ff SHA256 05e2a76befe6303ff624c8a22543444604a75815eae276e065e462a1d21ae801
 DIST xsb-3.1-gentoo-patchset-0.tar.gz 21394 RMD160 6a58fe5c11fce6620e6e453962c786d9e0b720d5 SHA1 df45cabc3deb6e27b4c4558109a5a9dc74d6e232 SHA256 a9435b13478e88763d659e75ce96f7ccebbcfe72fc78abcbe13bf2d2d9c92cf0
 DIST xsb-3.2-gentoo-patchset-2.tar.gz 21049 RMD160 56598ffe7d4f3ec75e50972ba6545ba572bcc480 SHA1 a533b346ecb0d68e1a433016dbd469b964f308ed SHA256 5e7ba187da25da81b4d1412ae9682c6094086cc7f068288b8c8edb06d0fc2a59
+DIST xsb-3.2-gentoo-patchset-3.tar.gz 21365 RMD160 507e70f906645fe4df0941a1549dde774cbebacf SHA1 06bddf984fcc5b7e60c6db97acc46609dec088d7 SHA256 92e5e3e5bd930021501909474530d1336e0c5f5f830e84f773fcf3a8cd85021a
 EBUILD xsb-3.0.1.ebuild 4622 RMD160 db8406a82cbbb5368d177a077df18e51cb7f56b2 SHA1 dc41686c5b1b53b9b9c96878ddcc3a9148a8411c SHA256 5c571e7b92811901c05a4dcffce94496116b40eeab68403299edf463a8cba695
 EBUILD xsb-3.1.ebuild 4136 RMD160 f6fdda4ded403f234f1a6338dbfaec43f664e938 SHA1 ba3c85a1a57b3afc301ff0b690e76f9909c699e8 SHA256 e794a19724b24a699f21174d970a62de1d2bb1921c26aab145892c06a6dddc3c
+EBUILD xsb-3.2-r1.ebuild 4518 RMD160 dd07ba5fd9d2bbe689d3cc2a09a2bc6ec1211323 SHA1 f19eebe50ef9fa210703332858b5b8c29ba92c36 SHA256 b4293a75c78b32b9598a38a5fddc8ceb2083a24266e24508b1991eb54fcbe7cb
 EBUILD xsb-3.2.ebuild 4483 RMD160 6d54d9e894d9a3becc177b91e999d4f02c9b4a70 SHA1 4334e7c250e1d044785c7194987f0ca1de74bac3 SHA256 3018ccc45a6e5bef5393724b42946046841ceafbfb1b7b70a5b2baa9b9a508a1
-MISC ChangeLog 4109 RMD160 7b57856a9c4e479e78cb75a385bb6e570a58ddf7 SHA1 20ba717d6abd17c4bc08aefe2a7daef07013a101 SHA256 10253e0376d6594be501ab2c97bb2327eebd6be3319aa3b9250a8343ff5c6401
+MISC ChangeLog 4233 RMD160 c458dd14400ccb2458b65fb8617e85e9ddcf3eb8 SHA1 7d49af29ab68a3c4171aac5b5e3dfa045b55fe63 SHA256 80bb56b26db4251c13d57b7b1759d3fcc2ac6dc0e2fb6f552bb67c7a6eacbaba
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/xsb/xsb-3.2-r1.ebuild b/dev-lang/xsb/xsb-3.2-r1.ebuild
new file mode 100644
index 000000000000..e05f88471e9b
--- /dev/null
+++ b/dev-lang/xsb/xsb-3.2-r1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/xsb-3.2-r1.ebuild,v 1.1 2010/08/21 07:29:23 keri Exp $
+
+MY_P="XSB"
+
+PATCHSET_VER="3"
+
+inherit eutils autotools java-pkg-opt-2
+
+DESCRIPTION="XSB is a logic programming and deductive database system"
+HOMEPAGE="http://xsb.sourceforge.net"
+SRC_URI="http://xsb.sourceforge.net/downloads/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug examples iodbc java libwww mysql odbc perl threads xml"
+
+RDEPEND="iodbc? ( dev-db/libiodbc )
+	java? ( >=virtual/jdk-1.4 )
+	libwww? ( net-libs/libwww )
+	mysql? ( virtual/mysql )
+	odbc? ( dev-db/unixODBC )
+	perl? ( dev-lang/perl )
+	xml? ( dev-libs/libxml2 )"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
+
+	cd "${S}"/build
+	eautoconf
+}
+
+src_compile() {
+	cd "${S}"/build
+
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--disable-optimization \
+		--without-smodels \
+		--with-config-tag="" \
+		$(use_with java interprolog) \
+		$(use_with odbc) \
+		$(use_with iodbc) \
+		$(use_enable threads mt) \
+		$(use_enable debug) \
+		$(use_enable debug debug-verbose) \
+		$(use_enable debug profile) \
+		|| die "econf failed"
+	emake || die "emake failed"
+
+	if use libwww ; then
+		cd "${S}"/packages/libwww
+		econf --with-libwww=/usr || die "econf libwww package failed"
+	fi
+
+	if use mysql ; then
+		cd "${S}"/packages/dbdrivers/mysql
+		econf || die "econf mysql package failed"
+	fi
+
+	if use odbc ; then
+		cd "${S}"/packages/dbdrivers/odbc
+		econf || die "econf odbc package failed"
+	fi
+
+	if use xml ; then
+		cd "${S}"/packages/xpath
+		econf || die "econf xpath package failed"
+	fi
+
+	# All XSB Packages are compiled using a single Prolog engine.
+	# Consequently they must all be compiled using a single make job.
+
+	cd "${S}"/packages
+	rm -rf *.xwam
+	emake -j1 || die "emake packages failed"
+
+	if use libwww ; then
+		emake -j1 libwww || die "emake libwww package failed"
+	fi
+
+	if use mysql ; then
+		emake -j1 mysql || die "emake mysql package failed"
+	fi
+
+	if use odbc ; then
+		emake -j1 odbc || die "emake odbc package failed"
+	fi
+
+	if use perl ; then
+		emake -j1 perlmatch || die "emake perlmatch package failed"
+	fi
+
+	if use xml ; then
+		emake -j1 xpath || die "emake xpath package failed"
+	fi
+}
+
+src_install() {
+	cd "${S}"/build
+	make DESTDIR="${D}" install || die "make install failed"
+
+	local XSB_INSTALL_DIR=/usr/$(get_libdir)/xsb-${PV}
+	dosym ${XSB_INSTALL_DIR}/bin/xsb /usr/bin/xsb
+
+	cd "${S}"/packages
+	local PACKAGES=${XSB_INSTALL_DIR}/packages
+	insinto ${PACKAGES}
+	doins *.xwam
+
+	insinto ${PACKAGES}/chr
+	doins chr/*.xwam
+
+	insinto ${PACKAGES}/chr_d
+	doins chr_d/*.xwam
+
+	insinto ${PACKAGES}/gap
+	doins gap/*.xwam
+
+	insinto ${PACKAGES}/justify
+	doins justify/*.xwam
+	doins justify/*.H
+
+	insinto ${PACKAGES}/regmatch
+	doins regmatch/*.xwam
+	insinto ${PACKAGES}/regmatch/cc
+	doins regmatch/cc/*.H
+
+	insinto ${PACKAGES}/sgml
+	doins sgml/*.xwam
+	insinto ${PACKAGES}/sgml/cc
+	doins sgml/cc/*.H
+	insinto ${PACKAGES}/sgml/cc/dtd
+	doins sgml/cc/dtd/*
+
+	insinto ${PACKAGES}/slx
+	doins slx/*.xwam
+
+	insinto ${PACKAGES}/wildmatch
+	doins wildmatch/*.xwam
+	insinto ${PACKAGES}/wildmatch/cc
+	doins wildmatch/cc/*.H
+
+	if use libwww ; then
+		insinto ${PACKAGES}/libwww
+		doins libwww/*.xwam
+		insinto ${PACKAGES}/libwww/cc
+		doins libwww/cc/*.H
+	fi
+
+	if use mysql || use odbc ; then
+		insinto ${PACKAGES}/dbdrivers
+		doins dbdrivers/*.xwam
+		doins dbdrivers/*.H
+		insinto ${PACKAGES}/dbdrivers/cc
+		doins dbdrivers/cc/*.H
+		if use mysql ; then
+			insinto ${PACKAGES}/dbdrivers/mysql
+			doins dbdrivers/mysql/*.xwam
+			insinto ${PACKAGES}/dbdrivers/mysql/cc
+			doins dbdrivers/mysql/cc/*.H
+		fi
+		if use odbc ; then
+			insinto ${PACKAGES}/dbdrivers/odbc
+			doins dbdrivers/odbc/*.xwam
+			insinto ${PACKAGES}/dbdrivers/odbc/cc
+			doins dbdrivers/odbc/cc/*.H
+		fi
+	fi
+
+	if use perl ; then
+		insinto ${PACKAGES}/perlmatch
+		doins perlmatch/*.xwam
+		insinto ${PACKAGES}/perlmatch/cc
+		doins perlmatch/cc/*.H
+	fi
+
+	if use xml ; then
+		insinto ${PACKAGES}/xpath
+		doins xpath/*xwam
+		insinto ${PACKAGES}/xpath/cc
+		doins xpath/cc/*.H
+	fi
+
+	if use examples ; then
+		cd "${S}"/build
+		make \
+			DESTDIR="${D}" \
+			install_examples="${D}"/usr/share/doc/${PF}/examples \
+			install_examples || die "make install_examples failed"
+	fi
+
+	cd "${S}"
+	dodoc FAQ README
+}