Fixed bug #135549 (package collisions).

Package-Manager: portage-2.1_rc4-r2

diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog
index 7b2c6db13e3264453036b34f24c520048dab38c8..ecc28fbc4a61b76585ce0f5606848b66651baca5 100644 (file)
--- a/x11-misc/xscreensaver/ChangeLog
+++ b/x11-misc/xscreensaver/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xscreensaver
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.138 2006/06/04 10:01:47 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/ChangeLog,v 1.139 2006/06/06 10:26:18 nelchael Exp $
+
+  06 Jun 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  xscreensaver-5.00.ebuild:
+  Fixed bug #135549 (package collisions).
 
 *xscreensaver-5.00 (04 Jun 2006)
 

diff --git a/x11-misc/xscreensaver/xscreensaver-5.00.ebuild b/x11-misc/xscreensaver/xscreensaver-5.00.ebuild
index f5feb9d31c95654e90856f6a8fcf4013b95c13fb..093583822eff5759c59fd62f1ad219bbce61b31c 100644 (file)
--- a/x11-misc/xscreensaver/xscreensaver-5.00.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.00.ebuild,v 1.1 2006/06/04 10:01:47 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xscreensaver/xscreensaver-5.00.ebuild,v 1.2 2006/06/06 10:26:18 nelchael Exp $
 
 inherit eutils flag-o-matic pam fixheadtails autotools
 
@@ -158,6 +158,13 @@ src_install() {
        use pam && fperms 755 /usr/bin/xscreensaver
        pamd_mimic_system xscreensaver auth
 
+       # Fix bug #135549:
+       rm -f "${D}/usr/share/xscreensaver/config/electricsheep.xml"
+       rm -f "${D}/usr/share/xscreensaver/config/fireflies.xml"
+       dodir /usr/share/man/man6x
+       mv "${D}/usr/share/man/man6/worm.6" \
+               "${D}/usr/share/man/man6x/worm.6x"
+
 }
 
 pkg_postinst() {