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

(Portage version: 2.1.4_rc14)

3 files changed, 41 insertions, 10 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/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() {