Specify correct include-path in swipl.pc. Closes #380661

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

4 files changed, 266 insertions, 5 deletions

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index b9077c21bb36..54c92b2f7b86 100644
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/swi-prolog
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.292 2011/08/21 00:58:39 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.293 2011/08/26 20:08:40 keri Exp $
+
+*swi-prolog-5.11.26-r1 (26 Aug 2011)
+*swi-prolog-5.10.5-r1 (26 Aug 2011)
+
+  26 Aug 2011; <keri@gentoo.org> +swi-prolog-5.10.5-r1.ebuild,
+  +swi-prolog-5.11.26-r1.ebuild:
+  Specify correct include-path in swipl.pc. Closes #380661
 
 *swi-prolog-5.10.5 (21 Aug 2011)
 
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 7c0b79e32693..aff402e7281b 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -8,20 +8,24 @@ DIST pl-5.11.25.tar.gz 13415609 RMD160 24eae70d9dc67e9aaf0582a80867c6d3489fba24
 DIST pl-5.11.26.tar.gz 13411865 RMD160 a683b98f63da51debb9ab1ee7d97349252742e20 SHA1 0e14d8673e3bb67c3372cfe95e816c165179d2e3 SHA256 04e18ee9ba4640556b3639b2ecb90b6d51b8598d2c709744d4945d37dfaee25d
 DIST swi-prolog-5.10.4-gentoo-patchset-3.tar.gz 9770 RMD160 6bf3af5c57da54407f260db9ee5203ee6fa8c032 SHA1 3fc7483226a7ea5363ee083105bcf1d81d645b1e SHA256 8745a67d34f83afdbb1ed852606d40fadfe7de7bca00c8a88690efb65aace21b
 DIST swi-prolog-5.10.5-gentoo-patchset-0.tar.gz 5860 RMD160 ec0c8237fecf838101602875a9e4eb64a1c84271 SHA1 57b97c3284158e0fad2c0371479284bf79e85654 SHA256 a20cb42ed5385076a2ba759898f44b82fe0d40b5f2f16063535f1635763c6aa6
+DIST swi-prolog-5.10.5-gentoo-patchset-1.tar.gz 6102 RMD160 0cfc76160f4215fa43deec718df663769132d57a SHA1 6f2b4d0961a9869f63c2fc3ba2aae32c325c8053 SHA256 c1374c45ce7a9d0b28b1dd448a2c711281718bcaa86b626fe96743c487a7e139
 DIST swi-prolog-5.11.24-gentoo-patchset-0.tar.gz 5854 RMD160 5572c4f82899957a634e4466a140809b8f211392 SHA1 b0441525bfa02610d997dd13f5553015f5f2c198 SHA256 bac858838e0f3abe3d95ed91051cd81f0f6b2b5c7a1fed32b702e64e88598f46
 DIST swi-prolog-5.11.25-gentoo-patchset-0.tar.gz 5869 RMD160 c66c66317e3eed2be84e4ccf42b332b98e51a335 SHA1 aa260ad460958bc72babea54efb030339de3e8bf SHA256 a8d73da393239848866adcea4765ded0e899baedcd0e5ef6e8b9ca2561d4f5a4
 DIST swi-prolog-5.11.26-gentoo-patchset-0.tar.gz 5857 RMD160 4a7b7c2fa5219b70f44e010510fd043b98697c32 SHA1 167c81cfd46c271b082ca8f6e3f72650870c3176 SHA256 c2a0d5e1f7e0071c33235b2e95baabd0b9ad98c5015af5130d2aa6efc8afb913
+DIST swi-prolog-5.11.26-gentoo-patchset-1.tar.gz 6096 RMD160 7cfa4424f6a4b00b966e05ea8415b3fca4b8deca SHA1 7fc4b86a277b9bd15844197771a38a16808a0304 SHA256 7a6d224966e74917dbecf37782c4ed264bd38a698bac366db4dea7e02f77ccd1
 EBUILD swi-prolog-5.10.4.ebuild 2859 RMD160 c14ad4d4fc9563870ca9ac9dbf6fb13d7c0f3f9c SHA1 2c12474596c885523f012ee4e1fee9cf1f270916 SHA256 d556eeafdbf96f17c83dbd469d239058e0a52144299c1188df617fe82513841f
+EBUILD swi-prolog-5.10.5-r1.ebuild 2863 RMD160 d7ce74ca10c521c186e9ae22f03469c52d1cc5c7 SHA1 72933ba1fbb800dbd17f8cb3ae46dd033a229953 SHA256 19d14eaaa79bc9aab5a04931d208b6a6390cb0827ca8717ebcc4f974a57ed9c4
 EBUILD swi-prolog-5.10.5.ebuild 2860 RMD160 53ab30c4f2047fd4c79ce60da8dde40bf41e5f17 SHA1 02348fd57d330fdf43e2bada8bf8027fcc5e7e82 SHA256 a4a376db10cf07af0cbdee1a701ab2ae8832c11c6ba5b1a24a12176bc934db15
 EBUILD swi-prolog-5.11.24.ebuild 2860 RMD160 93e0f5eea006207b67d81e7feb0a5e7ccd072c0c SHA1 e3d6376335ad92c039eb519f2817c855b18ca86c SHA256 52fff3da4a3186f48456e12ed5f8c48d468ad6f39a382129fb31d231260b560c
 EBUILD swi-prolog-5.11.25.ebuild 2860 RMD160 80716bfad53439ab93aa4152df47175b4b2194b9 SHA1 8ab01ef05a0a5f1068f385ac68b54dcd6ed0132e SHA256 d137c948a49f9b5445fd19cecf0383fcf37cc6241cb303a10bddca042e015e5b
+EBUILD swi-prolog-5.11.26-r1.ebuild 2863 RMD160 578c28b620564686c72ebe90729e8141a0b0ac83 SHA1 67bac7a3a4f7c87b498a2c9b80b17e572b0e9bfe SHA256 a7a16147ec3bda23788816af721fbfe9a6c564ef80c31d3d5c54e834e270629e
 EBUILD swi-prolog-5.11.26.ebuild 2860 RMD160 5f8b4d17b19ef4f841ca1008e2b5ebc1ee071b0d SHA1 b223170c98ac4b5b8f108de445d9d9bbbc2173ff SHA256 b5d5fa76dd6817769a6b85825961790d712fc51146e085121d1407489d9d7c12
-MISC ChangeLog 45558 RMD160 3f3602f515d7d31ad8b407268d9b4a843bb18b4d SHA1 bc851c5934a48aa312465510b2c87e8c726910f0 SHA256 89a6dde8f9e50c248e9cf0bb0f56e6337e05fa10bab0d58aa0b7996f09961d56
+MISC ChangeLog 45788 RMD160 29299e84baceca728a489cb6910ad7e4bff39442 SHA1 fa079c8521dfbf738a3ede58fc4e5489c625fa09 SHA256 7f0808da44e3eb23d1320482bd5c58b1235197996a1b8aaf6f258b4c1aae2083
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5QWEkACgkQrwS/tqE49e3QqACgoBuWaPmGUKnyk5XWMnn8nUqY
-RJ8An3qkHw30evR/C9mML0WiAbzC+X7I
-=QJsG
+iEYEARECAAYFAk5X/VUACgkQrwS/tqE49e3hWwCeKHn+QQQnEArH41U88FM+4Hfd
+cvcAn3lhZbbU5yiJ5TpQSGLOVTu9FJMS
+=pcPh
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/swi-prolog/swi-prolog-5.10.5-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-5.10.5-r1.ebuild
new file mode 100644
index 000000000000..7de6c1fe6304
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-5.10.5-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2011 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.10.5-r1.ebuild,v 1.1 2011/08/26 20:08:40 keri Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic java-pkg-opt-2
+
+PATCHSET_VER="1"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/stable/src/pl-${PV}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc gmp hardened java minimal odbc readline ssl static test zlib X"
+
+RDEPEND="sys-libs/ncurses
+	zlib? ( sys-libs/zlib )
+	odbc? ( dev-db/unixODBC )
+	readline? ( sys-libs/readline )
+	gmp? ( dev-libs/gmp )
+	ssl? ( dev-libs/openssl )
+	java? ( >=virtual/jdk-1.4 )
+	X? (
+		virtual/jpeg
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/pl-${PV}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use ppc && append-flags -mno-altivec
+	use hardened && append-flags -fno-unit-at-a-time
+	use debug && append-flags -DO_DEBUG
+
+	cd "${S}"/src
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		$(use_enable gmp) \
+		$(use_enable readline) \
+		$(use_enable !static shared) \
+		--enable-custom-flags COFLAGS="${CFLAGS}"
+}
+
+src_compile() {
+	cd "${S}"/src
+	emake || die "emake failed"
+
+	if ! use minimal ; then
+		local jpltestconf
+		if use java && use test ; then
+			jpltestconf="--with-junit=$(java-config --classpath junit)"
+		fi
+
+		cd "${S}/packages"
+		econf \
+			--libdir=/usr/$(get_libdir) \
+			--with-chr \
+			--with-clib \
+			--with-clpqr \
+			--with-cpp \
+			--with-http \
+			$(use_with java jpl) \
+			${jpltestconf} \
+			--with-nlp \
+			$(use_with odbc) \
+			--with-pldoc \
+			--with-plunit \
+			--with-protobufs \
+			--with-R \
+			--with-RDF \
+			--with-semweb \
+			--with-sgml \
+			$(use_with ssl) \
+			--with-table \
+			--with-tipc \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			COFLAGS='"${CFLAGS}"'
+
+		emake || die "packages emake failed"
+	fi
+}
+
+src_test() {
+	cd "${S}/src"
+	emake check || die "make check failed. See above for details."
+
+	if ! use minimal ; then
+		cd "${S}/packages"
+		emake check || die "make check failed. See above for details."
+	fi
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install || die "install src failed"
+
+	if ! use minimal ; then
+		emake -C packages DESTDIR="${D}" install || die "install packages failed"
+		if use doc ; then
+			emake -C packages DESTDIR="${D}" html-install || die "html-install failed"
+		fi
+	fi
+
+	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION || die
+}
diff --git a/dev-lang/swi-prolog/swi-prolog-5.11.26-r1.ebuild b/dev-lang/swi-prolog/swi-prolog-5.11.26-r1.ebuild
new file mode 100644
index 000000000000..b0873ff19748
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-5.11.26-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2011 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.11.26-r1.ebuild,v 1.1 2011/08/26 20:08:40 keri Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic java-pkg-opt-2
+
+PATCHSET_VER="1"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/pl-${PV}.tar.gz
+	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc gmp hardened java minimal odbc readline ssl static test zlib X"
+
+RDEPEND="sys-libs/ncurses
+	zlib? ( sys-libs/zlib )
+	odbc? ( dev-db/unixODBC )
+	readline? ( sys-libs/readline )
+	gmp? ( dev-libs/gmp )
+	ssl? ( dev-libs/openssl )
+	java? ( >=virtual/jdk-1.4 )
+	X? (
+		virtual/jpeg
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/pl-${PV}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	epatch "${WORKDIR}"/${PV}
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use ppc && append-flags -mno-altivec
+	use hardened && append-flags -fno-unit-at-a-time
+	use debug && append-flags -DO_DEBUG
+
+	cd "${S}"/src
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		$(use_enable gmp) \
+		$(use_enable readline) \
+		$(use_enable !static shared) \
+		--enable-custom-flags COFLAGS="${CFLAGS}"
+}
+
+src_compile() {
+	cd "${S}"/src
+	emake || die "emake failed"
+
+	if ! use minimal ; then
+		local jpltestconf
+		if use java && use test ; then
+			jpltestconf="--with-junit=$(java-config --classpath junit)"
+		fi
+
+		cd "${S}/packages"
+		econf \
+			--libdir=/usr/$(get_libdir) \
+			--with-chr \
+			--with-clib \
+			--with-clpqr \
+			--with-cpp \
+			--with-http \
+			$(use_with java jpl) \
+			${jpltestconf} \
+			--with-nlp \
+			$(use_with odbc) \
+			--with-pldoc \
+			--with-plunit \
+			--with-protobufs \
+			--with-R \
+			--with-RDF \
+			--with-semweb \
+			--with-sgml \
+			$(use_with ssl) \
+			--with-table \
+			--with-tipc \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			COFLAGS='"${CFLAGS}"'
+
+		emake || die "packages emake failed"
+	fi
+}
+
+src_test() {
+	cd "${S}/src"
+	emake check || die "make check failed. See above for details."
+
+	if ! use minimal ; then
+		cd "${S}/packages"
+		emake check || die "make check failed. See above for details."
+	fi
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install || die "install src failed"
+
+	if ! use minimal ; then
+		emake -C packages DESTDIR="${D}" install || die "install packages failed"
+		if use doc ; then
+			emake -C packages DESTDIR="${D}" html-install || die "html-install failed"
+		fi
+	fi
+
+	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION || die
+}