summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2002-10-27 16:21:31 +0000
committerMartin Schlemmer <azarah@gentoo.org>2002-10-27 16:21:31 +0000
commit6319f274a230cca71843bc05be74b9f63ed0365e (patch)
tree3d8f3f1777640ce0a0072b2058c73e762f921f80 /x11-misc
parentsome patches added (diff)
downloadgentoo-2-6319f274a230cca71843bc05be74b9f63ed0365e.tar.gz
gentoo-2-6319f274a230cca71843bc05be74b9f63ed0365e.tar.bz2
gentoo-2-6319f274a230cca71843bc05be74b9f63ed0365e.zip
remove extra capplet moved OUTSIDE gnome stuff, as it could still be installed without gnome.
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/xscreensaver/xscreensaver-4.06-r2.ebuild7
1 files changed, 5 insertions, 2 deletions
diff --git a/x11-misc/xscreensaver/xscreensaver-4.06-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-4.06-r2.ebuild
index 1d3ae7a4f6fb..bf67edee23d4 100644
--- a/x11-misc/xscreensaver/xscreensaver-4.06-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-4.06-r2.ebuild
@@ -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