fix use invocation

3 files changed, 21 insertions, 15 deletions

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 471d634c51d0..59758bfe18b3 100644
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
  ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.58 2004/07/24 06:28:11 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.59 2004/07/27 00:18:16 mr_bones_ Exp $
+
+  26 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  xscreensaver-4.16.ebuild:
+  fix use invocation
 
   24 Jul 2004; Alastair Tse <liquidx@gentoo.org>
   +files/xscreensaver-4.16-nsfw.patch, xscreensaver-4.16.ebuild:
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 2ec6bcc88e45..dbdfefa51b60 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -1,8 +1,8 @@
-MD5 2118bfbd805f94948ac705b9fcd6c1a9 ChangeLog 11227
+MD5 4936ae0fb0bc52d6d5ab1042c53e059d ChangeLog 11334
 MD5 0c7e1c065d3ff356793aa700b36c3380 metadata.xml 309
 MD5 e6d30dd55a138f1df371b5c57146d787 xscreensaver-4.14-r2.ebuild 4665
 MD5 47a7c7489bfb281970e80d9dd5d9a016 xscreensaver-4.15.ebuild 4511
-MD5 e12aa7079ddabcdbb241171f3b96c87d xscreensaver-4.16.ebuild 4704
+MD5 e73a75cd91487b92a238281bff089341 xscreensaver-4.16.ebuild 4679
 MD5 a7b4dde4c87b97301e1a02c7ddc2dfc9 files/digest-xscreensaver-4.14-r2 70
 MD5 8bd9730fb1f84b69efac29fab28d0db2 files/xscreensaver-4.14-analogtv_tmp.patch 419
 MD5 f6238a0e5ee2c4c61bbec5441e439750 files/digest-xscreensaver-4.15 70
diff --git a/x11-misc/xscreensaver/xscreensaver-4.16.ebuild b/x11-misc/xscreensaver/xscreensaver-4.16.ebuild
index 4358fd95ae10..a84923e80b80 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.16.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.16.ebuild,v 1.3 2004/07/24 08:50:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.16.ebuild,v 1.4 2004/07/27 00:18:16 mr_bones_ 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:"
@@ -118,14 +118,16 @@ 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
 
-	use icc && export CC=icc
-	use icc && autoconf
+	if use icc ; then
+		export CC=icc
+		autoconf
+	fi
 
 	econf \
 		--enable-hackdir=/usr/lib/xscreensaver \
@@ -151,11 +153,11 @@ 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
-	)
+	fi
 
 	# install symlink to satisfy kde
 	use kde && dosym /usr/share/control-center/screensavers /usr/lib/xscreensaver/config
@@ -163,13 +165,13 @@ src_install() {
 	# Remove "extra" capplet
 	rm -f ${D}/usr/share/control-center/capplets/screensaver-properties.desktop
 
-	use gnome && ( \
+	if use gnome ; then
 		insinto /usr/share/pixmaps
 		newins ${S}/utils/images/logo-50.xpm xscreensaver.xpm
-	)
+	fi
 
-	use pam && ( \
+	if use pam ; then
 		insinto /etc/pam.d
 		doins ${FILESDIR}/pam.d/xscreensaver
-	)
+	fi
 }