keri 15/01/09 18:31:42 Modified: ChangeLog xsb-3.3.6.ebuild xsb-3.3.7.ebuild Log: Do not compile xpath Prolog module without USE=curl (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A138F5ED)
Revision Changes Path 1.48 dev-lang/xsb/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/xsb/ChangeLog?rev=1.48&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/xsb/ChangeLog?rev=1.48&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/xsb/ChangeLog?r1=1.47&r2=1.48 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/xsb/ChangeLog,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- ChangeLog 9 Jan 2015 15:40:44 -0000 1.47 +++ ChangeLog 9 Jan 2015 18:31:42 -0000 1.48 @@ -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; <k...@gentoo.org> 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) 1.5 dev-lang/xsb/xsb-3.3.6.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/xsb/xsb-3.3.6.ebuild?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/xsb/xsb-3.3.6.ebuild?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/xsb/xsb-3.3.6.ebuild?r1=1.4&r2=1.5 Index: xsb-3.3.6.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/xsb/xsb-3.3.6.ebuild,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xsb-3.3.6.ebuild 9 Jan 2015 14:32:09 -0000 1.4 +++ xsb-3.3.6.ebuild 9 Jan 2015 18:31:42 -0000 1.5 @@ -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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 \ 1.2 dev-lang/xsb/xsb-3.3.7.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/xsb/xsb-3.3.7.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/xsb/xsb-3.3.7.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/xsb/xsb-3.3.7.ebuild?r1=1.1&r2=1.2 Index: xsb-3.3.7.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/xsb/xsb-3.3.7.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xsb-3.3.7.ebuild 9 Jan 2015 15:40:44 -0000 1.1 +++ xsb-3.3.7.ebuild 9 Jan 2015 18:31:42 -0000 1.2 @@ -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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 \