From 3af09adc3fbf16f162118f23d5c998eb4a8eb772 Mon Sep 17 00:00:00 2001 From: Keri Harris Date: Fri, 9 Jan 2015 18:31:53 +0000 Subject: [PATCH] Do not compile xpath Prolog module without USE=curl Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xA138F5ED --- dev-lang/xsb/ChangeLog | 5 ++++- dev-lang/xsb/Manifest | 12 ++++++------ dev-lang/xsb/xsb-3.3.6.ebuild | 35 ++++++++++++++++------------------- dev-lang/xsb/xsb-3.3.7.ebuild | 35 ++++++++++++++++------------------- 4 files changed, 42 insertions(+), 45 deletions(-) diff --git a/dev-lang/xsb/ChangeLog b/dev-lang/xsb/ChangeLog index fff2b49f5de2..2270f7cea4d8 100644 --- a/dev-lang/xsb/ChangeLog +++ b/dev-lang/xsb/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/xsb # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.47 2015/01/09 15:40:44 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v 1.48 2015/01/09 18:31:42 keri Exp $ + + 09 Jan 2015; xsb-3.3.6.ebuild, xsb-3.3.7.ebuild: + Do not compile xpath Prolog module without USE=curl *xsb-3.3.7 (09 Jan 2015) diff --git a/dev-lang/xsb/Manifest b/dev-lang/xsb/Manifest index c9dbed128b95..7cbca1167bb2 100644 --- a/dev-lang/xsb/Manifest +++ b/dev-lang/xsb/Manifest @@ -8,14 +8,14 @@ DIST xsb-3.3.5-gentoo-patchset-0.tar.gz 18570 SHA256 808e90836e69bcd9609ad945377 DIST xsb-3.3.6-gentoo-patchset-1.tar.gz 17711 SHA256 7630aa3497a80e6a39580bb050da8169318842de3f6b17a8b1f8a721ea6ec0e4 SHA512 a554833e974973f3bf6ad9d63d1e7bcbe358cfccdd35ad3f982375cfa171637484277c9c8be95c5eea34dac87845d02b6abc7d4675e1ff324c64603ae06338d1 WHIRLPOOL 5a0c6bfcc554e5c34f57acf1de2001bfbdea7e18e2ed1037409f58dc2151199c79af01f7d7cca8b7dea79bfe571fca8ff6b1f78ab368d7255e49dab8fe61fa3e DIST xsb-3.3.7-gentoo-patchset-0.tar.gz 18248 SHA256 2eaad6dedac906f207c24713d92115086196f3c626d1b0e0401c71b4bfe10038 SHA512 3943000e40abad25da8fef2983e059dadf6d794a5a40406a3fb9d7e29506afb0d5ad1d86b0825849ea7dd9741fdfafa2b71fc2fd26cc2b679e39d85f76a91959 WHIRLPOOL d2d51c482d1ff207709c8ed280eb148c632d81d4670ead646c8eb5a62651932dbe292adca03060d1b591405fdbad274be1b767fd3e19e5a4f4e4da3fd4277ea6 EBUILD xsb-3.3.5.ebuild 4452 SHA256 36b44944cea52e2b8c23332dd9816834f74fc1902ff45d0bb83f951467986f43 SHA512 0f88fac705909868c4dbc1fe6140afdac7c7cf21c1cc970ac317f7910b07ece52debc9101e871eda15a7e6a4bf94312b9b8147e3e9f759fa2452955bb546745c WHIRLPOOL a5bf37f24219b174ca39b4ca1d9b08ab617a0e627c6c3e775033eb1a5cbf9ff84f3969796375ff5b2977a9b11add00b2edc4f88a26a22445a52b174eddfe5a65 -EBUILD xsb-3.3.6.ebuild 4502 SHA256 7655930ae51400ca3131ad4ed0a58fcd3c8cd080b02fc20cdcd805790b24fdbd SHA512 9516dcb90615ccd971fd7168612395ffe5250c36f35a4dacc6bb53f1ec01401a59f01c902c42373751ae898aacb25884960dc8b1b5679c30cba6558374db864f WHIRLPOOL 7366ccbd594e3df25f46509fe42fc1942368c57feca1420ddf0a0929ba5ec5763f53ef4dbeb7de3be09b0f8e22439c5ee5aa5809376abe4782b1577c6fad4b34 -EBUILD xsb-3.3.7.ebuild 4504 SHA256 294d869c7646fc9ac061a535d6ec7102156940fb31e68c215c601457a3b66755 SHA512 d650a4db7bda17f8cf737add4d97c9c69272f6e44f21f9c4398c010ad9b971011cdbf97210e70abff3e9dfc3309b97bbe3cbdcde38be29471cf56c0bab67bfd5 WHIRLPOOL 233d180c599aecbc7eba1285cf5d3b377afffdbb151f5590e5327e9faf99f770d2df2168f5e727626bd78ca8c5bee1be89a6b5b41029e694c6de86a5db23d4c3 -MISC ChangeLog 7266 SHA256 64961fdc8dbdc193c66bb801fb299ceb6dd9ab30e2bb4988ebd563045f1a138e SHA512 e7c4712883d4cb0ba143228264f369367455745996520fe7d99702bd8c229bde2a3ca8cf7980dec99646c817d0a402483a0050559a1cfade34d1fb2b84298a44 WHIRLPOOL e6e48172860cc2ac94980035df457540066a007b9b31a86aa3237b8269aa0c3c24bbf682954d720aedaf0e2c1e669f909f59a0933909a4527439caaf8233fd35 +EBUILD xsb-3.3.6.ebuild 4514 SHA256 e590b4a09abd3527bd10839cfe97f2dc195f10fbc282aa16501fd40a39836662 SHA512 a0b920d4618f710319e0367edf021ccfb7c3b8dd482518004ab587653fe06d0ed8715007a78c1c4e072be7af4bdf6fe96f528391f54489970b1c66bcb0d91a67 WHIRLPOOL 0d352fb0e32447af7853f76129dfbf1ab8cb438a508e25d5d54fa5b1027c4c010ba9fddf4fdd9275e78b4872694d2d0fa2d8b703ad2f5ec00a1c7d12273353b9 +EBUILD xsb-3.3.7.ebuild 4516 SHA256 64d06959d84b253f282c63d813cae8ca14b51aeedeb59e284677732ec7818af1 SHA512 f2698b2b226cbcddf2ea71d8433100039c64913c1f3d323edbf456c7c3f630eb415f4e485661c6c5bee1de25a13be6b2e449a3fc802c1a9fe273004d32248170 WHIRLPOOL 8be501ae279bfeaeee016107a6f9c4cb71aaf60eb34f30b8053807bb4993ddac65345753dd30a5e82ef579e3469f10171a5eab5f397a1d2f05a02024f7136190 +MISC ChangeLog 7390 SHA256 19a8da0575b7a57832afd9c9d987a4b42a5f88f626fdf8846c756759acb0291c SHA512 6edeff14cdb9067345f74bb21ca07ce994331a2820d97faf9cfc38c5e1a178f9b4c23797a8584e84de4e822afcc3dbe00d2c2fce5d7ef57195070631c9bbeded WHIRLPOOL 7c3289fb2c93c22bc3a9ba47f084f8037fb380941d68f539bf42630f496b7f9ef8b0e9e50b63fcfdf55ecdfe625b894c0eb3ec1ad7b6c0583b19433d82a90cf3 MISC metadata.xml 159 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba SHA512 532979c6de159980035c56482b05558c2b59c97dc99d83903988d8a535512e209110273f7123fcb0b1ce8aeed34b368fc7a309e68f3a6b510296d547b0134137 WHIRLPOOL 24bf1d6894c0450424190af0e967c7f947cfa9a3a4b6cbe29c0a54ea4f857e252fb6ee5d14b3503b52f066dca47b4b7add3b7a57c5391de468ea49d589a2fe37 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlSv9gcACgkQrwS/tqE49e1k/gCgn+lQSCqJwpmasos1g9Rs9uo4 -/KoAnAxWtKA1o7o3li7DDX46rZY8s389 -=Lr4Z +iEYEAREIAAYFAlSwHhkACgkQrwS/tqE49e3n4ACfVTx9QI9CIf7C87NlY+V6AysG +ClcAoKoV85WL5hqcBo2cZNsaSBlwB/oe +=D2Jf -----END PGP SIGNATURE----- diff --git a/dev-lang/xsb/xsb-3.3.6.ebuild b/dev-lang/xsb/xsb-3.3.6.ebuild index b435c09bf69e..469322aa1072 100644 --- a/dev-lang/xsb/xsb-3.3.6.ebuild +++ b/dev-lang/xsb/xsb-3.3.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/xsb-3.3.6.ebuild,v 1.4 2015/01/09 14:32:09 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/xsb-3.3.6.ebuild,v 1.5 2015/01/09 18:31:42 keri Exp $ EAPI=2 @@ -97,6 +97,9 @@ src_compile() { if use curl ; then emake -j1 curl || die "emake curl package failed" emake -j1 sgml || die "emake sgml package failed" + if use xml ; then + emake -j1 xpath || die "emake xpath package failed" + fi fi if use mysql ; then @@ -110,10 +113,6 @@ src_compile() { if use pcre ; then emake -j1 pcre || die "emake pcre package failed" fi - - if use xml ; then - emake -j1 xpath || die "emake xpath package failed" - fi } src_install() { @@ -146,13 +145,6 @@ src_install() { insinto ${PACKAGES}/regmatch/cc doins regmatch/cc/*.H || die - insinto ${PACKAGES}/sgml - doins sgml/*.xwam || die - insinto ${PACKAGES}/sgml/cc - doins sgml/cc/*.H || die - insinto ${PACKAGES}/sgml/cc/dtd - doins sgml/cc/dtd/* || die - insinto ${PACKAGES}/slx doins slx/*.xwam || die @@ -164,6 +156,18 @@ src_install() { if use curl ; then insinto ${PACKAGES}/curl doins curl/*.xwam || die + insinto ${PACKAGES}/sgml + doins sgml/*.xwam || die + insinto ${PACKAGES}/sgml/cc + doins sgml/cc/*.H || die + insinto ${PACKAGES}/sgml/cc/dtd + doins sgml/cc/dtd/* || die + if use xml ; then + insinto ${PACKAGES}/xpath + doins xpath/*xwam || die + insinto ${PACKAGES}/xpath/cc + doins xpath/cc/*.H || die + fi fi if use mysql || use odbc ; then @@ -193,13 +197,6 @@ src_install() { doins pcre/cc/*.H || die fi - if use xml ; then - insinto ${PACKAGES}/xpath - doins xpath/*xwam || die - insinto ${PACKAGES}/xpath/cc - doins xpath/cc/*.H || die - fi - if use examples ; then cd "${S}"/build emake \ diff --git a/dev-lang/xsb/xsb-3.3.7.ebuild b/dev-lang/xsb/xsb-3.3.7.ebuild index f0f525d23e19..62a46f27ea8f 100644 --- a/dev-lang/xsb/xsb-3.3.7.ebuild +++ b/dev-lang/xsb/xsb-3.3.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/xsb-3.3.7.ebuild,v 1.1 2015/01/09 15:40:44 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/xsb/xsb-3.3.7.ebuild,v 1.2 2015/01/09 18:31:42 keri Exp $ EAPI=2 @@ -97,6 +97,9 @@ src_compile() { if use curl ; then emake -j1 curl || die "emake curl package failed" emake -j1 sgml || die "emake sgml package failed" + if use xml ; then + emake -j1 xpath || die "emake xpath package failed" + fi fi if use mysql ; then @@ -110,10 +113,6 @@ src_compile() { if use pcre ; then emake -j1 pcre || die "emake pcre package failed" fi - - if use xml ; then - emake -j1 xpath || die "emake xpath package failed" - fi } src_install() { @@ -146,13 +145,6 @@ src_install() { insinto ${PACKAGES}/regmatch/cc doins regmatch/cc/*.H || die - insinto ${PACKAGES}/sgml - doins sgml/*.xwam || die - insinto ${PACKAGES}/sgml/cc - doins sgml/cc/*.H || die - insinto ${PACKAGES}/sgml/cc/dtd - doins sgml/cc/dtd/* || die - insinto ${PACKAGES}/slx doins slx/*.xwam || die @@ -164,6 +156,18 @@ src_install() { if use curl ; then insinto ${PACKAGES}/curl doins curl/*.xwam || die + insinto ${PACKAGES}/sgml + doins sgml/*.xwam || die + insinto ${PACKAGES}/sgml/cc + doins sgml/cc/*.H || die + insinto ${PACKAGES}/sgml/cc/dtd + doins sgml/cc/dtd/* || die + if use xml ; then + insinto ${PACKAGES}/xpath + doins xpath/*xwam || die + insinto ${PACKAGES}/xpath/cc + doins xpath/cc/*.H || die + fi fi if use mysql || use odbc ; then @@ -193,13 +197,6 @@ src_install() { doins pcre/cc/*.H || die fi - if use xml ; then - insinto ${PACKAGES}/xpath - doins xpath/*xwam || die - insinto ${PACKAGES}/xpath/cc - doins xpath/cc/*.H || die - fi - if use examples ; then cd "${S}"/build emake \ -- 2.26.2