fix USE flags tests and die only with a complete check of features

Package-Manager: portage-2.1.4_rc14

4 files changed, 63 insertions, 22 deletions

diff --git a/x11-libs/goffice/ChangeLog b/x11-libs/goffice/ChangeLog
index cfb7888d4b1c..8779ae8afbeb 100644
--- a/x11-libs/goffice/ChangeLog
+++ b/x11-libs/goffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/goffice
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.32 2008/01/02 17:10:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.33 2008/01/02 22:55:12 eva Exp $
+
+  02 Jan 2008; Gilles Dartiguelongue <eva@gentoo.org> goffice-0.4.3.ebuild,
+  goffice-0.6.1.ebuild:
+  fix USE flags tests and die only with a complete check of features
 
   02 Jan 2008; Brent Baude <ranger@gentoo.org> goffice-0.6.1.ebuild:
   Marking goffice-0.6.1 ppc for bug 198385
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 54e0c82db48e..c8904268cbde 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX goffice-0.6.1-die-gtk-doc.patch 441 RMD160 d855c5c2e163bbfe9be4314c47c1fd37ad81ed66 SHA1 3c12861087bce53933004f77afe59e47c6a41fcf SHA256 4b0b6b3273d1ea7500a855311aab0906aa6ea6a326331e73b6dae96eb64f5748
 MD5 9ab75e16517dd724efabe5b546e1cf4c files/goffice-0.6.1-die-gtk-doc.patch 441
 RMD160 d855c5c2e163bbfe9be4314c47c1fd37ad81ed66 files/goffice-0.6.1-die-gtk-doc.patch 441
@@ -9,18 +12,18 @@ EBUILD goffice-0.2.1.ebuild 1551 RMD160 cade71502b36d292c06e87a5613d648f7cbafb9b
 MD5 4a8c880bb3c6218d98ef22a4732610df goffice-0.2.1.ebuild 1551
 RMD160 cade71502b36d292c06e87a5613d648f7cbafb9b goffice-0.2.1.ebuild 1551
 SHA256 ab44b56a516ee1716d370a0fd6c6b9a789da6e573c27a282973ccfceae23c7bb goffice-0.2.1.ebuild 1551
-EBUILD goffice-0.4.3.ebuild 2151 RMD160 83e25556f2304c3460fce089e7e9292358f73204 SHA1 8870ead5e8d2e0dac818197a81f48a9293bca9f5 SHA256 9c05d66e12d0af18ccaf3536de0b566be0b11a7eda1e7807f9c7f6b1e5da7013
-MD5 52add8ff02fb89b1c3b93138886186da goffice-0.4.3.ebuild 2151
-RMD160 83e25556f2304c3460fce089e7e9292358f73204 goffice-0.4.3.ebuild 2151
-SHA256 9c05d66e12d0af18ccaf3536de0b566be0b11a7eda1e7807f9c7f6b1e5da7013 goffice-0.4.3.ebuild 2151
-EBUILD goffice-0.6.1.ebuild 1876 RMD160 f21d24efba50dedf7f49d0d7da98b1031583ed4b SHA1 450da527ca5f345602464f0001142bfd174e58a7 SHA256 82da7adb127509046bce016db5791b05767f3da464cf406c78a5030576cd47b4
-MD5 ab04b2789165cf01b20bd6b1dd1eeed7 goffice-0.6.1.ebuild 1876
-RMD160 f21d24efba50dedf7f49d0d7da98b1031583ed4b goffice-0.6.1.ebuild 1876
-SHA256 82da7adb127509046bce016db5791b05767f3da464cf406c78a5030576cd47b4 goffice-0.6.1.ebuild 1876
-MISC ChangeLog 4369 RMD160 82e87aeb64273f7d06da2cef2087ffc2d48b2f9b SHA1 5988e25e5e1e758390deceeab68b540049fe8b24 SHA256 db0ecf9c0b743ecd07809ed3c80f6535ebb74ae53f9a1596eef663ac13042db0
-MD5 76e6591aa44485445564595dcd6ee5af ChangeLog 4369
-RMD160 82e87aeb64273f7d06da2cef2087ffc2d48b2f9b ChangeLog 4369
-SHA256 db0ecf9c0b743ecd07809ed3c80f6535ebb74ae53f9a1596eef663ac13042db0 ChangeLog 4369
+EBUILD goffice-0.4.3.ebuild 2831 RMD160 b800838573678b03aaece38a6bee65ce1500c63b SHA1 868c0077f4848d5db07dfbed0c6f03dc6feb8292 SHA256 d7a8892e52a83709309f322f8d06b9c6bbbc706c7ac8a2f7150f288a19cd1b96
+MD5 1010ba35b1c8ff62727ecc47508b4569 goffice-0.4.3.ebuild 2831
+RMD160 b800838573678b03aaece38a6bee65ce1500c63b goffice-0.4.3.ebuild 2831
+SHA256 d7a8892e52a83709309f322f8d06b9c6bbbc706c7ac8a2f7150f288a19cd1b96 goffice-0.4.3.ebuild 2831
+EBUILD goffice-0.6.1.ebuild 2289 RMD160 8d9ded962afb2b975540ccffec222cd42edd1469 SHA1 105938cbc78486c28afd391ce2fd8b523d940adb SHA256 6ff82c792c4deffde4402757caf65545138733b0d0a412f94ab85be23e8b5dfe
+MD5 e37eb37723d31bd4d2bd15889b9cce09 goffice-0.6.1.ebuild 2289
+RMD160 8d9ded962afb2b975540ccffec222cd42edd1469 goffice-0.6.1.ebuild 2289
+SHA256 6ff82c792c4deffde4402757caf65545138733b0d0a412f94ab85be23e8b5dfe goffice-0.6.1.ebuild 2289
+MISC ChangeLog 4536 RMD160 2d1df69743622bb4d8527d239686cffa9b7121af SHA1 eba8f43fd6eca505e571b125cd66f432e066c9c2 SHA256 67f73d7252d1b97b98cc6f7d33905f50598ac966f834b89eb27f4d90028eb8d1
+MD5 27789ff887b2732d0c95984ac3d33b37 ChangeLog 4536
+RMD160 2d1df69743622bb4d8527d239686cffa9b7121af ChangeLog 4536
+SHA256 67f73d7252d1b97b98cc6f7d33905f50598ac966f834b89eb27f4d90028eb8d1 ChangeLog 4536
 MISC metadata.xml 355 RMD160 c615373a952d378745eededbb389702d3d40d65a SHA1 27456654786f959e23af4221d884fd7ac0f6ac41 SHA256 5eedbf049eb7d297420c9dc4f58b392f9a05405a9d755e75661157a45fb51962
 MD5 7ab60162fa2a8efcd8dfa8c42366b1dc metadata.xml 355
 RMD160 c615373a952d378745eededbb389702d3d40d65a metadata.xml 355
@@ -34,3 +37,10 @@ SHA256 261ebd809f98d0a4b5756337e20ab8f9cf9d80eec32ad992365a2449c3a80ca0 files/di
 MD5 dc18f3085af121fee96199319a0c7cf1 files/digest-goffice-0.6.1 247
 RMD160 be30329ec617619e4003487cb1650c0defd8533a files/digest-goffice-0.6.1 247
 SHA256 c3c86cbfed1b7385f817c6a3680de3fc00883a3e84b7e6c3aada802733e20262 files/digest-goffice-0.6.1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.8 (GNU/Linux)
+
+iEYEARECAAYFAkd8Fg4ACgkQ1fmVwcYIWAZE8gCfe7iOeRHLBys9hxTv3q/V4cvY
+J8gAniK6ee37+DqU/UzEELAWIy0OXzeQ
+=QPx9
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/goffice/goffice-0.4.3.ebuild b/x11-libs/goffice/goffice-0.4.3.ebuild
index 849d43899512..1ea86f8476c1 100644
--- a/x11-libs/goffice/goffice-0.4.3.ebuild
+++ b/x11-libs/goffice/goffice-0.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.4.3.ebuild,v 1.7 2008/01/02 14:28:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.4.3.ebuild,v 1.8 2008/01/02 22:55:12 eva Exp $
 
 inherit eutils gnome2 flag-o-matic
 
@@ -37,12 +37,30 @@ DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
 pkg_setup() {
 	G2CONF="${G2CONF} $(use_with gnome)"
 
+	local diemessage=""
+
 	if use gnome && ! built_with_use gnome-extra/libgsf gnome; then
 		eerror "Please rebuild gnome-extra/libgsf with gnome support enabled"
-		eerror "USE=\"gnome\" emerge gnome-extra/libgsf"
+		eerror "echo \"gnome-extra/libgsf gnome\" >> /etc/portage/package.use"
 		eerror "or add  \"gnome\" to your USE string in /etc/make.conf"
-		die "No Gnome support found in libgsf"
+		diemessage="No Gnome support found in libgsf."
+	fi
+
+	if ! built_with_use x11-libs/cairo svg; then
+		eerror "Please rebuild x11-libs/cairo with svg support enabled"
+		eerror "echo \"x11-libs/cairo svg\" >> /etc/portage/package.use"
+		eerror "emerge -1 x11-libs/cairo"
+		diemessage="${diemessage} No SVG support found in cairo."
 	fi
+
+	if ! built_with_use dev-libs/libpcre unicode; then
+		eerror "Please rebuild dev-libs/libpcre with unicode support enabled"
+		eerror "echo \"dev-libs/libpcre unicode\" >> /etc/portage/package.use"
+		eerror "emerge -1 dev-libs/libpcre"
+		diemessage="${diemessage} No unicode support found in libpcre."
+	fi
+
+	[ -n "${diemessage}" ] && die ${diemessage}
 }
 
 src_unpack() {
diff --git a/x11-libs/goffice/goffice-0.6.1.ebuild b/x11-libs/goffice/goffice-0.6.1.ebuild
index cc214d6ed601..7a8c45d273f6 100644
--- a/x11-libs/goffice/goffice-0.6.1.ebuild
+++ b/x11-libs/goffice/goffice-0.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.6.1.ebuild,v 1.7 2008/01/02 17:10:07 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.6.1.ebuild,v 1.8 2008/01/02 22:55:12 eva Exp $
 
 inherit eutils gnome2 flag-o-matic
 
@@ -38,21 +38,30 @@ DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
 pkg_setup() {
 	G2CONF="${G2CONF} $(use_with gnome)"
 
+	local diemessage=""
+
 	if use gnome && ! built_with_use gnome-extra/libgsf gnome; then
 		eerror "Please rebuild gnome-extra/libgsf with gnome support enabled"
-		eerror "USE=\"gnome\" emerge gnome-extra/libgsf"
+		eerror "echo \"gnome-extra/libgsf gnome\" >> /etc/portage/package.use"
 		eerror "or add  \"gnome\" to your USE string in /etc/make.conf"
-		die "No Gnome support found in libgsf"
+		diemessage="No Gnome support found in libgsf."
 	fi
 
 	if ! built_with_use x11-libs/cairo svg ; then
-		eerror
 		eerror "Please rebuild x11-libs/cairo with svg support enabled"
 		eerror "echo \"x11-libs/cairo svg\" >> /etc/portage/package.use"
 		eerror "emerge -1 x11-libs/cairo"
-		eerror
-		die "cairo built with -svg"
+		diemessage="${diemessage} No SVG support found in cairo."
+	fi
+
+	if ! built_with_use dev-libs/libpcre unicode; then
+		eerror "Please rebuild dev-libs/libpcre with unicode support enabled"
+		eerror "echo \"dev-libs/libpcre unicode\" >> /etc/portage/package.use"
+		eerror "emerge -1 dev-libs/libpcre"
+		diemessage="${diemessage} No unicode support found in libpcre."
 	fi
+
+	[ -n "${diemessage}" ] && die ${diemessage}
 }
 
 src_unpack() {