From: Keri Harris Date: Sat, 17 Mar 2007 19:59:00 +0000 (+0000) Subject: Rollup patches into tarball. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=04c8c1bd56865c736865c7de89cf873268c730bc;p=gentoo.git Rollup patches into tarball. Package-Manager: portage-2.1.2.2 --- diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog index 662d871ac5cc..ea0cb3e6623e 100644 --- a/dev-lang/swi-prolog/ChangeLog +++ b/dev-lang/swi-prolog/ChangeLog @@ -1,6 +1,9 @@ # 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.78 2007/03/12 12:48:24 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.79 2007/03/17 19:59:00 keri Exp $ + + 17 Mar 2007; keri swi-prolog-5.6.30.ebuild: + Roll up -5.6.30 patches into tarball. 12 Mar 2007; Gustavo Zacarias swi-prolog-5.6.25.ebuild: diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest index c3a078c14744..373075b87099 100644 --- a/dev-lang/swi-prolog/Manifest +++ b/dev-lang/swi-prolog/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX swi-prolog-5.6.18-CFLAGS.patch 10475 RMD160 ee1ee90d4542de168787a1a98b1bcca6451f5760 SHA1 ad41ac9eee26461506c13776aac1f3ed9cbf3be7 SHA256 85051afdbe983622900b9b3692acfb08da338da8ade1be296992ab78f8391986 MD5 433655357c83157d2fb532efd135d7f5 files/swi-prolog-5.6.18-CFLAGS.patch 10475 RMD160 ee1ee90d4542de168787a1a98b1bcca6451f5760 files/swi-prolog-5.6.18-CFLAGS.patch 10475 @@ -218,6 +215,7 @@ DIST pl-5.6.27.tar.gz 11661684 RMD160 e180ad228946b36b2aaba561be25ba294da473af S DIST pl-5.6.28.tar.gz 11687262 RMD160 8a5113b5c97ab58baa8b6e0a3f92ea078f28f6bb SHA1 a02eb1613d5772f94fdad98b5b400013fc3d575a SHA256 ae6600e48cfa246a0c81c047e158fe9e68a72bfabea6abba0bcdec40ad67690a DIST pl-5.6.29.tar.gz 11697773 RMD160 ac7298a8884a69fc5bb9d4b0656a1845b9d7e1b6 SHA1 fbee19a7b8ab581070aefc64ac0d0f764107af4d SHA256 0390d63fa3090d11569c27322ada7ddfca4dfd7b1e8d32b7f2b44ed192be35ff DIST pl-5.6.30.tar.gz 11826456 RMD160 fdfb138a472af9109a4ab3ca91c0f3284a808a15 SHA1 e71aa52221207045bb73d3ade50ac0992f0c5fa5 SHA256 7ae6d35b9f3962463c7ec6057661e8c6b3c80f6791e52283c2097b39fee02d91 +DIST swi-prolog-5.6.30-gentoo-patchset.tar.gz 8688 RMD160 009b92030d05157c1f960e34fbca96ab384c9304 SHA1 f814033083c93792fd2cfc903ded713f09970786 SHA256 d9cb3529b7a3dddbef9538502d8bef789f8eea0dc4c1667f6b9a02114fe44c5a EBUILD swi-prolog-5.6.17-r1.ebuild 3799 RMD160 5dfb755c08250fdb9ac21187441bc55b4a8eb6d2 SHA1 74a16a2b3f64a1d9f315af4c52683412b0cf9363 SHA256 cbb68fa3284ce4f3dc55f184e7ef4fce073e5a18261100ae5214b7913fa4d237 MD5 c883caff349f028e966b808641fec7f0 swi-prolog-5.6.17-r1.ebuild 3799 RMD160 5dfb755c08250fdb9ac21187441bc55b4a8eb6d2 swi-prolog-5.6.17-r1.ebuild 3799 @@ -270,14 +268,14 @@ EBUILD swi-prolog-5.6.29.ebuild 3780 RMD160 b6041b5d1179d2a78943d3b948ecf000e4b9 MD5 d883f267b109cdcc403269892b4a996c swi-prolog-5.6.29.ebuild 3780 RMD160 b6041b5d1179d2a78943d3b948ecf000e4b90248 swi-prolog-5.6.29.ebuild 3780 SHA256 a32d6a1bac8ca1a79adb6e2c8924c5a48bee013d0327d0003516e758fa5ed2b7 swi-prolog-5.6.29.ebuild 3780 -EBUILD swi-prolog-5.6.30.ebuild 3692 RMD160 7379f225c70566c333ec0235b4147e13bc46e533 SHA1 9531e4c0e36c50ff661fe62361a9b3cc161eed2f SHA256 5ed7a5b5943da6c8d29beb4956b2995c6222447b340d604f164912d445b3338e -MD5 2172e34753e6c112cd08ebadeaa55e4d swi-prolog-5.6.30.ebuild 3692 -RMD160 7379f225c70566c333ec0235b4147e13bc46e533 swi-prolog-5.6.30.ebuild 3692 -SHA256 5ed7a5b5943da6c8d29beb4956b2995c6222447b340d604f164912d445b3338e swi-prolog-5.6.30.ebuild 3692 -MISC ChangeLog 15107 RMD160 941fdb1709820d8d8afcf41d77eafddf5504bff3 SHA1 aaea7f08ebda1d1d813f51e199af9b6ac985af63 SHA256 e37a01e7b50ab387e0ecfc81f399523784416e031c48afbf357008e22993cb9a -MD5 812e725ea2f9b562bde7211ff972e289 ChangeLog 15107 -RMD160 941fdb1709820d8d8afcf41d77eafddf5504bff3 ChangeLog 15107 -SHA256 e37a01e7b50ab387e0ecfc81f399523784416e031c48afbf357008e22993cb9a ChangeLog 15107 +EBUILD swi-prolog-5.6.30.ebuild 3895 RMD160 9366701bb354b4324c18d112af8982b8d4e174c2 SHA1 4ffc9d80f1ba4c2de6eb6212e74dc17ac5ad2ec7 SHA256 73015e1686c034044f29564f6b509da0583035816c307f24fe098259361fdb7c +MD5 e9eff842c346aa78e5a82ba65fa0066f swi-prolog-5.6.30.ebuild 3895 +RMD160 9366701bb354b4324c18d112af8982b8d4e174c2 swi-prolog-5.6.30.ebuild 3895 +SHA256 73015e1686c034044f29564f6b509da0583035816c307f24fe098259361fdb7c swi-prolog-5.6.30.ebuild 3895 +MISC ChangeLog 15208 RMD160 e1d013a66c8f4edbba30ab55b0096300b074e952 SHA1 00b328ca6a27e780d59b8a92b960d250a0a3b934 SHA256 c885c56b37cb51ee0c785fe4bd0834f020882c9de96b2bbdef940dca4df0ce16 +MD5 b848cd27fcdfae32b0c4d22265dca5c5 ChangeLog 15208 +RMD160 e1d013a66c8f4edbba30ab55b0096300b074e952 ChangeLog 15208 +SHA256 c885c56b37cb51ee0c785fe4bd0834f020882c9de96b2bbdef940dca4df0ce16 ChangeLog 15208 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159 @@ -321,13 +319,6 @@ SHA256 834c5d1b84792be48a5276686117aa9a862d820a5335c2f473fc8fc232f995a8 files/di MD5 382b7817e5831ca8ea92692df86d2e04 files/digest-swi-prolog-5.6.29-r1 235 RMD160 61af4f6ab311437f193c41a630ab41b4b5ffd259 files/digest-swi-prolog-5.6.29-r1 235 SHA256 834c5d1b84792be48a5276686117aa9a862d820a5335c2f473fc8fc232f995a8 files/digest-swi-prolog-5.6.29-r1 235 -MD5 b1b912677493159a856f9da58209e2cd files/digest-swi-prolog-5.6.30 235 -RMD160 43dd24ed4e9ef86e21ee4bc6c75a8db697a21710 files/digest-swi-prolog-5.6.30 235 -SHA256 6b5b9ab84e66e1c4e41e7bf4888c52b803f4ff4f9e7370cce1308470ef54134f files/digest-swi-prolog-5.6.30 235 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux) - -iD8DBQFF9UweKRy60XGEcJIRAuezAJ4+IoF080TBY++8rpKftl7mr+pt7ACfUTeI -thwOWmMu74h7UnldvR0bCCM= -=pPlr ------END PGP SIGNATURE----- +MD5 0c414c8a5f814d58981c6d12b7fee984 files/digest-swi-prolog-5.6.30 530 +RMD160 b75d040a4d81fd18058d4515bab4312aac845433 files/digest-swi-prolog-5.6.30 530 +SHA256 58c2629b06ed2c9e71dab3caedb251df29925cd458ef2ca39f4e81004c79acba files/digest-swi-prolog-5.6.30 530 diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.30 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.30 index a1015104e7b8..77457653169e 100644 --- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.30 +++ b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.30 @@ -1,3 +1,6 @@ MD5 a6df5d3e4199a296a8544a7574170f0c pl-5.6.30.tar.gz 11826456 RMD160 fdfb138a472af9109a4ab3ca91c0f3284a808a15 pl-5.6.30.tar.gz 11826456 SHA256 7ae6d35b9f3962463c7ec6057661e8c6b3c80f6791e52283c2097b39fee02d91 pl-5.6.30.tar.gz 11826456 +MD5 f8a413d02ccee46a5ef5626d43ee594d swi-prolog-5.6.30-gentoo-patchset.tar.gz 8688 +RMD160 009b92030d05157c1f960e34fbca96ab384c9304 swi-prolog-5.6.30-gentoo-patchset.tar.gz 8688 +SHA256 d9cb3529b7a3dddbef9538502d8bef789f8eea0dc4c1667f6b9a02114fe44c5a swi-prolog-5.6.30-gentoo-patchset.tar.gz 8688 diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.30.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.30.ebuild index bcb3e3c7dd57..fdb44c453250 100644 --- a/dev-lang/swi-prolog/swi-prolog-5.6.30.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-5.6.30.ebuild @@ -1,12 +1,13 @@ # 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.30.ebuild,v 1.2 2007/03/10 19:42:21 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.30.ebuild,v 1.3 2007/03/17 19:59:00 keri Exp $ inherit eutils flag-o-matic java-pkg-opt-2 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" +SRC_URI="http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-${PV}.tar.gz + mirror://gentoo/${P}-gentoo-patchset.tar.gz" LICENSE="LGPL-2.1" SLOT="0" @@ -39,21 +40,24 @@ 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-r5.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-r1.patch - epatch "${FILESDIR}"/${PN}-ltx2htm.patch - epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch - epatch "${FILESDIR}"/${PN}-thread-sandbox.patch - epatch "${FILESDIR}"/${PN}-thread-tests-r1.patch - epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch - epatch "${FILESDIR}"/${PN}-xpce-test-r1.patch + epatch "${WORKDIR}"/${PV}/1000-cflags.patch + epatch "${WORKDIR}"/${PV}/1001-multilib.patch + epatch "${WORKDIR}"/${PV}/2100-thread-sandbox.patch + epatch "${WORKDIR}"/${PV}/2800-mandir.patch + epatch "${WORKDIR}"/${PV}/3000-packages-subshell.patch + epatch "${WORKDIR}"/${PV}/3029-clib-test.patch + epatch "${WORKDIR}"/${PV}/3059-ssl-test.patch + epatch "${WORKDIR}"/${PV}/3069-semweb-test.patch + epatch "${WORKDIR}"/${PV}/3150-jpl-env.patch + epatch "${WORKDIR}"/${PV}/3151-jpl-ppc-arch.patch + epatch "${WORKDIR}"/${PV}/3152-jpl-junit.patch + epatch "${WORKDIR}"/${PV}/3159-jpl-test.patch + epatch "${WORKDIR}"/${PV}/3160-xpce-parallel-build.patch + epatch "${WORKDIR}"/${PV}/3139-sgml-test.patch + epatch "${WORKDIR}"/${PV}/3149-sgml-RDF-test.patch + epatch "${WORKDIR}"/${PV}/3169-xpce-test.patch + epatch "${WORKDIR}"/${PV}/3199-ltx2htm.patch + epatch "${WORKDIR}"/${PV}/3229-zlib-test.patch } src_compile() {