Add pkg_setup() to check whether the USE flags are sane.

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/app-pda/libsyncml/ChangeLog b/app-pda/libsyncml/ChangeLog
index bc3bc469bb41332bb56a3bcb4978a0c8e226d8aa..d33bc77efdb1ab8504bf136fe040ddafaf1ac08e 100644 (file)
--- a/app-pda/libsyncml/ChangeLog
+++ b/app-pda/libsyncml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-pda/libsyncml
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v 1.2 2006/11/25 10:44:26 peper Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/ChangeLog,v 1.3 2007/01/08 16:31:52 peper Exp $
+
+  08 Jan 2007; Piotr Jaroszyński <peper@gentoo.org>
+  libsyncml-0.4.2-r1.ebuild:
+  Add pkg_setup() to check whether the USE flags are sane.
 
 *libsyncml-0.4.2-r1 (25 Nov 2006)
 

diff --git a/app-pda/libsyncml/Manifest b/app-pda/libsyncml/Manifest
index 6273c8607a07f80a616129dd82c0866e55262ea6..fb4069273c3d72870def18b69eac29fbd12ed729 100644 (file)
--- a/app-pda/libsyncml/Manifest
+++ b/app-pda/libsyncml/Manifest
@@ -6,18 +6,18 @@ MD5 0e2033af7c3a1438bee4801dffd57b91 files/libsyncml-0.4.2-wbxml.patch 1398
 RMD160 aad0f1e004cf87606b6871538572dfa447f6578e files/libsyncml-0.4.2-wbxml.patch 1398
 SHA256 f3bbe29c088e7daa87646798d47925161ce8a017e9b94119a33c6824c90d7f4e files/libsyncml-0.4.2-wbxml.patch 1398
 DIST libsyncml-0.4.2.tar.gz 512702 RMD160 ca8d7459807160d6e4a0bf98de01136c295cb458 SHA1 f1d1236ce441d610612c4bf44e28602799997d86 SHA256 f9d15887ab0c9103f7798940e22f5a864a6aa3de80f9796c1b56f8876d566f1e
-EBUILD libsyncml-0.4.2-r1.ebuild 1386 RMD160 8cf7557e078ec18147d9f7e250d81d773309f5b7 SHA1 8cdad7d6ff1b10b51e435b1ba9af4de32fc43177 SHA256 719ed92e05dd4d3bc1935023e6cc29273756eef94c515f5d4d1b4a501ed833de
-MD5 160c779171622e981b60538e6ca1e171 libsyncml-0.4.2-r1.ebuild 1386
-RMD160 8cf7557e078ec18147d9f7e250d81d773309f5b7 libsyncml-0.4.2-r1.ebuild 1386
-SHA256 719ed92e05dd4d3bc1935023e6cc29273756eef94c515f5d4d1b4a501ed833de libsyncml-0.4.2-r1.ebuild 1386
+EBUILD libsyncml-0.4.2-r1.ebuild 2373 RMD160 d2112e87550bf60def744948703c96e18aea9ddf SHA1 15c2ab06e5062dbdf42f0f4f2e2dc6cca83c7fd0 SHA256 3965279e793339b42ec632025276471620170066d138a5698294e058c1056ac2
+MD5 41ab6f9e9a3a715a5d54ce89d61e91c7 libsyncml-0.4.2-r1.ebuild 2373
+RMD160 d2112e87550bf60def744948703c96e18aea9ddf libsyncml-0.4.2-r1.ebuild 2373
+SHA256 3965279e793339b42ec632025276471620170066d138a5698294e058c1056ac2 libsyncml-0.4.2-r1.ebuild 2373
 EBUILD libsyncml-0.4.2.ebuild 1258 RMD160 001c1e00f15a2fdffda0477de7ee8ca8c15895ea SHA1 eec9ab710c6060909db5638a6c3f14a9a08afdb7 SHA256 e749c083143dbe4352f9b73f6f591c25291ac28d1eab2ed8b1a3e3fdd1193a49
 MD5 5d6fdc68b0e0869a241a3afa82403266 libsyncml-0.4.2.ebuild 1258
 RMD160 001c1e00f15a2fdffda0477de7ee8ca8c15895ea libsyncml-0.4.2.ebuild 1258
 SHA256 e749c083143dbe4352f9b73f6f591c25291ac28d1eab2ed8b1a3e3fdd1193a49 libsyncml-0.4.2.ebuild 1258
-MISC ChangeLog 546 RMD160 545ddea5acd6d7a2b0f8714d68aa7b830e3ff6cd SHA1 8aa2f17839bbed3c65cdf26a15b2a1650eb19640 SHA256 af4d9193023c6652566af21ad46fb41d6ecc1604ac218d2fef7a499dd25ad6a3
-MD5 e669c078e5852b253106ecb84fff93be ChangeLog 546
-RMD160 545ddea5acd6d7a2b0f8714d68aa7b830e3ff6cd ChangeLog 546
-SHA256 af4d9193023c6652566af21ad46fb41d6ecc1604ac218d2fef7a499dd25ad6a3 ChangeLog 546
+MISC ChangeLog 688 RMD160 a4983c713f3360d90dca45b7581cf9dd7bf03bb2 SHA1 ba637f96688698d7e6863a639554bd0f2c0891d4 SHA256 3e80e2d0561a4954d70d45aebf856f9980f4ab8d36314fd183eb6be6c9e9184b
+MD5 bbd8b3c35ed5874f4861d81358675b16 ChangeLog 688
+RMD160 a4983c713f3360d90dca45b7581cf9dd7bf03bb2 ChangeLog 688
+SHA256 3e80e2d0561a4954d70d45aebf856f9980f4ab8d36314fd183eb6be6c9e9184b ChangeLog 688
 MISC metadata.xml 304 RMD160 1da32fded95735800bc96b0ff4c0a3af4691a724 SHA1 b96c72c417192c099990a616b12a1d2f55a06064 SHA256 7fa8df0f64197f3f6c018ed0d6c4cc4da014fbcc9af2da9b633f71657470236a
 MD5 45ae331a9c100ecabad1b4cd916f3d37 metadata.xml 304
 RMD160 1da32fded95735800bc96b0ff4c0a3af4691a724 metadata.xml 304
@@ -29,9 +29,9 @@ MD5 f08782044de244eb18c8147dd04fb1a2 files/digest-libsyncml-0.4.2-r1 247
 RMD160 06dc58d8055d86e4c8ec8b03cebe203e5148bb3c files/digest-libsyncml-0.4.2-r1 247
 SHA256 3b4e4493d2a103ec2bfa502bc535bd11130811c574b83db8e6c23f2793fada1d files/digest-libsyncml-0.4.2-r1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFaB6nppoStNGKGywRAnX1AKC1rebmwXDu+sfwgkuumgjekgGcFwCgslh5
-80pbCKGuSlWwt+JNEX/U3lQ=
-=Ytu8
+iD8DBQFFonH/ppoStNGKGywRAuYtAKCDl0ELPMkINecpiG7AibO2pFFGpQCfXYPj
+PUSe9UTslFbgQNPaXWv083M=
+=K9+A
 -----END PGP SIGNATURE-----

diff --git a/app-pda/libsyncml/libsyncml-0.4.2-r1.ebuild b/app-pda/libsyncml/libsyncml-0.4.2-r1.ebuild
index e330572233fd9af05c91e800f7b836cc43237eaa..0bf6610842bdd7eb17cf63b97bf948ead189017f 100644 (file)
--- a/app-pda/libsyncml/libsyncml-0.4.2-r1.ebuild
+++ b/app-pda/libsyncml/libsyncml-0.4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.4.2-r1.ebuild,v 1.1 2006/11/25 10:44:26 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-pda/libsyncml/libsyncml-0.4.2-r1.ebuild,v 1.2 2007/01/08 16:31:52 peper Exp $
 
 inherit eutils
 
@@ -28,6 +28,30 @@ DEPEND="${RDEPEND}
 # Some of the tests are broken
 RESTRICT="test"
 
+pkg_setup() {
+       if ! use obex && ! use http; then
+               eerror "${CATEGORY}/${P} without support for obex nor http is unusable."
+               einfo "Please enable \"obex\" or/and \"http\" USE flags."
+               die "Please enable \"obex\" or/and \"http\" USE flags."
+       fi
+
+       if use bluetooth; then
+               if use obex && ! built_with_use dev-libs/openobex bluetooth; then
+                       eerror "You are trying to build ${CATEGORY}/${P} with the \"bluetooth\""
+                       eerror "and \"obex\" USE flags, but dev-libs/openobex was built without"
+                       eerror "the \"bluetooth\" USE flag."
+                       einfo "Please rebuild dev-libs/openobex with \"bluetooth\" USE flag."
+                       die "Please rebuild dev-libs/openobex with \"bluetooth\" USE flag."
+               elif ! use obex; then
+                       eerror "You are trying to build ${CATEGORY}/${P} with the \"bluetooth\""
+                       eerror "USE flag, but you didn't enable the \"obex\" flag, which is"
+                       eerror "needed for bluetooth support."
+                       einfo "Please enable \"obex\" USE flag."
+                       die "Please enable \"obex\" USE flag."
+               fi
+       fi
+}
+
 src_unpack() {
        unpack ${A}
        cd "${S}"