Do not compile xpath Prolog module without USE=curl

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A138F5ED)

3 files changed, 36 insertions, 39 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; <keri@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)
 
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 \