Added a check to make sure dev-libs/xmlrpc-c has been installed with suitable USE flags. Fixes bug 194405.

Package-Manager: portage-2.1.4_rc9

3 files changed, 26 insertions, 22 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index b0d8acf7aa6c..20d444f3dd17 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cmake
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.65 2007/10/10 19:27:27 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.66 2007/12/17 06:51:30 philantrop Exp $
+
+  17 Dec 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  cmake-2.4.7-r2.ebuild:
+  Added a check to make sure dev-libs/xmlrpc-c has been installed with
+  suitable USE flags. Fixes bug 194405.
 
   10 Oct 2007; Christian Heim <phreak@gentoo.org> cmake-2.4.6-r1.ebuild,
   cmake-2.4.7.ebuild, cmake-2.4.7-r1.ebuild, cmake-2.4.7-r2.ebuild:
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 7b48db40b2b2..85bad2ee21e2 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50cmake-gentoo.el 244 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 SHA1 c34102f3343980275169144b40af6ec69a87d7fc SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00
 MD5 4281be81193a1c2ce2ae715da96208e0 files/50cmake-gentoo.el 244
 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 files/50cmake-gentoo.el 244
@@ -55,18 +52,18 @@ EBUILD cmake-2.4.7-r1.ebuild 2107 RMD160 a382d8e58f6bac1857faa10825079047133a20e
 MD5 23250662c2c37d2267e20e075164a648 cmake-2.4.7-r1.ebuild 2107
 RMD160 a382d8e58f6bac1857faa10825079047133a20e7 cmake-2.4.7-r1.ebuild 2107
 SHA256 67e610ddd89a8f395655d82503594ba83b17fe85f939fe78cbc86d16c15e49ec cmake-2.4.7-r1.ebuild 2107
-EBUILD cmake-2.4.7-r2.ebuild 2466 RMD160 806d68ce4f8db21a0726b10b64f85627fec209ba SHA1 25486e816608cc7c5446427637a897574b282179 SHA256 9df6c2d05c6431668f53960ac68d89543edcd58dabe6976a2083e8f535875d6c
-MD5 f20448a7516355d416024d06260ab63d cmake-2.4.7-r2.ebuild 2466
-RMD160 806d68ce4f8db21a0726b10b64f85627fec209ba cmake-2.4.7-r2.ebuild 2466
-SHA256 9df6c2d05c6431668f53960ac68d89543edcd58dabe6976a2083e8f535875d6c cmake-2.4.7-r2.ebuild 2466
+EBUILD cmake-2.4.7-r2.ebuild 2884 RMD160 4940274d73d4dcb4fed510ecbf547564f79de1a4 SHA1 9ebcba2e5eee76544548fa576a5f68e405a76fe9 SHA256 28c2ae7ce8fac4cebde52a7543495dcb21b65bc3e6f682f65502c677b5176037
+MD5 66de0008189e3a5fa08ebdf8ea0d2002 cmake-2.4.7-r2.ebuild 2884
+RMD160 4940274d73d4dcb4fed510ecbf547564f79de1a4 cmake-2.4.7-r2.ebuild 2884
+SHA256 28c2ae7ce8fac4cebde52a7543495dcb21b65bc3e6f682f65502c677b5176037 cmake-2.4.7-r2.ebuild 2884
 EBUILD cmake-2.4.7.ebuild 1957 RMD160 3558a2540c5e57f3b745a27cc72d1ac605676401 SHA1 998ccb0b5292e92df7da30cba89331dcb1bb2abe SHA256 60991b36ffd7c44f75f20e9dc2996b308ec98775de7dfff548b224a531fbe694
 MD5 b9525f8ac209124b5973a9c4b1a9b2fc cmake-2.4.7.ebuild 1957
 RMD160 3558a2540c5e57f3b745a27cc72d1ac605676401 cmake-2.4.7.ebuild 1957
 SHA256 60991b36ffd7c44f75f20e9dc2996b308ec98775de7dfff548b224a531fbe694 cmake-2.4.7.ebuild 1957
-MISC ChangeLog 9908 RMD160 ca36ebe71846f3c15a5390d6fb1b41747df7c591 SHA1 9c4faf9162d75980cd6576bb0223154feb950b93 SHA256 55f0bbbef219dbf8f521add5de08c3aaa100916a88e8f0b3fb2ab9d55be73250
-MD5 7cb673d5a5eb2b07f0d95585e0e557f0 ChangeLog 9908
-RMD160 ca36ebe71846f3c15a5390d6fb1b41747df7c591 ChangeLog 9908
-SHA256 55f0bbbef219dbf8f521add5de08c3aaa100916a88e8f0b3fb2ab9d55be73250 ChangeLog 9908
+MISC ChangeLog 10104 RMD160 239f86b893d6df92fb6d06544783bdb882e704e4 SHA1 11d8eb4c490cf702271696683696dc1aa63891c6 SHA256 0119138e623548f4995a7268338e45d7d264443493aaf33100b0a379659f7924
+MD5 9be7be22abd7d26e0762291f780e26d3 ChangeLog 10104
+RMD160 239f86b893d6df92fb6d06544783bdb882e704e4 ChangeLog 10104
+SHA256 0119138e623548f4995a7268338e45d7d264443493aaf33100b0a379659f7924 ChangeLog 10104
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
 MD5 bc5757868e9f06d6048259da3a5918aa metadata.xml 157
 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb metadata.xml 157
@@ -98,10 +95,3 @@ SHA256 c38ada811d01fc940e3984afba6671ca5477f67293007796798af3f75ce27e07 files/di
 MD5 5e292f9a81c05fe721f316e78ff770d8 files/digest-cmake-2.4.7-r2 238
 RMD160 9a282ff0296c16f7620409705f5b488c19eee1ce files/digest-cmake-2.4.7-r2 238
 SHA256 c38ada811d01fc940e3984afba6671ca5477f67293007796798af3f75ce27e07 files/digest-cmake-2.4.7-r2 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFHDSelyuNVb5qfaOYRAnLNAJ92cDqy0WaJfzIm6gq6S9cHpdxfcwCeKAlN
-p4qy+zrxHe8VA/3/nMXyFG4=
-=TPiL
------END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.4.7-r2.ebuild b/dev-util/cmake/cmake-2.4.7-r2.ebuild
index f414cbc90e28..0445164aa8b5 100644
--- a/dev-util/cmake/cmake-2.4.7-r2.ebuild
+++ b/dev-util/cmake/cmake-2.4.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.7-r2.ebuild,v 1.3 2007/10/10 19:27:27 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.7-r2.ebuild,v 1.4 2007/12/17 06:51:30 philantrop Exp $
 
 inherit elisp-common toolchain-funcs eutils versionator qt3 flag-o-matic
 
@@ -26,6 +26,17 @@ RDEPEND="${DEPEND}"
 SITEFILE="50${PN}-gentoo.el"
 VIMFILE="${PN}.vim"
 
+pkg_setup() {
+	if ! built_with_use dev-libs/xmlrpc-c libwww && ! built_with_use dev-libs/xmlrpc-c curl ; then
+		echo
+		eerror "${PN} requires dev-libs/xmlrpc-c to be built with either the 'libwww' or"
+		eerror "the 'curl' USE flag or both enabled."
+		eerror "Please re-emerge dev-libs/xmlrpc-c with USE=\"libwww\" or USE=\"curl\"."
+		echo
+		die "Please re-emerge dev-libs/xmlrpc-c with USE=\"libwww\" or USE=\"curl\"."
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -39,8 +50,6 @@ src_unpack() {
 }
 
 src_compile() {
-	cd "${S}"
-
 	if [ "$(gcc-major-version)" -eq "3" ] ; then
 		append-flags "-fno-stack-protector"
 	fi