QA - fix use invocation, get rid of subshells that break error handling

4 files changed, 31 insertions, 33 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 28637cd6774e..a440a953aa08 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.53 2004/06/14 18:48:15 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.54 2004/06/24 02:21:49 agriffis Exp $
+
+  23 Jun 2004; Aron Griffis <agriffis@gentoo.org> xscreensaver-4.14-r2.ebuild,
+  xscreensaver-4.15.ebuild:
+  QA - fix use invocation, get rid of subshells that break error handling
 
   14 Jun 2004; <pyrania@gentoo.org> xscreensaver-4.14-r2.ebuild,
   xscreensaver-4.15.ebuild:
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index e9d88f476f9b..ec4a602c03af 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,11 +1,11 @@
-MD5 6275ad374de3dc94d6c2388a419d0f7f ChangeLog 10484
-MD5 64fb2598d588d17945e6d77cf482e7b0 xscreensaver-4.14-r2.ebuild 4731
+MD5 6276c054352c371f125dc630df868cbd xscreensaver-4.14-r2.ebuild 4673
+MD5 60d14be711b0e2ef06e915aeb82795f4 ChangeLog 10667
 MD5 0c7e1c065d3ff356793aa700b36c3380 metadata.xml 309
-MD5 e6606e9033e2c5e3c515126f83d5fe8d xscreensaver-4.15.ebuild 4579
-MD5 18988e2c62fe964e00bc98c251dba3ee files/xscreensaver-4.14-icc.patch 8126
+MD5 dff3f49a9e59b5733137c771c34f037b xscreensaver-4.15.ebuild 4521
+MD5 f6238a0e5ee2c4c61bbec5441e439750 files/digest-xscreensaver-4.15 70
 MD5 8bd9730fb1f84b69efac29fab28d0db2 files/xscreensaver-4.14-analogtv_tmp.patch 419
+MD5 dc4579312065187f296cd6fdeba96664 files/xscreensaver-4.10-norpm.patch 1266
+MD5 18988e2c62fe964e00bc98c251dba3ee files/xscreensaver-4.14-icc.patch 8126
 MD5 a7b4dde4c87b97301e1a02c7ddc2dfc9 files/digest-xscreensaver-4.14-r2 70
 MD5 23c5d8085eb70d6dc6168857a31cc284 files/xscreensaver-4.14-fortune.patch 348
-MD5 dc4579312065187f296cd6fdeba96664 files/xscreensaver-4.10-norpm.patch 1266
-MD5 f6238a0e5ee2c4c61bbec5441e439750 files/digest-xscreensaver-4.15 70
 MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/pam.d/xscreensaver 79
diff --git a/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild
index 6774f5fce6e9..f1dc72ca35dc 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild,v 1.3 2004/06/14 18:48:15 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.14-r2.ebuild,v 1.4 2004/06/24 02:21:49 agriffis Exp $
 
 inherit eutils
 
@@ -51,7 +51,7 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 pkg_setup() {
-	if [ -n "`use kerberos`" -a -z "`use krb4`" ]; then
+	if use kerberos && ! use krb4; then
 		ewarn "You have enabled kerberos without krb4 support. Kerberos will be"
 		ewarn "disabled unless kerberos 4 support has been compiled with your"
 		ewarn "kerberos libraries. To do that, you should abort now and do:"
@@ -109,8 +109,8 @@ src_compile() {
 		|| myconf="${myconf} --disable-nls"
 
 
-	if [ -z "`use gtk2`" -a -n "`use gtk`" ]; then
-		if [ -n "`use gnome`" ]; then
+	if ! use gtk2 && use gtk; then
+		if use gnome; then
 			myconf="${myconf} --with-gnome --with-pixbuf"
 		fi
 	fi
@@ -142,11 +142,13 @@ src_install() {
 	make install_prefix="${D}" install || die
 
 	# install correctly in gnome2
-	use gnome && ( \
+	if use gnome; then
 		dodir /usr/share/gnome/capplets
 		insinto /usr/share/gnome/capplets
 		doins driver/screensaver-properties.desktop
-	)
+		insinto /usr/share/pixmaps
+		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
+	fi
 
 	# install symlink to satisfy kde
 	use kde && dosym /usr/share/control-center/screensavers /usr/lib/xscreensaver/config
@@ -154,13 +156,8 @@ src_install() {
 	# Remove "extra" capplet
 	rm -f ${D}/usr/share/control-center/capplets/screensaver-properties.desktop
 
-	use gnome && ( \
-		insinto /usr/share/pixmaps
-		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
-	)
-
-	use pam && ( \
+	if use pam; then
 		insinto /etc/pam.d
 		doins ${FILESDIR}/pam.d/xscreensaver
-	)
+	fi
 }
diff --git a/x11-misc/xscreensaver/xscreensaver-4.15.ebuild b/x11-misc/xscreensaver/xscreensaver-4.15.ebuild
index aba0f03aa48c..bd41be94aa10 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.15.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.15.ebuild,v 1.5 2004/06/14 18:48:15 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.15.ebuild,v 1.6 2004/06/24 02:21:49 agriffis Exp $
 
 inherit eutils
 
@@ -59,7 +59,7 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 pkg_setup() {
-	if [ -n "`use kerberos`" -a -z "`use krb4`" ]; then
+	if use kerberos && ! use krb4; then
 		ewarn "You have enabled kerberos without krb4 support. Kerberos will be"
 		ewarn "disabled unless kerberos 4 support has been compiled with your"
 		ewarn "kerberos libraries. To do that, you should abort now and do:"
@@ -114,8 +114,8 @@ src_compile() {
 		|| myconf="${myconf} --disable-nls"
 
 
-	if [ -z "`use gtk2`" -a -n "`use gtk`" ]; then
-		if [ -n "`use gnome`" ]; then
+	if ! use gtk2 && use gtk; then
+		if use gnome; then
 			myconf="${myconf} --with-gnome --with-pixbuf"
 		fi
 	fi
@@ -147,11 +147,13 @@ src_install() {
 	make install_prefix="${D}" install || die
 
 	# install correctly in gnome2
-	use gnome && ( \
+	if use gnome; then
 		dodir /usr/share/gnome/capplets
 		insinto /usr/share/gnome/capplets
 		doins driver/screensaver-properties.desktop
-	)
+		insinto /usr/share/pixmaps
+		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
+	fi
 
 	# install symlink to satisfy kde
 	use kde && dosym /usr/share/control-center/screensavers /usr/lib/xscreensaver/config
@@ -159,13 +161,8 @@ src_install() {
 	# Remove "extra" capplet
 	rm -f ${D}/usr/share/control-center/capplets/screensaver-properties.desktop
 
-	use gnome && ( \
-		insinto /usr/share/pixmaps
-		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
-	)
-
-	use pam && ( \
+	if use pam; then
 		insinto /etc/pam.d
 		doins ${FILESDIR}/pam.d/xscreensaver
-	)
+	fi
 }