From b702b12a03025f08cee4935d27bb50e3e2526e21 Mon Sep 17 00:00:00 2001 From: Krzysztof Pawlik Date: Tue, 6 Jun 2006 10:26:18 +0000 Subject: [PATCH] Fixed bug #135549 (package collisions). Package-Manager: portage-2.1_rc4-r2 --- x11-misc/xscreensaver/ChangeLog | 6 +++++- x11-misc/xscreensaver/xscreensaver-5.00.ebuild | 9 ++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/x11-misc/xscreensaver/ChangeLog b/x11-misc/xscreensaver/ChangeLog index 7b2c6db13e32..ecc28fbc4a61 100644 --- 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 + 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 f5feb9d31c95..093583822eff 100644 --- 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() { -- 2.26.2