remove extra capplet moved OUTSIDE gnome stuff, as it could still be installed withou...
authorMartin Schlemmer <azarah@gentoo.org>
Sun, 27 Oct 2002 16:21:31 +0000 (16:21 +0000)
committerMartin Schlemmer <azarah@gentoo.org>
Sun, 27 Oct 2002 16:21:31 +0000 (16:21 +0000)
x11-misc/xscreensaver/xscreensaver-4.06-r2.ebuild

index 1d3ae7a4f6fb4be45b35f501b993334b9caec35e..bf67edee23d4441775c208004d62092e2271b0d3 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.06-r2.ebuild,v 1.3 2002/10/26 18:03:02 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-4.06-r2.ebuild,v 1.4 2002/10/27 16:21:31 azarah Exp $
 
 IUSE="pam kerberos gtk motif gnome opengl jpeg xml"
 
@@ -118,14 +118,17 @@ src_install() {
        [ -n "${KDEDIR}" ] && dodir ${KDEDIR}/bin
        
        make install_prefix="${D}" install || die
+       
        # install correctly in gnome2 
        use gnome && ( \
                dodir /usr/share/gnome/capplets
                insinto /usr/share/gnome/capplets
                doins driver/screensaver-properties.desktop
-               rm -f ${D}/usr/share/control-center/capplets/screensaver-properties.desktop
        )
 
+       # 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